Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Alexey L. <lou...@us...> - 2002-12-13 21:38:11
|
User: loubyansky
Date: 02/12/13 13:38:09
Modified: . build.xml
Log:
added optimistic locking tests and enabled FoeDeployer tests
Revision Changes Path
1.203 +60 -40 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- build.xml 13 Dec 2002 04:30:12 -0000 1.202
+++ build.xml 13 Dec 2002 21:38:07 -0000 1.203
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.202 2002/12/13 04:30:12 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.203 2002/12/13 21:38:07 loubyansky Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -41,10 +41,6 @@
&targets;
- <!-- REMOVE THIS WHEN THE FOE DEPLOYER IS FIXED -->
- <property name="javac.excludes" value="org/jboss/test/foedeployer/**"/>
-
-
<!--+====================================================================+-->
<!--| Initialization |-->
<!--| |-->
@@ -304,6 +300,30 @@
Typemapping="Hypersonic SQL"/>
</ejbdoclet>
+ <!-- optimistic lock test -->
+ <mkdir dir="${build.resources}/cmp2/optimisticlock/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/optimisticlock">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/cmp2/optimisticlock/ejb/*Bean.java"/>
+ </fileset>
+ <packageSubstitution packages="ejb" substituteWith="interfaces"/>
+ <remoteinterface/>
+ <localinterface/>
+ <homeinterface/>
+ <localhomeinterface/>
+ <!-- <deploymentdescriptor xmlencoding ="UTF-8"
+ destdir="${build.resources}/cmp2/optimisticlock/META-INF"/> -->
+ <!-- <jboss xmlencoding="UTF-8"
+ version="3.0"
+ destdir="${build.resources}/cmp2/optimisticlock/META-INF"
+ mergedir="${source.resources}/cmp2/optimisticlock/"
+ Datasource="java:/DefaultDS"
+ Typemapping="Hypersonic SQL"/> -->
+ </ejbdoclet>
+
<!--undeploy of broken packages-->
<mkdir dir="${build.resources}/jmx/undeploy/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
@@ -420,17 +440,10 @@
mergedir="${source.resources}/banknew/"/>
</ejbdoclet>
-
-
- <!-- Foe-Deployer: Simple Test
-
- commented out until builds ... in nested comments will need to be restored
-
<mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
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>
@@ -447,15 +460,14 @@
createtables="True"
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
- <!== No JBoss DD generation here because that is what we can to use FoeDeployer for ==>
+ <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
</ejbdoclet>
- <!== Foe-Deployer: Message Test ==>
+ <!-- Foe-Deployer: Message Test -->
<mkdir dir="${build.resources}/foedeployer/message/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
- <!==mergedir="${source.resources}/jca/ejb"==>
<fileset dir="${source.java}">
<include name="org/jboss/test/foedeployer/ejb/message/*Bean.java"/>
</fileset>
@@ -468,15 +480,14 @@
validatexml="true"
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
- <!== No JBoss DD generation here because that is what we can to use FoeDeployer for ==>
+ <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
</ejbdoclet>
- <!== Foe-Deployer: O2MB Test ==>
+ <!-- Foe-Deployer: O2MB Test -->
<mkdir dir="${build.resources}/foedeployer/o2mb/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
- <!==mergedir="${source.resources}/jca/ejb"==>
<fileset dir="${source.java}">
<include name="org/jboss/test/foedeployer/ejb/o2mb/*Bean.java"/>
</fileset>
@@ -493,15 +504,14 @@
createtables="True"
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
- <!== No JBoss DD generation here because that is what we can to use FoeDeployer for ==>
+ <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
</ejbdoclet>
- <!== Foe-Deployer: M2MB Test ==>
+ <!-- Foe-Deployer: M2MB Test -->
<mkdir dir="${build.resources}/foedeployer/m2mb/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
- <!==mergedir="${source.resources}/jca/ejb"==>
<fileset dir="${source.java}">
<include name="org/jboss/test/foedeployer/ejb/m2mb/*Bean.java"/>
</fileset>
@@ -518,15 +528,14 @@
createtables="True"
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
- <!== No JBoss DD generation here because that is what we can to use FoeDeployer for ==>
+ <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
</ejbdoclet>
- <!== Foe-Deployer: QL Test ==>
+ <!-- Foe-Deployer: QL Test -->
<mkdir dir="${build.resources}/foedeployer/ql/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <!==mergedir="${source.resources}/jca/ejb"==>
+ ejbspec="2.0"
+ excludedtags="@version,@author">
<fileset dir="${source.java}">
<include name="org/jboss/test/foedeployer/ejb/ql/*Bean.java"/>
</fileset>
@@ -543,9 +552,8 @@
createtables="True"
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
- <!== No JBoss DD generation here because that is what we can to use FoeDeployer for ==>
+ <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
</ejbdoclet>
- -->
<!-- cpmanifest test -->
<mkdir dir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
@@ -675,7 +683,7 @@
<call target="_output:cmp2"/>
<call target="_output:jsr77"/>
<call target="_output:scheduler"/>
- <!--<call target="_output:foedeployer"/>-->
+ <call target="_output:foedeployer"/>
<call target="_output:jbossmx"/>
<call target="_output:ejbconf"/>
<call target="_output:proxycompiler"/>
@@ -2587,10 +2595,10 @@
</jar>
</target>
- <!-- foe-deployer test
+ <!-- foe-deployer test -->
<target name="_output:foedeployer" depends="_output:support">
- <!== <mkdir dir="${build.lib}"/> ==>
- <!== First task is to copy the Foe-Deployer SAR to the current lib directory ==>
+ <!-- <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">
@@ -2598,7 +2606,7 @@
</fileset>
</copy>
- <!== build foe-deployer-simple-test.wlar ==>
+ <!-- build foe-deployer-simple-test.wlar -->
<jar jarfile="${build.lib}/foe-deployer-simple-test.wlar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/foedeployer/ejb/simple/**"/>
@@ -2608,7 +2616,7 @@
</fileset>
</jar>
- <!== build foe-deployer-message-test.wlar ==>
+ <!-- build foe-deployer-message-test.wlar -->
<jar jarfile="${build.lib}/foe-deployer-message-test.wlar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/foedeployer/ejb/message/**"/>
@@ -2618,7 +2626,7 @@
</fileset>
</jar>
- <!== build foe-deployer-ql-test.wlar ==>
+ <!-- build foe-deployer-ql-test.wlar -->
<jar jarfile="${build.lib}/foe-deployer-ql-test.wlar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/foedeployer/ejb/ql/**"/>
@@ -2628,7 +2636,7 @@
</fileset>
</jar>
- <!== build foe-deployer-o2mb-test.wlar ==>
+ <!-- build foe-deployer-o2mb-test.wlar -->
<jar jarfile="${build.lib}/foe-deployer-o2mb-test.wlar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/foedeployer/ejb/o2mb/**"/>
@@ -2638,7 +2646,7 @@
</fileset>
</jar>
- <!== build foe-deployer-m2mb-test.wlar ==>
+ <!-- build foe-deployer-m2mb-test.wlar -->
<jar jarfile="${build.lib}/foe-deployer-m2mb-test.wlar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/foedeployer/ejb/m2mb/**"/>
@@ -2648,7 +2656,6 @@
</fileset>
</jar>
</target>
- -->
<!-- cmp2 tests -->
<target name="_output:cmp2" depends="_output:support">
@@ -2752,6 +2759,20 @@
includes="junit/**/*.*"/>
</jar>
+ <!-- build cmp2-optimisticlock.jar -->
+ <jar jarfile="${build.lib}/cmp2-optimisticlock.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cmp2/optimisticlock/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/optimisticlock">
+ <include name="**/*.*"/>
+ </fileset>
+ <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
+ <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
+ </jar>
+
</target>
<!-- exception tests -->
@@ -3628,7 +3649,7 @@
| JBoss server distribution build.
-->
- <!--
+ <!-- -->
<target name="tests-foe-deployer-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.log}"/>
@@ -3674,7 +3695,6 @@
</batchtest>
</junit>
</target>
- -->
<!--
| Standard JBoss Util tests that should run successfully against a default
|
