git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270584 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -802,7 +802,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool | |||||
| { | { | ||||
| // try to use the compiler specified by build.compiler. Right now we are just going | // try to use the compiler specified by build.compiler. Right now we are just going | ||||
| // to allow Jikes | // to allow Jikes | ||||
| String buildCompiler = getTask().getProject().getProperty( "build.compiler" ); | |||||
| String buildCompiler = getTask().getProperty( "build.compiler" ).toString(); | |||||
| if( buildCompiler != null && buildCompiler.equals( "jikes" ) ) | if( buildCompiler != null && buildCompiler.equals( "jikes" ) ) | ||||
| { | { | ||||
| javaTask.createArg().setValue( "-compiler" ); | javaTask.createArg().setValue( "-compiler" ); | ||||
| @@ -959,14 +959,15 @@ public class WebsphereDeploymentTool | |||||
| EnvironmentVariable var = new EnvironmentVariable(); | EnvironmentVariable var = new EnvironmentVariable(); | ||||
| var.setKey( "websphere.lib.dir" ); | 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 ); | javaTask.addSysproperty( var ); | ||||
| // Set the working directory | // Set the working directory | ||||
| javaTask.setDir( new File( getTask().getProject().getProperty( "websphere.home" ) ) ); | |||||
| javaTask.setDir( new File( webshpereHome ) ); | |||||
| @@ -802,7 +802,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool | |||||
| { | { | ||||
| // try to use the compiler specified by build.compiler. Right now we are just going | // try to use the compiler specified by build.compiler. Right now we are just going | ||||
| // to allow Jikes | // to allow Jikes | ||||
| String buildCompiler = getTask().getProject().getProperty( "build.compiler" ); | |||||
| String buildCompiler = getTask().getProperty( "build.compiler" ).toString(); | |||||
| if( buildCompiler != null && buildCompiler.equals( "jikes" ) ) | if( buildCompiler != null && buildCompiler.equals( "jikes" ) ) | ||||
| { | { | ||||
| javaTask.createArg().setValue( "-compiler" ); | javaTask.createArg().setValue( "-compiler" ); | ||||
| @@ -959,14 +959,15 @@ public class WebsphereDeploymentTool | |||||
| EnvironmentVariable var = new EnvironmentVariable(); | EnvironmentVariable var = new EnvironmentVariable(); | ||||
| var.setKey( "websphere.lib.dir" ); | 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 ); | javaTask.addSysproperty( var ); | ||||
| // Set the working directory | // Set the working directory | ||||
| javaTask.setDir( new File( getTask().getProject().getProperty( "websphere.home" ) ) ); | |||||
| javaTask.setDir( new File( webshpereHome ) ); | |||||