Menu
▾
▴
jboss-cvs-commits
|
From: Scott M S. <st...@us...> - 2003-07-30 17:52:50
|
User: starksm
Date: 03/07/30 10:52:48
Modified: . Tag: Branch_3_2 build.xml
Log:
Include a jboss-app.xml descriptor in the jbosstest-web.ear
Revision Changes Path
No revision
No revision
1.165.2.88 +11 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.87
retrieving revision 1.165.2.88
diff -u -r1.165.2.87 -r1.165.2.88
--- build.xml 25 Jul 2003 19:14:26 -0000 1.165.2.87
+++ build.xml 30 Jul 2003 17:52:47 -0000 1.165.2.88
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.87 2003/07/25 19:14:26 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.88 2003/07/30 17:52:47 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1798,6 +1798,13 @@
</fileset>
</jar>
+ <jar jarfile="${build.lib}/attrtest.sar">
+ <metainf dir="${build.resources}/jmx/attrs" />
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/attrs/AttrTests*"/>
+ </fileset>
+ </jar>
+
<jar jarfile="${build.lib}/testdeploya.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jmx/mbeana/**"/>
@@ -2837,6 +2844,9 @@
<include name="lib/util.jar"/>
<include name="websubdir/relative.jar"/>
</fileset>
+ <fileset dir="${build.resources}/web">
+ <include name="scripts/*"/>
+ </fileset>
</ear>
<!-- Create an ear with the same war as the jbosstest-web.ear to test
@@ -2844,9 +2854,6 @@
-->
<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="wars/notjbosstest-web.war"/>
</fileset>
|
|
From: Scott M S. <st...@us...> - 2003-08-01 20:00:06
|
User: starksm
Date: 03/08/01 13:00:04
Modified: . Tag: Branch_3_2 build.xml
Log:
Add 2 unpackaged ears to the resource loading test
Revision Changes Path
No revision
No revision
1.165.2.89 +51 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.88
retrieving revision 1.165.2.89
diff -u -r1.165.2.88 -r1.165.2.89
--- build.xml 30 Jul 2003 17:52:47 -0000 1.165.2.88
+++ build.xml 1 Aug 2003 20:00:03 -0000 1.165.2.89
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.88 2003/07/30 17:52:47 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.89 2003/08/01 20:00:03 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3566,7 +3566,7 @@
</jar>
<!-- build loadingresource.sar -->
- <jar jarfile="${build.lib}/loadingresource.sar">
+ <jar jarfile="${build.lib}/loading.sar">
<metainf dir="${source.resources}/classloader/resource">
<include name="jboss-service.xml" />
</metainf>
@@ -3584,9 +3584,57 @@
<include name="dtds/*" />
</fileset>
<fileset dir="${build.lib}">
- <include name="loadingresource.sar" />
+ <include name="loading.sar" />
</fileset>
</ear>
+
+ <!-- Create unpacked loadingresource1 ear -->
+ <property name="ear1.dist"
+ value="${build.lib}/unpacked/loadingresource1.ear" />
+ <mkdir dir="${ear1.dist}/META-INF" />
+ <copy todir="${ear1.dist}/META-INF">
+ <fileset dir="${build.resources}/classloader/resource">
+ <include name="application.xml" />
+ <include name="jboss-app.xml" />
+ </fileset>
+ </copy>
+ <mkdir dir="${ear1.dist}/loading.sar/META-INF" />
+ <unzip src="${build.lib}/loading.sar" dest="${ear1.dist}/loading.sar" />
+ <copy file="${build.resources}/classloader/resource/jboss-serviceX.xml"
+ tofile="${ear1.dist}/loading.sar/META-INF/jboss-service.xml"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="1"/>
+ </filterset>
+ </copy>
+ <copy file="${build.resources}/classloader/resource/dtds/sampleX.dtd"
+ tofile="${ear1.dist}/dtds/sample1.dtd" />
+ <!-- Create unpacked loadingresource2 ear -->
+ <property name="ear2.dist"
+ value="${build.lib}/unpacked/loadingresource2.ear" />
+ <mkdir dir="${ear2.dist}/META-INF" />
+ <copy todir="${ear2.dist}/META-INF">
+ <fileset dir="${build.resources}/classloader/resource">
+ <include name="application.xml" />
+ <include name="jboss-app.xml" />
+ </fileset>
+ </copy>
+ <mkdir dir="${ear2.dist}/loading.tmp/META-INF" />
+ <unzip src="${build.lib}/loading.sar" dest="${ear2.dist}/loading.tmp" />
+ <copy file="${build.resources}/classloader/resource/jboss-serviceX.xml"
+ tofile="${ear2.dist}/loading.tmp/META-INF/jboss-service.xml"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="2"/>
+ </filterset>
+ </copy>
+ <copy todir="${ear2.dist}//loading.tmp/dtds">
+ <fileset dir="${build.resources}/classloader/resource/dtds" />
+ </copy>
+ <copy file="${build.resources}/classloader/resource/dtds/sampleX.dtd"
+ tofile="${ear2.dist}/loading.tmp/dtds/sample2.dtd" />
+ <zip destfile="${ear2.dist}/loading.sar" basedir="${ear2.dist}/loading.tmp"/>
+ <delete dir="${ear2.dist}/loading.tmp" />
<!-- Build version 1 of the singleton.jar -->
<copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
|
|
From: Alexey L. <lou...@us...> - 2003-08-04 13:47:41
|
User: loubyansky
Date: 03/08/04 06:47:39
Modified: . Tag: Branch_3_2 build.xml
Log:
added cmp2/enum
Revision Changes Path
No revision
No revision
1.165.2.90 +33 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.89
retrieving revision 1.165.2.90
diff -u -r1.165.2.89 -r1.165.2.90
--- build.xml 1 Aug 2003 20:00:03 -0000 1.165.2.89
+++ build.xml 4 Aug 2003 13:47:38 -0000 1.165.2.90
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.89 2003/08/01 20:00:03 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.90 2003/08/04 13:47:38 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -550,6 +550,21 @@
/>
</ejbdoclet>
+ <!-- cmp2 enum tests -->
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/enum">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/cmp2/enum/ejb/*Bean.java"/>
+ </fileset>
+ <remoteinterface/>
+ <localinterface/>
+ <homeinterface/>
+ <localhomeinterface/>
+ <utilobject cacheHomes="true" includeGUID="false" kind="physical" />
+ </ejbdoclet>
+
<!--undeploy of broken packages-->
<mkdir dir="${build.resources}/jmx/undeploy/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
@@ -3371,7 +3386,21 @@
includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
- </jar>
+ </jar>
+
+ <!-- build cmp2-enum.jar -->
+ <jar jarfile="${build.lib}/cmp2-enum.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cmp2/enum/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/enum">
+ <include name="**/*.*"/>
+ </fileset>
+ <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
+ includes="net/**/*.*"/>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
+ </jar>
</target>
<!-- exception tests -->
@@ -3826,9 +3855,11 @@
<!-- build tmtest.sar -->
<jar jarfile="${build.lib}/tmtest.sar">
+<!--
<metainf dir="${build.resources}/tm">
<include name="jboss-service.xml" />
</metainf>
+-->
<fileset dir="${build.classes}">
<include name="org/jboss/test/tm/mbean/**"/>
<include name="org/jboss/test/tm/resource/**"/>
|
|
From: Adrian B. <ej...@us...> - 2003-08-04 18:55:23
|
User: ejort
Date: 03/08/04 11:55:22
Modified: . Tag: Branch_3_2 build.xml
Log:
Reinstate tmtest's jboss-service.xml accidently removed?
Revision Changes Path
No revision
No revision
1.165.2.91 +1 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.90
retrieving revision 1.165.2.91
diff -u -r1.165.2.90 -r1.165.2.91
--- build.xml 4 Aug 2003 13:47:38 -0000 1.165.2.90
+++ build.xml 4 Aug 2003 18:55:22 -0000 1.165.2.91
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.90 2003/08/04 13:47:38 loubyansky Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.91 2003/08/04 18:55:22 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3855,11 +3855,9 @@
<!-- build tmtest.sar -->
<jar jarfile="${build.lib}/tmtest.sar">
-<!--
<metainf dir="${build.resources}/tm">
<include name="jboss-service.xml" />
</metainf>
--->
<fileset dir="${build.classes}">
<include name="org/jboss/test/tm/mbean/**"/>
<include name="org/jboss/test/tm/resource/**"/>
|
|
From: Scott M S. <st...@us...> - 2003-08-09 20:19:23
|
User: starksm
Date: 03/08/09 13:19:23
Modified: . Tag: Branch_3_2 build.xml
Log:
- Include the PrincipalInterceptor in the invoker-adaptor-test.sar
- Set a jbosstest.secure true flag for security related tests
Revision Changes Path
No revision
No revision
1.165.2.92 +9 -6 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.91
retrieving revision 1.165.2.92
diff -u -r1.165.2.91 -r1.165.2.92
--- build.xml 4 Aug 2003 18:55:22 -0000 1.165.2.91
+++ build.xml 9 Aug 2003 20:19:22 -0000 1.165.2.92
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.91 2003/08/04 18:55:22 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.92 2003/08/09 20:19:22 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2239,6 +2239,7 @@
<jar jarfile="${build.lib}/invoker-adaptor-test.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jmx/invoker/*.class"/>
+ <include name="org/jboss/test/jmx/interceptors/PrincipalInterceptor.class"/>
</fileset>
<fileset dir="${build.resources}/jmx/invoker/sar">
<include name="META-INF/*.xml"/>
@@ -4179,6 +4180,7 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -4232,6 +4234,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.secure" value="true"/>
<classpath>
@@ -4273,9 +4276,9 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
<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"
@@ -4319,6 +4322,7 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy"
@@ -4378,6 +4382,7 @@
<sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/>
<sysproperty key="jboss.tools.dir" file="${project.root}/tools"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -4466,9 +4471,9 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
<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"
@@ -4517,7 +4522,6 @@
<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"
@@ -4570,7 +4574,6 @@
<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"
@@ -4619,7 +4622,6 @@
<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"
@@ -5057,6 +5059,7 @@
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
<sysproperty key="jbosstest.nodeploy" value="${jbosstest.nodeploy}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
|
|
From: Alexey L. <lou...@us...> - 2003-08-13 11:40:10
|
User: loubyansky
Date: 03/08/13 04:37:08
Modified: . build.xml
Log:
moved AOP related tests from tests-db target to its own tests-aop
Revision Changes Path
1.285 +46 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- build.xml 29 Jul 2003 07:55:18 -0000 1.284
+++ build.xml 13 Aug 2003 11:37:07 -0000 1.285
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.284 2003/07/29 07:55:18 bwang00 Exp $ -->
+<!-- $Id: build.xml,v 1.285 2003/08/13 11:37:07 loubyansky Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -4818,11 +4818,55 @@
<include name="**/cmp2/**/*UnitTestCase.class"/>
<include name="**/dbtest/**/*UnitTestCase.class"/>
<include name="**/deadlock/**/*StressTestCase.class"/>
- <include name="**/aop/**/*UnitTestCase.class"/>
<include name="**/entityexc/**/*UnitTestCase.class"/>
<include name="**/idgen/**/*UnitTestCase.class"/>
<include name="**/perf/**/*UnitTestCase.class"/>
<include name="**/testbean/**/*UnitTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <!--
+ | Run all AOP related tests
+ -->
+
+ <target name="tests-aop" depends="init, run-aop-tests, tests-report-html"/>
+ <target name="run-aop-tests" depends="maybejars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.log}"/>
+ <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}"/>
+ <sysproperty key="build.log" value="${build.log}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="jbosstest.data.dir" value="${jbosstest.data.dir}"/>
+ <sysproperty key="jbosstest.iterationcount" value="2"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <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="**/aop/**/*UnitTestCase.class"/>
</fileset>
</batchtest>
</junit>
|
|
From: Adrian B. <ej...@us...> - 2003-08-18 23:22:00
|
User: ejort
Date: 03/08/18 16:21:59
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a test for a read-only CMR get in a transaction thanks to Brian Stansberry
Revision Changes Path
No revision
No revision
1.165.2.93 +11 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.92
retrieving revision 1.165.2.93
diff -u -r1.165.2.92 -r1.165.2.93
--- build.xml 9 Aug 2003 20:19:22 -0000 1.165.2.92
+++ build.xml 18 Aug 2003 23:21:58 -0000 1.165.2.93
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.92 2003/08/09 20:19:22 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.93 2003/08/18 23:21:58 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3401,6 +3401,16 @@
includes="net/**/*.*"/>
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
+ </jar>
+
+ <!-- build cmp2-cmrtansaction.jar -->
+ <jar jarfile="${build.lib}/cmp2-cmrtransaction.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cmp2/cmrtransaction/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/cmrtransaction">
+ <include name="**/*.*"/>
+ </fileset>
</jar>
</target>
|
|
From: Scott M S. <st...@us...> - 2003-08-24 01:42:36
|
User: starksm
Date: 03/08/23 18:42:34
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a test of a jsp page accessing classes outside of the war referenced
through the war manifest classpath.
Revision Changes Path
No revision
No revision
1.165.2.94 +22 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.93
retrieving revision 1.165.2.94
diff -u -r1.165.2.93 -r1.165.2.94
--- build.xml 18 Aug 2003 23:21:58 -0000 1.165.2.93
+++ build.xml 24 Aug 2003 01:42:34 -0000 1.165.2.94
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.93 2003/08/18 23:21:58 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.94 2003/08/24 01:42:34 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2768,6 +2768,27 @@
</fileset>
</jar>
+ <!-- Build manifest-web.war -->
+ <manifest file="${build.resources}/manifest-web.mf">
+ <attribute name="Class-Path" value="jbosstest-web-util.jar"/>
+ </manifest>
+ <war warfile="${build.lib}/manifest-web.war"
+ manifest="${build.resources}/manifest-web.mf"
+ webxml="${build.resources}/web/WEB-INF/manifest-web.xml">
+ <fileset dir="${build.resources}/web/html/manifest">
+ <include name="**/*.jsp"/>
+ </fileset>
+ <fileset dir="${build.lib}">
+ <include name="jbosstest-web-util.jar" />
+ </fileset>
+ </war>
+ <ear earfile="${build.lib}/manifest-web.ear"
+ appxml="${build.resources}/web/META-INF/application-mf.xml">
+ <fileset dir="${build.lib}">
+ <include name="manifest-web.war"/>
+ <include name="jbosstest-web-util.jar"/>
+ </fileset>
+ </ear>
<!-- build root-web.war -->
<war warfile="${build.lib}/root-web.war"
|
|
From: Alexey L. <lou...@us...> - 2003-08-24 19:01:23
|
User: loubyansky
Date: 03/08/24 09:49:25
Modified: . Tag: Branch_3_2 build.xml
Log:
switched to xdoclet generation for cmp2/ejbselect
Revision Changes Path
No revision
No revision
1.165.2.95 +25 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.94
retrieving revision 1.165.2.95
diff -u -r1.165.2.94 -r1.165.2.95
--- build.xml 24 Aug 2003 01:42:34 -0000 1.165.2.94
+++ build.xml 24 Aug 2003 16:49:25 -0000 1.165.2.95
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.94 2003/08/24 01:42:34 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.95 2003/08/24 16:49:25 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -523,7 +523,30 @@
-->
</ejbdoclet>
-
+ <!-- ejbselect tests -->
+ <mkdir dir="${build.resources}/cmp2/ejbselect/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.etc}/cmp2/ejbselect">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/cmp2/ejbselect/*Bean.java"/>
+ </fileset>
+ <localinterface/>
+ <localhomeinterface/>
+ <entitypk/>
+ <utilobject cacheHomes="true" includeGUID="false"/>
+ <entitycmp/>
+ <session/>
+ <deploymentdescriptor
+ destdir="${build.resources}/cmp2/ejbselect/META-INF"
+ validatexml="${validatexml}"/>
+ <jboss
+ version="3.2"
+ xmlencoding="UTF-8"
+ destdir="${build.resources}/cmp2/ejbselect/META-INF"
+ validatexml="${validatexml}"/>
+ </ejbdoclet>
<!-- cmp2 relationship stress tests -->
<mkdir dir="${build.resources}/cmp2/cmrstress/META-INF"/>
|
|
From: Scott M S. <st...@us...> - 2003-08-24 19:53:31
|
User: starksm
Date: 03/08/24 12:53:30
Modified: . Tag: Branch_3_2 build.xml
Log:
Move the SecureJMXInvokerUnitTestCase to the basic security tests
Revision Changes Path
No revision
No revision
1.165.2.96 +3 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.95
retrieving revision 1.165.2.96
diff -u -r1.165.2.95 -r1.165.2.96
--- build.xml 24 Aug 2003 16:49:25 -0000 1.165.2.95
+++ build.xml 24 Aug 2003 19:53:29 -0000 1.165.2.96
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.95 2003/08/24 16:49:25 loubyansky Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.96 2003/08/24 19:53:29 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4405,6 +4405,7 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
+ <include name="**/test/jmx/test/SecureJMXInvokerUnitTestCase.class"/>
<include name="**/test/perf/test/SecurePerfStressTestCase.class"/>
<include name="**/test/security/test/*StressTestCase.class"/>
</fileset>
@@ -4740,6 +4741,7 @@
<include name="**/jbossmx/implementation/**/*TestCase.class"/>
<!-- Ignore the abstract class -->
<exclude name="org/jboss/test/jbossmx/implementation/TestCase.class"/>
+ <exclude name="org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.class"/>
</fileset>
</batchtest>
</junit>
|
|
From: Bill B. <pat...@us...> - 2003-08-30 00:29:23
|
User: patriot1burke
Date: 03/08/29 17:29:20
Modified: . build.xml
Log:
aop testsuite integration
Revision Changes Path
1.287 +200 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- build.xml 27 Aug 2003 04:32:45 -0000 1.286
+++ build.xml 30 Aug 2003 00:29:20 -0000 1.287
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.286 2003/08/27 04:32:45 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.287 2003/08/30 00:29:20 patriot1burke Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -97,6 +97,7 @@
<path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
+ <path refid="jdom.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -137,6 +138,10 @@
<path refid="jboss.management.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aspects.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+
</path>
<!-- ===== -->
@@ -848,6 +853,86 @@
destdir="${build.resources}/entity/entity/META-INF"/>
</ejbdoclet>
+ <!-- aop test -->
+ <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/simpleejb/SimpleBean.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/aop/simpleejb/META-INF"/>
+ <jboss xmlencoding="UTF-8"
+ version="3.0"
+ destdir="${build.resources}/aop/simpleejb/META-INF"/>
+ </ejbdoclet>
+
+ <!-- aop xdoclet test - ->
+ <taskdef name="aopdoclet"
+ classname="xdoclet.modules.jboss.aop.JBossAopTask"
+ classpathref="tests.classpath"/>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Advised">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Advised.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/ClassMetaData">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/ClassMetaData.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Intercepted">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Intercepted.java"/>
+ <include name="org/jboss/test/aop/xdoclet/BasicInterceptor.java"/>
+ <include name="org/jboss/test/aop/xdoclet/XmlLoadingInterceptor.java"/>
+ <include name="org/jboss/test/aop/xdoclet/XmlInterceptorFactory.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/NewIntercepted">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/NewIntercepted.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Introduced">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Introduced.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/NotAdvised">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/NotAdvised.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Secured">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Secured.java"/>
+ </fileset>
+ <configParam name="RunAs" value="Andy"/>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Stack">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Stack.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Transacted">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Transacted.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+-->
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
@@ -1012,6 +1097,7 @@
_jars-jsr77,
_jars-foedeployer,
_jars-jbossmx,
+ _jars-aop,
_jars-ejbconf,
_jars-proxycompiler,
_jars-helloiiop,
@@ -3829,6 +3915,119 @@
</jar>
</target>
+ <!-- aop test -->
+ <target name="_jars-aop">
+ <!-- <mkdir dir="${build.lib}"/> -->
+ <!-- build aopest.jar -->
+ <jar jarfile="${build.lib}/aoptest.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/aop/test/**"/>
+ <include name="org/somepackage/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="*.*"/>
+ </fileset>
+ </jar>
+
+ <!-- build simpleejb.jar -->
+ <jar jarfile="${build.lib}/simpleejb.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/simpleejb/"/>
+ </fileset>
+ <metainf dir="${build.resources}/aop/simpleejb/META-INF/"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/aop-call-logging.aop">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/test/CallLoggingUnitTestCase.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/aop/calllogging/META-INF/"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/aop-invocationlog.aop">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/test/InvocationLogUnitTestCase.class"/>
+ <include name="org/jboss/test/aop/bean/POJO.class"/>
+ <include name="org/jboss/test/aop/bean/SomeException.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/invocationlog">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${build.lib}/aop-invocationlog.sar">
+ <fileset dir="${build.lib}">
+ <include name="aop-invocationlog.aop"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/invocationlog">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/aoptest.aop"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/Person.class"/>
+ <include name="org/jboss/test/aop/bean/Address.class"/>
+ <include name="org/jboss/test/aop/bean/NoInterceptorsPOJO*.class"/>
+ <include name="org/jboss/test/aop/bean/NonadvisedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SecuredPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SomeException.class"/>
+ <include name="org/jboss/test/aop/bean/POJO*.class"/>
+ <include name="org/jboss/test/aop/bean/Call*.class"/>
+ <include name="org/jboss/test/aop/bean/SomeIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/SubclassIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/AnotherIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/Introduction.class"/>
+ <include name="org/jboss/test/aop/bean/Introduction2.class"/>
+ <include name="org/jboss/test/aop/bean/InterfaceMixin.class"/>
+ <include name="org/jboss/test/aop/bean/TxPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleInterceptorFactory.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanInterceptorFactory.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build aop.jar -->
+ <jar jarfile="${build.lib}/aoptest.sar">
+ <fileset dir="${build.lib}">
+ <include name="aoptest.aop"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/AOPTester.class"/>
+ <include name="org/jboss/test/aop/bean/AOPTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/RemotingTester.class"/>
+ <include name="org/jboss/test/aop/bean/RemotingTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/SecurityTester.class"/>
+ <include name="org/jboss/test/aop/bean/SecurityTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/TxTester.class"/>
+ <include name="org/jboss/test/aop/bean/TxTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockTester.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedObjectTester.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedObjectTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/CacheTester.class"/>
+ <include name="org/jboss/test/aop/bean/CacheTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/BeforeInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/AfterInterceptor.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ </target>
<!-- entity test -->
<target name="_jars-entity">
<mkdir dir="${build.lib}"/>
|
|
From: Scott M S. <st...@us...> - 2003-09-04 19:56:33
|
User: starksm
Date: 03/09/04 12:56:31
Modified: . Tag: Branch_3_2 build.xml
Log:
Include the junit and ejbjunit classes in the cts.jar
Revision Changes Path
No revision
No revision
1.165.2.97 +4 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.96
retrieving revision 1.165.2.97
diff -u -r1.165.2.96 -r1.165.2.97
--- build.xml 24 Aug 2003 19:53:29 -0000 1.165.2.96
+++ build.xml 4 Sep 2003 19:56:29 -0000 1.165.2.97
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.96 2003/08/24 19:53:29 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.97 2003/09/04 19:56:29 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1230,7 +1230,10 @@
<include name="org/jboss/test/cts/jms/**"/>
<include name="org/jboss/test/cts/keys/**"/>
<include name="org/jboss/test/cts/test/*_Stub*.class"/>
+ <include name="org/jboss/test/util/ejb/*"/>
</fileset>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
</jar>
<!-- build a duplicate cts.jar with new home bindings -->
<jar jarfile="${build.lib}/cts2.jar">
|
|
From: Scott M S. <st...@us...> - 2003-09-04 20:05:18
|
User: starksm
Date: 03/09/04 13:05:17
Modified: . build.xml
Log:
Include the junit and ejbjunit classes in the cts.jar
Revision Changes Path
1.288 +5 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- build.xml 30 Aug 2003 00:29:20 -0000 1.287
+++ build.xml 4 Sep 2003 20:05:17 -0000 1.288
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.287 2003/08/30 00:29:20 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.288 2003/09/04 20:05:17 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1316,6 +1316,10 @@
<include name="org/jboss/test/cts/jms/**"/>
<include name="org/jboss/test/cts/keys/**"/>
<include name="org/jboss/test/cts/test/*_Stub*.class"/>
+ <include name="org/jboss/test/util/ejb/*"/>
+ </fileset>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
</fileset>
</jar>
<!-- build a duplicate cts.jar with new home bindings -->
|
|
From: Bill B. <pat...@us...> - 2003-09-05 15:53:36
|
User: patriot1burke
Date: 03/09/05 08:53:28
Modified: . build.xml
Log:
fix AOP remoting
Revision Changes Path
1.289 +8 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- build.xml 4 Sep 2003 20:05:17 -0000 1.288
+++ build.xml 5 Sep 2003 15:53:28 -0000 1.289
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.288 2003/09/04 20:05:17 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.289 2003/09/05 15:53:28 patriot1burke Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1319,8 +1319,8 @@
<include name="org/jboss/test/util/ejb/*"/>
</fileset>
<zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
- </fileset>
+ includes="junit/**/*.*">
+ </zipfileset>
</jar>
<!-- build a duplicate cts.jar with new home bindings -->
<jar jarfile="${build.lib}/cts2.jar">
@@ -4279,6 +4279,8 @@
jvm="${junit.jvm}">
<jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -5144,7 +5146,7 @@
| name in -Dtest=dirname in tests/dirname/test/**TestCase.class
-->
- <target name="test" depends="maybejars" if="test"
+ <target name="test" depends="init" if="test"
description="Execute a single test.">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
@@ -5159,6 +5161,8 @@
jvm="${junit.jvm}">
<jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/>
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
|
|
From: Scott M S. <st...@us...> - 2003-09-10 00:12:32
|
User: starksm
Date: 03/09/09 17:12:31
Modified: . Tag: Branch_3_2 build.xml
Log:
Include the junit classes in the naming.jar
Revision Changes Path
No revision
No revision
1.165.2.98 +4 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.97
retrieving revision 1.165.2.98
diff -u -r1.165.2.97 -r1.165.2.98
--- build.xml 4 Sep 2003 19:56:29 -0000 1.165.2.97
+++ build.xml 10 Sep 2003 00:12:30 -0000 1.165.2.98
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.97 2003/09/04 19:56:29 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.98 2003/09/10 00:12:30 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -96,7 +96,6 @@
<path refid="jacorb.jacorb.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
- <path refid="junitejb.junitejb.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -191,7 +190,6 @@
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/junit.jar"/>
<pathelement path="${project.tools}/lib/optional.jar"/>
<path refid="jboss.jmx.classpath"/>
<path refid="thirdparty.classpath"/>
@@ -2296,7 +2294,10 @@
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
+ <include name="org/jboss/test/util/ejb/*"/>
</fileset>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
<fileset dir="${build.resources}/naming/jar">
<include name="META-INF/*.xml"/>
</fileset>
|
|
From: Scott M S. <st...@us...> - 2003-09-10 00:39:34
|
User: starksm
Date: 03/09/09 17:39:29
Modified: . build.xml
Log:
Add the junit jars to the naming.jar
Revision Changes Path
1.290 +4 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- build.xml 5 Sep 2003 15:53:28 -0000 1.289
+++ build.xml 10 Sep 2003 00:39:29 -0000 1.290
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.289 2003/09/05 15:53:28 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.290 2003/09/10 00:39:29 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -196,7 +196,6 @@
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/junit.jar"/>
<pathelement path="${project.tools}/lib/optional.jar"/>
<path refid="jboss.jmx.classpath"/>
<path refid="thirdparty.classpath"/>
@@ -2383,7 +2382,10 @@
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
+ <include name="org/jboss/test/util/ejb/*"/>
</fileset>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
<fileset dir="${build.resources}/naming/jar">
<include name="META-INF/*.xml"/>
</fileset>
|
|
From: Ben W. <bw...@us...> - 2003-09-13 07:12:36
|
User: bwang00
Date: 03/09/13 00:12:35
Modified: . build.xml
Log:
Added cache testsuite back to current jboss-head
Revision Changes Path
1.291 +20 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- build.xml 10 Sep 2003 00:39:29 -0000 1.290
+++ build.xml 13 Sep 2003 07:12:35 -0000 1.291
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.290 2003/09/10 00:39:29 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.291 2003/09/13 07:12:35 bwang00 Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -98,6 +98,7 @@
<path refid="junitejb.junitejb.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
<path refid="jdom.classpath"/>
+ <path refid="javagroups.javagroups.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -141,6 +142,7 @@
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.cache.classpath"/>
</path>
@@ -932,6 +934,23 @@
<jbossaop/>
</aopdoclet>
-->
+
+ <!-- cache test -->
+ <mkdir dir="${build.resources}/cache/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/cache/bean/*Bean.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/cache/META-INF"/>
+ <jboss xmlencoding="UTF-8"
+ version="3.0"
+ destdir="${build.resources}/cache/META-INF"/>
+ </ejbdoclet>
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
|
|
From: Scott M S. <st...@us...> - 2003-09-19 19:34:38
|
User: starksm
Date: 03/09/18 23:35:47
Modified: . build.xml
Log:
Merge tests from 3.2
Revision Changes Path
1.292 +55 -46 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- build.xml 13 Sep 2003 07:12:35 -0000 1.291
+++ build.xml 19 Sep 2003 06:35:46 -0000 1.292
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.291 2003/09/13 07:12:35 bwang00 Exp $ -->
+<!-- $Id: build.xml,v 1.292 2003/09/19 06:35:46 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1143,7 +1143,7 @@
<include name="org/jboss/test/util/**"/>
</patternset>
- <patternset id="common.test.application.classes">
+ <patternset id="jboss.test.util.ejb.set">
<include name="org/jboss/test/util/ejb/**"/>
</patternset>
@@ -1167,7 +1167,7 @@
<!-- build bank.jar -->
<jar jarfile="${build.lib}/bank.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bank/interfaces/**"/>
<include name="org/jboss/test/bank/ejb/**"/>
<include name="org/jboss/test/bank/beans/**"/>
@@ -1180,7 +1180,7 @@
<!-- build bank.jar -->
<jar jarfile="${build.lib}/bank-ejb20.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bank/interfaces/**"/>
<include name="org/jboss/test/bank/ejb/**"/>
<include name="org/jboss/test/bank/beans/**"/>
@@ -1211,7 +1211,7 @@
<!-- build banknew.jar -->
<jar jarfile="${build.lib}/banknew.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/banknew/interfaces/**"/>
<include name="org/jboss/test/banknew/ejb/**"/>
<include name="org/jboss/test/banknew/beans/**"/>
@@ -1242,7 +1242,7 @@
<!-- build bankiiop.jar -->
<jar jarfile="${build.lib}/bankiiop.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bankiiop/interfaces/**"/>
<include name="org/jboss/test/bankiiop/ejb/**"/>
<include name="org/jboss/test/bankiiop/beans/**"/>
@@ -1273,7 +1273,7 @@
<!-- build bmp.jar -->
<jar jarfile="${build.lib}/bmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bmp/interfaces/**"/>
<include name="org/jboss/test/bmp/ejb/**"/>
<include name="org/jboss/test/bmp/beans/**"/>
@@ -1327,7 +1327,7 @@
<include name="jboss.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/interfaces/**"/>
<include name="org/jboss/test/cts/ejb/**"/>
<include name="org/jboss/test/cts/beans/**"/>
@@ -1337,8 +1337,7 @@
<include name="org/jboss/test/util/ejb/*"/>
</fileset>
<zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*">
- </zipfileset>
+ includes="junit/**/*.*"/>
</jar>
<!-- build a duplicate cts.jar with new home bindings -->
<jar jarfile="${build.lib}/cts2.jar">
@@ -1347,7 +1346,7 @@
<include name="jboss.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/interfaces/**"/>
<include name="org/jboss/test/cts/ejb/**"/>
<include name="org/jboss/test/cts/beans/**"/>
@@ -1388,7 +1387,7 @@
</jar>
<jar jarfile="${build.lib}/cts-v1cmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
<include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
</fileset>
@@ -1452,7 +1451,7 @@
</jar>
<jar jarfile="${build.lib}/cts-v2cmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
<include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
</fileset>
@@ -1504,7 +1503,7 @@
<!-- build entityexc.jar -->
<jar jarfile="${build.lib}/entityexc.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/entityexc/interfaces/**"/>
<include name="org/jboss/test/entityexc/ejb/**"/>
</fileset>
@@ -1535,7 +1534,7 @@
<jar jarfile="${build.lib}/hello.jar">
<metainf dir="${build.resources}/hello/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hello/interfaces/**"/>
<include name="org/jboss/test/hello/ejb/**"/>
</fileset>
@@ -1563,7 +1562,7 @@
<jar jarfile="${build.lib}/helloiiop.jar">
<metainf dir="${build.resources}/helloiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/helloiiop/interfaces/**"/>
<include name="org/jboss/test/helloiiop/ejb/**"/>
</fileset>
@@ -1591,7 +1590,7 @@
<jar jarfile="${build.lib}/hellojrmpiiop.jar">
<metainf dir="${build.resources}/hellojrmpiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hellojrmpiiop/interfaces/**"/>
<include name="org/jboss/test/hellojrmpiiop/ejb/**"/>
</fileset>
@@ -1619,7 +1618,7 @@
<jar jarfile="${build.lib}/excepiiop.jar">
<metainf dir="${build.resources}/excepiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/excepiiop/interfaces/**"/>
<include name="org/jboss/test/excepiiop/ejb/**"/>
</fileset>
@@ -1646,7 +1645,7 @@
<!-- build idgen.jar -->
<jar jarfile="${build.lib}/idgen.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/idgen/interfaces/**"/>
<include name="org/jboss/test/idgen/ejb/**"/>
<include name="org/jboss/test/idgen/beans/**"/>
@@ -1677,7 +1676,7 @@
<!-- build dbtest.jar -->
<jar jarfile="${build.lib}/dbtest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/dbtest/interfaces/**"/>
<include name="org/jboss/test/dbtest/ejb/**"/>
<include name="org/jboss/test/dbtest/bean/**"/>
@@ -1708,7 +1707,7 @@
<!-- build jmsra.jar -->
<jar jarfile="${build.lib}/jmsra.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jmsra/interfaces/**"/>
<include name="org/jboss/test/jmsra/ejb/**"/>
<include name="org/jboss/test/jmsra/bean/**"/>
@@ -1739,7 +1738,7 @@
<!-- build mdb.jar -->
<jar jarfile="${build.lib}/mdb.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/mdb/bean/**"/>
</fileset>
<fileset dir="${build.resources}/mdb">
@@ -1768,7 +1767,7 @@
<!-- build locktest.jar -->
<jar jarfile="${build.lib}/locktest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/lock/interfaces/**"/>
<include name="org/jboss/test/lock/bean/**"/>
</fileset>
@@ -1798,7 +1797,7 @@
<!-- build readahead.jar -->
<jar jarfile="${build.lib}/readahead.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/readahead/interfaces/**"/>
<include name="org/jboss/test/readahead/ejb/**"/>
</fileset>
@@ -1828,7 +1827,7 @@
<!-- build xatest.jar -->
<jar jarfile="${build.lib}/xatest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/xa/interfaces/**"/>
<include name="org/jboss/test/xa/bean/**"/>
</fileset>
@@ -2387,6 +2386,17 @@
</fileset>
</jar>
+ <pathconvert targetos="unix" property="codebaseURL">
+ <path path="${build.lib}"/>
+ </pathconvert>
+ <echo message="+++ codebase=${codebaseURL}" />
+ <echo message="+++ build.lib=${build.lib}" />
+ <copy todir="${build.lib}" filtering="true" overwrite="true"
+ file="${source.resources}/jmx/archivestest-service.xml">
+ <filterset>
+ <filter token="codebase" value="file:/${codebaseURL}"/>
+ </filterset>
+ </copy>
</target>
<!-- naming test -->
@@ -2397,7 +2407,7 @@
<!-- build naming.jar -->
<jar jarfile="${build.lib}/naming.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2413,7 +2423,7 @@
<!-- build remote-naming.jar -->
<jar jarfile="${build.lib}/remote-naming.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2426,7 +2436,7 @@
<!-- build naminga.jar -->
<jar jarfile="${build.lib}/subdir/naminga.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2439,7 +2449,7 @@
<!-- build namingb.jar -->
<jar jarfile="${build.lib}/namingb.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2613,7 +2623,7 @@
<!-- build threadingBean.jar -->
<jar jarfile="${build.lib}/threadingBean.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/threading/interfaces/**"/>
<include name="org/jboss/test/threading/ejb/**"/>
</fileset>
@@ -2644,7 +2654,7 @@
<!-- build deadlock.jar -->
<jar jarfile="${build.lib}/deadlock.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/deadlock/interfaces/**"/>
<include name="org/jboss/test/deadlock/bean/**"/>
<include name="org/somepackage/**"/>
@@ -2677,7 +2687,7 @@
<!-- build pooled.jar -->
<jar jarfile="${build.lib}/pooled.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/pooled/interfaces/**"/>
<include name="org/jboss/test/pooled/bean/**"/>
<include name="org/somepackage/**"/>
@@ -2712,7 +2722,7 @@
<!-- build testbean.jar -->
<jar jarfile="${build.lib}/testbean.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
<!--include name="org/jboss/test/testbean2/interfaces/**"/-->
@@ -2726,7 +2736,7 @@
<!-- build testbean2.jar -->
<jar jarfile="${build.lib}/testbean2.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbean2/interfaces/**"/>
<include name="org/jboss/test/testbean2/bean/**"/>
@@ -2744,7 +2754,7 @@
<!-- build testbeancluster.jar -->
<jar jarfile="${build.lib}/testbeancluster.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbeancluster/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
@@ -2777,7 +2787,7 @@
<!-- build perf.jar -->
<jar jarfile="${build.lib}/perf.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/**"/>
<include name="org/jboss/test/perf/ejb/**"/>
</fileset>
@@ -2788,7 +2798,7 @@
<!-- build probe.jar -->
<jar jarfile="${build.lib}/probe.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/Perf*"/>
<include name="org/jboss/test/perf/interfaces/Probe*"/>
<include name="org/jboss/test/perf/ejb/Perf*"/>
@@ -2803,7 +2813,7 @@
<!-- build secure-perf.jar -->
<jar jarfile="${build.lib}/secure-perf.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/**"/>
<include name="org/jboss/test/perf/ejb/**"/>
</fileset>
@@ -2862,7 +2872,7 @@
<jar jarfile="${build.lib}/jbosstest-web-ejbs.jar"
manifest="${build.resources}/web/ejb.mf">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/web/interfaces/**"/>
<include name="org/jboss/test/web/ejb/**"/>
</fileset>
@@ -3051,7 +3061,7 @@
<!-- build bench.jar -->
<jar jarfile="${build.lib}/bench.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bench/interfaces/**"/>
<include name="org/jboss/test/bench/ejb/**"/>
</fileset>
@@ -3355,15 +3365,14 @@
<!-- build cmp2-simple.jar -->
<jar jarfile="${build.lib}/cmp2-simple.jar">
<fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set" />
<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/**/*.*"/>
+ includes="junit/framework/*.*"/>
</jar>
<!-- build cmp2-commerce.jar -->
@@ -3596,7 +3605,7 @@
<!-- build compliance.jar -->
<jar jarfile="${build.lib}/jbossmx-compliance.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/compliance/**"/>
</fileset>
</jar>
@@ -3604,7 +3613,7 @@
<!-- build implementation.jar -->
<jar jarfile="${build.lib}/jbossmx-implementation.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/implementation/**"/>
</fileset>
</jar>
@@ -3612,7 +3621,7 @@
<!-- build performance.jar -->
<jar jarfile="${build.lib}/jbossmx-performance.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/performance/**"/>
</fileset>
</jar>
|
|
From: Scott M S. <st...@us...> - 2003-09-19 20:13:01
|
User: starksm
Date: 03/09/18 23:20:31
Modified: . Tag: Branch_3_2 build.xml
Log:
Update the cmp2-simple.jar build
Revision Changes Path
No revision
No revision
1.165.2.100 +43 -44 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.99
retrieving revision 1.165.2.100
diff -u -r1.165.2.99 -r1.165.2.100
--- build.xml 18 Sep 2003 04:48:29 -0000 1.165.2.99
+++ build.xml 19 Sep 2003 06:20:30 -0000 1.165.2.100
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.99 2003/09/18 04:48:29 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.100 2003/09/19 06:20:30 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1037,7 +1037,7 @@
<include name="org/jboss/test/util/**"/>
</patternset>
- <patternset id="common.test.application.classes">
+ <patternset id="jboss.test.util.ejb.set">
<include name="org/jboss/test/util/ejb/**"/>
</patternset>
@@ -1061,7 +1061,7 @@
<!-- build bank.jar -->
<jar jarfile="${build.lib}/bank.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bank/interfaces/**"/>
<include name="org/jboss/test/bank/ejb/**"/>
<include name="org/jboss/test/bank/beans/**"/>
@@ -1074,7 +1074,7 @@
<!-- build bank.jar -->
<jar jarfile="${build.lib}/bank-ejb20.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bank/interfaces/**"/>
<include name="org/jboss/test/bank/ejb/**"/>
<include name="org/jboss/test/bank/beans/**"/>
@@ -1105,7 +1105,7 @@
<!-- build banknew.jar -->
<jar jarfile="${build.lib}/banknew.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/banknew/interfaces/**"/>
<include name="org/jboss/test/banknew/ejb/**"/>
<include name="org/jboss/test/banknew/beans/**"/>
@@ -1136,7 +1136,7 @@
<!-- build bankiiop.jar -->
<jar jarfile="${build.lib}/bankiiop.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bankiiop/interfaces/**"/>
<include name="org/jboss/test/bankiiop/ejb/**"/>
<include name="org/jboss/test/bankiiop/beans/**"/>
@@ -1167,7 +1167,7 @@
<!-- build bmp.jar -->
<jar jarfile="${build.lib}/bmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bmp/interfaces/**"/>
<include name="org/jboss/test/bmp/ejb/**"/>
<include name="org/jboss/test/bmp/beans/**"/>
@@ -1221,7 +1221,7 @@
<include name="jboss.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/interfaces/**"/>
<include name="org/jboss/test/cts/ejb/**"/>
<include name="org/jboss/test/cts/beans/**"/>
@@ -1240,7 +1240,7 @@
<include name="jboss.xml"/>
</metainf>
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/interfaces/**"/>
<include name="org/jboss/test/cts/ejb/**"/>
<include name="org/jboss/test/cts/beans/**"/>
@@ -1281,7 +1281,7 @@
</jar>
<jar jarfile="${build.lib}/cts-v1cmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
<include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
</fileset>
@@ -1345,7 +1345,7 @@
</jar>
<jar jarfile="${build.lib}/cts-v2cmp.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/cts/ejb/CtsCmp2*.class"/>
<include name="org/jboss/test/cts/interfaces/CtsCmp2*"/>
</fileset>
@@ -1397,7 +1397,7 @@
<!-- build entityexc.jar -->
<jar jarfile="${build.lib}/entityexc.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/entityexc/interfaces/**"/>
<include name="org/jboss/test/entityexc/ejb/**"/>
</fileset>
@@ -1428,7 +1428,7 @@
<jar jarfile="${build.lib}/hello.jar">
<metainf dir="${build.resources}/hello/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hello/interfaces/**"/>
<include name="org/jboss/test/hello/ejb/**"/>
</fileset>
@@ -1456,7 +1456,7 @@
<jar jarfile="${build.lib}/helloiiop.jar">
<metainf dir="${build.resources}/helloiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/helloiiop/interfaces/**"/>
<include name="org/jboss/test/helloiiop/ejb/**"/>
</fileset>
@@ -1484,7 +1484,7 @@
<jar jarfile="${build.lib}/hellojrmpiiop.jar">
<metainf dir="${build.resources}/hellojrmpiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hellojrmpiiop/interfaces/**"/>
<include name="org/jboss/test/hellojrmpiiop/ejb/**"/>
</fileset>
@@ -1512,7 +1512,7 @@
<jar jarfile="${build.lib}/excepiiop.jar">
<metainf dir="${build.resources}/excepiiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/excepiiop/interfaces/**"/>
<include name="org/jboss/test/excepiiop/ejb/**"/>
</fileset>
@@ -1539,7 +1539,7 @@
<!-- build idgen.jar -->
<jar jarfile="${build.lib}/idgen.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/idgen/interfaces/**"/>
<include name="org/jboss/test/idgen/ejb/**"/>
<include name="org/jboss/test/idgen/beans/**"/>
@@ -1570,7 +1570,7 @@
<!-- build dbtest.jar -->
<jar jarfile="${build.lib}/dbtest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/dbtest/interfaces/**"/>
<include name="org/jboss/test/dbtest/ejb/**"/>
<include name="org/jboss/test/dbtest/bean/**"/>
@@ -1601,7 +1601,7 @@
<!-- build jmsra.jar -->
<jar jarfile="${build.lib}/jmsra.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jmsra/interfaces/**"/>
<include name="org/jboss/test/jmsra/ejb/**"/>
<include name="org/jboss/test/jmsra/bean/**"/>
@@ -1632,7 +1632,7 @@
<!-- build mdb.jar -->
<jar jarfile="${build.lib}/mdb.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/mdb/bean/**"/>
</fileset>
<fileset dir="${build.resources}/mdb">
@@ -1661,7 +1661,7 @@
<!-- build locktest.jar -->
<jar jarfile="${build.lib}/locktest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/lock/interfaces/**"/>
<include name="org/jboss/test/lock/bean/**"/>
</fileset>
@@ -1691,7 +1691,7 @@
<!-- build readahead.jar -->
<jar jarfile="${build.lib}/readahead.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/readahead/interfaces/**"/>
<include name="org/jboss/test/readahead/ejb/**"/>
</fileset>
@@ -1721,7 +1721,7 @@
<!-- build xatest.jar -->
<jar jarfile="${build.lib}/xatest.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/xa/interfaces/**"/>
<include name="org/jboss/test/xa/bean/**"/>
</fileset>
@@ -2301,7 +2301,7 @@
<!-- build naming.jar -->
<jar jarfile="${build.lib}/naming.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2317,7 +2317,7 @@
<!-- build remote-naming.jar -->
<jar jarfile="${build.lib}/remote-naming.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2330,7 +2330,7 @@
<!-- build naminga.jar -->
<jar jarfile="${build.lib}/subdir/naminga.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2343,7 +2343,7 @@
<!-- build namingb.jar -->
<jar jarfile="${build.lib}/namingb.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/naming/ejb/**"/>
<include name="org/jboss/test/naming/interfaces/**"/>
<include name="org/jboss/test/util/Debug.class"/>
@@ -2517,7 +2517,7 @@
<!-- build threadingBean.jar -->
<jar jarfile="${build.lib}/threadingBean.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/threading/interfaces/**"/>
<include name="org/jboss/test/threading/ejb/**"/>
</fileset>
@@ -2548,7 +2548,7 @@
<!-- build deadlock.jar -->
<jar jarfile="${build.lib}/deadlock.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/deadlock/interfaces/**"/>
<include name="org/jboss/test/deadlock/bean/**"/>
<include name="org/somepackage/**"/>
@@ -2581,7 +2581,7 @@
<!-- build pooled.jar -->
<jar jarfile="${build.lib}/pooled.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/pooled/interfaces/**"/>
<include name="org/jboss/test/pooled/bean/**"/>
<include name="org/somepackage/**"/>
@@ -2616,7 +2616,7 @@
<!-- build testbean.jar -->
<jar jarfile="${build.lib}/testbean.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
<!--include name="org/jboss/test/testbean2/interfaces/**"/-->
@@ -2630,7 +2630,7 @@
<!-- build testbean2.jar -->
<jar jarfile="${build.lib}/testbean2.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbean2/interfaces/**"/>
<include name="org/jboss/test/testbean2/bean/**"/>
@@ -2648,7 +2648,7 @@
<!-- build testbeancluster.jar -->
<jar jarfile="${build.lib}/testbeancluster.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
<include name="org/jboss/test/testbeancluster/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
@@ -2681,7 +2681,7 @@
<!-- build perf.jar -->
<jar jarfile="${build.lib}/perf.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/**"/>
<include name="org/jboss/test/perf/ejb/**"/>
</fileset>
@@ -2692,7 +2692,7 @@
<!-- build probe.jar -->
<jar jarfile="${build.lib}/probe.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/Perf*"/>
<include name="org/jboss/test/perf/interfaces/Probe*"/>
<include name="org/jboss/test/perf/ejb/Perf*"/>
@@ -2707,7 +2707,7 @@
<!-- build secure-perf.jar -->
<jar jarfile="${build.lib}/secure-perf.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/perf/interfaces/**"/>
<include name="org/jboss/test/perf/ejb/**"/>
</fileset>
@@ -2766,7 +2766,7 @@
<jar jarfile="${build.lib}/jbosstest-web-ejbs.jar"
manifest="${build.resources}/web/ejb.mf">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/web/interfaces/**"/>
<include name="org/jboss/test/web/ejb/**"/>
</fileset>
@@ -2955,7 +2955,7 @@
<!-- build bench.jar -->
<jar jarfile="${build.lib}/bench.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/bench/interfaces/**"/>
<include name="org/jboss/test/bench/ejb/**"/>
</fileset>
@@ -3259,15 +3259,14 @@
<!-- build cmp2-simple.jar -->
<jar jarfile="${build.lib}/cmp2-simple.jar">
<fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set" />
<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/**/*.*"/>
+ includes="junit/framework/*.*"/>
</jar>
<!-- build cmp2-commerce.jar -->
@@ -3500,7 +3499,7 @@
<!-- build compliance.jar -->
<jar jarfile="${build.lib}/jbossmx-compliance.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/compliance/**"/>
</fileset>
</jar>
@@ -3508,7 +3507,7 @@
<!-- build implementation.jar -->
<jar jarfile="${build.lib}/jbossmx-implementation.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/implementation/**"/>
</fileset>
</jar>
@@ -3516,7 +3515,7 @@
<!-- build performance.jar -->
<jar jarfile="${build.lib}/jbossmx-performance.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/jbossmx/performance/**"/>
</fileset>
</jar>
|
|
From: Adrian B. <ej...@us...> - 2003-09-22 17:47:31
|
User: ejort
Date: 03/09/22 10:47:29
Modified: . Tag: Branch_3_2 build.xml
Log:
Fix the codebase url. The general format is file://host/path where host is usually empty
Revision Changes Path
No revision
No revision
1.165.2.101 +2 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.100
retrieving revision 1.165.2.101
diff -u -r1.165.2.100 -r1.165.2.101
--- build.xml 19 Sep 2003 06:20:30 -0000 1.165.2.100
+++ build.xml 22 Sep 2003 17:47:27 -0000 1.165.2.101
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.100 2003/09/19 06:20:30 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.101 2003/09/22 17:47:27 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2288,7 +2288,7 @@
<copy todir="${build.lib}" filtering="true" overwrite="true"
file="${source.resources}/jmx/archivestest-service.xml">
<filterset>
- <filter token="codebase" value="file:/${codebaseURL}"/>
+ <filter token="codebase" value="file://${codebaseURL}"/>
</filterset>
</copy>
</target>
|
|
From: Adrian B. <ej...@us...> - 2003-09-22 18:31:01
|
User: ejort
Date: 03/09/22 11:30:59
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a simple test for accessing an MBean using an HA detached invoker
Revision Changes Path
No revision
No revision
1.165.2.102 +11 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.101
retrieving revision 1.165.2.102
diff -u -r1.165.2.101 -r1.165.2.102
--- build.xml 22 Sep 2003 17:47:27 -0000 1.165.2.101
+++ build.xml 22 Sep 2003 18:30:57 -0000 1.165.2.102
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.101 2003/09/22 17:47:27 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.102 2003/09/22 18:30:57 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2256,6 +2256,16 @@
<jar jarfile="${build.lib}/missingclassmbean.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jmx/missingclass/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- ha-invoker adaptor sar -->
+ <jar jarfile="${build.lib}/ha-invoker.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/ha/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/ha/">
+ <include name="META-INF/*.xml"/>
</fileset>
</jar>
|
|
From: Adrian B. <ej...@us...> - 2003-09-24 21:28:11
|
User: ejort
Date: 03/09/24 14:28:09
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a test for unshared resources
Revision Changes Path
No revision
No revision
1.165.2.103 +12 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.102
retrieving revision 1.165.2.103
diff -u -r1.165.2.102 -r1.165.2.103
--- build.xml 22 Sep 2003 18:30:57 -0000 1.165.2.102
+++ build.xml 24 Sep 2003 21:28:06 -0000 1.165.2.103
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.102 2003/09/22 18:30:57 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.103 2003/09/24 21:28:06 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -620,6 +620,7 @@
<!--mergedir="${source.resources}/jca/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/jca/ejb/*Bean.java"/>
+ <exclude name="org/jboss/test/jca/ejb/Unshareable*Bean.java"/>
</fileset>
<packageSubstitution packages="ejb" substituteWith="interfaces"/>
<remoteinterface/>
@@ -1782,6 +1783,16 @@
</fileset>
</jar>
+ <!-- build jcatest-unshared.jar -->
+ <jar jarfile="${build.lib}/jcatest-unshared.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/interfaces/Unshareable**"/>
+ <include name="org/jboss/test/jca/ejb/Unshareable**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jca/ejb">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
<jar jarfile="${build.lib}/jcabanktest.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jca/bank/interfaces/**"/>
|
|
From: Adrian B. <ej...@us...> - 2003-09-24 21:36:54
|
User: ejort
Date: 03/09/24 14:36:53
Modified: . build.xml
Log:
Add a test for unshared resources
Revision Changes Path
1.294 +23 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- build.xml 23 Sep 2003 15:46:10 -0000 1.293
+++ build.xml 24 Sep 2003 21:36:53 -0000 1.294
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.293 2003/09/23 15:46:10 slaboure Exp $ -->
+<!-- $Id: build.xml,v 1.294 2003/09/24 21:36:53 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -628,6 +628,7 @@
<!--mergedir="${source.resources}/jca/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/jca/ejb/*Bean.java"/>
+ <exclude name="org/jboss/test/jca/ejb/Unshareable*Bean.java"/>
</fileset>
<packageSubstitution packages="ejb" substituteWith="interfaces"/>
<remoteinterface/>
@@ -1888,6 +1889,17 @@
</fileset>
</jar>
+ <!-- build jcatest-unshared.jar -->
+ <jar jarfile="${build.lib}/jcatest-unshared.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/interfaces/Unshareable**"/>
+ <include name="org/jboss/test/jca/ejb/Unshareable**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jca/ejb">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
<jar jarfile="${build.lib}/jcabanktest.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jca/bank/interfaces/**"/>
@@ -2362,6 +2374,16 @@
<jar jarfile="${build.lib}/missingclassmbean.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jmx/missingclass/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- ha-invoker adaptor sar -->
+ <jar jarfile="${build.lib}/ha-invoker.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/ha/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/ha/">
+ <include name="META-INF/*.xml"/>
</fileset>
</jar>
|
|
From: Francisco R. <rev...@us...> - 2003-09-25 15:38:04
|
User: reverbel
Date: 03/09/25 08:38:02
Modified: . Tag: Branch_3_2 build.xml
Log:
IIOP parameter passing test added to the testsuite. This test was designed
to catch marshaling/unmarshaling bugs such as the ones I have just fixed.
Revision Changes Path
No revision
No revision
1.165.2.104 +32 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.103
retrieving revision 1.165.2.104
diff -u -r1.165.2.103 -r1.165.2.104
--- build.xml 24 Sep 2003 21:28:06 -0000 1.165.2.103
+++ build.xml 25 Sep 2003 15:38:01 -0000 1.165.2.104
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.103 2003/09/24 21:28:06 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.104 2003/09/25 15:38:01 reverbel Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1016,6 +1016,7 @@
_jars-helloiiop,
_jars-bankiiop,
_jars-hellojrmpiiop,
+ _jars-iiop,
_jars-excepiiop,
_jars-marathon,
_jars-entity,
@@ -1488,6 +1489,36 @@
<patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hellojrmpiiop/interfaces/**"/>
<include name="org/jboss/test/hellojrmpiiop/ejb/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- iiop parameter passing test -->
+ <target name="_jars-iiop">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build iioptest.jar -->
+ <jar jarfile="${build.lib}/iioptest.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/iiop/interfaces/**"/>
+ <include name="org/jboss/test/iiop/util/**"/>
+ <include name="org/jboss/test/iiop/test/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/iiop">
+ <include name="*.*"/>
+ </fileset>
+ </jar>
+
+ <!-- build iiop.jar -->
+ <jar jarfile="${build.lib}/iiop.jar">
+ <metainf dir="${build.resources}/iiop/META-INF" />
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.application.classes"/>
+ <include name="org/jboss/test/iiop/interfaces/**"/>
+ <include name="org/jboss/test/iiop/util/**"/>
+ <include name="org/jboss/test/iiop/ejb/**"/>
</fileset>
</jar>
</target>
|
|
From: Francisco R. <rev...@us...> - 2003-09-25 23:00:30
|
User: reverbel
Date: 03/09/25 16:00:26
Modified: . Tag: Branch_3_2 build.xml
Log:
Replace common.test.application.classes by jboss.test.util.ejb.set.
Revision Changes Path
No revision
No revision
1.165.2.105 +2 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.104
retrieving revision 1.165.2.105
diff -u -r1.165.2.104 -r1.165.2.105
--- build.xml 25 Sep 2003 15:38:01 -0000 1.165.2.104
+++ build.xml 25 Sep 2003 23:00:23 -0000 1.165.2.105
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.104 2003/09/25 15:38:01 reverbel Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.105 2003/09/25 23:00:23 reverbel Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1515,7 +1515,7 @@
<jar jarfile="${build.lib}/iiop.jar">
<metainf dir="${build.resources}/iiop/META-INF" />
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
+ <patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/iiop/interfaces/**"/>
<include name="org/jboss/test/iiop/util/**"/>
<include name="org/jboss/test/iiop/ejb/**"/>
|
Thanks for helping keep SourceForge clean.
X