cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb WebsphereDeploymentTool.java

[conor]

conor       2003/02/16 05:19:40

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        WebsphereDeploymentTool.java
  Log:
  Merge
  
  Revision  Changes    Path
  1.18      +7 -0      
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.17
  retrieving revision 1.18
  diff -u -w -u -r1.17 -r1.18
  --- WebsphereDeploymentTool.java      10 Feb 2003 14:13:52 -0000      1.17
  +++ WebsphereDeploymentTool.java      16 Feb 2003 13:19:40 -0000      1.18
  @@ -699,6 +699,13 @@
        */
       public void validateConfigured() throws BuildException {
           super.validateConfigured();
  +        if (ejbdeploy) {
  +            String home = 
getTask().getProject().getProperty("websphere.home");
  +            if (home == null) {
  +                throw new BuildException("The 'websphere.home' property must 
be set when 'ejbdeploy=true'");
  +            }
  +            websphereHome = getTask().getProject().resolveFile(home);
  +        }
       }