Menu
▾
▴
jboss-cvs-commits
|
From: Alexey L. <lou...@us...> - 2004-10-08 09:42:24
|
User: loubyansky
Date: 04/10/08 02:42:17
Modified: . build.xml
Log:
create jars for cache invalidation tests
Revision Changes Path
1.412 +29 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- build.xml 5 Oct 2004 00:24:12 -0000 1.411
+++ build.xml 8 Oct 2004 09:42:16 -0000 1.412
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.411 2004/10/05 00:24:12 andd Exp $ -->
+<!-- $Id: build.xml,v 1.412 2004/10/08 09:42:16 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2362,6 +2362,34 @@
includes="junit/**/*.*"/>
</jar>
+ <!-- build cmp2-cacheinvalidation.jar -->
+ <copy file="${build.resources}/cmp2/cacheinvalidation/META-INF/jdbcpm-jboss.xml"
+ tofile="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+ <jar jarfile="${build.lib}/cmp2-cacheinvalidation.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/cmp2/cacheinvalidation/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/cacheinvalidation">
+ <include name="**/*.*"/>
+ <exclude name="**/jdbc*.xml"/>
+ </fileset>
+ </jar>
+ <delete file="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+ <copy file="${build.resources}/cmp2/cacheinvalidation/META-INF/jdbc2pm-jboss.xml"
+ tofile="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+ <jar jarfile="${build.lib}/cmp2-jdbc2pm-cacheinvalidation.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/cmp2/cacheinvalidation/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/cacheinvalidation">
+ <include name="**/*.*"/>
+ <exclude name="**/jdbc*.xml"/>
+ </fileset>
+ </jar>
+ <delete file="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+
<!-- build cmp2-readonly.jar -->
<jar jarfile="${build.lib}/cmp2-readonly.jar">
<fileset dir="${build.classes}">
|
|
From: Alexey L. <lou...@us...> - 2004-10-08 15:21:45
|
User: loubyansky
Date: 04/10/08 08:21:32
Modified: . Tag: Branch_4_0 build.xml
Log:
create jars for cache invalidation tests
Revision Changes Path
No revision
No revision
1.406.2.3 +29 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.2
retrieving revision 1.406.2.3
diff -u -r1.406.2.2 -r1.406.2.3
--- build.xml 23 Sep 2004 12:58:04 -0000 1.406.2.2
+++ build.xml 8 Oct 2004 15:21:31 -0000 1.406.2.3
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.406.2.2 2004/09/23 12:58:04 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.3 2004/10/08 15:21:31 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2335,6 +2335,34 @@
includes="junit/**/*.*"/>
</jar>
+ <!-- build cmp2-cacheinvalidation.jar -->
+ <copy file="${build.resources}/cmp2/cacheinvalidation/META-INF/jdbcpm-jboss.xml"
+ tofile="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+ <jar jarfile="${build.lib}/cmp2-cacheinvalidation.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/cmp2/cacheinvalidation/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/cacheinvalidation">
+ <include name="**/*.*"/>
+ <exclude name="**/jdbc*.xml"/>
+ </fileset>
+ </jar>
+ <delete file="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+ <copy file="${build.resources}/cmp2/cacheinvalidation/META-INF/jdbc2pm-jboss.xml"
+ tofile="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+ <jar jarfile="${build.lib}/cmp2-jdbc2pm-cacheinvalidation.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/cmp2/cacheinvalidation/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/cacheinvalidation">
+ <include name="**/*.*"/>
+ <exclude name="**/jdbc*.xml"/>
+ </fileset>
+ </jar>
+ <delete file="${build.resources}/cmp2/cacheinvalidation/META-INF/jboss.xml"/>
+
<!-- build cmp2-readonly.jar -->
<jar jarfile="${build.lib}/cmp2-readonly.jar">
<fileset dir="${build.classes}">
|
|
From: Thomas D. <tdi...@us...> - 2004-10-08 20:25:17
|
User: tdiesler
Date: 04/10/08 13:25:08
Modified: . build.xml
Log:
Remove unwanted ws4ee-deployment.xml
Revision Changes Path
1.413 +1 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- build.xml 8 Oct 2004 09:42:16 -0000 1.412
+++ build.xml 8 Oct 2004 20:25:07 -0000 1.413
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.412 2004/10/08 09:42:16 loubyansky Exp $ -->
+<!-- $Id: build.xml,v 1.413 2004/10/08 20:25:07 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -5588,7 +5588,6 @@
<metainf dir="${build.resources}/webservice/marshalltest-rpclit/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="ws4ee-deployment.xml"/>
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="wsdl/*.wsdl"/>
@@ -5603,7 +5602,6 @@
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="ws4ee-deployment.xml"/>
<include name="wsdl/*.wsdl"/>
</metainf>
</jar>
|
|
From: Alexey L. <lou...@us...> - 2004-10-17 08:54:20
|
User: loubyansky
Date: 04/10/17 01:54:14
Modified: . Tag: Branch_3_2 build.xml
Log:
create invoker-proxy-test.sar
Revision Changes Path
No revision
No revision
1.165.2.166 +11 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.165
retrieving revision 1.165.2.166
diff -u -r1.165.2.165 -r1.165.2.166
--- build.xml 7 Oct 2004 09:52:21 -0000 1.165.2.165
+++ build.xml 17 Oct 2004 08:54:12 -0000 1.165.2.166
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.165 2004/10/07 09:52:21 loubyansky Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.166 2004/10/17 08:54:12 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2870,6 +2870,16 @@
</fileset>
</jar>
+ <!-- invoker proxy test sar -->
+ <jar jarfile="${build.lib}/invoker-proxy-test.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/invokerproxy/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/invokerproxy">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
<pathconvert targetos="unix" property="codebaseURL">
<path path="${build.lib}"/>
</pathconvert>
|
|
From: Alexey L. <lou...@us...> - 2004-10-17 09:25:49
|
User: loubyansky
Date: 04/10/17 02:25:43
Modified: . Tag: Branch_4_0 build.xml
Log:
create invoker-proxy-test.sar
Revision Changes Path
No revision
No revision
1.406.2.4 +10 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.3
retrieving revision 1.406.2.4
diff -u -r1.406.2.3 -r1.406.2.4
--- build.xml 8 Oct 2004 15:21:31 -0000 1.406.2.3
+++ build.xml 17 Oct 2004 09:25:41 -0000 1.406.2.4
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.406.2.3 2004/10/08 15:21:31 loubyansky Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.4 2004/10/17 09:25:41 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4301,6 +4301,15 @@
</fileset>
</jar>
+ <jar jarfile="${build.lib}/invoker-proxy-test.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/invokerproxy/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/invokerproxy">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
<property environment="env"/>
<property name="win32.drive" value="${env.SYSTEMDRIVE}" />
<pathconvert targetos="unix" property="codebaseURL">
|
|
From: Alexey L. <lou...@us...> - 2004-10-17 09:45:26
|
User: loubyansky
Date: 04/10/17 02:45:14
Modified: . build.xml
Log:
create invoker-proxy-test.sar
Revision Changes Path
1.414 +11 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- build.xml 8 Oct 2004 20:25:07 -0000 1.413
+++ build.xml 17 Oct 2004 09:45:13 -0000 1.414
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.413 2004/10/08 20:25:07 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.414 2004/10/17 09:45:13 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4328,6 +4328,16 @@
</fileset>
</jar>
+ <!-- invoker proxy test sar -->
+ <jar jarfile="${build.lib}/invoker-proxy-test.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/invokerproxy/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/invokerproxy">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
<property environment="env"/>
<property name="win32.drive" value="${env.SYSTEMDRIVE}" />
<pathconvert targetos="unix" property="codebaseURL">
|
|
From: Thomas D. <tdi...@us...> - 2004-10-24 19:12:40
|
User: tdiesler
Date: 04/10/24 12:12:32
Modified: . Tag: Branch_4_0 build.xml
Log:
Merge webservice testsuite changes with head
Revision Changes Path
No revision
No revision
1.406.2.6 +90 -44 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.5
retrieving revision 1.406.2.6
diff -u -r1.406.2.5 -r1.406.2.6
--- build.xml 21 Oct 2004 13:09:57 -0000 1.406.2.5
+++ build.xml 24 Oct 2004 19:12:30 -0000 1.406.2.6
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.406.2.5 2004/10/21 13:09:57 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.6 2004/10/24 19:12:30 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1174,6 +1174,32 @@
destdir="${build.resources}/cache/META-INF"/>
</ejbdoclet>
+ <!-- webservice/exception test -->
+ <mkdir dir="${build.resources}/webservice/exception/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/webservice/exception/*BeanImpl.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ <jboss xmlencoding="UTF-8"
+ version="3.0"
+ destdir="${build.resources}/webservice/exception/META-INF"/>
+ </ejbdoclet>
+ <!-- webservice/marshalltest test -->
+ <mkdir dir="${build.resources}/webservice/marshalltest/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/webservice/marshalltest/*BeanImpl.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ </ejbdoclet>
+
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
@@ -5525,32 +5551,30 @@
<!-- build ws4eemarshall-rpcenc.ear -->
<jar destfile="${build.lib}/ws4eemarshall-rpcenc.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestHome.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestRemote.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestBean.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanHome.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanImpl.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
- <metainf dir="${build.resources}/webservice/marshalltest/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- </metainf>
<metainf dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/rpc-encoded.wsdl"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<jar destfile="${build.lib}/ws4eemarshall-rpcenc-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/rpc-encoded.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eemarshall-rpcenc.ear" manifest="${build.etc}/manifest.mf"
@@ -5564,34 +5588,30 @@
<!-- build ws4eemarshall-rpclit.ear -->
<jar destfile="${build.lib}/ws4eemarshall-rpclit.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestHome.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestRemote.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestBean.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanHome.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanImpl.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
- <metainf dir="${build.resources}/webservice/marshalltest/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- </metainf>
<metainf dir="${build.resources}/webservice/marshalltest-rpclit/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="ws4ee-deployment.xml"/>
- <include name="wsdl/rpc-literal.wsdl"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<jar destfile="${build.lib}/ws4eemarshall-rpclit-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/webservice/marshalltest-rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="ws4ee-deployment.xml"/>
- <include name="wsdl/rpc-literal.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eemarshall-rpclit.ear" manifest="${build.etc}/manifest.mf"
@@ -5605,34 +5625,32 @@
<!-- build ws4eemarshall-doclit.ear -->
<jar destfile="${build.lib}/ws4eemarshall-doclit.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestHome.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestRemote.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestBean.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocBeanHome.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocBean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocBeanImpl.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/*"/>
</fileset>
- <metainf dir="${build.resources}/webservice/marshalltest/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- </metainf>
<metainf dir="${build.resources}/webservice/marshalltest-doclit/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="ws4ee-deployment.xml"/>
- <include name="wsdl/doc-literal.wsdl"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<jar destfile="${build.lib}/ws4eemarshall-doclit-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/*"/>
</fileset>
<metainf dir="${build.resources}/webservice/marshalltest-doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="ws4ee-deployment.xml"/>
- <include name="wsdl/doc-literal.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eemarshall-doclit.ear" manifest="${build.etc}/manifest.mf"
@@ -5643,7 +5661,7 @@
</fileset>
</ear>
- <!-- build ws4eehandlerflow-ejb.ear -->
+ <!-- build ws4eehandlerflow-ejb.jar -->
<jar destfile="${build.lib}/ws4eehandlerflow.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/webservice/handlerflow/HelloHome.class"/>
@@ -5691,6 +5709,35 @@
</webinf>
</war>
+ <!-- build ws4eeexception.jar -->
+ <jar destfile="${build.lib}/ws4eeexception.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/exception/*.class"/>
+ <exclude name="**/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/webservice/exception/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/*.wsdl"/>
+ </metainf>
+ </jar>
+
+ <!-- build ws4eeexception-client.jar -->
+ <jar destfile="${build.lib}/ws4eeexception-client.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/exception/*Service.class"/>
+ <include name="org/jboss/test/webservice/exception/*ServiceInterface.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/webservice/exception/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*.wsdl"/>
+ </metainf>
+ </jar>
+
</target>
<!-- xa test -->
@@ -6667,7 +6714,6 @@
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <echo message="java.endorsed.dirs=${jboss.home}/lib/endorsed"/>
<junit dir="${module.output}"
printsummary="${junit.printsummary}"
|
|
From: Thomas D. <tdi...@us...> - 2004-10-25 07:43:26
|
User: tdiesler Date: 04/10/25 00:43:19 Modified: . build.xml Log: Retire JBoss.NET in head Revision Changes Path 1.416 +2 -468 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.415 retrieving revision 1.416 diff -u -r1.415 -r1.416 --- build.xml 22 Oct 2004 06:24:35 -0000 1.415 +++ build.xml 25 Oct 2004 07:43:18 -0000 1.416 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.415 2004/10/22 06:24:35 ejort Exp $ --> +<!-- $Id: build.xml,v 1.416 2004/10/25 07:43:18 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -147,7 +147,6 @@ <path refid="jboss.internal-server.classpath"/> <path refid="jboss.j2ee.classpath"/> <path refid="jboss.jaxrpc.classpath"/> - <path refid="jboss.jbossnet.classpath"/> <path refid="jboss.jca.classpath"/> <path refid="jboss.jmx.classpath"/> <path refid="jboss.management.classpath"/> @@ -256,12 +255,8 @@ <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> <include name="**/*.jar"/> </fileset> -<!-- - <fileset dir="${project.root}/jboss.net/output/lib"> - <include name="xdoclet-*.jar"/> - </fileset> ---> </path> + <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> @@ -930,152 +925,6 @@ destdir="${build.resources}/entity/entity/META-INF"/> </ejbdoclet> - <!-- JBoss.NET services generation --> - - <!-- call wsdl4j emitter for AddressBook interfaces and stubs --> - <java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java"> - <arg value="-s"/> - <arg value="-d"/> - <arg value="Session"/> - <arg value="-Nhttp://test.jboss.org/samples/AddressBook=org.jboss.test.jbossnet.wsr"/> - <arg value="${source.resources}/jbossnet/wsr/wsr/META-INF/AddressBook.wsdl"/> - <classpath refid="thirdparty.classpath"/> - </java> - - <!-- Delete the service impl skeleton as we have an impl already --> - <delete file="${build.gen-src}/org/jboss/test/jbossnet/wsr/AddressBookSOAPBindingImpl.java"/> - - <!-- call wsdl4j emitter for Bablefish stubs --> - <java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java"> - <arg value="-d"/> - <arg value="Session"/> - <arg value="-Nhttp://www.xmethods.net/sd/BabelFishService.wsdl=org.jboss.test.jbossnet.external.babelfish"/> - <arg value="${source.resources}/jbossnet/external/wsr/META-INF/babelfish.wsdl"/> - <classpath refid="thirdparty.classpath"/> - </java> - - <!-- call wsdl4j emitter for Google stubs --> - <java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java"> - <arg value="-d"/> - <arg value="Session"/> - <arg value="-Nurn:GoogleSearch=org.jboss.test.jbossnet.external.google"/> - <arg value="${source.resources}/jbossnet/external/wsr/META-INF/google.wsdl"/> - <classpath refid="thirdparty.classpath"/> - </java> - - <!-- these taskdefs allow to call jboss.net specific xdoclet functionality --> - <taskdef name="jbossnet-ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> - <classpath refid="xdoclet.task.classpath"/> - <classpath refid="jboss.jbossnet.classpath"/> - </taskdef> - <taskdef name="jbossnet-jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"> - <classpath refid="xdoclet.task.classpath"/> - <classpath refid="jboss.jbossnet.classpath"/> - </taskdef> - - <!-- generate ejbsimple meta-data and interfaces --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jbossnet/ejbsimple/server/Hello*Bean.java"/> - <include name="org/jboss/test/jbossnet/ejbsimple/HelloData.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/> - <jbossnet webDeploymentName="EjbSimple" - prefix="ejbsimple" - destdir="${build.resources}/jbossnet/ejbsimple/wsr/META-INF" - targetNameSpace="http://test.jboss.org/ejbsimple"/> - </jbossnet-ejbdoclet> - - <!-- generate jmx meta-data and interfaces --> - <jbossnet-jmxdoclet destdir="${build.gen-src}" - excludedtags="@version,@author"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jbossnet/jmx/server/JMXTest.java"/> - <include name="org/jboss/test/jbossnet/jmx/server/JMXDynamicTest.java"/> - </fileset> - <mbeaninterface/> - <jbossnet webDeploymentName="JMXTest" - prefix="jmx" - destdir="${build.resources}/jbossnet/jmx/wsr/META-INF" - targetNameSpace="http://test.jboss.org/jmx"/> - </jbossnet-jmxdoclet> - - <!-- generate state test meta-data --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jbossnet/state/server/*Bean.java"/> - </fileset> - <remoteinterface/> - <homeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> - <jbossnet webDeploymentName="State" - prefix="state" - destdir="${build.resources}/jbossnet/state/wsr/META-INF" - targetNameSpace="http://test.jboss.org/state"/> - </jbossnet-ejbdoclet> - - <!-- generate security test meta-data --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jbossnet/security/server/*Bean.java"/> - </fileset> - <entitycmp cmpspec="2.x"/> - <remoteinterface/> - <homeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jbossnet/security/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - securitydomain="java:/jaas/other" - destdir="${build.resources}/jbossnet/security/ejb/META-INF"/> - <jbossnet webDeploymentName="Security" - prefix="security" - destdir="${build.resources}/jbossnet/security/wsr/META-INF" - targetNameSpace="http://test.jboss.org/security"/> - </jbossnet-ejbdoclet> - - <!-- generate external test meta-data --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jbossnet/external/server/*Bean.java"/> - </fileset> - <entitycmp cmpspec="2.x"/> - <remoteinterface/> - <homeinterface/> - <localinterface/> - <localhomeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> - <jbossnet webDeploymentName="External" - prefix="external" - mergedir="${source.resources}/jbossnet/external/wsr/META-INF" - destdir="${build.resources}/jbossnet/external/wsr/META-INF" - targetNameSpace="http://test.jboss.org/external"/> - </jbossnet-ejbdoclet> - <!-- aop test --> <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/> <ejbdoclet destdir="${build.gen-src}" @@ -1297,13 +1146,6 @@ <include name="**/*"/> </fileset> </copy> - <!-- we copy the standard client-config to the resources folder - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${jboss.jbossnet.etc}"> - <include name="**/client-config.xml"/> - </fileset> - </copy> ---> </target> <!-- Compile stylesheets files --> @@ -1326,93 +1168,6 @@ </copy> </target> - <!-- Compile wsdl files --> - <target name="compile-wsdl" depends="init"> - - <!-- Note, we use the latest axis tools --> - <path id="java2wsdl.classpath"> - <path refid="apache.axis.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="ibm.wsdl4j.classpath"/> - <path refid="sun.jaf.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.j2ee.classpath"/> - </path> - - <!-- jboss.net/ejbsimple --> - <mkdir dir="${build.resources}/jbossnet/ejbsimple"/> - <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> - <classpath refid="java2wsdl.classpath"/> - <classpath path="${build.classes}"/> - <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/jbossnet/ejbsimple/hello.wsdl"/> - <arg value="-nhttp://ejbsimple.jbossnet.test.jboss.org"/> - <arg value="-STestService"/> - <arg value="-sTestPort"/> - <arg value="-yRPC"/> - <arg value="-uENCODED"/> - <arg value="org.jboss.test.jbossnet.ejbsimple.HelloRemote"/> - </java> - - <!-- webservice/marshalltest --> - <mkdir dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF/wsdl"/> - <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> - <classpath refid="java2wsdl.classpath"/> - <classpath path="${build.classes}"/> - <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/webservice/marshalltest-rpcenc/META-INF/wsdl/rpc-encoded.wsdl"/> - <arg value="-nhttp://marshalltest.webservice.test.jboss.org"/> - <arg value="-SMarshallTestService"/> - <arg value="-sMarshallTestPort"/> - <arg value="-yRPC"/> - <arg value="-uENCODED"/> - <arg value="org.jboss.test.webservice.marshalltest.MarshallRpcServiceInterface"/> - </java> - <mkdir dir="${build.resources}/webservice/marshalltest-rpclit/META-INF/wsdl"/> - <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> - <classpath refid="java2wsdl.classpath"/> - <classpath path="${build.classes}"/> - <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/webservice/marshalltest-rpclit/META-INF/wsdl/rpc-literal.wsdl"/> - <arg value="-nhttp://marshalltest.webservice.test.jboss.org"/> - <arg value="-SMarshallTestService"/> - <arg value="-sMarshallTestPort"/> - <arg value="-yRPC"/> - <arg value="-uLITERAL"/> - <arg value="org.jboss.test.webservice.marshalltest.MarshallRpcServiceInterface"/> - </java> - <mkdir dir="${build.resources}/webservice/marshalltest-doclit/META-INF/wsdl"/> - <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> - <classpath refid="java2wsdl.classpath"/> - <classpath path="${build.classes}"/> - <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/webservice/marshalltest-doclit/META-INF/wsdl/doc-literal.wsdl"/> - <arg value="-nhttp://marshalltest.webservice.test.jboss.org"/> - <arg value="-SMarshallTestService"/> - <arg value="-sMarshallTestPort"/> - <arg value="-yDOCUMENT"/> - <arg value="-uLITERAL"/> - <arg value="org.jboss.test.webservice.marshalltest.MarshallRpcServiceInterface"/> - </java> - - <!-- webservice/handlerflow --> - <mkdir dir="${build.resources}/webservice/handlerflow/META-INF/wsdl"/> - <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> - <classpath refid="java2wsdl.classpath"/> - <classpath path="${build.classes}"/> - <arg value="-lhttp://localhost:8080/ws4eehandlerflow/HelloService"/> - <arg value="-o${build.resources}/webservice/handlerflow/META-INF/wsdl/Hello.wsdl"/> - <arg value="-nhttp://test.jboss.org/webservice/handlerflow"/> - <arg value="-SHelloService"/> - <arg value="-sHelloPort"/> - <arg value="-yRPC"/> - <arg value="-uENCODED"/> - <arg value="org.jboss.test.webservice.handlerflow.HelloEndpoint"/> - </java> - </target> - <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -1453,7 +1208,6 @@ _jars-isolation, _jars-jbossmq, _jars-jbossmx, - _jars-jbossnet, _jars-jca, _jars-jmsra, _jars-jmx, @@ -3446,166 +3200,6 @@ </jar> </target> - <!-- jbossnet tests --> - <target name="_jars-jbossnet"> - <mkdir dir="${build.lib}"/> - - <!-- The wsr.wsr --> - <mkdir dir="${build.resources}/jbossnet/wsr/wsr/META-INF"/> - <copy toFile="${build.resources}/jbossnet/wsr/wsr/META-INF/web-service.xml" - file="${build.gen-src}/org/jboss/test/jbossnet/wsr/deploy.wsdd"/> - - <jar destfile="${build.lib}/wsr.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/test/jbossnet/wsr/**/*.class"/> - <exclude name="**/*Test*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/wsr/wsr"/> - </jar> - - <!-- The wsjmx.sar --> - <jar destfile="${build.lib}/wsjmx.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/jbossnet/jmx/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsjmx.sar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsjmx.wsr"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/jmx/sar/"> - <include name="**/*"/> - </fileset> - <fileset dir="${build.classes}"> - <include name="org/jboss/test/jbossnet/jmx/server/*"/> - </fileset> - </jar> - - <!-- The wsejbsimple.ear --> - <jar destfile="${build.lib}/wsejbsimple.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/jbossnet/ejbsimple/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsejbsimple.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/test/util/**"/> - <include name="org/jboss/test/jbossnet/ejbsimple/**"/> - <exclude name="org/jboss/test/jbossnet/ejbsimple/*Test*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/ejbsimple/ejb/"> - <include name="**/*.xml"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsejbsimple.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsejbsimple.wsr"/> - <include name="wsejbsimple.jar"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/ejbsimple/ear/"> - <include name="**"/> - </fileset> - </jar> - - <!-- The wsexternal wsr and ear --> - <jar destfile="${build.lib}/wsexternal.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/test/jbossnet/external/google/*.class"/> - <include name="org/jboss/test/jbossnet/external/babelfish/*.class"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/external/wsr/"> - <include name="**/*"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsexternal.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/test/util/**"/> - <include name="org/jboss/test/jbossnet/external/**/*.class"/> - <exclude name="org/jboss/test/jbossnet/external/google/**/*.class"/> - <exclude name="org/jboss/test/jbossnet/external/babelfish/**/*.class"/> - <exclude name="org/jboss/test/jbossnet/external/*Test*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/external/ejb/"> - <include name="**/*"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsexternal.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsexternal.wsr"/> - <include name="wsexternal.jar"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/external/ear/"> - <include name="**/META-INF/application.xml"/> - </fileset> - </jar> - - <!-- build state.ear --> - <jar jarFile="${build.lib}/wsstate.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/jbossnet/state/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar jarfile="${build.lib}/wsstate.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="**/test/util/**"/> - <include name="**/test/jbossnet/state/**"/> - <exclude name="**/*Test*.*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/state/ejb/"> - <include name="**/*.xml"/> - </fileset> - </jar> - - <jar jarFile="${build.lib}/wsstate.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsstate.wsr"/> - <include name="wsstate.jar"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/state/ear"> - <include name="**"/> - </fileset> - </jar> - - <!-- build security.ear --> - <jar jarFile="${build.lib}/wssecurity.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/jbossnet/security/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar jarfile="${build.lib}/wssecurity.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="**/test/util/**"/> - <include name="**/test/jbossnet/security/**"/> - <include name="**/test/security/service/SecurityConfig*.*"/> - <exclude name="**/*TestCase*.*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/security/ejb/"> - <include name="**/*.xml"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/security/server/"> - <include name="**/*.xml"/> - </fileset> - </jar> - - <jar jarFile="${build.lib}/wssecurity.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wssecurity.wsr"/> - <include name="wssecurity.jar"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/security/ear"> - <include name="**/*.xml"/> - </fileset> - </jar> - - </target> - <!-- jca test --> <target name="_jars-jca"> <mkdir dir="${build.lib}"/> @@ -5986,9 +5580,6 @@ <!-- Exclude JSR77, it is run in its own target with a security manager --> <exclude name="**/test/management/test/**UnitTestCase.class"/> - <!-- Exclude jboss.net, they run in their own target --> - <exclude name="**/test/jbossnet/**"/> - <!-- Exclude iiop they run in their own target --> <exclude name="**/test/*iiop/test/*"/> <exclude name="org/jboss/test/media/**" /> @@ -6646,63 +6237,6 @@ </target> <!-- - | Standard jbossnet tests that should run successfully against a - | JBoss server distribution build that contains jboss-net. - --> - - <target name="tests-jbossnet-unit" depends="maybejars"> - - <mkdir dir="${build.reports}"/> - <mkdir dir="${build.testlog}"/> - <!-- choose a testpattern via a property --> - <property name="jbosstest.pattern" value="**/*"/> - <junit dir="${module.output}" - printsummary="${junit.printsummary}" - haltonerror="${junit.haltonerror}" - haltonfailure="${junit.haltonfailure}" - fork="${junit.fork}" - timeout="${junit.timeout}" - jvm="${junit.jvm}"> - - <jvmarg line="${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" value="${build.resources}/security/tst.policy"/> - <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> - - <sysproperty key="build.testlog" value="${build.testlog}"/> - <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - - <!-- make sure to use xerces on the client side as well, otherwise the element echo tests might fail --> - <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> - <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}/security"/> - <pathelement location="${build.resources}"/> - <pathelement location="${jboss.jbossnet.lib}/jboss-net-client.jar"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter type="xml" usefile="${junit.formatter.usefile}"/> - <formatter type="plain" usefile="${junit.formatter.usefile}"/> - - <batchtest todir="${build.reports}" - haltonerror="${junit.batchtest.haltonerror}" - haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> - - <fileset dir="${build.classes}"> - <include name="**/test/jbossnet/${jbosstest.pattern}TestCase.class"/> - </fileset> - </batchtest> - </junit> - </target> - - <!-- | J2EE webservice tests that should run successfully against a | JBoss server distribution build that contains jboss-webservice.sar --> |
|
From: Thomas D. <tdi...@us...> - 2004-10-26 12:44:37
|
User: tdiesler
Date: 04/10/26 05:44:31
Modified: . Tag: Branch_4_0 build.xml
Log:
Add user exception tests
Revision Changes Path
No revision
No revision
1.406.2.7 +1 -15 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.6
retrieving revision 1.406.2.7
diff -u -r1.406.2.6 -r1.406.2.7
--- build.xml 24 Oct 2004 19:12:30 -0000 1.406.2.6
+++ build.xml 26 Oct 2004 12:44:30 -0000 1.406.2.7
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.406.2.6 2004/10/24 19:12:30 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.7 2004/10/26 12:44:30 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1174,20 +1174,6 @@
destdir="${build.resources}/cache/META-INF"/>
</ejbdoclet>
- <!-- webservice/exception test -->
- <mkdir dir="${build.resources}/webservice/exception/META-INF"/>
- <ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <fileset dir="${source.java}">
- <include name="org/jboss/test/webservice/exception/*BeanImpl.java"/>
- </fileset>
- <remoteinterface/>
- <homeinterface/>
- <jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/webservice/exception/META-INF"/>
- </ejbdoclet>
<!-- webservice/marshalltest test -->
<mkdir dir="${build.resources}/webservice/marshalltest/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
|
|
From: Bill B. <pat...@us...> - 2004-10-26 17:21:07
|
User: patriot1burke
Date: 04/10/26 10:21:00
Modified: . build.xml
Log:
Test new JMX introspection aspect
Revision Changes Path
1.417 +11 -65 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- build.xml 25 Oct 2004 07:43:18 -0000 1.416
+++ build.xml 26 Oct 2004 17:20:58 -0000 1.417
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.416 2004/10/25 07:43:18 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.417 2004/10/26 17:20:58 patriot1burke Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -942,70 +942,6 @@
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>
- -->
-
<!-- cache test -->
<mkdir dir="${build.resources}/cache/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
@@ -1307,6 +1243,16 @@
<metainf dir="${build.resources}/aop/calllogging/META-INF/"/>
</jar>
+ <jar jarfile="${build.lib}/jmx-aoptest.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/jmx/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/jmx">
+ <include name="jmx-aop.xml"/>
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
<jar jarfile="${build.lib}/aop-invocationlog.aop">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/test/InvocationLogUnitTestCase.class"/>
|
|
From: Dimitris A. <an...@us...> - 2004-10-27 10:04:36
|
User: andd
Date: 04/10/27 03:04:22
Modified: . Tag: Branch_4_0 build.xml
Log:
added DeployXMBeanUnitTestCase.testGeneratedAVCFromWrappedStandardMBeanImpl
Revision Changes Path
No revision
No revision
1.406.2.8 +9 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.7
retrieving revision 1.406.2.8
diff -u -r1.406.2.7 -r1.406.2.8
--- build.xml 26 Oct 2004 12:44:30 -0000 1.406.2.7
+++ build.xml 27 Oct 2004 10:04:21 -0000 1.406.2.8
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.406.2.7 2004/10/26 12:44:30 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.8 2004/10/27 10:04:21 andd Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4249,6 +4249,14 @@
</fileset>
</copy>
+ <!-- xmbean AVC generation from wrapped standard mbean impl -->
+ <jar jarfile="${build.lib}/listener-xmbean.sar">
+ <metainf dir="${build.resources}/jmx/xmbean/listener/META-INF"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/xmbean/SelfListenerService.class"/>
+ </fileset>
+ </jar>
+
<!-- Tests of xmbeans with custom interceptors -->
<jar jarfile="${build.lib}/interceptors-xmbean.sar">
<metainf dir="${build.resources}/jmx/interceptors">
|
|
From: Thomas D. <tdi...@us...> - 2004-10-28 11:30:27
|
User: tdiesler
Date: 04/10/28 04:30:19
Modified: . Tag: Branch_4_0 build.xml
Log:
Add admin-devel example chap12
Revision Changes Path
No revision
No revision
1.406.2.9 +55 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.8
retrieving revision 1.406.2.9
diff -u -r1.406.2.8 -r1.406.2.9
--- build.xml 27 Oct 2004 10:04:21 -0000 1.406.2.8
+++ build.xml 28 Oct 2004 11:30:18 -0000 1.406.2.9
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.406.2.8 2004/10/27 10:04:21 andd Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.9 2004/10/28 11:30:18 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -932,6 +932,18 @@
<!-- JBoss.NET services generation -->
+ <java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java">
+ <arg value="-Nhttp://localhost/HelloBean=org.jboss.test.jbossnet.admindevel"/>
+ <arg value="-Nhttp://localhost:8080/jboss-net/services/Hello=org.jboss.test.jbossnet.admindevel"/>
+ <arg value="${source.resources}/jbossnet/admindevel/hello.wsdl"/>
+ <classpath refid="thirdparty.classpath"/>
+ </java>
+ <!-- These are in CVS and contain JBoss.NET XDoclet directives -->
+ <delete dir="${build.gen-src}/org/jboss/test/jbossnet/admindevel">
+ <include name="HelloObj.java"/>
+ <include name="HelloReplyObj.java"/>
+ </delete>
+
<!-- call wsdl4j emitter for AddressBook interfaces and stubs -->
<java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java">
<arg value="-s"/>
@@ -973,6 +985,23 @@
<classpath refid="jboss.jbossnet.classpath"/>
</taskdef>
+ <!-- generate admindevel meta-data and interfaces -->
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/jbossnet/admindevel/*Bean.java"/>
+ <include name="org/jboss/test/jbossnet/admindevel/*Obj.java"/>
+ </fileset>
+ <remoteinterface pattern="{0}Remote"/>
+ <homeinterface />
+ <deploymentdescriptor destdir="${build.resources}/jbossnet/admindevel/ejb/META-INF"/>
+ <jbossnet webDeploymentName="HelloBean"
+ prefix="hello"
+ destdir="${build.resources}/jbossnet/admindevel/wsr/META-INF"
+ targetNameSpace="http://localhost/HelloBean"/>
+ </ejbdoclet>
+
<!-- generate ejbsimple meta-data and interfaces -->
<jbossnet-ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
@@ -3435,6 +3464,31 @@
<target name="_jars-jbossnet">
<mkdir dir="${build.lib}"/>
+ <!-- The admindevel -->
+ <jar destfile="${build.lib}/jbossnet-admindevel-ejb.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jbossnet/admindevel/**"/>
+ <exclude name="org/jboss/test/jbossnet/admindevel/HelloServiceLocator.class"/>
+ <exclude name="org/jboss/test/jbossnet/admindevel/HelloSoapBindingStub.class"/>
+ <exclude name="org/jboss/test/jbossnet/admindevel/HelloTestCase.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/jbossnet/admindevel/ejb/META-INF">
+ <include name="ejb-jar.xml"/>
+ </metainf>
+ </jar>
+ <jar destfile="${build.lib}/jbossnet-admindevel-ejb.wsr">
+ <metainf dir="${build.resources}/jbossnet/admindevel/wsr/META-INF">
+ <include name="web-service.xml"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.lib}/jbossnet-admindevel.ear"
+ appxml="${source.resources}/jbossnet/admindevel/META-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="jbossnet-admindevel-ejb.jar"/>
+ <include name="jbossnet-admindevel-ejb.wsr"/>
+ </fileset>
+ </ear>
+
<!-- The wsr.wsr -->
<mkdir dir="${build.resources}/jbossnet/wsr/wsr/META-INF"/>
<copy toFile="${build.resources}/jbossnet/wsr/wsr/META-INF/web-service.xml"
|
|
From: Dimitris A. <an...@us...> - 2004-10-28 19:35:18
|
User: andd
Date: 04/10/28 12:35:08
Modified: . Tag: Branch_3_2 build.xml
Log:
added DeployXMBeanUnitTestCase.testGeneratedAVCFromWrappedStandardMBeanImpl
Revision Changes Path
No revision
No revision
1.165.2.168 +9 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.167
retrieving revision 1.165.2.168
diff -u -r1.165.2.167 -r1.165.2.168
--- build.xml 21 Oct 2004 13:56:55 -0000 1.165.2.167
+++ build.xml 28 Oct 2004 19:35:05 -0000 1.165.2.168
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.167 2004/10/21 13:56:55 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.168 2004/10/28 19:35:05 andd Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2806,6 +2806,14 @@
</fileset>
</copy>
+ <!-- xmbean AVC generation from wrapped standard mbean impl -->
+ <jar jarfile="${build.lib}/listener-xmbean.sar">
+ <metainf dir="${build.resources}/jmx/xmbean/listener/META-INF"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/xmbean/SelfListenerService.class"/>
+ </fileset>
+ </jar>
+
<!-- Tests of xmbeans with custom interceptors -->
<jar jarfile="${build.lib}/interceptors-xmbean.sar">
<metainf dir="${build.resources}/jmx/interceptors">
|
|
From: Dimitris A. <an...@us...> - 2004-10-28 19:36:28
|
User: andd
Date: 04/10/28 12:36:21
Modified: . build.xml
Log:
added DeployXMBeanUnitTestCase.testGeneratedAVCFromWrappedStandardMBeanImpl
Revision Changes Path
1.418 +9 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- build.xml 26 Oct 2004 17:20:58 -0000 1.417
+++ build.xml 28 Oct 2004 19:36:20 -0000 1.418
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.417 2004/10/26 17:20:58 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.418 2004/10/28 19:36:20 andd Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3804,6 +3804,14 @@
</fileset>
</copy>
+ <!-- xmbean AVC generation from wrapped standard mbean impl -->
+ <jar jarfile="${build.lib}/listener-xmbean.sar">
+ <metainf dir="${build.resources}/jmx/xmbean/listener/META-INF"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/xmbean/SelfListenerService.class"/>
+ </fileset>
+ </jar>
+
<!-- Tests of xmbeans with custom interceptors -->
<jar jarfile="${build.lib}/interceptors-xmbean.sar">
<metainf dir="${build.resources}/jmx/interceptors">
|
|
From: Alexey L. <lou...@us...> - 2004-10-30 19:39:11
|
User: loubyansky Date: 04/10/30 12:38:59 Modified: . Tag: Branch_4_0 build.xml Log: added jaxme and wutka's parser to the tests.classpath Revision Changes Path No revision No revision 1.406.2.11 +3 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.10 retrieving revision 1.406.2.11 diff -u -r1.406.2.10 -r1.406.2.11 --- build.xml 30 Oct 2004 02:55:42 -0000 1.406.2.10 +++ build.xml 30 Oct 2004 19:38:58 -0000 1.406.2.11 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.10 2004/10/30 02:55:42 recampbell Exp $ --> +<!-- $Id: build.xml,v 1.406.2.11 2004/10/30 19:38:58 loubyansky Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -208,6 +208,8 @@ <pathelement path="${project.tools}/lib/optional.jar"/> <path refid="jboss.jmx.classpath"/> <path refid="thirdparty.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> </path> <!-- The classpath required to build javadocs. --> @@ -1652,8 +1654,6 @@ <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> <path refid="tests.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> </classpath> <formatter type="xml" usefile="${junit.formatter.usefile}"/> |
|
From: Alexey L. <lou...@us...> - 2004-10-30 19:52:29
|
User: loubyansky Date: 04/10/30 12:52:08 Modified: . build.xml Log: added jaxme and wutka's parser to the tests.classpath Revision Changes Path 1.420 +3 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.419 retrieving revision 1.420 diff -u -r1.419 -r1.420 --- build.xml 30 Oct 2004 03:23:55 -0000 1.419 +++ build.xml 30 Oct 2004 19:52:08 -0000 1.420 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.419 2004/10/30 03:23:55 recampbell Exp $ --> +<!-- $Id: build.xml,v 1.420 2004/10/30 19:52:08 loubyansky Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -207,6 +207,8 @@ <pathelement path="${project.tools}/lib/optional.jar"/> <path refid="jboss.jmx.classpath"/> <path refid="thirdparty.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> </path> <!-- The classpath required to build javadocs. --> @@ -1563,8 +1565,6 @@ <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> <path refid="tests.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> </classpath> <formatter type="xml" usefile="${junit.formatter.usefile}"/> |
|
From: Alexey L. <lou...@us...> - 2004-10-30 19:54:19
|
User: loubyansky Date: 04/10/30 12:54:12 Modified: . build.xml Log: moved jaxme and wutka's parsers to library.classpath from tests.classpath Revision Changes Path 1.421 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.420 retrieving revision 1.421 diff -u -r1.420 -r1.421 --- build.xml 30 Oct 2004 19:52:08 -0000 1.420 +++ build.xml 30 Oct 2004 19:54:11 -0000 1.421 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.420 2004/10/30 19:52:08 loubyansky Exp $ --> +<!-- $Id: build.xml,v 1.421 2004/10/30 19:54:11 loubyansky Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -72,6 +72,8 @@ <path refid="apache.commons.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="apache.xerces.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="ibm.wsdl4j.classpath"/> @@ -207,8 +209,6 @@ <pathelement path="${project.tools}/lib/optional.jar"/> <path refid="jboss.jmx.classpath"/> <path refid="thirdparty.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> </path> <!-- The classpath required to build javadocs. --> |
|
From: Alexey L. <lou...@us...> - 2004-10-30 19:55:16
|
User: loubyansky Date: 04/10/30 12:55:06 Modified: . Tag: Branch_4_0 build.xml Log: moved jaxme and wutka's parsers to library.classpath from tests.classpath Revision Changes Path No revision No revision 1.406.2.12 +3 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.11 retrieving revision 1.406.2.12 diff -u -r1.406.2.11 -r1.406.2.12 --- build.xml 30 Oct 2004 19:38:58 -0000 1.406.2.11 +++ build.xml 30 Oct 2004 19:55:05 -0000 1.406.2.12 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.11 2004/10/30 19:38:58 loubyansky Exp $ --> +<!-- $Id: build.xml,v 1.406.2.12 2004/10/30 19:55:05 loubyansky Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -72,6 +72,8 @@ <path refid="apache.commons.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="apache.xerces.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="ibm.wsdl4j.classpath"/> @@ -208,8 +210,6 @@ <pathelement path="${project.tools}/lib/optional.jar"/> <path refid="jboss.jmx.classpath"/> <path refid="thirdparty.classpath"/> - <path refid="apache.jaxme.classpath"/> - <path refid="wutka.dtdparser.classpath"/> </path> <!-- The classpath required to build javadocs. --> |
|
From: Scott M S. <st...@us...> - 2004-10-31 14:48:23
|
User: starksm Date: 04/10/31 06:48:13 Modified: . build.xml Log: Get rid of the local javac.target override Revision Changes Path 1.422 +1 -7 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.421 retrieving revision 1.422 diff -u -r1.421 -r1.422 --- build.xml 30 Oct 2004 19:54:11 -0000 1.421 +++ build.xml 31 Oct 2004 14:48:12 -0000 1.422 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.421 2004/10/30 19:54:11 loubyansky Exp $ --> +<!-- $Id: build.xml,v 1.422 2004/10/31 14:48:12 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -191,12 +191,6 @@ <path refid="thirdparty.classpath"/> </path> - <!-- This module is based on Java 1.2 --> - <property name="javac.target" value="1.2"/> - - <!-- RMIC should generate stubs compatible with Java 1.2+ --> - <property name="rmic.stubVersion" value="1.2"/> - <!-- classpath and local.classpath must have a value using with a path --> <property name="classpath" value=""/> <property name="local.classpath" value=""/> |
|
From: Scott M S. <st...@us...> - 2004-10-31 14:49:11
|
User: starksm Date: 04/10/31 06:49:00 Modified: . Tag: Branch_4_0 build.xml Log: Get rid of the local javac.target override Revision Changes Path No revision No revision 1.406.2.13 +6 -7 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.12 retrieving revision 1.406.2.13 diff -u -r1.406.2.12 -r1.406.2.13 --- build.xml 30 Oct 2004 19:55:05 -0000 1.406.2.12 +++ build.xml 31 Oct 2004 14:48:59 -0000 1.406.2.13 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.12 2004/10/30 19:55:05 loubyansky Exp $ --> +<!-- $Id: build.xml,v 1.406.2.13 2004/10/31 14:48:59 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -192,12 +192,6 @@ <path refid="thirdparty.classpath"/> </path> - <!-- This module is based on Java 1.2 --> - <property name="javac.target" value="1.2"/> - - <!-- RMIC should generate stubs compatible with Java 1.2+ --> - <property name="rmic.stubVersion" value="1.2"/> - <!-- classpath and local.classpath must have a value using with a path --> <property name="classpath" value=""/> <property name="local.classpath" value=""/> @@ -1210,6 +1204,9 @@ <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> + <include name="deploy/jbossjca-service.xml"/> + <include name="deploy/jboss-local-jdbc.rar"/> + <include name="deploy/jms/*"/> <include name="lib/**"/> </patternset> </create-config> @@ -1654,6 +1651,8 @@ <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> <path refid="tests.classpath"/> + <path refid="apache.jaxme.classpath"/> + <path refid="wutka.dtdparser.classpath"/> </classpath> <formatter type="xml" usefile="${junit.formatter.usefile}"/> |
|
From: Scott M S. <st...@us...> - 2004-10-31 15:10:07
|
User: starksm Date: 04/10/31 07:10:00 Modified: . Tag: Branch_4_0 build.xml Log: Use systempropertyset to pass in all jbosstest.* properties to the unit tests Revision Changes Path No revision No revision 1.406.2.14 +65 -32 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.13 retrieving revision 1.406.2.14 diff -u -r1.406.2.13 -r1.406.2.14 --- build.xml 31 Oct 2004 14:48:59 -0000 1.406.2.13 +++ build.xml 31 Oct 2004 15:09:59 -0000 1.406.2.14 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.13 2004/10/31 14:48:59 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.14 2004/10/31 15:09:59 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -857,9 +857,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> @@ -898,9 +899,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1006,6 +1008,10 @@ <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"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1049,6 +1055,10 @@ <sysproperty key="jbosstest.secure" value="true"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" @@ -1095,12 +1105,10 @@ <jvmarg value="-Djava.security.manager"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.secure" value="true"/> - <sysproperty key="jbosstest.iterationcount" - value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.threadcount" - value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.beancount" - value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/> <sysproperty key="java.security.auth.login.config" @@ -1241,6 +1249,10 @@ <sysproperty key="jboss.tools.dir" file="${project.root}/tools"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.secure" value="true"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> <sysproperty key="build.testlog" value="${build.testlog}"/> @@ -1293,6 +1305,10 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1346,6 +1362,10 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1384,6 +1404,10 @@ <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"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1429,6 +1453,10 @@ value="${build.resources}/security/auth.conf"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1602,9 +1630,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1643,9 +1672,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1692,6 +1722,10 @@ <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <!-- The crimson parser cannot do schema validation, which we need for jaxrpc-mapping.xml --> <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> @@ -1858,9 +1892,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> @@ -1921,9 +1956,10 @@ <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/> <sysproperty key="log4j.properties" file="${build.resources}/log4j.properties"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1964,9 +2000,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -2011,10 +2048,6 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> - <sysproperty key="jbosstest.nodeploy" value="${jbosstest.nodeploy}"/> <sysproperty key="jbosstest.secure" value="true"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> |
|
From: Scott M S. <st...@us...> - 2004-10-31 17:12:14
|
User: starksm Date: 04/10/31 09:12:06 Modified: . Tag: Branch_4_0 build.xml Log: Change the invalid jaxr.includes.refid property to jaxr.includes Revision Changes Path No revision No revision 1.406.2.15 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.14 retrieving revision 1.406.2.15 diff -u -r1.406.2.14 -r1.406.2.15 --- build.xml 31 Oct 2004 15:09:59 -0000 1.406.2.14 +++ build.xml 31 Oct 2004 17:12:05 -0000 1.406.2.15 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.14 2004/10/31 15:09:59 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.15 2004/10/31 17:12:05 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1810,7 +1810,7 @@ fork="${junit.batchtest.fork}"> <fileset dir="${build.classes}"> - <patternset refid="${jaxr.includes.refid}"/> + <patternset refid="jaxr.includes"/> </fileset> </batchtest> </junit> |
|
From: Anil S. <osd...@us...> - 2004-10-31 19:57:59
|
User: osdchicago Date: 04/10/31 11:57:52 Modified: . build.xml Log: Correct jaxr.includes Revision Changes Path 1.423 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.422 retrieving revision 1.423 diff -u -r1.422 -r1.423 --- build.xml 31 Oct 2004 14:48:12 -0000 1.422 +++ build.xml 31 Oct 2004 19:57:51 -0000 1.423 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.422 2004/10/31 14:48:12 starksm Exp $ --> +<!-- $Id: build.xml,v 1.423 2004/10/31 19:57:51 osdchicago Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -487,7 +487,7 @@ <exclude name="org/jboss/test/xml/*TestCase.class"/> </patternset> <patternset id="jaxr.includes"> - <include name="org/jboss/test/webservice/jaxr/**/*TestCase.class"/> + <include name="org/jboss/test/jaxr/**/*TestCase.class"/> </patternset> <!-- Tests that are currently broken --> |
|
From: Scott M S. <st...@us...> - 2004-10-31 20:05:11
|
User: starksm Date: 04/10/31 12:05:03 Modified: . build.xml Log: Synch up with the fixes from the 4.0 branch Revision Changes Path 1.424 +109 -38 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.423 retrieving revision 1.424 diff -u -r1.423 -r1.424 --- build.xml 31 Oct 2004 19:57:51 -0000 1.423 +++ build.xml 31 Oct 2004 20:05:03 -0000 1.424 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.423 2004/10/31 19:57:51 osdchicago Exp $ --> +<!-- $Id: build.xml,v 1.424 2004/10/31 20:05:03 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -574,6 +574,8 @@ <antcall target="tests-jbossmx-implementation"/> <antcall target="tests-jbossmx-performance"/> <antcall target="tests-iiop"/> + <antcall target="tests-webservices" /> + <antcall target="tests-jaxr" /> <stop-jboss/> <wait-on-shutdown conf="all" /> </target> @@ -842,9 +844,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> @@ -883,9 +886,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -991,6 +995,10 @@ <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"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1034,6 +1042,10 @@ <sysproperty key="jbosstest.secure" value="true"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" @@ -1080,12 +1092,10 @@ <jvmarg value="-Djava.security.manager"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.secure" value="true"/> - <sysproperty key="jbosstest.iterationcount" - value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.threadcount" - value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.beancount" - value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/> <sysproperty key="java.security.auth.login.config" @@ -1201,6 +1211,10 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1254,6 +1268,10 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1292,6 +1310,10 @@ <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"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1337,6 +1359,10 @@ value="${build.resources}/security/auth.conf"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1510,9 +1536,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1551,9 +1578,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1578,10 +1606,54 @@ <!-- Run the Web Services Tests--> <target name="tests-webservices" description="Execute Web Services Related Tests"> - <!-- Test the Jaxr compliance--> - <antcall target="tests-jaxr"> - <param name="jaxr.includes.refid" value="jaxr.includes"/> - </antcall> + + <echo message="java.endorsed.dirs=${jboss.dist}/lib/endorsed"/> + + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="${junit.fork}" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg line="${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" value="${build.resources}/security/tst.policy"/> + <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> + <sysproperty key="build.testlog" value="${build.testlog}"/> + <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + + <!-- The crimson parser cannot do schema validation, which we need for jaxrpc-mapping.xml --> + <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> + + <classpath> + <pathelement location="${build.classes}"/> + <pathelement location="${build.resources}/security"/> + <pathelement location="${build.resources}"/> + <path refid="tests.classpath"/> + </classpath> + + <formatter type="xml" usefile="${junit.formatter.usefile}"/> + <formatter type="plain" 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="org/jboss/test/webservice/**/*TestCase.class"/> + </fileset> + </batchtest> + </junit> </target> <!-- Test for JAXR under the Web Services Umbrella --> @@ -1592,7 +1664,7 @@ printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" - fork="true" + fork="${junit.fork}" timeout="${junit.timeout}" jvm="${junit.jvm}" failureProperty="tests.failure"> @@ -1643,7 +1715,7 @@ fork="${junit.batchtest.fork}"> <fileset dir="${build.classes}"> - <patternset refid="${jaxr.includes.refid}"/> + <patternset refid="jaxr.includes"/> </fileset> </batchtest> </junit> @@ -1725,9 +1797,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> @@ -1788,9 +1861,10 @@ <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/> <sysproperty key="log4j.properties" file="${build.resources}/log4j.properties"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1831,9 +1905,10 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1878,10 +1953,6 @@ <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"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> - <sysproperty key="jbosstest.nodeploy" value="${jbosstest.nodeploy}"/> <sysproperty key="jbosstest.secure" value="true"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> |
|
From: Scott M S. <st...@us...> - 2004-10-31 20:08:41
|
User: starksm Date: 04/10/31 12:08:33 Modified: . Tag: Branch_4_0 build.xml Log: Fix the jaxr.includes path Revision Changes Path No revision No revision 1.406.2.16 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.15 retrieving revision 1.406.2.16 diff -u -r1.406.2.15 -r1.406.2.16 --- build.xml 31 Oct 2004 17:12:05 -0000 1.406.2.15 +++ build.xml 31 Oct 2004 20:08:31 -0000 1.406.2.16 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.15 2004/10/31 17:12:05 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.16 2004/10/31 20:08:31 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -494,7 +494,7 @@ <exclude name="org/jboss/test/xml/*TestCase.class"/> </patternset> <patternset id="jaxr.includes"> - <include name="org/jboss/test/webservice/jaxr/**/*TestCase.class"/> + <include name="org/jboss/test/jaxr/**/*TestCase.class"/> </patternset> <!-- Tests that are currently broken --> |
Thanks for helping keep SourceForge clean.
X