ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb WeblogicDeploymentTool.java
Date Wed, 18 Jul 2001 14:03:34 GMT
conor       01/07/18 07:03:34

  Modified:    docs/manual/OptionalTasks ejb.html
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        WeblogicDeploymentTool.java
  Log:
  Linked the compiler used by ejbjar to the build.compiler property. This
  linking can be overidden by either supplying a value to the compiler attribute
  or setting that attribute to "default", in which case ejbc's default compiler
  choise will be used.
  
  PR:	1146
  Suggested by:	David Ventimiglia <david.ventimiglia@msdw.com>
  
  Revision  Changes    Path
  1.6       +6 -2      jakarta-ant/docs/manual/OptionalTasks/ejb.html
  
  Index: ejb.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/OptionalTasks/ejb.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ejb.html	2001/07/08 00:00:38	1.5
  +++ ejb.html	2001/07/18 14:03:33	1.6
  @@ -19,7 +19,7 @@
   </ul>
   
   <p>Version @VERSION@<br>
  -$Id: ejb.html,v 1.5 2001/07/08 00:00:38 conor Exp $
  +$Id: ejb.html,v 1.6 2001/07/18 14:03:33 conor Exp $
   </p>
   <hr>
   <h2>Table of Contents</h2>
  @@ -777,7 +777,11 @@
       <td valign="top">This allows for the selection of a different compiler
                        to be used for the compilation of the generated Java
                        files. This could be set, for example, to Jikes to 
  -                     compile with the Jikes compiler.</td>
  +                     compile with the Jikes compiler. If this is not set
  +                     and the <code>build.compiler</code> property is set
  +                     to jikes, the Jikes compiler will be used. If this
  +                     is not desired, the value &quot;<code>default</code>&quot;

  +                     may be given to use the default compiler</td>
       <td valign="top" align="center">No</td>
     </tr>
     <tr>
  
  
  
  1.28      +16 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  
  Index: WeblogicDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- WeblogicDeploymentTool.java	2001/07/18 13:32:03	1.27
  +++ WeblogicDeploymentTool.java	2001/07/18 14:03:34	1.28
  @@ -90,6 +90,8 @@
       protected static final String DEFAULT_WL60_DTD_LOCATION 
           = "/weblogic/ejb20/dd/xml/weblogic600-ejb-jar.dtd";
   
  +    protected static final String DEFAULT_COMPILER = "default"; 
  +    
       protected static final String WL_DD = "weblogic-ejb-jar.xml";
       protected static final String WL_CMP_DD = "weblogic-cmp-rdbms-jar.xml";
   
  @@ -420,10 +422,21 @@
               javaTask.createArg().setLine(additionalArgs);
               if (keepgenerated) {
                   javaTask.createArg().setValue("-keepgenerated");
  +            }
  +            if (compiler == null) {
  +                // 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");
  +                if (buildCompiler.equals("jikes")) {
  +                    javaTask.createArg().setValue("-compiler");
  +                    javaTask.createArg().setValue("jikes");
  +                }
               }
  -            if (compiler != null) {
  -                javaTask.createArg().setValue("-compiler");
  -                javaTask.createArg().setValue(compiler);
  +            else {
  +                if (!compiler.equals(DEFAULT_COMPILER)) {
  +                    javaTask.createArg().setValue("-compiler");
  +                    javaTask.createArg().setValue(compiler);
  +                }
               }
               javaTask.createArg().setValue(sourceJar.getPath());
               javaTask.createArg().setValue(destJar.getPath());
  
  
  

Mime
View raw message