conor 2003/02/16 05:12:31
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
ANT_15_BRANCH WebsphereDeploymentTool.java
Log:
Only require webspher.home to be set if ejbdeploy=true
PR: 14958
Submitted by: Jesse Stockall
Revision Changes Path
No revision
No revision
1.11.2.6 +6 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Index: WebsphereDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -w -u -r1.11.2.5 -r1.11.2.6
--- WebsphereDeploymentTool.java 10 Feb 2003 14:25:07 -0000 1.11.2.5
+++ WebsphereDeploymentTool.java 16 Feb 2003 13:12:31 -0000 1.11.2.6
@@ -671,11 +671,13 @@
*/
public void validateConfigured() throws BuildException {
super.validateConfigured();
+ if (ejbdeploy) {
String home = getTask().getProject().getProperty("websphere.home");
if (home == null) {
- throw new BuildException("Please set the property
'websphere.home' in your buildfile");
+ throw new BuildException("The 'websphere.home' property must
be set when 'ejbdeploy=true'");
}
websphereHome = getTask().getProject().resolveFile(home);
+ }
}