ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/docs/manual/OptionalTasks ejb.html
Date Mon, 05 Jan 2004 11:46:06 GMT
peterreilly    2004/01/05 03:46:06

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
                        ANT_16_BRANCH JbossDeploymentTool.java
               docs/manual/OptionalTasks Tag: ANT_16_BRANCH ejb.html
  Log:
  Sync with HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.16.2.1  +8 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
  
  Index: JbossDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- JbossDeploymentTool.java	19 Jul 2003 11:20:17 -0000	1.16
  +++ JbossDeploymentTool.java	5 Jan 2004 11:46:06 -0000	1.16.2.1
  @@ -120,7 +120,14 @@
        * of this jar will be checked against the dependent bean classes.
        */
       File getVendorOutputJarFile(String baseName) {
  -        return new File(getParent().getDestdir(), baseName + jarSuffix);
  +        if (getDestDir() == null && getParent().getDestdir() == null) {
  +            throw new BuildException("DestDir not specified");
  +        }
  +        if (getDestDir() == null) {
  +            return new File(getParent().getDestdir(), baseName + jarSuffix);
  +        } else {
  +            return new File(getDestDir(), baseName + jarSuffix);
  +        }
       }
   
       /**
  
  
  
  No                   revision
  No                   revision
  1.36.2.2  +3 -2      ant/docs/manual/OptionalTasks/ejb.html
  
  Index: ejb.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ejb.html,v
  retrieving revision 1.36.2.1
  retrieving revision 1.36.2.2
  diff -u -r1.36.2.1 -r1.36.2.2
  --- ejb.html	9 Oct 2003 21:01:12 -0000	1.36.2.1
  +++ ejb.html	5 Jan 2004 11:46:06 -0000	1.36.2.2
  @@ -716,7 +716,8 @@
                        namespace. Note that this attribute is only used if the
                        task is generating generic jars (i.e. no vendor-specific
                        deployment elements have been specified).</td>
  -    <td valign="top" align="center">Yes</td>
  +    <td valign="top" align="center">Yes, unless vendor-specific deployment elements
  +    have been specified.</td>
     </tr>
     <tr>
       <td valign="top">cmpversion</td>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message