From abbc84b8d28ae56432a03bb541e19bdc25d29e97 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 6 Jan 2002 02:21:41 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270584 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java | 2 +- .../ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java | 5 +++-- .../ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java | 2 +- .../ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index f57d33106..dd85408e9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -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" ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 9a41f559b..d867f0b88 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -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 ) ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index f57d33106..dd85408e9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -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" ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 9a41f559b..d867f0b88 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -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 ) );