donaldp 02/01/05 18:21:41
Modified:
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
WeblogicDeploymentTool.java
WebsphereDeploymentTool.java
Log:
Revision Changes Path
1.13 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
Index: WeblogicDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WeblogicDeploymentTool.java 30 Dec 2001 03:33:58 -0000 1.12
+++ WeblogicDeploymentTool.java 6 Jan 2002 02:21:41 -0000 1.13
@@ -802,7 +802,7 @@
{
// 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" );
1.13 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Index: WebsphereDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebsphereDeploymentTool.java 30 Dec 2001 03:33:58 -0000 1.12
+++ WebsphereDeploymentTool.java 6 Jan 2002 02:21:41 -0000 1.13
@@ -959,14 +959,15 @@
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 ) );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
