jboss-cvs-commits

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/20 22:31:57

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Add ResourceTsts case#4, a sar with a service descriptor with
  mulitiple mbeans, a resource file with multiple configs
  using a namespace, and the service code in a nested jar
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.13 +11 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.12
  retrieving revision 1.106.2.13
  diff -u -r1.106.2.12 -r1.106.2.13
  --- build.xml	21 May 2002 03:00:11 -0000	1.106.2.12
  +++ build.xml	21 May 2002 05:31:57 -0000	1.106.2.13
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.12 2002/05/21 03:00:11 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.13 2002/05/21 05:31:57 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -1355,6 +1355,16 @@
            <include name="rsrcsvc.jar"/>
            <include name="rsrc31.sar" />
            <include name="rsrc32.sar" />
  +       </fileset>
  +    </jar>
  +    <!-- ResourceTsts case#4, a sar with a service descriptor with
  +      mulitiple mbeans, a resource file with multiple configs
  +      using a namespace, and the service code in a nested jar
  +    -->
  +    <jar jarfile="${build.lib}/rsrc4.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc4" />
  +       <fileset dir="${build.lib}">
  +         <include name="rsrcsvc.jar"/>
          </fileset>
       </jar>
   
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/22 16:43:58

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Remove references to jndi.jar
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.14 +1 -9      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.13
  retrieving revision 1.106.2.14
  diff -u -r1.106.2.13 -r1.106.2.14
  --- build.xml	21 May 2002 05:31:57 -0000	1.106.2.13
  +++ build.xml	22 May 2002 23:43:58 -0000	1.106.2.14
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.13 2002/05/21 05:31:57 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.14 2002/05/22 23:43:58 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -70,13 +70,6 @@
       <!-- Libraries -->
       <!-- ========= -->
   
  -    <!-- Java Naming and Directory Interface (JNDI) -->
  -    <property name="sun.jndi.root" value="${project.thirdparty}/sun/jndi"/>
  -    <property name="sun.jndi.lib" value="${sun.jndi.root}/lib"/>
  -    <path id="sun.jndi.classpath">
  -      <pathelement path="${sun.jndi.lib}/jndi.jar"/>
  -    </path>
  -
       <!-- Java API for XML Processing (JAXP) -->
       <property name="sun.jaxp.root" value="${project.thirdparty}/sun/jaxp"/>
       <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
  @@ -176,7 +169,6 @@
   
       <!-- The combined library classpath -->
       <path id="library.classpath">
  -      <path refid="sun.jndi.classpath"/>
         <path refid="sun.jaxp.classpath"/>
         <path refid="sun.jaas.classpath"/>
         <path refid="sun.jce.classpath"/>
  
  
  

[jboss-cvs] jbosstest build.xml

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 02/05/23 10:10:23

  Modified:    .        build.xml
  Log:
  Added Erwin Guib's support for unshared connections as per spec
  
  Revision  Changes    Path
  1.130     +53 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- build.xml	18 May 2002 22:37:04 -0000	1.129
  +++ build.xml	23 May 2002 17:10:23 -0000	1.130
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.129 2002/05/18 22:37:04 reverbel Exp $ -->
  +<!-- $Id: build.xml,v 1.130 2002/05/23 17:10:23 d_jencks Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -646,6 +646,34 @@
            destdir="${build.resources}/banknew/META-INF"
            mergedir="${source.resources}/banknew/"/>
       </xdoclet>
  +
  +<!--rules-->
  +    <mkdir dir="${build.resources}/rulesfactorial/META-INF"/>
  +    <xdoclet destdir="${build.gen-src}"
  +	     classpath="${xdoclet.task.classpath}"
  +	     ejbspec="2.0"
  +	     excludedtags="@version,@author">
  +             <!--mergedir="${source.resources}/jca/ejb"-->
  +      <fileset dir="${source.java}">
  +        <include name="org/jboss/test/rules/factorial/ejb/*Bean.java"/>
  +      </fileset>
  +      <packageSubstitution packages="ejb" substituteWith="interfaces"/>
  +      <remoteinterface/>
  +<!--      <localinterface/> -->
  +      <homeinterface/>
  +<!--      <localhomeinterface/> -->
  +      <!--dataobject/-->
  +      <!--entitypk/-->
  +      <!--session/-->
  +      <deploymentdescriptor xmlencoding ="UTF-8"
  +         destdir="${build.resources}/rulesfactorial/META-INF"/>
  +      <jboss xmlencoding="UTF-8" 
  +         version="3.0"
  +         destdir="${build.resources}/rulesfactorial/META-INF"
  +         mergedir="${source.resources}/rulesfactorial/"/>
  +    </xdoclet>
  +
  +
     </target>
   
     <target name="compile-mbean-sources" depends="init">
  @@ -2363,6 +2391,30 @@
       <jar jarfile="${build.lib}/marathon.jar">
         <fileset dir="${build.classes}">
          <include name="org/jboss/test/marathon/**"/>
  +      </fileset>
  +    </jar>
  +  </target>
  +
  +  <!-- rules test -->
  +  <target name="_jars-rules">
  +    <mkdir dir="${build.lib}"/>
  +
  +    <!-- build rulesfactorial.jar -->
  +    <jar jarfile="${build.lib}/rulesfactorialtest.jar">
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/rules/factorial/**"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/rulesfactorial/">
  +       <include name="META-INF/*.*"/>
  +      </fileset>
  +    </jar>
  +    <!-- build rulesfactorial.sar -->
  +    <jar jarfile="${build.lib}/rulesfactorialtest.sar">
  +      <fileset dir="${build.lib}">
  +        <include name="rulesfactorialtest.jar"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/rules/factorial/">
  +       <include name="META-INF/jboss-service.xml"/>
         </fileset>
       </jar>
     </target>
  
  
  

[jboss-cvs] jbosstest build.xml

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 02/05/23 10:20:20

  Modified:    .        build.xml
  Log:
  oops, didn't mean to commit my private copy of this
  
  Revision  Changes    Path
  1.131     +0 -52     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- build.xml	23 May 2002 17:10:23 -0000	1.130
  +++ build.xml	23 May 2002 17:20:19 -0000	1.131
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.130 2002/05/23 17:10:23 d_jencks Exp $ -->
  +<!-- $Id: build.xml,v 1.131 2002/05/23 17:20:19 d_jencks Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -646,34 +646,6 @@
            destdir="${build.resources}/banknew/META-INF"
            mergedir="${source.resources}/banknew/"/>
       </xdoclet>
  -
  -<!--rules-->
  -    <mkdir dir="${build.resources}/rulesfactorial/META-INF"/>
  -    <xdoclet destdir="${build.gen-src}"
  -	     classpath="${xdoclet.task.classpath}"
  -	     ejbspec="2.0"
  -	     excludedtags="@version,@author">
  -             <!--mergedir="${source.resources}/jca/ejb"-->
  -      <fileset dir="${source.java}">
  -        <include name="org/jboss/test/rules/factorial/ejb/*Bean.java"/>
  -      </fileset>
  -      <packageSubstitution packages="ejb" substituteWith="interfaces"/>
  -      <remoteinterface/>
  -<!--      <localinterface/> -->
  -      <homeinterface/>
  -<!--      <localhomeinterface/> -->
  -      <!--dataobject/-->
  -      <!--entitypk/-->
  -      <!--session/-->
  -      <deploymentdescriptor xmlencoding ="UTF-8"
  -         destdir="${build.resources}/rulesfactorial/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  -         version="3.0"
  -         destdir="${build.resources}/rulesfactorial/META-INF"
  -         mergedir="${source.resources}/rulesfactorial/"/>
  -    </xdoclet>
  -
  -
     </target>
   
     <target name="compile-mbean-sources" depends="init">
  @@ -2391,30 +2363,6 @@
       <jar jarfile="${build.lib}/marathon.jar">
         <fileset dir="${build.classes}">
          <include name="org/jboss/test/marathon/**"/>
  -      </fileset>
  -    </jar>
  -  </target>
  -
  -  <!-- rules test -->
  -  <target name="_jars-rules">
  -    <mkdir dir="${build.lib}"/>
  -
  -    <!-- build rulesfactorial.jar -->
  -    <jar jarfile="${build.lib}/rulesfactorialtest.jar">
  -      <fileset dir="${build.classes}">
  -        <include name="org/jboss/test/rules/factorial/**"/>
  -      </fileset>
  -      <fileset dir="${build.resources}/rulesfactorial/">
  -       <include name="META-INF/*.*"/>
  -      </fileset>
  -    </jar>
  -    <!-- build rulesfactorial.sar -->
  -    <jar jarfile="${build.lib}/rulesfactorialtest.sar">
  -      <fileset dir="${build.lib}">
  -        <include name="rulesfactorialtest.jar"/>
  -      </fileset>
  -      <fileset dir="${build.resources}/rules/factorial/">
  -       <include name="META-INF/jboss-service.xml"/>
         </fileset>
       </jar>
     </target>
  
  
  

[jboss-cvs] jbosstest build.xml

[Andreas S. <sch...@us...>]

  User: schaefera
  Date: 02/05/23 11:24:26

  Modified:    .        build.xml
  Log:
  Added a test case for the Foe-Deployer creating a WL application, deploys
  it on the JBoss server and checks if it finally got deployed as JBoss
  application. If necessary it will deploy the foe-deployer first (if not
  already done) because it is an optinal service.
  
  Revision  Changes    Path
  1.132     +132 -24   jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- build.xml	23 May 2002 17:20:19 -0000	1.131
  +++ build.xml	23 May 2002 18:24:26 -0000	1.132
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.131 2002/05/23 17:20:19 d_jencks Exp $ -->
  +<!-- $Id: build.xml,v 1.132 2002/05/23 18:24:26 schaefera Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -646,6 +646,39 @@
            destdir="${build.resources}/banknew/META-INF"
            mergedir="${source.resources}/banknew/"/>
       </xdoclet>
  +    
  +    <!-- Foe-Deployer: Simple Test -->
  +    <mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
  +    <xdoclet destdir="${build.gen-src}"
  +	     classpath="${xdoclet.task.classpath}"
  +	     ejbspec="2.0"
  +	     excludedtags="@version,@author">
  +             <!--mergedir="${source.resources}/jca/ejb"-->
  +      <fileset dir="${source.java}">
  +        <include name="org/jboss/test/foedeployer/ejb/simple/*Bean.java"/>
  +      </fileset>
  +      <packageSubstitution packages="simple" substituteWith="interfaces"/>
  +      <!-- <dataobject/> -->
  +      <!-- <valueobject/> -->
  +      <remoteinterface/>
  +      <localinterface/>
  +      <homeinterface/>
  +      <localhomeinterface/>
  +      <entitypk/>
  +      <!-- <entitycmp/> -->
  +      <!-- <entitybmp/> -->
  +      <!-- <utilobject/> -->
  +      <!-- <session/> -->
  +      <deploymentdescriptor xmlencoding ="UTF-8"
  +         destdir="${build.resources}/foedeployer/simple/META-INF"/>
  +      <weblogic version="6.1"
  +                xmlencoding="UTF-8"
  +                destdir="${build.resources}/foedeployer/simple/META-INF"
  +                validatexml="true"
  +                datasource="xdoclet.samples"
  +                mergedir="${source.resources}/foedeployer/"/>
  +       <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
  +    </xdoclet>
     </target>
   
     <target name="compile-mbean-sources" depends="init">
  @@ -806,6 +839,7 @@
                      _jars-security,
                      _jars-cmp2,
                      _jars-jsr77,
  +                   _jars-foedeployer,
                      _jars-jbossmx,
                      _jars-ejbconf,
                      _jars-proxycompiler,
  @@ -2223,7 +2257,7 @@
     <target name="_jars-jsr77">
       <mkdir dir="${build.lib}"/>
   
  -    <!-- build ejbconf-test.jar -->
  +    <!-- build jsr77-test.jar -->
       <jar jarfile="${build.lib}/jsr77-test.jar">
         <fileset dir="${build.classes}">
          <include name="org/jboss/test/management/**"/>
  @@ -2231,6 +2265,30 @@
       </jar>
     </target>
   
  +  <!-- foe-deployer test -->
  +  <target name="_jars-foedeployer">
  +    <mkdir dir="${build.lib}"/>
  +    <!-- First task is to copy the Foe-Deployer SAR to the current lib directory -->
  +    <echo>${project.root}</echo>
  +    <copy todir="${build.lib}" filtering="no">
  +      <fileset dir="${project.root}/varia/output/lib">
  +        <include name="foe-deployer.sar"/>
  +      </fileset>
  +    </copy>
  +    <!-- build foe-deployer-test.wlar -->
  +    <jar jarfile="${build.lib}/foe-deployer-test.wlar">
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/foedeployer/ejb/**"/>
  +      </fileset>
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/foedeployer/interfaces/**"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/foedeployer/simple/">
  +        <include name="META-INF/**"/>
  +      </fileset>
  +    </jar>
  +  </target>
  +
     <!-- cmp2 tests -->
     <target name="_jars-cmp2">
       <mkdir dir="${build.lib}"/>
  @@ -2968,12 +3026,12 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}"
  -	   haltonerror="${junit.haltonerror}"
  -	   haltonfailure="${junit.haltonfailure}"
  -	   fork="${junit.fork}"
  -	   timeout="${junit.timeout}"
  -	   jvm="${junit.jvm}">
  +      printsummary="${junit.printsummary}"
  +      haltonerror="${junit.haltonerror}"
  +      haltonfailure="${junit.haltonfailure}"
  +      fork="${junit.fork}"
  +      timeout="${junit.timeout}"
  +      jvm="${junit.jvm}">
   
         <jvmarg value="${junit.jvm.options}"/>
         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  @@ -2981,7 +3039,7 @@
         <jvmarg value="-Djava.security.manager"/>
         <jvmarg value="-Dsecurity.domain=test-domain"/>
         <sysproperty key="java.security.policy"
  -		   value="${build.resources}/security/tst.policy"/>
  +         value="${build.resources}/security/tst.policy"/>
         <sysproperty key="java.security.auth.login.config"
                      value="${build.resources}/security/auth.conf"/>
         <sysproperty key="build.testlog" value="${build.testlog}"/>
  @@ -2995,12 +3053,12 @@
         </classpath>
   
         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
  -		 extension=".xml" usefile="${junit.formatter.usefile}"/>
  +       extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}"
  -		 haltonfailure="${junit.batchtest.haltonfailure}"
  -		 fork="${junit.batchtest.fork}">
  +       haltonerror="${junit.batchtest.haltonerror}"
  +       haltonfailure="${junit.batchtest.haltonfailure}"
  +       fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
             <include name="**/test/management/test/**UnitTestCase.class"/>
  @@ -3018,12 +3076,12 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}"
  -	   haltonerror="${junit.haltonerror}"
  -	   haltonfailure="${junit.haltonfailure}"
  -	   fork="${junit.fork}"
  -	   timeout="${marathon.timeout}"
  -	   jvm="${junit.jvm}">
  +      printsummary="${junit.printsummary}"
  +      haltonerror="${junit.haltonerror}"
  +      haltonfailure="${junit.haltonfailure}"
  +      fork="${junit.fork}"
  +      timeout="${marathon.timeout}"
  +      jvm="${junit.jvm}">
   
         <jvmarg value="${junit.jvm.options}"/>
         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  @@ -3031,7 +3089,7 @@
         <jvmarg value="-Djava.security.manager"/>
         <jvmarg value="-Dsecurity.domain=test-domain"/>
         <sysproperty key="java.security.policy"
  -		   value="${build.resources}/security/tst.policy"/>
  +         value="${build.resources}/security/tst.policy"/>
         <sysproperty key="java.security.auth.login.config"
                      value="${build.resources}/security/auth.conf"/>
         <sysproperty key="build.testlog" value="${build.testlog}"/>
  @@ -3049,15 +3107,65 @@
         </classpath>
   
         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
  -		 extension=".xml" usefile="${junit.formatter.usefile}"/>
  +       extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}"
  -		 haltonfailure="${junit.batchtest.haltonfailure}"
  -		 fork="${junit.batchtest.fork}">
  +       haltonerror="${junit.batchtest.haltonerror}"
  +       haltonfailure="${junit.batchtest.haltonfailure}"
  +       fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
             <include name="**/test/marathon/test/**MarathonTestCase.class"/>
  +        </fileset>
  +      </batchtest>
  +    </junit>
  +  </target>
  +
  +  <!--
  +     | Standard Foe-Deployer tests that should run successfully against a default
  +     | JBoss server distribution build.
  +   -->
  +
  +  <target name="tests-foe-deployer-unit" depends="maybejars">
  +    <mkdir dir="${build.reports}"/>
  +    <mkdir dir="${build.testlog}"/>
  +    <junit dir="${module.output}"
  +      printsummary="${junit.printsummary}"
  +      haltonerror="${junit.haltonerror}"
  +      haltonfailure="${junit.haltonfailure}"
  +      fork="${junit.fork}"
  +      timeout="${junit.timeout}"
  +      jvm="${junit.jvm}">
  +
  +      <jvmarg value="${junit.jvm.options}"/>
  +      <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  +
  +      <jvmarg value="-Djava.security.manager"/>
  +      <jvmarg value="-Dsecurity.domain=test-domain"/>
  +      <sysproperty key="java.security.policy"
  +        value="${build.resources}/security/tst.policy"/>
  +      <sysproperty key="java.security.auth.login.config"
  +        value="${build.resources}/security/auth.conf"/>
  +      <sysproperty key="build.testlog" value="${build.testlog}"/>
  +      <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  +
  +      <classpath>
  +        <pathelement location="${build.classes}"/>
  +        <pathelement location="${build.resources}/security"/>
  +        <pathelement location="${build.resources}"/>
  +        <path refid="tests.classpath"/>
  +      </classpath>
  +
  +      <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
  +        extension=".xml" usefile="${junit.formatter.usefile}"/>
  +
  +      <batchtest todir="${build.reports}"
  +        haltonerror="${junit.batchtest.haltonerror}"
  +        haltonfailure="${junit.batchtest.haltonfailure}"
  +        fork="${junit.batchtest.fork}">
  +
  +        <fileset dir="${build.classes}">
  +          <include name="**/test/foedeployer/test/**TestCase.class"/>
           </fileset>
         </batchtest>
       </junit>
  
  
  

[jboss-cvs] jbosstest build.xml

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 02/05/23 18:39:11

  Modified:    .        build.xml
  Log:
  implemented cleanup to reset autocommit and tx isolation state, added a test
  
  Revision  Changes    Path
  1.133     +9 -1      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.132
  retrieving revision 1.133
  diff -u -r1.132 -r1.133
  --- build.xml	23 May 2002 18:24:26 -0000	1.132
  +++ build.xml	24 May 2002 01:39:10 -0000	1.133
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.132 2002/05/23 18:24:26 schaefera Exp $ -->
  +<!-- $Id: build.xml,v 1.133 2002/05/24 01:39:10 d_jencks Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -1396,6 +1396,14 @@
           <include name="**/*.xml"/>
         </fileset>
       </jar>
  +
  +    <!--copy the plain *-service.xml files too -->
  +    <copy todir="${build.lib}" filtering="no">
  +      <fileset dir="${build.resources}/jca/autocommit">
  +         <include name="*.xml"/>
  +      </fileset>
  +    </copy>
  +
     </target>
   
     <!-- jmx test -->
  
  
  

[jboss-cvs] jbosstest build.xml

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 02/05/23 19:12:08

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  implemented cleanup to reset autocommit and tx isolation state, added a test
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.15 +9 -1      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.14
  retrieving revision 1.106.2.15
  diff -u -r1.106.2.14 -r1.106.2.15
  --- build.xml	22 May 2002 23:43:58 -0000	1.106.2.14
  +++ build.xml	24 May 2002 02:12:08 -0000	1.106.2.15
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.14 2002/05/22 23:43:58 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.15 2002/05/24 02:12:08 d_jencks Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -1236,6 +1236,14 @@
           <include name="**/*.xml"/>
         </fileset>
       </jar>
  +
  +    <!--copy the plain *-service.xml files too -->
  +    <copy todir="${build.lib}" filtering="no">
  +      <fileset dir="${build.resources}/jca/autocommit">
  +         <include name="*.xml"/>
  +      </fileset>
  +    </copy>
  +
     </target>
   
     <!-- jmx test -->
  
  
  

[jboss-cvs] jbosstest build.xml

[Simone B. <bio...@us...>]

  User: biorn_steedom
  Date: 02/05/24 05:12:20

  Modified:    .        build.xml
  Log:
  Added target for the unified classloader tests
  
  Revision  Changes    Path
  1.134     +41 -24    jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- build.xml	24 May 2002 01:39:10 -0000	1.133
  +++ build.xml	24 May 2002 12:12:20 -0000	1.134
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.133 2002/05/24 01:39:10 d_jencks Exp $ -->
  +<!-- $Id: build.xml,v 1.134 2002/05/24 12:12:20 biorn_steedom Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -846,7 +846,8 @@
                      _jars-helloiiop,
                      _jars-bankiiop,
                      _jars-hellojrmpiiop,
  -                   _jars-marathon">
  +                   _jars-marathon,
  +                   _jars-classloader">
     </target>
   
     <!--
  @@ -2433,6 +2434,22 @@
       </jar>
     </target>
   
  +  <!-- classloader test -->
  +  <target name="_jars-classloader" depends="compile-classes-only">
  +    <mkdir dir="${build.lib}"/>
  +
  +    <!-- build classloader.jar -->
  +    <jar jarfile="${build.lib}/classloader.sar">
  +      <fileset dir="${build.classes}">
  +       <include name="org/jboss/test/classloader/concurrentload/**"/>
  +      </fileset>
  +      <fileset dir="${source.resources}/classloader/concurrentloader">
  +       <include name="**"/>
  +      </fileset>
  +    </jar>
  +  </target>
  +
  +
     <!-- ================================================================== -->
     <!-- Documents                                                          -->
     <!-- ================================================================== -->
  @@ -3034,12 +3051,12 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -      printsummary="${junit.printsummary}"
  -      haltonerror="${junit.haltonerror}"
  -      haltonfailure="${junit.haltonfailure}"
  -      fork="${junit.fork}"
  -      timeout="${junit.timeout}"
  -      jvm="${junit.jvm}">
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
  +	   fork="${junit.fork}"
  +	   timeout="${junit.timeout}"
  +	   jvm="${junit.jvm}">
   
         <jvmarg value="${junit.jvm.options}"/>
         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  @@ -3047,7 +3064,7 @@
         <jvmarg value="-Djava.security.manager"/>
         <jvmarg value="-Dsecurity.domain=test-domain"/>
         <sysproperty key="java.security.policy"
  -         value="${build.resources}/security/tst.policy"/>
  +		   value="${build.resources}/security/tst.policy"/>
         <sysproperty key="java.security.auth.login.config"
                      value="${build.resources}/security/auth.conf"/>
         <sysproperty key="build.testlog" value="${build.testlog}"/>
  @@ -3061,12 +3078,12 @@
         </classpath>
   
         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
  -       extension=".xml" usefile="${junit.formatter.usefile}"/>
  +		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -       haltonerror="${junit.batchtest.haltonerror}"
  -       haltonfailure="${junit.batchtest.haltonfailure}"
  -       fork="${junit.batchtest.fork}">
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
  +		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
             <include name="**/test/management/test/**UnitTestCase.class"/>
  @@ -3084,12 +3101,12 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -      printsummary="${junit.printsummary}"
  -      haltonerror="${junit.haltonerror}"
  -      haltonfailure="${junit.haltonfailure}"
  -      fork="${junit.fork}"
  -      timeout="${marathon.timeout}"
  -      jvm="${junit.jvm}">
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
  +	   fork="${junit.fork}"
  +	   timeout="${marathon.timeout}"
  +	   jvm="${junit.jvm}">
   
         <jvmarg value="${junit.jvm.options}"/>
         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  @@ -3097,7 +3114,7 @@
         <jvmarg value="-Djava.security.manager"/>
         <jvmarg value="-Dsecurity.domain=test-domain"/>
         <sysproperty key="java.security.policy"
  -         value="${build.resources}/security/tst.policy"/>
  +		   value="${build.resources}/security/tst.policy"/>
         <sysproperty key="java.security.auth.login.config"
                      value="${build.resources}/security/auth.conf"/>
         <sysproperty key="build.testlog" value="${build.testlog}"/>
  @@ -3115,12 +3132,12 @@
         </classpath>
   
         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
  -       extension=".xml" usefile="${junit.formatter.usefile}"/>
  +		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -       haltonerror="${junit.batchtest.haltonerror}"
  -       haltonfailure="${junit.batchtest.haltonfailure}"
  -       fork="${junit.batchtest.fork}">
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
  +		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
             <include name="**/test/marathon/test/**MarathonTestCase.class"/>
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/24 12:41:14

  Modified:    .        build.xml
  Log:
  Add the build sets for the service resource tests deployments
  
  Revision  Changes    Path
  1.135     +50 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- build.xml	24 May 2002 12:12:20 -0000	1.134
  +++ build.xml	24 May 2002 19:41:10 -0000	1.135
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.134 2002/05/24 12:12:20 biorn_steedom Exp $ -->
  +<!-- $Id: build.xml,v 1.135 2002/05/24 19:41:10 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -1478,6 +1478,55 @@
         <fileset dir="${build.resources}/jmx/mbeane">
           <include name="META-INF/jboss-service.xml"/>
         </fileset>
  +    </jar>
  +
  +    <!-- ResourceTsts case#1, a sar with the classes and resources -->
  +    <jar jarfile="${build.lib}/rsrc1.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc1" />
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jmx/loading/ResourceTsts*"/>
  +      </fileset>
  +    </jar>
  +    <!-- ResourceTsts case#2, a sar with the resources and the
  +      service in a nested jar
  +    -->
  +    <jar jarfile="${build.lib}/rsrcsvc.jar">
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jmx/loading/ResourceTsts*"/>
  +      </fileset>
  +    </jar>
  +    <jar jarfile="${build.lib}/rsrc2.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc2" />
  +      <fileset dir="${build.lib}">
  +        <include name="rsrcsvc.jar"/>
  +      </fileset>
  +    </jar>
  +    <!-- ResourceTsts case#3, a jar with two sars with only
  +      the service descriptor metadata and a jar containing the
  +      service code.
  +    -->
  +    <jar jarfile="${build.lib}/rsrc31.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc1" />
  +    </jar>
  +    <jar jarfile="${build.lib}/rsrc32.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc2" />
  +    </jar>
  +    <jar jarfile="${build.lib}/rsrc3.jar">
  +       <fileset dir="${build.lib}">
  +         <include name="rsrcsvc.jar"/>
  +         <include name="rsrc31.sar" />
  +         <include name="rsrc32.sar" />
  +       </fileset>
  +    </jar>
  +    <!-- ResourceTsts case#4, a sar with a service descriptor with
  +      mulitiple mbeans, a resource file with multiple configs
  +      using a namespace, and the service code in a nested jar
  +    -->
  +    <jar jarfile="${build.lib}/rsrc4.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc4" />
  +       <fileset dir="${build.lib}">
  +         <include name="rsrcsvc.jar"/>
  +       </fileset>
       </jar>
   
       <!--build test sar for testing local directory copy deployment -->
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/24 14:03:03

  Modified:    .        build.xml
  Log:
  Remove the jndi.jar references
  
  Revision  Changes    Path
  1.136     +1 -9      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.135
  retrieving revision 1.136
  diff -u -r1.135 -r1.136
  --- build.xml	24 May 2002 19:41:10 -0000	1.135
  +++ build.xml	24 May 2002 21:03:03 -0000	1.136
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.135 2002/05/24 19:41:10 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.136 2002/05/24 21:03:03 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -74,13 +74,6 @@
       <!-- Libraries -->
       <!-- ========= -->
   
  -    <!-- Java Naming and Directory Interface (JNDI) -->
  -    <property name="sun.jndi.root" value="${project.thirdparty}/sun/jndi"/>
  -    <property name="sun.jndi.lib" value="${sun.jndi.root}/lib"/>
  -    <path id="sun.jndi.classpath">
  -      <pathelement path="${sun.jndi.lib}/jndi.jar"/>
  -    </path>
  -
       <!-- Java API for XML Processing (JAXP) -->
       <property name="sun.jaxp.root" value="${project.thirdparty}/sun/jaxp"/>
       <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
  @@ -180,7 +173,6 @@
   
       <!-- The combined library classpath -->
       <path id="library.classpath">
  -      <path refid="sun.jndi.classpath"/>
         <path refid="sun.jaxp.classpath"/>
         <path refid="sun.jaas.classpath"/>
         <path refid="sun.jce.classpath"/>
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/26 13:48:11

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Add tests of a jboss-service.xml importing content using an external
  entity reference
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.16 +10 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.15
  retrieving revision 1.106.2.16
  diff -u -r1.106.2.15 -r1.106.2.16
  --- build.xml	24 May 2002 02:12:08 -0000	1.106.2.15
  +++ build.xml	26 May 2002 20:48:11 -0000	1.106.2.16
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.15 2002/05/24 02:12:08 d_jencks Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.16 2002/05/26 20:48:11 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -1366,6 +1366,15 @@
          <fileset dir="${build.lib}">
            <include name="rsrcsvc.jar"/>
          </fileset>
  +    </jar>
  +
  +    <!-- Tests that a sar jboss-service.xml can include an entity ref
  +    -->
  +    <jar jarfile="${build.lib}/entityref.sar">
  +      <metainf dir="${build.resources}/jmx/loading/entityref" />
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jmx/loading/NoopService*"/>
  +      </fileset>
       </jar>
   
       <!--build test sar for testing local directory copy deployment -->
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/26 13:53:24

  Modified:    .        build.xml
  Log:
  Add tests of a jboss-service.xml importing content using an external
  entity reference
  
  Revision  Changes    Path
  1.137     +10 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- build.xml	24 May 2002 21:03:03 -0000	1.136
  +++ build.xml	26 May 2002 20:53:24 -0000	1.137
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.136 2002/05/24 21:03:03 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.137 2002/05/26 20:53:24 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -1519,6 +1519,15 @@
          <fileset dir="${build.lib}">
            <include name="rsrcsvc.jar"/>
          </fileset>
  +    </jar>
  +
  +    <!-- Tests that a sar jboss-service.xml can include an entity ref
  +    -->
  +    <jar jarfile="${build.lib}/entityref.sar">
  +      <metainf dir="${build.resources}/jmx/loading/entityref" />
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jmx/loading/NoopService*"/>
  +      </fileset>
       </jar>
   
       <!--build test sar for testing local directory copy deployment -->
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/27 10:00:34

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Add failed war/ear redeployment tests to the web integration suite
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.17 +94 -4     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.16
  retrieving revision 1.106.2.17
  diff -u -r1.106.2.16 -r1.106.2.17
  --- build.xml	26 May 2002 20:48:11 -0000	1.106.2.16
  +++ build.xml	27 May 2002 17:00:31 -0000	1.106.2.17
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.16 2002/05/26 20:48:11 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.17 2002/05/27 17:00:31 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -745,7 +745,9 @@
                      _jars-ejbconf,
                      _jars-proxycompiler,
                      _jars-helloiiop,
  -                   _jars-bankiiop">
  +                   _jars-bankiiop,
  +                   _jars-classloader"
  +                   >
     </target>
   
     <!--
  @@ -1912,7 +1914,8 @@
       </war>
   
       <!-- build notjbosstest-web.war -->
  -    <war warfile="${build.lib}/notjbosstest-web.war"
  +    <mkdir dir="${build.lib}/wars" />
  +    <war warfile="${build.lib}/wars/notjbosstest-web.war"
   	   webxml="${build.resources}/web/WEB-INF/notjbosstest-web.xml">
         <webinf dir="${build.resources}/web/html/other/WEB-INF">
           <include name="*"/>
  @@ -1950,6 +1953,29 @@
         </fileset>
       </war>
   
  +    <!-- Create a war with a bad web.xml descriptor to test redeployment
  +    of a failed war. The good-web.war is the same war with the web.xml
  +    descriptor fixed. Both use a context-root of /redeploy
  +    -->
  +    <war warfile="${build.lib}/bad-web.war"
  +	   webxml="${build.resources}/web/WEB-INF/bad-web.xml">
  +      <webinf dir="${build.resources}/web/html/bad/WEB-INF">
  +        <include name="*"/>
  +      </webinf>
  +      <fileset dir="${build.resources}/web/html/bad">
  +        <include name="**/*.html"/>
  +      </fileset>
  +    </war>
  +    <war warfile="${build.lib}/good-web.war"
  +	   webxml="${build.resources}/web/WEB-INF/good-web.xml">
  +      <webinf dir="${build.resources}/web/html/bad/WEB-INF">
  +        <include name="*"/>
  +      </webinf>
  +      <fileset dir="${build.resources}/web/html/bad">
  +        <include name="**/*.html"/>
  +      </fileset>
  +    </war>
  +
       <!-- build jbosstest-web.ear -->
       <ear earfile="${build.lib}/jbosstest-web.ear"
   	 appxml="${build.resources}/web/META-INF/application.xml">
  @@ -1960,10 +1986,36 @@
           <include name="jbosstest-web-ejbs.jar"/>
           <include name="root-web.war"/>
           <include name="jbosstest-web.war"/>
  -        <include name="notjbosstest-web.war"/>
  +        <include name="wars/notjbosstest-web.war"/>
           <include name="cts.jar"/>
         </fileset>
       </ear>
  +
  +    <!-- Create an ear with the same war as the jbosstest-web.ear to test
  +    conflicts with unpackaging ear content
  +    -->
  +    <ear earfile="${build.lib}/jbosstest-web2.ear"
  +	 appxml="${build.resources}/web/META-INF/application2.xml">
  +      <metainf dir="${build.resources}/web/META-INF">
  +        <include name="jboss-app.xml" />
  +      </metainf>
  +      <fileset dir="${build.lib}">
  +        <include name="notjbosstest-web.war"/>
  +      </fileset>
  +    </ear>
  +
  +    <ear earfile="${build.lib}/jbosstest-bad.ear"
  +	 appxml="${build.resources}/web/META-INF/application-bad.xml">
  +      <fileset dir="${build.lib}">
  +        <include name="bad-web.war"/>
  +      </fileset>
  +    </ear>
  +    <ear earfile="${build.lib}/jbosstest-good.ear"
  +	 appxml="${build.resources}/web/META-INF/application-good.xml">
  +      <fileset dir="${build.lib}">
  +        <include name="good-web.war"/>
  +      </fileset>
  +    </ear>
     </target>
   
     <!-- bench test -->
  @@ -2268,6 +2320,44 @@
       </jar>
      
     </target>
  +
  +  <!-- classloader test
  +  <target name="_jars-classloader" depends="compile-classes-only">
  +    <mkdir dir="${build.lib}"/>
  +
  +    <jar jarfile="${build.lib}/c0.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass0*.class"/>
  +    <jar jarfile="${build.lib}/c1.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass1*.class"/>
  +    <jar jarfile="${build.lib}/c2.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass2*.class"/>
  +    <jar jarfile="${build.lib}/c3.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass3*.class"/>
  +    <jar jarfile="${build.lib}/c4.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass4*.class"/>
  +    <jar jarfile="${build.lib}/c5.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass5*.class"/>
  +    <jar jarfile="${build.lib}/c6.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass6*.class"/>
  +    <jar jarfile="${build.lib}/c7.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass7*.class"/>
  +    <jar jarfile="${build.lib}/c8.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass8*.class"/>
  +    <jar jarfile="${build.lib}/c9.jar" basedir="${build.classes}"
  +      includes="org/jboss/test/classloader/concurrentload/Anyclass9*.class"/>
  +    <jar jarfile="${build.lib}/classloader.sar">
  +      <fileset dir="${build.classes}">
  +       <include name="org/jboss/test/classloader/concurrentload/ConcurrentLoader*.class"/>
  +      </fileset>
  +      <fileset dir="${build.lib}">
  +       <include name="c?.jar"/>
  +      </fileset>
  +      <fileset dir="${source.resources}/classloader/concurrentloader">
  +       <include name="**"/>
  +      </fileset>
  +    </jar>
  +  </target>
  +-->
   
     <!-- ================================================================== -->
     <!-- Documents                                                          -->
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/27 11:16:14

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Fix _jars-classloader reference
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.18 +4 -3      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.17
  retrieving revision 1.106.2.18
  diff -u -r1.106.2.17 -r1.106.2.18
  --- build.xml	27 May 2002 17:00:31 -0000	1.106.2.17
  +++ build.xml	27 May 2002 18:16:13 -0000	1.106.2.18
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.17 2002/05/27 17:00:31 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.18 2002/05/27 18:16:13 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -2321,8 +2321,9 @@
      
     </target>
   
  -  <!-- classloader test
  +  <!-- classloader test -->
     <target name="_jars-classloader" depends="compile-classes-only">
  +<!--
       <mkdir dir="${build.lib}"/>
   
       <jar jarfile="${build.lib}/c0.jar" basedir="${build.classes}"
  @@ -2356,8 +2357,8 @@
          <include name="**"/>
         </fileset>
       </jar>
  -  </target>
   -->
  +  </target>
   
     <!-- ================================================================== -->
     <!-- Documents                                                          -->
  
  
  

[jboss-cvs] jbosstest build.xml

[Francisco R. <rev...@us...>]

  User: reverbel
  Date: 02/05/27 15:41:48

  Modified:    .        build.xml
  Log:
  Making the bankiiop test work with the multiple invokers code:
    - The test client uses the CosNaming jndi provider.
    - Beans use ejb-refs to find each other.
    - These refs are properly set up for IIOP (in jboss.xml).
  
  Revision  Changes    Path
  1.138     +2 -1      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- build.xml	26 May 2002 20:53:24 -0000	1.137
  +++ build.xml	27 May 2002 22:41:48 -0000	1.138
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.137 2002/05/26 20:53:24 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.138 2002/05/27 22:41:48 reverbel Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -948,6 +948,7 @@
           <include name="org/jboss/test/bankiiop/beans/**"/>
         </fileset>
         <fileset dir="${build.resources}/bankiiop">
  +        <include name="cosnaming.jndi.properties"/>
           <include name="**/*.xml"/>
         </fileset>
       </jar>
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/27 22:40:35

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  - Add a probe.jar with the PerfUnitTestCase beans
  - Add a jbosstest.nodeploy system property to the one-test target so that
  a test may be rerun against a static deployment.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.19 +18 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.18
  retrieving revision 1.106.2.19
  diff -u -r1.106.2.18 -r1.106.2.19
  --- build.xml	27 May 2002 18:16:13 -0000	1.106.2.18
  +++ build.xml	28 May 2002 05:40:35 -0000	1.106.2.19
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.18 2002/05/27 18:16:13 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.19 2002/05/28 05:40:35 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -379,6 +379,7 @@
       <property name="jbosstest.iterationcount" value="10"/>
       <property name="jbosstest.threadcount" value="5"/>
       <property name="jbosstest.beancount" value="5"/>
  +    <property name="jbosstest.nodeploy" value="false"/>
       <property name="junit.batchtest.todir" value="${build.reports}"/>
       <property name="junit.jvm.options" value="-Ddummy"/>
       <echo><![CDATA[
  @@ -1818,11 +1819,26 @@
           <patternset refid="common.test.application.classes"/>
           <include name="org/jboss/test/perf/interfaces/**"/>
           <include name="org/jboss/test/perf/ejb/**"/>
  +        <include name="org/jboss/test/util/Debug.class"/>
         </fileset>
         <metainf dir="${build.resources}/perf/META-INF">
            <exclude name="jboss-service.xml" />
         </metainf>
       </jar>
  +    <!-- build probe.jar -->
  +    <jar jarfile="${build.lib}/probe.jar">
  +      <fileset dir="${build.classes}">
  +        <patternset refid="common.test.application.classes"/>
  +        <include name="org/jboss/test/perf/interfaces/Perf*"/>
  +        <include name="org/jboss/test/perf/interfaces/Probe*"/>
  +        <include name="org/jboss/test/perf/ejb/Perf*"/>
  +        <include name="org/jboss/test/perf/ejb/Probe*"/>
  +        <include name="org/jboss/test/util/Debug.class"/>
  +      </fileset>
  +      <metainf dir="${build.resources}/perf/probe">
  +         <exclude name="jboss-service.xml" />
  +      </metainf>
  +    </jar>
   
       <!-- build secure-perf.jar -->
       <jar jarfile="${build.lib}/secure-perf.jar">
  @@ -3359,6 +3375,7 @@
         <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
  +      <sysproperty key="jbosstest.nodeploy" value="${jbosstest.nodeploy}"/>
         <sysproperty key="java.security.auth.login.config"
                      value="${build.resources}/security/auth.conf"/>
   
  
  
  

[jboss-cvs] jbosstest build.xml

[Francisco R. <rev...@us...>]

  User: reverbel
  Date: 02/05/28 08:54:06

  Modified:    .        build.xml
  Log:
  There is no need to include cosnaming.jndi.properties in the bean jar.
  
  Revision  Changes    Path
  1.139     +1 -2      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- build.xml	27 May 2002 22:41:48 -0000	1.138
  +++ build.xml	28 May 2002 15:54:05 -0000	1.139
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.138 2002/05/27 22:41:48 reverbel Exp $ -->
  +<!-- $Id: build.xml,v 1.139 2002/05/28 15:54:05 reverbel Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -948,7 +948,6 @@
           <include name="org/jboss/test/bankiiop/beans/**"/>
         </fileset>
         <fileset dir="${build.resources}/bankiiop">
  -        <include name="cosnaming.jndi.properties"/>
           <include name="**/*.xml"/>
         </fileset>
       </jar>
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/28 13:56:12

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  The inclusion of notjbosstest-web.war was incorrect in jbosstest-web2.ear
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.20 +2 -2      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.19
  retrieving revision 1.106.2.20
  diff -u -r1.106.2.19 -r1.106.2.20
  --- build.xml	28 May 2002 05:40:35 -0000	1.106.2.19
  +++ build.xml	28 May 2002 20:56:10 -0000	1.106.2.20
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.19 2002/05/28 05:40:35 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.20 2002/05/28 20:56:10 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -2016,7 +2016,7 @@
           <include name="jboss-app.xml" />
         </metainf>
         <fileset dir="${build.lib}">
  -        <include name="notjbosstest-web.war"/>
  +        <include name="wars/notjbosstest-web.war"/>
         </fileset>
       </ear>
   
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/29 00:07:59

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Add builds of two ears that include different versions of the same
  CMP2 ejb and local interface
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.21 +74 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.20
  retrieving revision 1.106.2.21
  diff -u -r1.106.2.20 -r1.106.2.21
  --- build.xml	28 May 2002 20:56:10 -0000	1.106.2.20
  +++ build.xml	29 May 2002 07:07:59 -0000	1.106.2.21
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.20 2002/05/28 20:56:10 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.21 2002/05/29 07:07:59 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -914,6 +914,79 @@
           <include name="META-INF/jboss.xml"/>
         </fileset>
       </jar>
  +
  +    <!-- Build version 1 of the cts-cmp2 ear -->
  +    <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" />
  +    <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" />
  +    <javac destdir="${build.classes}" optimize="${javac.optimize}"
  +      target="${javac.target}" debug="${javac.debug}" >
  +       <src path="${build.gen-src}"/>
  +       <classpath refid="tests.classpath"/>
  +       <include name="org/jboss/test/cts/**" />
  +    </javac>
  +    <jar jarfile="${build.lib}/cts-v1cmp.jar">
  +      <fileset dir="${build.classes}">
  +        <patternset refid="common.test.application.classes"/>
  +        <include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
  +        <include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
  +      </fileset>
  +      <metainf dir="${build.resources}/cts/cmpv1">
  +        <include name="ejb-jar.xml"/>
  +        <include name="jboss.xml"/>
  +        <include name="jbosscmp-jdbc.xml"/>
  +      </metainf>
  +    </jar>
  +    <ear earfile="${build.lib}/cts-v1cmp.ear"
  +       appxml="${build.resources}/cts/cmpv1/application.xml">
  +       <metainf dir="${build.resources}/cts/cmpv1">
  +         <include name="jboss-app.xml" />
  +       </metainf>
  +       <fileset dir="${build.lib}">
  +         <include name="cts-v1cmp.jar" />
  +       </fileset>
  +    </ear>
  +
  +    <!-- Build version 2 of the cts-cmp2 ear -->
  +    <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" />
  +    <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" />
  +    <javac destdir="${build.classes}" optimize="${javac.optimize}"
  +      target="${javac.target}" debug="${javac.debug}" >
  +       <src path="${build.gen-src}"/>
  +       <classpath refid="tests.classpath"/>
  +       <include name="org/jboss/test/cts/**" />
  +    </javac>
  +
  +    <jar jarfile="${build.lib}/cts-v2cmp.jar">
  +      <fileset dir="${build.classes}">
  +        <patternset refid="common.test.application.classes"/>
  +        <include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
  +        <include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
  +      </fileset>
  +      <metainf dir="${build.resources}/cts/cmpv2">
  +        <include name="ejb-jar.xml"/>
  +        <include name="jboss.xml"/>
  +        <include name="jbosscmp-jdbc.xml"/>
  +      </metainf>
  +    </jar>
  +    <ear earfile="${build.lib}/cts-v2cmp.ear"
  +       appxml="${build.resources}/cts/cmpv2/application.xml">
  +       <metainf dir="${build.resources}/cts/cmpv2">
  +         <include name="jboss-app.xml" />
  +       </metainf>
  +       <fileset dir="${build.lib}">
  +         <include name="cts-v2cmp.jar" />
  +       </fileset>
  +    </ear>
     </target>
   
     <!-- entityexc test -->
  
  
  

[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}"/>
  
  
  

[jboss-cvs] jbosstest build.xml

[Jason D. <us...@us...>]

  User: user57  
  Date: 02/05/30 21:13:43

  Modified:    .        build.xml
  Log:
   o Moved the TransactionManager (not UserTransaction) services and support
     classes to jboss/transaction.
   o Transaction services are now configured in transaction-service.xml and
     dependent services in jboss-service.xml (which were using order to
     prevent loading problems) now have explicit <depends>
   o Build system has been updated to include jboss/transaction by default
  
  Revision  Changes    Path
  1.140     +9 -1      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- build.xml	28 May 2002 15:54:05 -0000	1.139
  +++ build.xml	31 May 2002 04:13:43 -0000	1.140
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.139 2002/05/28 15:54:05 reverbel Exp $ -->
  +<!-- $Id: build.xml,v 1.140 2002/05/31 04:13:43 user57 Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -274,6 +274,13 @@
          <pathelement path="${jboss.cluster.lib}/jbossha-client.jar"/>
        </path>
   
  +     <!-- Transaction -->
  +     <property name="jboss.transaction.root" value="${project.root}/transaction/output"/>
  +     <property name="jboss.transaction.lib" value="${jboss.transaction.root}/lib"/>
  +     <path id="jboss.transaction.classpath">
  +       <pathelement path="${jboss.transaction.lib}/testsuite-support.jar"/>
  +     </path>
  +
        <!-- JBossMX -->
        <property name="jboss.jmx.root" value="${project.root}/jmx/output"/>
        <property name="jboss.jmx.lib" value="${jboss.jmx.root}/lib"/>
  @@ -310,6 +317,7 @@
         <path refid="jboss.connector.classpath"/>
         <path refid="jboss.cluster.classpath"/>
         <path refid="jboss.management.classpath"/>
  +      <path refid="jboss.transaction.classpath"/>
       </path>
   
       <!-- ===== -->
  
  
  

[jboss-cvs] jbosstest build.xml

[Simone B. <bio...@us...>]

  User: biorn_steedom
  Date: 02/06/04 07:13:06

  Modified:    .        build.xml
  Log:
  Added classes for the circularity error test case to the classloader's sar.
  
  Revision  Changes    Path
  1.141     +136 -135  jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- build.xml	31 May 2002 04:13:43 -0000	1.140
  +++ build.xml	4 Jun 2002 14:13:05 -0000	1.141
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.140 2002/05/31 04:13:43 user57 Exp $ -->
  +<!-- $Id: build.xml,v 1.141 2002/06/04 14:13:05 biorn_steedom Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -36,7 +36,7 @@
     <!-- ================================================================== -->
   
     <!--
  -     | Initialize the build system.  Must depend on '_buildmagic:init'.  
  +     | Initialize the build system.  Must depend on '_buildmagic:init'.
        | Other targets should depend on 'init' or things will mysteriously fail.
      -->
   
  @@ -49,15 +49,15 @@
     <!-- ================================================================== -->
   
     <!--
  -     | Configure the build system.  
  +     | Configure the build system.
        |
  -     | This target is invoked by the Buildmagic initialization logic and 
  +     | This target is invoked by the Buildmagic initialization logic and
        | should contain module specific configuration elements.
      -->
   
     <target name="configure" unless="configure.disable">
   
  -    <!-- Give user a chance to override without editing this file 
  +    <!-- Give user a chance to override without editing this file
          (and without typing -D each time they run it) -->
       <property file=".ant.properties" />
   
  @@ -156,9 +156,9 @@
       </path>
   
       <!-- JUnitEJB -->
  -    <property name="junitejb.junitejb.root" 
  +    <property name="junitejb.junitejb.root"
          value="${project.thirdparty}/junitejb/junitejb"/>
  -    <property name="junitejb.junitejb.lib" 
  +    <property name="junitejb.junitejb.lib"
          value="${junitejb.junitejb.root}/lib"/>
       <path id="junitejb.junitejb.classpath">
         <pathelement path="${junitejb.junitejb.lib}/junitejb.jar"/>
  @@ -236,7 +236,7 @@
   
       <!-- InternalServer -->
   <!-- This could be a mistake.  Perhaps, though, it would be a good idea to separate
  -tests that need internal jboss classes from those that don't.  When I put it in, only 
  +tests that need internal jboss classes from those that don't.  When I put it in, only
   the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)-->
       <property name="jboss.internal-server.root" value="${project.root}/server/output"/>
       <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/>
  @@ -414,7 +414,7 @@
         <pathelement location="${project.tools}/lib/xjavadoc.jar"/>
         <pathelement location="${project.tools}/lib/ant.jar"/>
       </path>
  -    <property name="xdoclet.task.classpath" 
  +    <property name="xdoclet.task.classpath"
   	      refid="xdoclet.task.classpath"/>
   
       <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/>
  @@ -427,14 +427,14 @@
     <!-- Compile                                                            -->
     <!-- ================================================================== -->
   
  -  <!-- 
  +  <!--
        |  Compile everything.
        |
  -     |  This target should depend on other compile-* targets for each 
  +     |  This target should depend on other compile-* targets for each
        |  different type of compile that needs to be performed, short of
        |  documentation compiles.
       -->
  -  <target name="compile" 
  +  <target name="compile"
   	  depends="compile-classes, compile-xmbean-dds,  compile-etc, compile-stylesheets, compile-resources"
   	  description="Compile all source files."/>
   
  @@ -462,7 +462,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/ejbconf/readonly/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/ejbconf/readonly/META-INF"
                mergedir="${source.resources}/ejbconf/readonly/"
  @@ -489,7 +489,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/jmx/eardeployment/a/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/jmx/eardeployment/a/META-INF"
                mergedir="${source.resources}/jmx/eardeployment/a/"/>
  @@ -513,7 +513,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/jmx/eardeployment/b/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/jmx/eardeployment/b/META-INF"
                mergedir="${source.resources}/jmx/eardeployment/b/"/>
  @@ -537,7 +537,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/cmp2/cmr/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/cmp2/cmr/META-INF"
                mergedir="${source.resources}/cmp2/cmr/"
  @@ -564,7 +564,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/jmx/undeploy/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/jmx/undeploy/META-INF"
                mergedir="${source.resources}/jmx/undeploy/"
  @@ -591,7 +591,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/jca/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/jca/META-INF"
                mergedir="${source.resources}/jca/"/>
  @@ -614,7 +614,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/jca/bank/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/jca/bank/META-INF"
                mergedir="${source.resources}/jca/bank/"/>
  @@ -641,12 +641,12 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
            destdir="${build.resources}/banknew/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
            version="3.0"
            destdir="${build.resources}/banknew/META-INF"
            mergedir="${source.resources}/banknew/"/>
       </xdoclet>
  -    
  +
       <!-- Foe-Deployer: Simple Test -->
       <mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
       <xdoclet destdir="${build.gen-src}"
  @@ -735,7 +735,7 @@
         <!--session/-->
         <deploymentdescriptor xmlencoding ="UTF-8"
   			    destdir="${build.resources}/proxycompiler/META-INF"/>
  -      <jboss xmlencoding="UTF-8" 
  +      <jboss xmlencoding="UTF-8"
                version="3.0"
   	     destdir="${build.resources}/proxycompiler/META-INF"
                mergedir="${source.resources}/proxycompiler"/>
  @@ -803,7 +803,7 @@
     <!-- Archives                                                           -->
     <!-- ================================================================== -->
   
  -  <!-- 
  +  <!--
        | Build all jar files.
      -->
   
  @@ -1594,7 +1594,7 @@
   
       <!--eardeployment, 2 jars of 1 session bean each-->
       <!--IMPORTANT!! this test relies on the dd's being in the "wrong" jar -->
  -    <!--the point of the test is to see if the classes in one jar are visible to 
  +    <!--the point of the test is to see if the classes in one jar are visible to
         the deployment descriptors of the other jar -->
       <jar jarfile="${build.lib}/sessiona.jar">
         <fileset dir="${build.classes}">
  @@ -2477,7 +2477,7 @@
          <include name="META-INF/*"/>
         </fileset>
       </jar>
  -   
  +
     </target>
   
     <!-- marathon test -->
  @@ -2500,6 +2500,7 @@
       <jar jarfile="${build.lib}/classloader.sar">
         <fileset dir="${build.classes}">
          <include name="org/jboss/test/classloader/concurrentload/**"/>
  +       <include name="org/jboss/test/classloader/circularity/**"/>
         </fileset>
         <fileset dir="${source.resources}/classloader/concurrentloader">
          <include name="**"/>
  @@ -2512,10 +2513,10 @@
     <!-- Documents                                                          -->
     <!-- ================================================================== -->
   
  -  <!-- 
  +  <!--
        | Create all generated documenation.
        |
  -     | This target should depend on other docs-* targets for each 
  +     | This target should depend on other docs-* targets for each
        | different type of docuementation that is to be generated.
      -->
   
  @@ -2526,8 +2527,8 @@
     <!-- Javadocs is an exception, but provide a docs-api to conform. -->
     <target name="docs-api" depends="docs-javadocs"/>
   
  -  <!-- 
  -     | Check if we need to build javadocs 
  +  <!--
  +     | Check if we need to build javadocs
        |
        | Javadocs will only be generated if one or more .java source files
        | is newer than the generated index.html.
  @@ -2539,7 +2540,7 @@
   	      targetfile="${build.api}/index.html">
         <srcfiles dir="${source.java}" includes="**/*.java"/>
       </uptodate>
  -  </target>	      
  +  </target>
   
     <!-- Generate Javadoc if we are out of date -->
     <target name="docs-javadocs" depends="docs-javadocs-check" unless="docs-javadocs.disable">
  @@ -2558,7 +2559,7 @@
                protected="${javadoc.protected}"
                private="${javadoc.private}"
                use="${javadoc.use}"
  -	     verbose="${javadoc.verbose}"> 
  +	     verbose="${javadoc.verbose}">
         <!-- <group title="??" packages="org.jboss.*"/> -->
       </javadoc>
     </target>
  @@ -2570,21 +2571,21 @@
     <!-- Install & Release                                                  -->
     <!-- ================================================================== -->
   
  -  <target name="install" 
  +  <target name="install"
   	  description="Install the structure for a release."
   	  depends="all, _buildmagic:install:default"/>
   
     <target name="release" depends="install"/>
   
  -  <target name="release-zip" 
  +  <target name="release-zip"
   	  description="Builds a ZIP distribution."
   	  depends="release, _buildmagic:release:zip"/>
   
  -  <target name="release-tar" 
  +  <target name="release-tar"
   	  description="Builds a TAR distribution."
   	  depends="release, _buildmagic:release:tar"/>
   
  -  <target name="release-tgz" 
  +  <target name="release-tgz"
   	  description="Builds a TAR-GZ distribution."
   	  depends="release, _buildmagic:release:tgz"/>
   
  @@ -2598,13 +2599,13 @@
     <!-- ================================================================== -->
   
     <!-- Clean up all build output -->
  -  <target name="clean" 
  +  <target name="clean"
   	  description="Cleans up most generated files."
   	  depends="_buildmagic:clean">
     </target>
   
     <!-- Clean up all generated files -->
  -  <target name="clobber" 
  +  <target name="clobber"
   	  description="Cleans up all generated files."
   	  depends="_buildmagic:clobber, clean">
     </target>
  @@ -2617,16 +2618,16 @@
     <target name="main"
   	  description="Executes the default target (most)."
   	  depends="most"/>
  -    
  +
     <target name="all"
   	  description="Builds everything."
   	  depends="jars, docs"/>
   
  -  <target name="most" 
  +  <target name="most"
   	  description="Builds almost everything."
   	  depends="jars"/>
   
  -  <target name="help" 
  +  <target name="help"
             description="Show this help message."
   	  depends="_buildmagic:help:standard"/>
   
  @@ -2638,21 +2639,21 @@
        | Run all tests.
      -->
   
  -  <target name="maybejars" depends="init" 
  +  <target name="maybejars" depends="init"
             unless="nojars">
       <antcall target="jars"/>
     </target>
   
     <target name="tests" description="Execute all tests."
  -    depends="init, 
  -             tests-standard-unit, 
  -             tests-client-unit, 
  -             tests-security-basic-unit, 
  -             tests-standard-stress, 
  -             tests-client-stress, 
  -             tests-security-basic-stress, 
  -             tests-jsr77-unit, 
  -             tests-util-unit, 
  +    depends="init,
  +             tests-standard-unit,
  +             tests-client-unit,
  +             tests-security-basic-unit,
  +             tests-standard-stress,
  +             tests-client-stress,
  +             tests-security-basic-stress,
  +             tests-jsr77-unit,
  +             tests-util-unit,
                tests-jbossmx-compliance,
                tests-jbossmx-implementation,
                tests-jbossmx-performance,
  @@ -2662,44 +2663,44 @@
   
   
     <target name="tests-unit" description="Execute all unit tests."
  -    depends="init, 
  -             tests-standard-unit, 
  -             tests-client-unit, 
  -             tests-security-basic-unit, 
  -             tests-jsr77-unit, 
  -             tests-util-unit, 
  -             tests-jbossmx-compliance, 
  -             tests-jbossmx-implementation, 
  +    depends="init,
  +             tests-standard-unit,
  +             tests-client-unit,
  +             tests-security-basic-unit,
  +             tests-jsr77-unit,
  +             tests-util-unit,
  +             tests-jbossmx-compliance,
  +             tests-jbossmx-implementation,
                tests-report">
     </target>
  -  
  +
     <target name="tests-stress" description="Execute all stress tests."
  -    depends="init, 
  +    depends="init,
                tests-standard-stress,
                tests-iiop-stress,
  -             tests-client-stress, 
  -             tests-security-basic-stress, 
  -             tests-jbossmx-performance, 
  +             tests-client-stress,
  +             tests-security-basic-stress,
  +             tests-jbossmx-performance,
                tests-report">
     </target>
   
  -  <!-- 
  +  <!--
        | Helper for running all jbossmx tests
      -->
     <target name="tests-jbossmx-all" description="Execute all jmx tests."
  -    depends="init, 
  +    depends="init,
                tests-jbossmx-compliance,
                tests-jbossmx-implementation,
                tests-jbossmx-performance,
                tests-report">
     </target>
  -  
  +
     <target name="tests-marathon" description="Execute all marathon tests."
  -    depends="init, 
  +    depends="init,
                tests-standard-marathon">
     </target>
   
  -  <!-- 
  +  <!--
        | Standard tests that should run successfully against a default JBoss
        | server distribution build.
      -->
  @@ -2846,8 +2847,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -2861,9 +2862,9 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -2882,7 +2883,7 @@
         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
   
  -       
  +
         <classpath>
           <pathelement path="${build.lib}/jrmp-dl-client.jar"/>
           <pathelement location="${build.resources}"/>
  @@ -2893,8 +2894,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -2905,7 +2906,7 @@
       </junit>
     </target>
   
  -  <!-- 
  +  <!--
        | Standard security tests that should run successfully against a default
        | JBoss server distribution build.
      -->
  @@ -2914,9 +2915,9 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -2932,7 +2933,7 @@
                      value="${build.resources}/security/auth.conf"/>
         <sysproperty key="build.testlog" value="${build.testlog}"/>
         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  -       
  +
         <classpath>
           <pathelement location="${build.classes}"/>
           <pathelement location="${build.resources}/security"/>
  @@ -2982,7 +2983,7 @@
         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
   
  -       
  +
         <classpath>
           <pathelement location="${build.classes}"/>
           <pathelement location="${build.resources}/security"/>
  @@ -2994,8 +2995,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -3254,7 +3255,7 @@
       </junit>
     </target>
   
  -  <!-- 
  +  <!--
        | Standard JBoss Util tests that should run successfully against a default
        | JBoss server distribution build.
      -->
  @@ -3263,9 +3264,9 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -3281,7 +3282,7 @@
                      value="${build.resources}/security/auth.conf"/>
         <sysproperty key="build.testlog" value="${build.testlog}"/>
         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  -       
  +
         <classpath>
           <pathelement location="${build.classes}"/>
           <pathelement location="${build.resources}/security"/>
  @@ -3293,8 +3294,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -3304,7 +3305,7 @@
       </junit>
     </target>
   
  -  <!-- 
  +  <!--
        | JBossMX implementation tests that should run correctly.
      -->
   
  @@ -3312,9 +3313,9 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -3323,7 +3324,7 @@
   
         <sysproperty key="build.testlog" value="${build.testlog}"/>
         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  -       
  +
         <classpath>
           <pathelement location="${build.classes}"/>
           <path refid="tests.classpath"/>
  @@ -3333,8 +3334,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -3346,7 +3347,7 @@
       </junit>
     </target>
   
  -  <!-- 
  +  <!--
        | JBossMX performance tests that should run correctly.
      -->
   
  @@ -3354,9 +3355,9 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -3365,7 +3366,7 @@
   
         <sysproperty key="build.testlog" value="${build.testlog}"/>
         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  -       
  +
         <classpath>
           <pathelement location="${build.classes}"/>
           <path refid="tests.classpath"/>
  @@ -3375,8 +3376,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -3388,7 +3389,7 @@
       </junit>
     </target>
   
  -  <!-- 
  +  <!--
        | JBossMX compliance tests that should run correctly.
      -->
   
  @@ -3396,9 +3397,9 @@
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -3407,7 +3408,7 @@
   
         <sysproperty key="build.testlog" value="${build.testlog}"/>
         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  -       
  +
         <classpath>
           <pathelement location="${build.classes}"/>
           <path refid="tests.classpath"/>
  @@ -3417,8 +3418,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -3494,9 +3495,9 @@
       <!-- Remove the test.log so each run has a fresh log -->
       <delete file="${build.testlog}/test.log" />
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -3520,8 +3521,8 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -3532,7 +3533,7 @@
     </target>
   
     <!--
  -     | Run iiop testcases in a single directory by specifing the test 
  +     | Run iiop testcases in a single directory by specifing the test
        | directory name in -Dtest=dirname in tests/dirname/test/**TestCase.class
      -->
   
  @@ -3543,9 +3544,9 @@
       <!-- Remove the test.log so each run has a fresh log -->
       <delete file="${build.testlog}/test.log" />
       <junit dir="${module.output}"
  -          printsummary="${junit.printsummary}" 
  -          haltonerror="${junit.haltonerror}" 
  -          haltonfailure="${junit.haltonfailure}" 
  +          printsummary="${junit.printsummary}"
  +          haltonerror="${junit.haltonerror}"
  +          haltonfailure="${junit.haltonfailure}"
             fork="${junit.fork}"
             timeout="${junit.timeout}"
             jvm="${junit.jvm}">
  @@ -3578,8 +3579,8 @@
                   extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <batchtest todir="${build.reports}"
  -                haltonerror="${junit.batchtest.haltonerror}" 
  -                haltonfailure="${junit.batchtest.haltonfailure}" 
  +                haltonerror="${junit.batchtest.haltonerror}"
  +                haltonfailure="${junit.batchtest.haltonfailure}"
                   fork="${junit.batchtest.fork}">
   
           <fileset dir="${build.classes}">
  @@ -3631,9 +3632,9 @@
         </batchtest>
       </junit>
     </target>
  -  
  +
     <!--
  -     | Run a single testcase by specifing the fully qualified class name 
  +     | Run a single testcase by specifing the fully qualified class name
        | of the unit test using the test property, -Dtest=org.jboss.test....
        | Here you specify the testcase class, not the directory
      -->
  @@ -3645,9 +3646,9 @@
       <!-- Remove the test.log so each test has a fresh log -->
       <delete file="${build.testlog}/test.log"/>
       <junit dir="${module.output}"
  -	   printsummary="${junit.printsummary}" 
  -	   haltonerror="${junit.haltonerror}" 
  -	   haltonfailure="${junit.haltonfailure}" 
  +	   printsummary="${junit.printsummary}"
  +	   haltonerror="${junit.haltonerror}"
  +	   haltonfailure="${junit.haltonfailure}"
   	   fork="${junit.fork}"
   	   timeout="${junit.timeout}"
   	   jvm="${junit.jvm}">
  @@ -3674,18 +3675,18 @@
   		 extension=".xml" usefile="${junit.formatter.usefile}"/>
   
         <test todir="${build.reports}" name="${test}"
  -		 haltonerror="${junit.batchtest.haltonerror}" 
  -		 haltonfailure="${junit.batchtest.haltonfailure}" 
  +		 haltonerror="${junit.batchtest.haltonerror}"
  +		 haltonfailure="${junit.batchtest.haltonfailure}"
   		 fork="${junit.batchtest.fork}"/>
       </junit>
     </target>
   
   
  -  <!-- 
  +  <!--
        | Generates reports from JUnit output.
      -->
   
  -  <target name="reports" depends="tests-report" 
  +  <target name="reports" depends="tests-report"
   	  description="Generates all reports."/>
   
     <target name="tests-report-clean" depends="init">
  @@ -3701,14 +3702,14 @@
         <fileset dir="${build.reports}">
           <include name="TEST-*.xml"/>
         </fileset>
  -      <report format="frames" 
  +      <report format="frames"
                 todir="${build.reports}/html"
                 styledir="${build.stylesheets}"
         />
       </junitreport>
     </target>
   
  -  <!-- 
  +  <!--
        | this currently spews logs of VariableReference crap, so it is turned
        | off by default.  Once this is fixed, it should be built after
        | tests-report-html
  @@ -3742,7 +3743,7 @@
       </style>
     </target>
   
  -  <!-- include the mqstress test - remember that these tests need to be 
  +  <!-- include the mqstress test - remember that these tests need to be
          manually updated when the version info of the server changes
     -->
     &mqstress;
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/06/13 10:57:25

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Include a security config service in the security-spec.jar so that a custom
  security config can be installed and removed with the testcase
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.23 +12 -3     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.22
  retrieving revision 1.106.2.23
  diff -u -r1.106.2.22 -r1.106.2.23
  --- build.xml	29 May 2002 22:16:17 -0000	1.106.2.22
  +++ build.xml	13 Jun 2002 17:57:25 -0000	1.106.2.23
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.22 2002/05/29 22:16:17 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.23 2002/06/13 17:57:25 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -2186,6 +2186,12 @@
       </jar>
   
       <!-- build security-spec.jar -->
  +    <jar jarfile="${build.lib}/security-spec.sar">
  +      <metainf dir="${build.resources}/security-spec/service-inf" />
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/security/service/SecurityConfig*.class"/>
  +      </fileset>
  +    </jar>
       <jar jarfile="${build.lib}/security-spec.jar">
         <fileset dir="${build.classes}">
           <include name="org/jboss/test/security/interfaces/**"/>
  @@ -2194,10 +2200,13 @@
           <include name="org/jboss/test/security/test/PermissionName*"/>
         </fileset>
         <fileset dir="${build.resources}/security-spec">
  -        <include name="**/ejb-jar.xml" />
  -        <include name="**/jboss.xml" />
  +        <include name="META-INF/ejb-jar.xml" />
  +        <include name="META-INF/jboss.xml" />
           <include name="users.properties"/>
           <include name="roles.properties"/>
  +      </fileset>
  +      <fileset dir="${build.lib}">
  +        <include name="security-spec.sar"/>
         </fileset>
       </jar>
   
  
  
  

[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/06/13 10:58:05

  Modified:    .        build.xml
  Log:
  Include a security config service in the security-spec.jar so that a custom
  security config can be installed and removed with the testcase
  
  Revision  Changes    Path
  1.142     +12 -3     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- build.xml	4 Jun 2002 14:13:05 -0000	1.141
  +++ build.xml	13 Jun 2002 17:58:05 -0000	1.142
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.141 2002/06/04 14:13:05 biorn_steedom Exp $ -->
  +<!-- $Id: build.xml,v 1.142 2002/06/13 17:58:05 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -2238,6 +2238,12 @@
       </jar>
   
       <!-- build security-spec.jar -->
  +    <jar jarfile="${build.lib}/security-spec.sar">
  +      <metainf dir="${build.resources}/security-spec/service-inf" />
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/security/service/SecurityConfig*.class"/>
  +      </fileset>
  +    </jar>
       <jar jarfile="${build.lib}/security-spec.jar">
         <fileset dir="${build.classes}">
           <include name="org/jboss/test/security/interfaces/**"/>
  @@ -2246,10 +2252,13 @@
           <include name="org/jboss/test/security/test/PermissionName*"/>
         </fileset>
         <fileset dir="${build.resources}/security-spec">
  -        <include name="**/ejb-jar.xml" />
  -        <include name="**/jboss.xml" />
  +        <include name="META-INF/ejb-jar.xml" />
  +        <include name="META-INF/jboss.xml" />
           <include name="users.properties"/>
           <include name="roles.properties"/>
  +      </fileset>
  +      <fileset dir="${build.lib}">
  +        <include name="security-spec.sar"/>
         </fileset>
       </jar>
   
  
  
  

[jboss-cvs] jbosstest build.xml

[Dain S. <dsu...@us...>]

  User: dsundstrom
  Date: 02/06/15 22:20:34

  Modified:    .        build.xml
  Log:
  Added cmp2 simple test.
  
  Revision  Changes    Path
  1.143     +15 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- build.xml	13 Jun 2002 17:58:05 -0000	1.142
  +++ build.xml	16 Jun 2002 05:20:34 -0000	1.143
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.142 2002/06/13 17:58:05 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.143 2002/06/16 05:20:34 dsundstrom Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -2423,6 +2423,20 @@
         <fileset dir="${build.resources}/cmp2/cmr">
          <include name="**/*.*"/>
         </fileset>
  +    </jar>
  +
  +    <!-- build cmp2-simple.jar -->
  +    <jar jarfile="${build.lib}/cmp2-simple.jar">
  +      <fileset dir="${build.classes}">
  +       <include name="org/jboss/test/cmp2/simple/**"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/cmp2/simple">
  +       <include name="**/*.*"/>
  +      </fileset>
  +      <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
  +        includes="net/**/*.*"/>
  +      <zipfileset src="${junit.junit.lib}/junit.jar"
  +        includes="junit/**/*.*"/>
       </jar>
     </target>