[jboss-cvs] jbosstest build.xml

[Scott M S. <st...@us...>]

  User: starksm 
  Date: 02/05/29 15:16:17

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  The build was not generating the two versions of the cts-cmp2 ears
  correctly to produce different cmp beans.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.22 +15 -9     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.21
  retrieving revision 1.106.2.22
  diff -u -r1.106.2.21 -r1.106.2.22
  --- build.xml	29 May 2002 07:07:59 -0000	1.106.2.21
  +++ build.xml	29 May 2002 22:16:17 -0000	1.106.2.22
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.21 2002/05/29 07:07:59 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.22 2002/05/29 22:16:17 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -400,6 +400,10 @@
   	      refid="xdoclet.task.classpath"/>
       <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/>
   
  +    <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces" />
  +    <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java"
  +      file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt"
  +      overwrite="true" />
   
     </target>
   
  @@ -916,14 +920,13 @@
       </jar>
   
       <!-- Build version 1 of the cts-cmp2 ear -->
  +    <delete dir="${build.gen-src}/org/jboss/test/cts" />
       <mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb" />
       <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces" />
       <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java"
  -      file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt"
  -      overwrite="true" />
  +      file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt"/>
       <copy tofile="${build.gen-src}/org/jboss/test/cts/ejb/CtsCmp2Bean.java"
  -      file="${source.java}/org/jboss/test/cts/ejb/CtsCmp2Bean_V1.txt" 
  -      overwrite="true" />
  +      file="${source.java}/org/jboss/test/cts/ejb/CtsCmp2Bean_V1.txt" />
       <javac destdir="${build.classes}" optimize="${javac.optimize}"
         target="${javac.target}" debug="${javac.debug}" >
          <src path="${build.gen-src}"/>
  @@ -953,12 +956,15 @@
       </ear>
   
       <!-- Build version 2 of the cts-cmp2 ear -->
  +    <delete dir="${build.classes}/org/jboss/test/cts">
  +      <include name="**/CtsCmp2Local.class" />
  +      <include name="**/CtsCmp2Bean.class" />
  +    </delete>
  +    <delete dir="${build.gen-src}/org/jboss/test/cts" />
       <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java"
  -      file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V2.txt"
  -      overwrite="true" />
  +      file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V2.txt" />
       <copy tofile="${build.gen-src}/org/jboss/test/cts/ejb/CtsCmp2Bean.java"
  -      file="${source.java}/org/jboss/test/cts/ejb/CtsCmp2Bean_V2.txt" 
  -      overwrite="true" />
  +      file="${source.java}/org/jboss/test/cts/ejb/CtsCmp2Bean_V2.txt" />
       <javac destdir="${build.classes}" optimize="${javac.optimize}"
         target="${javac.target}" debug="${javac.debug}" >
          <src path="${build.gen-src}"/>