Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-08-09 09:54:34
|
User: tdiesler
Date: 04/08/09 02:54:23
Modified: . Tag: Branch_3_2 build.xml
Log:
Bring jboss.met testsuite in sync with head
Revision Changes Path
No revision
No revision
1.165.2.160 +303 -265 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.159
retrieving revision 1.165.2.160
diff -u -r1.165.2.159 -r1.165.2.160
--- build.xml 2 Aug 2004 01:17:08 -0000 1.165.2.159
+++ build.xml 9 Aug 2004 09:54:18 -0000 1.165.2.160
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.159 2004/08/02 01:17:08 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.160 2004/08/09 09:54:18 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -84,21 +84,21 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jce.classpath"/>
- <path refid="sun.jsse.classpath"/>
- <path refid="sun.javamail.classpath"/>
- <path refid="sun.servlet.classpath"/>
<path refid="apache.avalon.classpath"/>
- <path refid="apache.xalan.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="apache.axis.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="jacorb.jacorb.classpath"/>
+ <path refid="apache.xalan.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
- <path refid="junit.junit.classpath"/>
+ <path refid="ibm.wsdl4j.classpath"/>
+ <path refid="jacorb.jacorb.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
+ <path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="sun.jce.classpath"/>
+ <path refid="sun.jsse.classpath"/>
+ <path refid="sun.javamail.classpath"/>
+ <path refid="sun.servlet.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -922,94 +922,151 @@
destdir="${build.resources}/entity/entity/META-INF"/>
</ejbdoclet>
-<!-- JBoss.NET services generation -->
- <!-- call wsdl4j emitter -->
+ <!-- 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://net.jboss.org/samples/AddressBook=org.jboss.test.webservice.addr" />
- <arg value="${source.resources}/webservice/addr/wsr/META-INF/AddressBook.wsdl" />
- <classpath refid="apache.axis.generate.classpath"/>
+ <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>
- <!-- call wsdl4j emitter -->
+ <!-- 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.webservice.external.babelfish" />
- <arg value="${source.resources}/webservice/external/wsr/META-INF/babelfish.wsdl" />
- <classpath refid="apache.axis.generate.classpath"/>
+ <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 -->
+ <!-- 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.webservice.external.google" />
- <arg value="${source.resources}/webservice/external/wsr/META-INF/google.wsdl" />
- <classpath refid="apache.axis.generate.classpath"/>
+ <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>
- <!-- Delete the service impl skeleton as we have an impl -->
- <delete file="${build.gen-src}/org/jboss/test/webservice/addr/AddressBookSOAPBindingImpl.java"/>
-
- <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"
- classpathref="xdoclet.task.classpath"/>
- <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"
- classpathref="xdoclet.task.classpath"/>
-
- <webserviceejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
+ <!-- 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/webservice/hello/server/Hello*Bean.java"/>
- <include name="org/jboss/test/webservice/hello/HelloData.java"/>
+ <include name="org/jboss/test/jbossnet/ejbsimple/server/Hello*Bean.java"/>
+ <include name="org/jboss/test/jbossnet/ejbsimple/HelloData.java"/>
</fileset>
- <entitycmp cmpspec="2.x"/>
<remoteinterface/>
+ <localinterface/>
<homeinterface/>
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/webservice/hello/ejb/META-INF"/>
+ <localhomeinterface/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/webservice/hello/ejb/META-INF"/>
- <jbossnet webDeploymentName="Hello"
- prefix="hello"
- destdir="${build.resources}/webservice/hello/wsr/META-INF"
- targetNameSpace="http://net.jboss.org/hello" />
- </webserviceejbdoclet>
-
- <webservicejmxdoclet destdir="${build.gen-src}"
- excludedtags="@version,@author">
+ 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/webservice/jmx/JMXTest.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}/webservice/jmx/wsr/META-INF"
- targetNameSpace="http://net.jboss.org/jmx" />
- </webservicejmxdoclet>
-
- <webserviceejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
+ 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/webservice/arrays/ArraysData.java"/>
- <include name="org/jboss/test/webservice/arrays/server/ArraysBean.java"/>
- <include name="org/jboss/test/webservice/arrays/server/ArraysBean2.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}/webservice/arrays/ejb/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jbossnet/security/ejb/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/webservice/arrays/ejb/META-INF"/>
- <jbossnet webDeploymentName="Arrays"
- prefix="arrays"
- destdir="${build.resources}/webservice/arrays/wsr/META-INF"
- targetNameSpace="http://net.jboss.org/arrays" />
- </webserviceejbdoclet>
+ 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>
</target>
@@ -1191,7 +1248,7 @@
_jars-classloader,
_jars-tm,
_jars-util,
- _jars-webservice,
+ _jars-jbossnet,
_jars-hibernate
">
</target>
@@ -1969,6 +2026,166 @@
</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"
depends="compile">
@@ -4561,188 +4778,6 @@
</jar>
</target>
- <!-- Web services tests -->
- <target name="_jars-webservice">
- <mkdir dir="${build.lib}"/>
-
- <!-- The addr.wsr -->
- <mkdir dir="${build.resources}/webservice/addr/wsr/META-INF"/>
-
- <copy toFile="${build.resources}/webservice/addr/wsr/META-INF/web-service.xml"
- file="${build.gen-src}/org/jboss/test/webservice/addr/deploy.wsdd"/>
-
- <jar destfile="${build.lib}/addr.wsr">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/addr/*.class"/>
- <exclude name="org/jboss/test/webservice/addr/AddressBookSOAPBindingStub*" />
- </fileset>
- <fileset dir="${build.resources}/webservice/addr/wsr" />
- </jar>
-
- <jar destfile="${build.lib}/addrtest.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/addr/*.class"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/addr/*.class"/>
- </fileset>
- </jar>
-
- <!-- The jmx.wsr -->
- <jar destfile="${build.lib}/jmx.wsr">
- <fileset dir="${build.resources}/webservice/jmx/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/jmx-test.sar">
- <fileset dir="${build.lib}">
- <include name="jmx.wsr"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/jmx/sar/">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/jmx/**"/>
- </fileset>
- </jar>
-
- <!-- The wshello.ear and wsr -->
- <jar destfile="${build.lib}/wshello.wsr">
- <fileset dir="${build.resources}/webservice/hello/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/wshellotest.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/hello/**"/>
- <exclude name="org/jboss/test/webservice/hello/server/**"/>
- </fileset>
- </jar>
-
- <!-- build hello.jar -->
- <jar destfile="${build.lib}/wshello.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/webservice/hello/**"/>
- <exclude name="org/jboss/test/webservice/hello/*UnitTestCase.*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/hello/ejb/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
-
- <ear destfile="${build.lib}/wshello.ear"
- appxml="${build.resources}/webservice/hello/ear/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="wshello.wsr"/>
- <include name="wshello.jar"/>
- </fileset>
- </ear>
-
- <!-- The arrays.ear and arrays.wsr -->
- <jar jarFile="${build.lib}/arrays.wsr">
- <fileset dir="${build.resources}/webservice/arrays/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
-
- <jar jarFile="${build.lib}/arraystest.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/arrays/**"/>
- <exclude name="org/jboss/test/webservice/arrays/server/**"/>
- </fileset>
- </jar>
-
- <!-- build arrays.jar -->
- <jar jarfile="${build.lib}/arrays.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/webservice/arrays/**"/>
- <exclude name="org/jboss/test/webservice/arrays/*UnitTestCase.*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/arrays/ejb/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
-
- <ear destfile="${build.lib}/arrays.ear"
- appxml="${build.resources}/webservice/arrays/ear/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="arrays.wsr"/>
- <include name="arrays.jar"/>
- </fileset>
- </ear>
-
- <!-- The store wsr and ear -->
- <jar destfile="${build.lib}/store.wsr">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/store/server/**"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/store/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/storetest.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/store/*"/>
- </fileset>
- </jar>
-
- <!-- build store.jar -->
- <jar destfile="${build.lib}/store.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/store/**"/>
- <exclude name="org/jboss/test/webservice/*Test*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/store/jar/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
-
- <ear destfile="${build.lib}/store.ear"
- appxml="${build.resources}/webservice/store/ear/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="store.wsr"/>
- <include name="store.jar"/>
- </fileset>
- </ear>
-
- <!-- The wsexternal wsr and ear -->
- <jar destfile="${build.lib}/wsexternal.wsr">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/external/google/*.class"/>
- <include name="org/jboss/test/webservice/external/babelfish/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/external/wsr/">
- <include name="**/*"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/wsexternal.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/external/**/*.class"/>
- <exclude name="org/jboss/test/webservice/external/google/**/*.class"/>
- <exclude name="org/jboss/test/webservice/external/babelfish/**/*.class"/>
- <exclude name="org/jboss/test/webservice/external/*Test*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/external/jar/">
- <include name="**/*"/>
- </fileset>
- </jar>
-
- <ear destfile="${build.lib}/wsexternal.ear"
- appxml="${build.resources}/webservice/external/ear/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="wsexternal.wsr"/>
- <include name="wsexternal.jar"/>
- </fileset>
- </ear>
-
- </target>
-
<target name="_jars-hibernate">
<mkdir dir="${build.lib}"/>
@@ -5418,11 +5453,12 @@
</target>
<!--
- | Standard webservice tests that should run successfully against a
+ | 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 -->
@@ -5440,17 +5476,21 @@
<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="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>
@@ -5463,9 +5503,7 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="**/test/webservice/${jbosstest.pattern}TestCase.class"/>
- <exclude name="**/test/webservice/external/**"/>
- <exclude name="**/test/webservice/store/**"/>
+ <include name="**/test/jbossnet/${jbosstest.pattern}TestCase.class"/>
</fileset>
</batchtest>
</junit>
|
