Browse Source

*** empty log message ***

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270584 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
abbc84b8d2
4 changed files with 8 additions and 6 deletions
  1. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  2. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  3. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  4. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java

+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java View File

@@ -802,7 +802,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool
{
// try to use the compiler specified by build.compiler. Right now we are just going
// to allow Jikes
String buildCompiler = getTask().getProject().getProperty( "build.compiler" );
String buildCompiler = getTask().getProperty( "build.compiler" ).toString();
if( buildCompiler != null && buildCompiler.equals( "jikes" ) )
{
javaTask.createArg().setValue( "-compiler" );


+ 3
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java View File

@@ -959,14 +959,15 @@ public class WebsphereDeploymentTool

EnvironmentVariable var = new EnvironmentVariable();
var.setKey( "websphere.lib.dir" );
var.setValue( getTask().getProject().getProperty( "websphere.home" ) + "/lib" );
final String webshpereHome = getTask().getProperty( "websphere.home" ).toString();
var.setValue( webshpereHome + "/lib" );
javaTask.addSysproperty( var );



// Set the working directory

javaTask.setDir( new File( getTask().getProject().getProperty( "websphere.home" ) ) );
javaTask.setDir( new File( webshpereHome ) );





+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java View File

@@ -802,7 +802,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool
{
// try to use the compiler specified by build.compiler. Right now we are just going
// to allow Jikes
String buildCompiler = getTask().getProject().getProperty( "build.compiler" );
String buildCompiler = getTask().getProperty( "build.compiler" ).toString();
if( buildCompiler != null && buildCompiler.equals( "jikes" ) )
{
javaTask.createArg().setValue( "-compiler" );


+ 3
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java View File

@@ -959,14 +959,15 @@ public class WebsphereDeploymentTool

EnvironmentVariable var = new EnvironmentVariable();
var.setKey( "websphere.lib.dir" );
var.setValue( getTask().getProject().getProperty( "websphere.home" ) + "/lib" );
final String webshpereHome = getTask().getProperty( "websphere.home" ).toString();
var.setValue( webshpereHome + "/lib" );
javaTask.addSysproperty( var );



// Set the working directory

javaTask.setDir( new File( getTask().getProject().getProperty( "websphere.home" ) ) );
javaTask.setDir( new File( webshpereHome ) );





Loading…
Cancel
Save