[jboss-cvs] JBossAS SVN: r80496 - in trunk/testsuite/imports: config and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 4 08:43:44 EST 2008
Author: wolfc
Date: 2008-11-04 08:43:43 -0500 (Tue, 04 Nov 2008)
New Revision: 80496
Added:
trunk/testsuite/imports/sections/bootstrapdependencies.xml
Modified:
trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml
trunk/testsuite/imports/sections/deployers.xml
trunk/testsuite/imports/test-jars.xml
Log:
JBAS-6028: bootstrap test runnable on its own
Modified: trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml
===================================================================
--- trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml 2008-11-04 13:41:52 UTC (rev 80495)
+++ trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml 2008-11-04 13:43:43 UTC (rev 80496)
@@ -72,7 +72,7 @@
</target>
<!-- General module's test -->
- <target name="generalmodule-bootstrap-dependencies-tests">
+ <target name="generalmodule-bootstrap-dependencies-tests" depends="jbas5349">
<create-bootstrapdependencies-config baseconf="all" conf="bootstrapdependenciesJBAS5349-${jboss-junit-configuration}">
<module-patternset>
<include name="${bootstrap.testmodule.name}"/>
Added: trunk/testsuite/imports/sections/bootstrapdependencies.xml
===================================================================
--- trunk/testsuite/imports/sections/bootstrapdependencies.xml (rev 0)
+++ trunk/testsuite/imports/sections/bootstrapdependencies.xml 2008-11-04 13:43:43 UTC (rev 80496)
@@ -0,0 +1,67 @@
+<project name="tests-bootstrapdependencies-jars">
+ <!-- deployers test -->
+ <target name="_jars-bootstrapdependencies" depends="jbas5349"/>
+
+ <target name="jbas5349" depends="compile">
+ <delete dir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar"/>
+ <mkdir dir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar"/>
+ <copy todir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar/">
+ <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/sar">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/sar/BootstrapDependenciesTest*.class"/>
+ </fileset>
+ </copy>
+ <copy file="${build.resources}/bootstrapdependencies/jbas5349/bootstrapdependencies-hsqldb-ds.xml" todir="${build.lib}"/>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb3-sessionbean.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/DummyStateless*.class"/>
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/DummyStateful*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb3-entitybean.jar">
+ <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb3/entity">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/SimpleEntity.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb3-messagebean.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/DummyMessageBean.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb2-sessionbean.jar">
+ <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb2/session">
+ <include name="META-INF/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/DummyStateless*.class"/>
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/DummyStateful*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb2-entitycmpbean.jar">
+ <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb2/cmp">
+ <include name="META-INF/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/SimpleEntity*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb2-messagebean.jar">
+ <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb2/mdb">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/DummyMessageBean.class"/>
+ </fileset>
+ </jar>
+ <war destfile="${build.lib}/bootstrapdependencies-web.war" webxml="${build.resources}/bootstrapdependencies/jbas5349/dummywar/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/bootstrapdependencies/jbas5349/servlet/DummyServlet.class"/>
+ </classes>
+ </war>
+ </target>
+</project>
\ No newline at end of file
Modified: trunk/testsuite/imports/sections/deployers.xml
===================================================================
--- trunk/testsuite/imports/sections/deployers.xml 2008-11-04 13:41:52 UTC (rev 80495)
+++ trunk/testsuite/imports/sections/deployers.xml 2008-11-04 13:43:43 UTC (rev 80496)
@@ -133,68 +133,6 @@
</fileset>
</jar>
- <!-- JBAS-5349 -->
- <delete dir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar"/>
- <mkdir dir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar"/>
- <copy todir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar/">
- <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/sar">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/sar/BootstrapDependenciesTest*.class"/>
- </fileset>
- </copy>
- <copy file="${build.resources}/bootstrapdependencies/jbas5349/bootstrapdependencies-hsqldb-ds.xml" todir="${build.lib}"/>
- <jar destfile="${build.lib}/bootstrapdependencies-ejb3-sessionbean.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/DummyStateless*.class"/>
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/DummyStateful*.class"/>
- </fileset>
- </jar>
- <jar destfile="${build.lib}/bootstrapdependencies-ejb3-entitybean.jar">
- <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb3/entity">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/SimpleEntity.class"/>
- </fileset>
- </jar>
- <jar destfile="${build.lib}/bootstrapdependencies-ejb3-messagebean.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb3/DummyMessageBean.class"/>
- </fileset>
- </jar>
- <jar destfile="${build.lib}/bootstrapdependencies-ejb2-sessionbean.jar">
- <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb2/session">
- <include name="META-INF/*"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/DummyStateless*.class"/>
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/DummyStateful*.class"/>
- </fileset>
- </jar>
- <jar destfile="${build.lib}/bootstrapdependencies-ejb2-entitycmpbean.jar">
- <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb2/cmp">
- <include name="META-INF/*"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/SimpleEntity*.class"/>
- </fileset>
- </jar>
- <jar destfile="${build.lib}/bootstrapdependencies-ejb2-messagebean.jar">
- <fileset dir="${build.resources}/bootstrapdependencies/jbas5349/ejb2/mdb">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/ejb2/DummyMessageBean.class"/>
- </fileset>
- </jar>
- <war destfile="${build.lib}/bootstrapdependencies-web.war" webxml="${build.resources}/bootstrapdependencies/jbas5349/dummywar/WEB-INF/web.xml">
- <classes dir="${build.classes}">
- <include name="org/jboss/test/bootstrapdependencies/jbas5349/servlet/DummyServlet.class"/>
- </classes>
- </war>
-
<!-- JBAS-2904 SAR -->
<jar destfile="${build.lib}/Atestdeployerorder-jbas2904.sar">
<fileset dir="${build.resources}/deployers/jbas2904/mbean1">
Modified: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml 2008-11-04 13:41:52 UTC (rev 80495)
+++ trunk/testsuite/imports/test-jars.xml 2008-11-04 13:43:43 UTC (rev 80496)
@@ -12,6 +12,7 @@
<import file="sections/bank.xml"/>
<import file="sections/bench.xml"/>
<import file="sections/bmp.xml"/>
+ <import file="sections/bootstrapdependencies.xml"/>
<import file="sections/classloader.xml"/>
<import file="sections/client.xml"/>
<import file="sections/cluster.xml"/>
@@ -95,6 +96,7 @@
_jars-bankiiop,
_jars-bench,
_jars-bmp,
+ _jars-bootstrapdependencies,
_jars-cache,
_jars-classloader,
_jars-client,
More information about the jboss-cvs-commits
mailing list