Menu
▾
▴
jboss-cvs-commits
|
From: Bill B. <pat...@us...> - 2004-07-16 15:32:55
|
User: patriot1burke
Date: 04/07/16 08:32:46
Modified: . build.xml
Log:
added regression test for EJB interception tests
Revision Changes Path
1.373 +25 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- build.xml 13 Jul 2004 00:59:18 -0000 1.372
+++ build.xml 16 Jul 2004 15:32:45 -0000 1.373
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.372 2004/07/13 00:59:18 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.373 2004/07/16 15:32:45 patriot1burke Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1513,6 +1513,8 @@
<metainf dir="${build.resources}/aop/simpleejb/META-INF/"/>
</jar>
+
+
<jar jarfile="${build.lib}/aop-call-logging.aop">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/test/CallLoggingUnitTestCase.class"/>
@@ -1572,6 +1574,7 @@
<include name="org/jboss/test/aop/bean/SimpleInterceptor.class"/>
<include name="org/jboss/test/aop/bean/SimpleInterceptorFactory.class"/>
<include name="org/jboss/test/aop/bean/SimpleBeanInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanCallerInterceptor.class"/>
<include name="org/jboss/test/aop/bean/SimpleBeanInterceptorFactory.class"/>
<include name="org/jboss/test/aop/bean/Temperature*.class"/>
<include name="org/jboss/test/aop/bean/Observable*.class"/>
@@ -1582,7 +1585,6 @@
</fileset>
</jar>
- <!-- build aop.jar -->
<jar jarfile="${build.lib}/aoptest.sar">
<fileset dir="${build.lib}">
<include name="aoptest.aop"/>
@@ -1617,6 +1619,27 @@
<include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
+
+ <jar jarfile="${build.lib}/simpleejb.sar">
+ <fileset dir="${build.lib}">
+ <include name="aoptest.aop"/>
+ </fileset>
+ <fileset dir="${build.lib}">
+ <include name="simpleejb.jar"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/SimpleBeanTester.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanTesterMBean.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/simpleejb">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
<!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test -->
<aopc compilerclasspathref="aop.task.classpath">
|
|
From: Adrian B. <ej...@us...> - 2004-07-18 11:26:57
|
User: ejort
Date: 04/07/18 04:26:50
Modified: . build.xml
Log:
Fix the testsuite compilation, ant optional is no longer used.
Revision Changes Path
1.374 +2 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- build.xml 16 Jul 2004 15:32:45 -0000 1.373
+++ build.xml 18 Jul 2004 11:26:49 -0000 1.374
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.373 2004/07/16 15:32:45 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.374 2004/07/18 11:26:49 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -98,7 +98,6 @@
<path refid="junit.junit.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
- <path refid="junitejb.junitejb.classpath"/>
<path refid="jdom.classpath"/>
<path refid="javassist.classpath"/>
<path refid="trove.classpath"/>
@@ -209,7 +208,7 @@
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/optional.jar"/>
+ <pathelement path="${project.tools}/lib/ant-junit.jar"/>
<path refid="jboss.jmx.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
|
|
From: Adrian B. <ej...@us...> - 2004-07-22 22:41:33
|
User: ejort
Date: 04/07/22 15:41:27
Modified: . build.xml
Log:
A simple test of message inflow using a non jms message listener.
Revision Changes Path
1.375 +26 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- build.xml 18 Jul 2004 11:26:49 -0000 1.374
+++ build.xml 22 Jul 2004 22:41:26 -0000 1.375
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.374 2004/07/18 11:26:49 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.375 2004/07/22 22:41:26 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3241,8 +3241,7 @@
</target>
<!-- jca test -->
- <target name="_jars-jca"
- depends="compile">
+ <target name="_jars-jca">
<mkdir dir="${build.lib}"/>
<!-- build test jdbc driver with config inside sar -->
@@ -3279,6 +3278,30 @@
</fileset>
</copy>
+ <!-- build inflow adapter -->
+ <jar jarfile="${build.lib}/jcainflow.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/inflow/**"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${build.lib}/jcainflow.rar">
+ <fileset dir="${build.lib}">
+ <include name="jcainflow.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/jca/inflow">
+ <include name="META-INF/ra.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build inflow adapter -->
+ <jar jarfile="${build.lib}/jcainflowmdb.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/inflowmdb/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jca/inflowmdb">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
<!-- build jcatest.jar -->
<jar jarfile="${build.lib}/jcatest.jar">
|
|
From: Thomas D. <tdi...@us...> - 2004-07-23 15:23:51
|
User: tdiesler
Date: 04/07/23 08:23:45
Modified: . build.xml
Log:
Move wsdl files in the wsdl subdir as now mandated by the spec
Revision Changes Path
1.376 +29 -35 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- build.xml 22 Jul 2004 22:41:26 -0000 1.375
+++ build.xml 23 Jul 2004 15:23:44 -0000 1.376
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.375 2004/07/22 22:41:26 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.376 2004/07/23 15:23:44 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1317,12 +1317,12 @@
<target name="compile-wsdl" depends="init">
<!-- ws4ee/marshalltest -->
- <mkdir dir="${build.resources}/ws4ee/marshalltest/META-INF"/>
+ <mkdir dir="${build.resources}/ws4ee/marshalltest/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/rpc-encoded.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/rpc-encoded.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1334,7 +1334,7 @@
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/rpc-literal.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/rpc-literal.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1346,7 +1346,7 @@
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/doc-encoded.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/doc-encoded.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1358,7 +1358,7 @@
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/doc-literal.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/doc-literal.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1368,12 +1368,12 @@
</java>
<!-- ws4ee/handlerflow -->
- <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF"/>
+ <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://localhost:8080/ws4ee/services/HelloService"/>
- <arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/Hello.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/wsdl/Hello.wsdl"/>
<arg value="-nhttp://test.jboss.org/ws4ee/handlerflow"/>
<arg value="-SHelloService"/>
<arg value="-sHelloPort"/>
@@ -5311,8 +5311,8 @@
<fileset dir="${source.resources}/ws4ee/ws4eesimple">
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/webservices.xml"/>
- <include name="META-INF/Hello.wsdl"/>
<include name="META-INF/HelloMapping.xml"/>
+ <include name="META-INF/wsdl/Hello.wsdl"/>
</fileset>
</jar>
@@ -5324,8 +5324,8 @@
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
<webinf dir="${source.resources}/ws4ee/ws4eesimple/META-INF">
- <include name="Hello.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/Hello.wsdl"/>
</webinf>
<webinf dir="${source.resources}/ws4ee/ws4eesimple/WEB-INF">
<include name="webservices.xml"/>
@@ -5343,8 +5343,8 @@
<metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
- <include name="HelloClient.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/HelloClient.wsdl"/>
</metainf>
</jar>
<war warfile="${build.lib}/ws4eesimple-client.war"
@@ -5354,8 +5354,8 @@
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
<webinf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
- <include name="HelloClient.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/HelloClient.wsdl"/>
</webinf>
</war>
<jar destfile="${build.lib}/ws4eesimple-client-ejb.jar" manifest="${build.etc}/manifest.mf">
@@ -5367,8 +5367,8 @@
</fileset>
<metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
<include name="ejb-jar.xml"/>
- <include name="HelloClient.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/HelloClient.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eesimple-client.ear" manifest="${build.etc}/manifest.mf"
@@ -5390,7 +5390,7 @@
</fileset>
<metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
<include name="*.xml"/>
- <include name="*.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
@@ -5413,7 +5413,7 @@
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="HelloMapping.xml"/>
- <include name="Hello.wsdl"/>
+ <include name="wsdl/Hello.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eehandlerflow-ejb.ear" manifest="${build.etc}/manifest.mf"
@@ -5443,8 +5443,8 @@
<include name="org/jboss/test/ws4ee/handlerflow/ClientHandler2.class"/>
</classes>
<webinf dir="${build.resources}/ws4ee/handlerflow/META-INF">
- <include name="Hello.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/Hello.wsdl"/>
</webinf>
<webinf dir="${build.resources}/ws4ee/handlerflow/WEB-INF">
<include name="webservices.xml"/>
@@ -5463,7 +5463,6 @@
<!-- delete file="${build.lib}/ws4eehandlerflow.war"/ -->
<!-- build ws4eecomplex.jar -->
- <!--
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Bean.class"/>
@@ -5473,17 +5472,15 @@
<include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Home.class"/>
<include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
</fileset>
- <fileset dir="${source.resources}/ws4ee/ws4eecomplex">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/Complex1.wsdl"/>
- <include name="META-INF/Complex1Mapping.xml"/>
- <include name="META-INF/webservices.xml"/>
- </fileset>
+ <metainf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="Complex1Mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/Complex1.wsdl"/>
+ </metainf>
</jar>
- -->
<!-- build ws4eecomplex.war -->
- <!--
<war warfile="${build.lib}/ws4eecomplex.war"
webxml="${source.resources}/ws4ee/ws4eecomplex/WEB-INF/web.xml">
<classes dir="${build.classes}">
@@ -5493,27 +5490,24 @@
<include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
</classes>
<webinf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
- <include name="Complex1.wsdl"/>
<include name="Complex1Mapping.xml"/>
+ <include name="wsdl/Complex1.wsdl"/>
</webinf>
</war>
- -->
<!-- build ws4eehandler.jar -->
- <!--
<jar destfile="${build.lib}/ws4eehandler.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/util/**"/>
<include name="org/jboss/test/ws4ee/ws4eehandler/*.class"/>
</fileset>
- <fileset dir="${source.resources}/ws4ee/ws4eehandler">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/webservices.xml"/>
- <include name="META-INF/Handler.wsdl"/>
- <include name="META-INF/HandlerMapping.xml"/>
- </fileset>
+ <metainf dir="${source.resources}/ws4ee/ws4eehandler/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="webservices.xml"/>
+ <include name="HandlerMapping.xml"/>
+ <include name="wsdl/Handler.wsdl"/>
+ </metainf>
</jar>
- -->
</target>
<!-- xa test -->
|
|
From: Thomas D. <tdi...@us...> - 2004-07-24 23:46:12
|
User: tdiesler
Date: 04/07/24 16:45:59
Modified: . build.xml
Log:
Restore the ws4ee tests. marshalltest, ws4eecomplex still need some work.
Revision Changes Path
1.377 +18 -48 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- build.xml 23 Jul 2004 15:23:44 -0000 1.376
+++ build.xml 24 Jul 2004 23:45:58 -0000 1.377
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.376 2004/07/23 15:23:44 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.377 2004/07/24 23:45:58 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -85,23 +85,24 @@
&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.crimson.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
+ <path refid="ibm.wsdl4j.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
+ <path refid="jgroups.jgroups.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
<path refid="jdom.classpath"/>
<path refid="javassist.classpath"/>
+ <path refid="sun.jce.classpath"/>
+ <path refid="sun.jsse.classpath"/>
+ <path refid="sun.javamail.classpath"/>
+ <path refid="sun.servlet.classpath"/>
<path refid="trove.classpath"/>
- <path refid="jgroups.jgroups.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -111,9 +112,11 @@
<!-- needed for security login module tests -->
<path refid="hsqldb.hsqldb.classpath"/>
- <!-- needed for webservice tests -->
+ <!-- needed for JBoss.NET tests -->
+ <!-- Note, enabeling this breaks the ws4ee tests
<path refid="apache.axis.classpath"/>
<path refid="ibm.uddi4j.classpath"/>
+ -->
</path>
<!-- ======= -->
@@ -1372,7 +1375,7 @@
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
- <arg value="-lhttp://localhost:8080/ws4ee/services/HelloService"/>
+ <arg value="-lhttp://localhost:8080/ws4eehandlerflow/HelloService"/>
<arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/wsdl/Hello.wsdl"/>
<arg value="-nhttp://test.jboss.org/ws4ee/handlerflow"/>
<arg value="-SHelloService"/>
@@ -5416,16 +5419,6 @@
<include name="wsdl/Hello.wsdl"/>
</metainf>
</jar>
- <ear destfile="${build.lib}/ws4eehandlerflow-ejb.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/ws4ee/handlerflow/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eehandlerflow.jar"/>
- </fileset>
- <metainf dir="${build.resources}/ws4ee/handlerflow/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </ear>
- <!-- delete file="${build.lib}/ws4eehandlerflow.jar"/-->
<!-- build ws4eehandlerflow.war -->
<war warfile="${build.lib}/ws4eehandlerflow.war"
@@ -5451,16 +5444,6 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
- <ear destfile="${build.lib}/ws4eehandlerflow-jse.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/ws4ee/handlerflow/WEB-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eehandlerflow.war"/>
- </fileset>
- <metainf dir="${build.resources}/ws4ee/handlerflow/WEB-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </ear>
- <!-- delete file="${build.lib}/ws4eehandlerflow.war"/ -->
<!-- build ws4eecomplex.jar -->
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
@@ -5495,19 +5478,6 @@
</webinf>
</war>
- <!-- build ws4eehandler.jar -->
- <jar destfile="${build.lib}/ws4eehandler.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/ws4ee/ws4eehandler/*.class"/>
- </fileset>
- <metainf dir="${source.resources}/ws4ee/ws4eehandler/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="HandlerMapping.xml"/>
- <include name="wsdl/Handler.wsdl"/>
- </metainf>
- </jar>
</target>
<!-- xa test -->
@@ -6486,10 +6456,8 @@
<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"/>
@@ -6509,8 +6477,9 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/ws4ee/ws4eesimple/*TestCase.class"/>
- <include name="org/jboss/test/ws4ee/marshalltest/*TestCase.class"/>
+ <include name="org/jboss/test/ws4ee/**/*TestCase.class"/>
+ <exclude name="org/jboss/test/ws4ee/marshalltest/**"/>
+ <exclude name="org/jboss/test/ws4ee/ws4eecomplex/**"/>
</fileset>
</batchtest>
</junit>
@@ -7131,6 +7100,7 @@
<path refid="tests.classpath"/>
</classpath>
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
|
|
From: Thomas D. <tdi...@us...> - 2004-07-26 14:06:03
|
User: tdiesler
Date: 04/07/26 07:05:41
Modified: . build.xml
Log:
ws4ee marshalltest
Revision Changes Path
1.378 +129 -31 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- build.xml 24 Jul 2004 23:45:58 -0000 1.377
+++ build.xml 26 Jul 2004 14:05:41 -0000 1.378
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.377 2004/07/24 23:45:58 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.378 2004/07/26 14:05:41 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -926,9 +926,9 @@
destdir="${build.resources}/entity/entity/META-INF"/>
</ejbdoclet>
- <!-- JBoss.NET services generation -->
+ <!-- JBoss.NET services generation
- <!-- call wsdl4j emitter for AddressBook interfaces and stubs -->
+ <!- - 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"/>
@@ -938,10 +938,10 @@
<classpath refid="thirdparty.classpath"/>
</java>
- <!-- Delete the service impl skeleton as we have an impl already -->
+ <!- - Delete the service impl skeleton as we have an impl already - ->
<delete file="${build.gen-src}/org/jboss/test/webservice/wsr/AddressBookSOAPBindingImpl.java"/>
- <!-- call wsdl4j emitter for Bablefish stubs-->
+ <!- - 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"/>
@@ -950,7 +950,7 @@
<classpath refid="thirdparty.classpath"/>
</java>
- <!-- call wsdl4j emitter for Google stubs -->
+ <!- - 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"/>
@@ -959,7 +959,7 @@
<classpath refid="thirdparty.classpath"/>
</java>
- <!-- these taskdefs allow to call jboss.net specific xdoclet functionality -
+ <!- - these taskdefs allow to call jboss.net specific xdoclet functionality
<taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"
classpathref="xdoclet.task.classpath"/>
<taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"
@@ -1319,13 +1319,24 @@
<!-- 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="ibm.wsdl4j.classpath"/>
+ <path refid="sun.jaf.classpath"/>
+ <path refid="sun.javamail.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="jboss.j2ee.classpath"/>
+ </path>
+
<!-- ws4ee/marshalltest -->
- <mkdir dir="${build.resources}/ws4ee/marshalltest/META-INF/wsdl"/>
+ <mkdir dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
- <classpath refid="tests.classpath"/>
+ <classpath refid="java2wsdl.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/rpc-encoded.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl/rpc-encoded.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1333,11 +1344,12 @@
<arg value="-uENCODED"/>
<arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
</java>
+ <mkdir dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
- <classpath refid="tests.classpath"/>
+ <classpath refid="java2wsdl.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/rpc-literal.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest-rpclit/META-INF/wsdl/rpc-literal.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1345,23 +1357,12 @@
<arg value="-uLITERAL"/>
<arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
</java>
+ <mkdir dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
- <classpath refid="tests.classpath"/>
- <classpath path="${build.classes}"/>
- <arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/doc-encoded.wsdl"/>
- <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
- <arg value="-SMarshallTestService"/>
- <arg value="-sMarshallTestPort"/>
- <arg value="-yDOCUMENT"/>
- <arg value="-uENCODED"/>
- <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
- </java>
- <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
- <classpath refid="tests.classpath"/>
+ <classpath refid="java2wsdl.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/doc-literal.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest-doclit/META-INF/wsdl/doc-literal.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1373,7 +1374,7 @@
<!-- ws4ee/handlerflow -->
<mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
- <classpath refid="tests.classpath"/>
+ <classpath refid="java2wsdl.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://localhost:8080/ws4eehandlerflow/HelloService"/>
<arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/wsdl/Hello.wsdl"/>
@@ -5383,8 +5384,8 @@
</fileset>
</ear>
- <!-- build ws4eemarshall.jar -->
- <jar destfile="${build.lib}/ws4eemarshall.jar" manifest="${build.etc}/manifest.mf">
+ <!-- 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/ws4ee/marshalltest/MarshallTestHome.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/>
@@ -5392,10 +5393,107 @@
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
</fileset>
<metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
- <include name="*.xml"/>
- <include name="wsdl/*.wsdl"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+ <metainf dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/rpc-encoded.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/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/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"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.lib}/ws4eemarshall-rpcenc.ear" manifest="${build.etc}/manifest.mf"
+ appxml="${source.resources}/ws4ee/marshalltest-rpcenc/META-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="ws4eemarshall-rpcenc.jar"/>
+ <include name="ws4eemarshall-rpcenc-client.jar"/>
+ </fileset>
+ </ear>
+
+ <!-- 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/ws4ee/marshalltest/MarshallTestHome.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+ <metainf dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/rpc-literal.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/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/rpc-literal.wsdl"/>
</metainf>
</jar>
+ <ear destfile="${build.lib}/ws4eemarshall-rpclit.ear" manifest="${build.etc}/manifest.mf"
+ appxml="${source.resources}/ws4ee/marshalltest-rpclit/META-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="ws4eemarshall-rpclit.jar"/>
+ <include name="ws4eemarshall-rpclit-client.jar"/>
+ </fileset>
+ </ear>
+
+ <!-- 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/ws4ee/marshalltest/MarshallTestHome.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+ <metainf dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/doc-literal.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/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/doc-literal.wsdl"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.lib}/ws4eemarshall-doclit.ear" manifest="${build.etc}/manifest.mf"
+ appxml="${source.resources}/ws4ee/marshalltest-doclit/META-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="ws4eemarshall-doclit.jar"/>
+ <include name="ws4eemarshall-doclit-client.jar"/>
+ </fileset>
+ </ear>
<!-- build ws4eehandlerflow-ejb.ear -->
<jar destfile="${build.lib}/ws4eehandlerflow.jar" manifest="${build.etc}/manifest.mf">
|
|
From: Thomas D. <tdi...@us...> - 2004-07-27 14:01:28
|
User: tdiesler
Date: 04/07/27 07:01:13
Modified: . build.xml
Log:
ws4ee testsuite ok
Revision Changes Path
1.379 +26 -39 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- build.xml 26 Jul 2004 14:05:41 -0000 1.378
+++ build.xml 27 Jul 2004 14:01:11 -0000 1.379
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.378 2004/07/26 14:05:41 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.379 2004/07/27 14:01:11 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1331,13 +1331,15 @@
</path>
<!-- ws4ee/marshalltest -->
+
+ <!-- Always uses xsd:base64Binary fo byte[], we need to manually override with xsd:hexBinary
<mkdir dir="${build.resources}/ws4ee/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}/ws4ee/marshalltest-rpcenc/META-INF/wsdl/rpc-encoded.wsdl"/>
- <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
+ <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
<arg value="-yRPC"/>
@@ -1350,7 +1352,7 @@
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
<arg value="-o${build.resources}/ws4ee/marshalltest-rpclit/META-INF/wsdl/rpc-literal.wsdl"/>
- <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
+ <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
<arg value="-yRPC"/>
@@ -1363,13 +1365,14 @@
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
<arg value="-o${build.resources}/ws4ee/marshalltest-doclit/META-INF/wsdl/doc-literal.wsdl"/>
- <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
+ <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
<arg value="-yDOCUMENT"/>
<arg value="-uLITERAL"/>
<arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
</java>
+ -->
<!-- ws4ee/handlerflow -->
<mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/>
@@ -5391,6 +5394,7 @@
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
<include name="ejb-jar.xml"/>
@@ -5405,6 +5409,7 @@
<jar destfile="${build.lib}/ws4eemarshall-rpcenc-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF">
<include name="application-client.xml"/>
@@ -5428,6 +5433,7 @@
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
<include name="ejb-jar.xml"/>
@@ -5436,17 +5442,20 @@
<metainf dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
+ <include name="ws4ee-deployment.xml"/>
<include name="wsdl/rpc-literal.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/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/ws4ee/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"/>
</metainf>
</jar>
@@ -5465,6 +5474,7 @@
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
<include name="ejb-jar.xml"/>
@@ -5473,17 +5483,20 @@
<metainf dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
+ <include name="ws4ee-deployment.xml"/>
<include name="wsdl/doc-literal.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/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/ws4ee/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"/>
</metainf>
</jar>
@@ -5543,39 +5556,6 @@
</webinf>
</war>
- <!-- build ws4eecomplex.jar -->
- <jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Bean.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer1.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Home.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
- </fileset>
- <metainf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="Complex1Mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/Complex1.wsdl"/>
- </metainf>
- </jar>
-
- <!-- build ws4eecomplex.war -->
- <war warfile="${build.lib}/ws4eecomplex.war"
- webxml="${source.resources}/ws4ee/ws4eecomplex/WEB-INF/web.xml">
- <classes dir="${build.classes}">
- <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1WsClientServlet.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer1.class"/>
- <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
- </classes>
- <webinf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
- <include name="Complex1Mapping.xml"/>
- <include name="wsdl/Complex1.wsdl"/>
- </webinf>
- </war>
-
</target>
<!-- xa test -->
@@ -6539,8 +6519,14 @@
<target name="tests-ws4ee-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
+
<!-- choose a testpattern via a property -->
<property name="jbosstest.pattern" value="**/*"/>
+
+ <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}"
haltonerror="${junit.haltonerror}"
@@ -6559,6 +6545,9 @@
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <!-- The crimson parser cannot do schema validation, which we need for jaxrpc-mapping.xml -->
+ <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
+
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}/security"/>
@@ -6576,8 +6565,6 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws4ee/**/*TestCase.class"/>
- <exclude name="org/jboss/test/ws4ee/marshalltest/**"/>
- <exclude name="org/jboss/test/ws4ee/ws4eecomplex/**"/>
</fileset>
</batchtest>
</junit>
|
|
From: Thomas D. <tdi...@us...> - 2004-07-27 21:31:57
|
User: tdiesler Date: 04/07/27 14:31:50 Modified: . Tag: Branch_3_2 build.xml Log: Add the jboss.net tests Revision Changes Path No revision No revision 1.165.2.156 +58 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.155 retrieving revision 1.165.2.156 diff -u -r1.165.2.155 -r1.165.2.156 --- build.xml 13 Jul 2004 13:50:32 -0000 1.165.2.155 +++ build.xml 27 Jul 2004 21:31:47 -0000 1.165.2.156 @@ -15,7 +15,7 @@ <!-- --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.155 2004/07/13 13:50:32 ejort Exp $ --> +<!-- $Id: build.xml,v 1.165.2.156 2004/07/27 21:31:47 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -4873,11 +4873,12 @@ tests-client-stress, tests-security-basic-stress, tests-jsr77-unit, + tests-webservice-unit, tests-util-unit, tests-jbossmx-compliance, tests-jbossmx-implementation, tests-jbossmx-performance, - tests-iiop-stress, + tests-iiop-stress, tests-report"> </target> @@ -4888,6 +4889,7 @@ tests-client-unit, tests-security-basic-unit, tests-jsr77-unit, + tests-webservice-unit, tests-util-unit, tests-jbossmx-compliance, tests-jbossmx-implementation, @@ -5427,6 +5429,60 @@ </target> <!-- + | Standard webservice tests that should run successfully against a + | JBoss server distribution build that contains jboss-net. + --> + + <target name="tests-webservice-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"/> + + <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="**/test/webservice/${jbosstest.pattern}TestCase.class"/> + <exclude name="**/test/webservice/external/**"/> + <exclude name="**/test/webservice/store/**"/> + </fileset> + </batchtest> + </junit> + </target> + + <!-- | Standard marathon tests that should run successfully against a default | JBoss server distribution build. --> |
|
From: Thomas D. <tdi...@us...> - 2004-07-28 11:53:06
|
User: tdiesler Date: 04/07/28 04:52:57 Modified: . build.xml Log: Restore the jboss.net test build. To run tests-jbossnet-unit install the jboss-net.sar and client jars first. Revision Changes Path 1.380 +77 -33 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- build.xml 27 Jul 2004 14:01:11 -0000 1.379 +++ build.xml 28 Jul 2004 11:52:56 -0000 1.380 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.379 2004/07/27 14:01:11 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.380 2004/07/28 11:52:56 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -112,11 +112,8 @@ <!-- needed for security login module tests --> <path refid="hsqldb.hsqldb.classpath"/> - <!-- needed for JBoss.NET tests --> - <!-- Note, enabeling this breaks the ws4ee tests - <path refid="apache.axis.classpath"/> + <!-- needed for jboss.net module tests --> <path refid="ibm.uddi4j.classpath"/> - --> </path> <!-- ======= --> @@ -144,7 +141,6 @@ <path refid="jboss.iiop.classpath"/> <path refid="jboss.internal-server.classpath"/> <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jbossnet.classpath"/> <path refid="jboss.jca.classpath"/> <path refid="jboss.management.classpath"/> <path refid="jboss.media.classpath"/> @@ -156,7 +152,6 @@ <path refid="jboss.system.classpath"/> <path refid="jboss.transaction.classpath"/> <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> </path> <!-- ===== --> @@ -288,7 +283,7 @@ | documentation compiles. --> <target name="compile" - depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources, compile-wsdl" + depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources" description="Compile all source files."/> <!-- Compile EJB beans with XDoclet --> @@ -926,9 +921,9 @@ destdir="${build.resources}/entity/entity/META-INF"/> </ejbdoclet> - <!-- JBoss.NET services generation + <!-- JBoss.NET services generation --> - <!- - call wsdl4j emitter for AddressBook interfaces and stubs - -> + <!-- 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"/> @@ -936,36 +931,43 @@ <arg value="-Nhttp://test.jboss.org/samples/AddressBook=org.jboss.test.webservice.wsr"/> <arg value="${source.resources}/webservice/wsr/wsr/META-INF/AddressBook.wsdl"/> <classpath refid="thirdparty.classpath"/> + <classpath refid="apache.axis.classpath"/> </java> - <!- - Delete the service impl skeleton as we have an impl already - -> + <!-- Delete the service impl skeleton as we have an impl already --> <delete file="${build.gen-src}/org/jboss/test/webservice/wsr/AddressBookSOAPBindingImpl.java"/> - <!- - call wsdl4j emitter for Bablefish stubs- -> + <!-- 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="thirdparty.classpath"/> + <classpath refid="apache.axis.classpath"/> </java> - <!- - call wsdl4j emitter for Google stubs - -> + <!-- 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="thirdparty.classpath"/> + <classpath refid="apache.axis.classpath"/> </java> - <!- - these taskdefs allow to call jboss.net specific xdoclet functionality - <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" - classpathref="xdoclet.task.classpath"/> - <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" - classpathref="xdoclet.task.classpath"/> + <!-- these taskdefs allow to call jboss.net specific xdoclet functionality --> + <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> + <classpath refid="xdoclet.task.classpath"/> + <classpath refid="jboss.jbossnet.classpath"/> + </taskdef> + <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"> + <classpath refid="xdoclet.task.classpath"/> + <classpath refid="jboss.jbossnet.classpath"/> + </taskdef> - <!- - generate ejbsimple meta-data and interfaces + <!-- generate ejbsimple meta-data and interfaces --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -988,7 +990,7 @@ targetNameSpace="http://test.jboss.org/ejbsimple"/> </webserviceejbdoclet> - <!- - generate jmx meta-data and interfaces + <!-- generate jmx meta-data and interfaces --> <webservicejmxdoclet destdir="${build.gen-src}" excludedtags="@version,@author"> <fileset dir="${source.java}"> @@ -1002,7 +1004,7 @@ targetNameSpace="http://test.jboss.org/jmx"/> </webservicejmxdoclet> - <!- - generate state test meta-data + <!-- generate state test meta-data --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1022,7 +1024,7 @@ targetNameSpace="http://test.jboss.org/state"/> </webserviceejbdoclet> - <!- - generate security test meta-data - - + <!-- generate security test meta-data --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1044,7 +1046,7 @@ targetNameSpace="http://test.jboss.org/security"/> </webserviceejbdoclet> - <!- - generate external test meta-data - - + <!-- generate external test meta-data --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1067,7 +1069,6 @@ destdir="${build.resources}/webservice/external/wsr/META-INF" targetNameSpace="http://test.jboss.org/external"/> </webserviceejbdoclet> ---> <!-- aop test --> <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/> @@ -1275,7 +1276,13 @@ <classpath refid="tests.classpath"/> <include name="${javac.includes}"/> <exclude name="${javac.excludes}"/> + + <!-- + The sources for these modules are compiled in their respective _jars-xxx target + because they depend on conflicting axis versions + --> <exclude name="org/jboss/test/webservice/**" /> + <exclude name="org/jboss/test/ws4ee/**" /> </javac> </target> @@ -1332,7 +1339,6 @@ <!-- ws4ee/marshalltest --> - <!-- Always uses xsd:base64Binary fo byte[], we need to manually override with xsd:hexBinary <mkdir dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl"/> <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> <classpath refid="java2wsdl.classpath"/> @@ -1372,7 +1378,6 @@ <arg value="-uLITERAL"/> <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/> </java> - --> <!-- ws4ee/handlerflow --> <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/> @@ -1447,7 +1452,7 @@ _jars-security, _jars-testbean, _jars-testbeancluster, - _jars-httpsessionreplication, + _jars-httpsessionreplication, _jars-threading, _jars-timer, _jars-tm, @@ -1456,7 +1461,8 @@ _jars-txtimer, _jars-util, _jars-web, - _jars-ws4ee, + _jars-jbossnet, + _jars-webservice, _jars-xa"> </target> @@ -1648,6 +1654,7 @@ <!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test --> +<!-- <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="thirdparty.classpath"/> <classpath path="${build.classes}"/> @@ -1655,6 +1662,7 @@ <include name="org/jboss/test/aop/bean/**"/> <aoppath path="${source.resources}/aop/META-INF/jboss-aop.xml"/> </aopc> +--> </target> <!-- bank test --> @@ -5103,9 +5111,27 @@ </target> <!-- webservice tests --> - <target name="_jars-webservice"> + <target name="_jars-jbossnet"> <mkdir dir="${build.lib}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + <classpath refid="apache.axis.classpath"/> + <classpath refid="jboss.jbossnet.classpath"/> + <include name="org/jboss/test/webservice/**" /> + </javac> + <!-- The wsr.wsr --> <mkdir dir="${build.resources}/webservice/wsr/wsr/META-INF"/> <copy toFile="${build.resources}/webservice/wsr/wsr/META-INF/web-service.xml" @@ -5304,9 +5330,26 @@ </target> <!-- ws4ee tests --> - <target name="_jars-ws4ee"> + <target name="_jars-webservice"> <mkdir dir="${build.lib}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + <classpath refid="jboss.webservice.classpath"/> + <include name="org/jboss/test/ws4ee/**" /> + </javac> + <!-- build ws4eesimple.jar --> <jar destfile="${build.lib}/ws4eesimple.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> @@ -5689,7 +5732,6 @@ tests-txtimer-unit, tests-util-unit, tests-webservice-unit, - tests-ws4ee-unit, tests-iiop-unit, tests-xml-unit"> </target> @@ -6464,7 +6506,7 @@ | JBoss server distribution build that contains jboss-net. --> - <target name="tests-webservice-unit" depends="maybejars"> + <target name="tests-jbossnet-unit" depends="maybejars"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <!-- choose a testpattern via a property --> @@ -6493,7 +6535,9 @@ <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"/> + <path refid="apache.axis.classpath"/> </classpath> <formatter type="xml" usefile="${junit.formatter.usefile}"/> @@ -6516,7 +6560,7 @@ | JBoss server distribution build that contains jboss-ws4ee.sar --> - <target name="tests-ws4ee-unit" depends="maybejars"> + <target name="tests-webservice-unit" depends="maybejars"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
|
From: Steve E. <ste...@us...> - 2004-07-29 05:24:28
|
User: steveebersole
Date: 04/07/28 22:24:22
Modified: . Tag: Branch_3_2 build.xml
Log:
added stuff for testing hibernate module
Revision Changes Path
No revision
No revision
1.165.2.157 +42 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.156
retrieving revision 1.165.2.157
diff -u -r1.165.2.156 -r1.165.2.157
--- build.xml 27 Jul 2004 21:31:47 -0000 1.165.2.156
+++ build.xml 29 Jul 2004 05:24:20 -0000 1.165.2.157
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.156 2004/07/27 21:31:47 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.157 2004/07/29 05:24:20 steveebersole Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -107,6 +107,11 @@
<path refid="apache.bcel.classpath"/>
<!-- needed for security login module tests -->
<path refid="hsqldb.hsqldb.classpath"/>
+
+ <!-- Need hibernate jar for hibernate-based tests -->
+ <path refid="hibernate2.classpath"/>
+ <path refid="odmg.classpath"/>
+ <path refid="cglib.classpath"/>
</path>
<!-- ======= -->
@@ -201,6 +206,7 @@
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/optional.jar"/>
<path refid="jboss.jmx.classpath"/>
+ <path refid="jboss.hibernate.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -1185,7 +1191,8 @@
_jars-classloader,
_jars-tm,
_jars-util,
- _jars-webservice
+ _jars-webservice,
+ _jars-hibernate
">
</target>
@@ -4787,6 +4794,39 @@
</target>
+ <target name="_jars-hibernate">
+ <mkdir dir="${build.lib}"/>
+
+ <jar basedir="${build.classes}" destfile="${build.lib}/hib-test.har">
+ <metainf dir="${source.resources}/hibernate/mappings">
+ <include name="*"/>
+ </metainf>
+ <metainf dir="${source.resources}/hibernate/har-deployment">
+ <include name="*"/>
+ </metainf>
+ <include name="org/jboss/test/hibernate/model/*"/>
+ </jar>
+
+ <jar basedir="${build.classes}" destfile="${build.lib}/hib-test-ejb.jar">
+ <metainf dir="${source.resources}/hibernate/ejb/META-INF">
+ <include name="*"/>
+ </metainf>
+ <include name="org/jboss/test/hibernate/ejb/**"/>
+ <include name="org/jboss/test/hibernate/ProfileService.class"/>
+ </jar>
+
+ <ear earfile="${build.lib}/hib-test.ear"
+ appxml="${source.resources}/hibernate/ear/application.xml">
+ <metainf dir="${source.resources}/hibernate/ear">
+ <include name="jboss-app.xml" />
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="hib-test-ejb.jar" />
+ <include name="hib-test.har" />
+ </fileset>
+ </ear>
+ </target>
+
<!-- ================================================================== -->
<!-- Install & Release -->
<!-- ================================================================== -->
|
|
From: Thomas D. <tdi...@us...> - 2004-07-30 17:04:40
|
User: tdiesler
Date: 04/07/30 10:04:34
Modified: . Tag: Branch_3_2 build.xml
Log:
Rename tests-webservice to tests-jbossnet
Revision Changes Path
No revision
No revision
1.165.2.158 +4 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.157
retrieving revision 1.165.2.158
diff -u -r1.165.2.157 -r1.165.2.158
--- build.xml 29 Jul 2004 05:24:20 -0000 1.165.2.157
+++ build.xml 30 Jul 2004 17:04:32 -0000 1.165.2.158
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.157 2004/07/29 05:24:20 steveebersole Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.158 2004/07/30 17:04:32 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4913,7 +4913,7 @@
tests-client-stress,
tests-security-basic-stress,
tests-jsr77-unit,
- tests-webservice-unit,
+ tests-jbossnet-unit,
tests-util-unit,
tests-jbossmx-compliance,
tests-jbossmx-implementation,
@@ -4929,7 +4929,7 @@
tests-client-unit,
tests-security-basic-unit,
tests-jsr77-unit,
- tests-webservice-unit,
+ tests-jbossnet-unit,
tests-util-unit,
tests-jbossmx-compliance,
tests-jbossmx-implementation,
@@ -5473,7 +5473,7 @@
| JBoss server distribution build that contains jboss-net.
-->
- <target name="tests-webservice-unit" depends="maybejars">
+ <target name="tests-jbossnet-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- choose a testpattern via a property -->
|
|
From: Scott M S. <st...@us...> - 2004-08-02 01:17:43
|
User: starksm
Date: 04/08/01 18:17:11
Modified: . Tag: Branch_3_2 build.xml
Log:
Remove the form-auth and client-cert test wars
Revision Changes Path
No revision
No revision
1.165.2.159 +1 -52 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.158
retrieving revision 1.165.2.159
diff -u -r1.165.2.158 -r1.165.2.159
--- build.xml 30 Jul 2004 17:04:32 -0000 1.165.2.158
+++ build.xml 2 Aug 2004 01:17:08 -0000 1.165.2.159
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.158 2004/07/30 17:04:32 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.159 2004/08/02 01:17:08 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3401,57 +3401,6 @@
</fileset>
</war>
- <!-- war to test DIGEST auth
- <war warfile="${build.lib}/digest-auth.war"
- webxml="${build.resources}/web/WEB-INF/digest-auth-web.xml">
- <webinf dir="${build.resources}/web/html/other/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${build.resources}/web/html/root">
- <include name="**/*.html"/>
- </fileset>
- </war>
--->
- <!-- war to test FORM auth -->
- <war destfile="${build.lib}/form-auth.war"
- webxml="${build.resources}/web/WEB-INF/form-auth-web.xml">
- <webinf dir="${build.resources}/web/html/other/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/web/servlets/SecureServlet.class" />
- </classes>
- <fileset dir="${build.resources}/web/html/other">
- <include name="**/*.html"/>
- </fileset>
- </war>
-<!--
- <ear destfile="${build.lib}/form-auth.ear">
- appxml="${build.resources}/web/META-INF/application.xml">
- <metainf dir="${build.resources}/web/META-INF">
- <include name="jboss-app.xml" />
- </metainf>
- <fileset dir="${build.lib}">
- <include name="form-auth.war"/>
- <include name="web-sec.sar"/>
- </fileset>
- </ear>
--->
-
- <!-- war to test CLIENT-CERT auth -->
- <war warfile="${build.lib}/clientcert-auth.war"
- webxml="${build.resources}/web/WEB-INF/clientcert-auth-web.xml">
- <webinf dir="${build.resources}/web/html/other/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/test/web/servlets/SecureServlet.class" />
- </classes>
- <fileset dir="${build.resources}/web/html/root">
- <include name="**/*.html"/>
- </fileset>
- </war>
-
<!-- build jbosstest-web.ear -->
<ear earfile="${build.lib}/jbosstest-web.ear"
appxml="${build.resources}/web/META-INF/application.xml">
|
|
From: Thomas D. <tdi...@us...> - 2004-08-02 14:24:04
|
User: tdiesler
Date: 04/08/02 07:23:58
Modified: . build.xml
Log:
JBoss.NET should use the axis-ws4ee implementation.
Apache Axis is only kept for java2wsdl.
Revision Changes Path
1.381 +20 -51 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- build.xml 28 Jul 2004 11:52:56 -0000 1.380
+++ build.xml 2 Aug 2004 14:23:57 -0000 1.381
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.380 2004/07/28 11:52:56 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.381 2004/08/02 14:23:57 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -111,9 +111,6 @@
<path refid="apache.bcel.classpath"/>
<!-- needed for security login module tests -->
<path refid="hsqldb.hsqldb.classpath"/>
-
- <!-- needed for jboss.net module tests -->
- <path refid="ibm.uddi4j.classpath"/>
</path>
<!-- ======= -->
@@ -141,6 +138,7 @@
<path refid="jboss.iiop.classpath"/>
<path refid="jboss.internal-server.classpath"/>
<path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jbossnet.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.management.classpath"/>
<path refid="jboss.media.classpath"/>
@@ -152,6 +150,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
+ <path refid="jboss.webservice.classpath"/>
</path>
<!-- ===== -->
@@ -931,7 +930,6 @@
<arg value="-Nhttp://test.jboss.org/samples/AddressBook=org.jboss.test.webservice.wsr"/>
<arg value="${source.resources}/webservice/wsr/wsr/META-INF/AddressBook.wsdl"/>
<classpath refid="thirdparty.classpath"/>
- <classpath refid="apache.axis.classpath"/>
</java>
<!-- Delete the service impl skeleton as we have an impl already -->
@@ -944,7 +942,6 @@
<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="thirdparty.classpath"/>
- <classpath refid="apache.axis.classpath"/>
</java>
<!-- call wsdl4j emitter for Google stubs -->
@@ -954,7 +951,6 @@
<arg value="-Nurn:GoogleSearch=org.jboss.test.webservice.external.google"/>
<arg value="${source.resources}/webservice/external/wsr/META-INF/google.wsdl"/>
<classpath refid="thirdparty.classpath"/>
- <classpath refid="apache.axis.classpath"/>
</java>
<!-- these taskdefs allow to call jboss.net specific xdoclet functionality -->
@@ -1276,13 +1272,6 @@
<classpath refid="tests.classpath"/>
<include name="${javac.includes}"/>
<exclude name="${javac.excludes}"/>
-
- <!--
- The sources for these modules are compiled in their respective _jars-xxx target
- because they depend on conflicting axis versions
- -->
- <exclude name="org/jboss/test/webservice/**" />
- <exclude name="org/jboss/test/ws4ee/**" />
</javac>
</target>
@@ -1330,6 +1319,7 @@
<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"/>
@@ -1337,8 +1327,22 @@
<path refid="jboss.j2ee.classpath"/>
</path>
- <!-- ws4ee/marshalltest -->
+ <!-- jboss.net/ejbsimple -->
+ <mkdir dir="${build.resources}/webservice/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}/webservice/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.webservice.ejbsimple.HelloRemote"/>
+ </java>
+ <!-- ws4ee/marshalltest -->
<mkdir dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="java2wsdl.classpath"/>
@@ -5114,24 +5118,6 @@
<target name="_jars-jbossnet">
<mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}"/>
- <src path="${build.gen-src}"/>
- <classpath refid="tests.classpath"/>
- <classpath refid="apache.axis.classpath"/>
- <classpath refid="jboss.jbossnet.classpath"/>
- <include name="org/jboss/test/webservice/**" />
- </javac>
-
<!-- The wsr.wsr -->
<mkdir dir="${build.resources}/webservice/wsr/wsr/META-INF"/>
<copy toFile="${build.resources}/webservice/wsr/wsr/META-INF/web-service.xml"
@@ -5333,23 +5319,6 @@
<target name="_jars-webservice">
<mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}"/>
- <src path="${build.gen-src}"/>
- <classpath refid="tests.classpath"/>
- <classpath refid="jboss.webservice.classpath"/>
- <include name="org/jboss/test/ws4ee/**" />
- </javac>
-
<!-- build ws4eesimple.jar -->
<jar destfile="${build.lib}/ws4eesimple.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
@@ -6507,6 +6476,7 @@
-->
<target name="tests-jbossnet-unit" depends="maybejars">
+
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- choose a testpattern via a property -->
@@ -6537,7 +6507,6 @@
<pathelement location="${build.resources}"/>
<pathelement location="${jboss.jbossnet.lib}/jboss-net-client.jar"/>
<path refid="tests.classpath"/>
- <path refid="apache.axis.classpath"/>
</classpath>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
|
|
From: Thomas D. <tdi...@us...> - 2004-08-02 19:19:54
|
User: tdiesler Date: 04/08/02 12:19:48 Modified: . build.xml Log: Remove ejbcomplex test from jboss.net as it is part of jboss-ws4ee Revision Changes Path 1.382 +1 -28 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- build.xml 2 Aug 2004 14:23:57 -0000 1.381 +++ build.xml 2 Aug 2004 19:19:48 -0000 1.382 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.381 2004/08/02 14:23:57 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.382 2004/08/02 19:19:48 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -5178,33 +5178,6 @@ </fileset> </jar> - <!-- The wsejbcomplex.ear --> - <jar destfile="${build.lib}/wsejbcomplex.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${source.resources}/webservice/ejbcomplex/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsejbcomplex.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/test/webservice/ejbcomplex/**"/> - <exclude name="org/jboss/test/webservice/ejbcomplex/*Test*"/> - </fileset> - <fileset dir="${source.resources}/webservice/ejbcomplex/jar/"> - <include name="**/*.xml"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsejbcomplex.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsejbcomplex.wsr"/> - <include name="wsejbcomplex.jar"/> - </fileset> - <fileset dir="${source.resources}/webservice/ejbcomplex/ear/"> - <include name="**/*.xml"/> - </fileset> - </jar> - <!-- The wsexternal wsr and ear --> <jar destfile="${build.lib}/wsexternal.wsr" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> |
|
From: Scott M S. <st...@us...> - 2004-08-02 21:49:04
|
User: starksm Date: 04/08/02 14:48:55 Modified: . build.xml Log: Remove the axis wsdl2java usage and disable the jboss.net webservice build for now Revision Changes Path 1.384 +3 -34 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- build.xml 2 Aug 2004 20:58:29 -0000 1.383 +++ build.xml 2 Aug 2004 21:48:55 -0000 1.384 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.383 2004/08/02 20:58:29 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.384 2004/08/02 21:48:55 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -920,39 +920,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.webservice.wsr"/> - <arg value="${source.resources}/webservice/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/webservice/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="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.webservice.external.google"/> - <arg value="${source.resources}/webservice/external/wsr/META-INF/google.wsdl"/> - <classpath refid="thirdparty.classpath"/> - </java> - <!-- these taskdefs allow to call jboss.net specific xdoclet functionality --> <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> <classpath refid="xdoclet.task.classpath"/> @@ -1272,6 +1239,8 @@ <classpath refid="tests.classpath"/> <include name="${javac.includes}"/> <exclude name="${javac.excludes}"/> + <!-- Exclude the jboss.net tests for now --> + <exclude name="org/jboss/test/webservice/**" /> </javac> </target> |
|
From: Scott M S. <st...@us...> - 2004-08-02 22:13:22
|
User: starksm
Date: 04/08/02 15:13:15
Modified: . build.xml
Log:
Remove the call of the _jars-jbossnet target for now
Revision Changes Path
1.385 +1 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- build.xml 2 Aug 2004 21:48:55 -0000 1.384
+++ build.xml 2 Aug 2004 22:13:14 -0000 1.385
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.384 2004/08/02 21:48:55 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.385 2004/08/02 22:13:14 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1434,7 +1434,6 @@
_jars-txtimer,
_jars-util,
_jars-web,
- _jars-jbossnet,
_jars-webservice,
_jars-xa">
</target>
|
|
From: Thomas D. <tdi...@us...> - 2004-08-03 08:04:12
|
User: tdiesler Date: 04/08/03 01:04:06 Modified: . build.xml Log: Restore the jboss.net test build Revision Changes Path 1.386 +36 -19 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- build.xml 2 Aug 2004 22:13:14 -0000 1.385 +++ build.xml 3 Aug 2004 08:04:06 -0000 1.386 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.385 2004/08/02 22:13:14 starksm Exp $ --> +<!-- $Id: build.xml,v 1.386 2004/08/03 08:04:06 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -920,6 +920,39 @@ 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.webservice.wsr"/> + <arg value="${source.resources}/webservice/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/webservice/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="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.webservice.external.google"/> + <arg value="${source.resources}/webservice/external/wsr/META-INF/google.wsdl"/> + <classpath refid="thirdparty.classpath"/> + </java> + <!-- these taskdefs allow to call jboss.net specific xdoclet functionality --> <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> <classpath refid="xdoclet.task.classpath"/> @@ -1239,8 +1272,6 @@ <classpath refid="tests.classpath"/> <include name="${javac.includes}"/> <exclude name="${javac.excludes}"/> - <!-- Exclude the jboss.net tests for now --> - <exclude name="org/jboss/test/webservice/**" /> </javac> </target> @@ -1434,6 +1465,7 @@ _jars-txtimer, _jars-util, _jars-web, + _jars-jbossnet, _jars-webservice, _jars-xa"> </target> @@ -1626,7 +1658,6 @@ <!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test --> -<!-- <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="thirdparty.classpath"/> <classpath path="${build.classes}"/> @@ -1634,7 +1665,7 @@ <include name="org/jboss/test/aop/bean/**"/> <aoppath path="${source.resources}/aop/META-INF/jboss-aop.xml"/> </aopc> ---> + </target> <!-- bank test --> @@ -5240,20 +5271,6 @@ </fileset> </jar> - <jar jarfile="${build.lib}/wsuddi.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="**/test/util/**"/> - <include name="**/test/webservice/security/server/*Login*.*"/> - <include name="**/test/security/service/SecurityConfig*.*"/> - <exclude name="**/*TestCase*.*"/> - </fileset> - <fileset dir="${build.resources}/webservice/uddi/ejb/"> - <include name="**/*.xml"/> - </fileset> - <fileset dir="${build.resources}/webservice/security/server/"> - <include name="**/*.xml"/> - </fileset> - </jar> </target> <!-- ws4ee tests --> |
|
From: Thomas D. <tdi...@us...> - 2004-08-04 09:14:32
|
User: tdiesler Date: 04/08/04 02:14:25 Modified: . build.xml Log: Move jboss.net test stuff from webservice to jbossnet. Move webservice test stuff from ws4ee to webservice. Revision Changes Path 1.387 +184 -182 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.386 retrieving revision 1.387 diff -u -r1.386 -r1.387 --- build.xml 3 Aug 2004 08:04:06 -0000 1.386 +++ build.xml 4 Aug 2004 09:14:24 -0000 1.387 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.386 2004/08/03 08:04:06 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.387 2004/08/04 09:14:24 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -927,20 +927,20 @@ <arg value="-s"/> <arg value="-d"/> <arg value="Session"/> - <arg value="-Nhttp://test.jboss.org/samples/AddressBook=org.jboss.test.webservice.wsr"/> - <arg value="${source.resources}/webservice/wsr/wsr/META-INF/AddressBook.wsdl"/> + <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/webservice/wsr/AddressBookSOAPBindingImpl.java"/> + <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"/> + <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> @@ -948,106 +948,106 @@ <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"/> + <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="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> + <taskdef name="jbossnet-ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> <classpath refid="xdoclet.task.classpath"/> <classpath refid="jboss.jbossnet.classpath"/> </taskdef> - <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"> + <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 --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/ejbsimple/server/Hello*Bean.java"/> - <include name="org/jboss/test/webservice/ejbsimple/HelloData.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}/webservice/ejbsimple/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" - destdir="${build.resources}/webservice/ejbsimple/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/> <jbossnet webDeploymentName="EjbSimple" prefix="ejbsimple" - destdir="${build.resources}/webservice/ejbsimple/wsr/META-INF" + destdir="${build.resources}/jbossnet/ejbsimple/wsr/META-INF" targetNameSpace="http://test.jboss.org/ejbsimple"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- generate jmx meta-data and interfaces --> - <webservicejmxdoclet destdir="${build.gen-src}" + <jbossnet-jmxdoclet destdir="${build.gen-src}" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/jmx/server/JMXTest.java"/> - <include name="org/jboss/test/webservice/jmx/server/JMXDynamicTest.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" + destdir="${build.resources}/jbossnet/jmx/wsr/META-INF" targetNameSpace="http://test.jboss.org/jmx"/> - </webservicejmxdoclet> + </jbossnet-jmxdoclet> <!-- generate state test meta-data --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/state/server/*Bean.java"/> + <include name="org/jboss/test/jbossnet/state/server/*Bean.java"/> </fileset> <remoteinterface/> <homeinterface/> <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/webservice/state/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" - destdir="${build.resources}/webservice/state/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> <jbossnet webDeploymentName="State" prefix="state" - destdir="${build.resources}/webservice/state/wsr/META-INF" + destdir="${build.resources}/jbossnet/state/wsr/META-INF" targetNameSpace="http://test.jboss.org/state"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- generate security test meta-data --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/security/server/*Bean.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/security/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/security/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" securitydomain="java:/jaas/other" - destdir="${build.resources}/webservice/security/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/security/ejb/META-INF"/> <jbossnet webDeploymentName="Security" prefix="security" - destdir="${build.resources}/webservice/security/wsr/META-INF" + destdir="${build.resources}/jbossnet/security/wsr/META-INF" targetNameSpace="http://test.jboss.org/security"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- generate external test meta-data --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/external/server/*Bean.java"/> + <include name="org/jboss/test/jbossnet/external/server/*Bean.java"/> </fileset> <entitycmp cmpspec="2.x"/> <remoteinterface/> @@ -1055,16 +1055,16 @@ <localinterface/> <localhomeinterface/> <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/webservice/external/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" - destdir="${build.resources}/webservice/external/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> <jbossnet webDeploymentName="External" prefix="external" - mergedir="${source.resources}/webservice/external/wsr/META-INF" - destdir="${build.resources}/webservice/external/wsr/META-INF" + mergedir="${source.resources}/jbossnet/external/wsr/META-INF" + destdir="${build.resources}/jbossnet/external/wsr/META-INF" targetNameSpace="http://test.jboss.org/external"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- aop test --> <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/> @@ -1328,74 +1328,74 @@ </path> <!-- jboss.net/ejbsimple --> - <mkdir dir="${build.resources}/webservice/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}/webservice/ejbsimple/hello.wsdl"/> + <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.webservice.ejbsimple.HelloRemote"/> + <arg value="org.jboss.test.jbossnet.ejbsimple.HelloRemote"/> </java> - <!-- ws4ee/marshalltest --> - <mkdir dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl"/> + <!-- 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}/ws4ee/marshalltest-rpcenc/META-INF/wsdl/rpc-encoded.wsdl"/> - <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/> + <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.ws4ee.marshalltest.MarshallTestEndpoint"/> + <arg value="org.jboss.test.webservice.marshalltest.MarshallTestEndpoint"/> </java> - <mkdir dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF/wsdl"/> + <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}/ws4ee/marshalltest-rpclit/META-INF/wsdl/rpc-literal.wsdl"/> - <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/> + <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.ws4ee.marshalltest.MarshallTestEndpoint"/> + <arg value="org.jboss.test.webservice.marshalltest.MarshallTestEndpoint"/> </java> - <mkdir dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF/wsdl"/> + <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}/ws4ee/marshalltest-doclit/META-INF/wsdl/doc-literal.wsdl"/> - <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/> + <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.ws4ee.marshalltest.MarshallTestEndpoint"/> + <arg value="org.jboss.test.webservice.marshalltest.MarshallTestEndpoint"/> </java> - <!-- ws4ee/handlerflow --> - <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/> + <!-- 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}/ws4ee/handlerflow/META-INF/wsdl/Hello.wsdl"/> - <arg value="-nhttp://test.jboss.org/ws4ee/handlerflow"/> + <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.ws4ee.handlerflow.HelloEndpoint"/> + <arg value="org.jboss.test.webservice.handlerflow.HelloEndpoint"/> </java> </target> @@ -1658,6 +1658,7 @@ <!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test --> +<!-- <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="thirdparty.classpath"/> <classpath path="${build.classes}"/> @@ -1665,6 +1666,7 @@ <include name="org/jboss/test/aop/bean/**"/> <aoppath path="${source.resources}/aop/META-INF/jboss-aop.xml"/> </aopc> +--> </target> @@ -5113,26 +5115,26 @@ </ear> </target> - <!-- webservice tests --> + <!-- jbossnet tests --> <target name="_jars-jbossnet"> <mkdir dir="${build.lib}"/> <!-- The wsr.wsr --> - <mkdir dir="${build.resources}/webservice/wsr/wsr/META-INF"/> - <copy toFile="${build.resources}/webservice/wsr/wsr/META-INF/web-service.xml" - file="${build.gen-src}/org/jboss/test/webservice/wsr/deploy.wsdd"/> + <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/webservice/wsr/**/*.class"/> + <include name="org/jboss/test/jbossnet/wsr/**/*.class"/> <exclude name="**/*Test*"/> </fileset> - <fileset dir="${build.resources}/webservice/wsr/wsr"/> + <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}/webservice/jmx/wsr"> + <fileset dir="${build.resources}/jbossnet/jmx/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5141,17 +5143,17 @@ <fileset dir="${build.lib}"> <include name="wsjmx.wsr"/> </fileset> - <fileset dir="${source.resources}/webservice/jmx/sar/"> + <fileset dir="${source.resources}/jbossnet/jmx/sar/"> <include name="**/*"/> </fileset> <fileset dir="${build.classes}"> - <include name="org/jboss/test/webservice/jmx/server/*"/> + <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}/webservice/ejbsimple/wsr"> + <fileset dir="${build.resources}/jbossnet/ejbsimple/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5159,10 +5161,10 @@ <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/webservice/ejbsimple/**"/> - <exclude name="org/jboss/test/webservice/ejbsimple/*Test*"/> + <include name="org/jboss/test/jbossnet/ejbsimple/**"/> + <exclude name="org/jboss/test/jbossnet/ejbsimple/*Test*"/> </fileset> - <fileset dir="${build.resources}/webservice/ejbsimple/ejb/"> + <fileset dir="${build.resources}/jbossnet/ejbsimple/ejb/"> <include name="**/*.xml"/> </fileset> </jar> @@ -5172,7 +5174,7 @@ <include name="wsejbsimple.wsr"/> <include name="wsejbsimple.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/ejbsimple/ear/"> + <fileset dir="${source.resources}/jbossnet/ejbsimple/ear/"> <include name="**"/> </fileset> </jar> @@ -5180,10 +5182,10 @@ <!-- 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/webservice/external/google/*.class"/> - <include name="org/jboss/test/webservice/external/babelfish/*.class"/> + <include name="org/jboss/test/jbossnet/external/google/*.class"/> + <include name="org/jboss/test/jbossnet/external/babelfish/*.class"/> </fileset> - <fileset dir="${build.resources}/webservice/external/wsr/"> + <fileset dir="${build.resources}/jbossnet/external/wsr/"> <include name="**/*"/> </fileset> </jar> @@ -5191,12 +5193,12 @@ <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/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*"/> + <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}/webservice/external/ejb/"> + <fileset dir="${build.resources}/jbossnet/external/ejb/"> <include name="**/*"/> </fileset> </jar> @@ -5206,14 +5208,14 @@ <include name="wsexternal.wsr"/> <include name="wsexternal.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/external/ear/"> + <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}/webservice/state/wsr"> + <fileset dir="${build.resources}/jbossnet/state/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5221,10 +5223,10 @@ <jar jarfile="${build.lib}/wsstate.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> <include name="**/test/util/**"/> - <include name="**/test/webservice/state/**"/> + <include name="**/test/jbossnet/state/**"/> <exclude name="**/*Test*.*"/> </fileset> - <fileset dir="${build.resources}/webservice/state/ejb/"> + <fileset dir="${build.resources}/jbossnet/state/ejb/"> <include name="**/*.xml"/> </fileset> </jar> @@ -5234,14 +5236,14 @@ <include name="wsstate.wsr"/> <include name="wsstate.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/state/ear"> + <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}/webservice/security/wsr"> + <fileset dir="${build.resources}/jbossnet/security/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5249,14 +5251,14 @@ <jar jarfile="${build.lib}/wssecurity.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> <include name="**/test/util/**"/> - <include name="**/test/webservice/security/**"/> + <include name="**/test/jbossnet/security/**"/> <include name="**/test/security/service/SecurityConfig*.*"/> <exclude name="**/*TestCase*.*"/> </fileset> - <fileset dir="${build.resources}/webservice/security/ejb/"> + <fileset dir="${build.resources}/jbossnet/security/ejb/"> <include name="**/*.xml"/> </fileset> - <fileset dir="${build.resources}/webservice/security/server/"> + <fileset dir="${build.resources}/jbossnet/security/server/"> <include name="**/*.xml"/> </fileset> </jar> @@ -5266,26 +5268,26 @@ <include name="wssecurity.wsr"/> <include name="wssecurity.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/security/ear"> + <fileset dir="${source.resources}/jbossnet/security/ear"> <include name="**/*.xml"/> </fileset> </jar> </target> - <!-- ws4ee tests --> + <!-- webservice tests --> <target name="_jars-webservice"> <mkdir dir="${build.lib}"/> <!-- build ws4eesimple.jar --> <jar destfile="${build.lib}/ws4eesimple.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloBean.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloBean.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> </fileset> - <fileset dir="${source.resources}/ws4ee/ws4eesimple"> + <fileset dir="${source.resources}/webservice/ws4eesimple"> <include name="META-INF/ejb-jar.xml"/> <include name="META-INF/webservices.xml"/> <include name="META-INF/HelloMapping.xml"/> @@ -5295,16 +5297,16 @@ <!-- build ws4eesimple.war --> <war warfile="${build.lib}/ws4eesimple.war" - webxml="${source.resources}/ws4ee/ws4eesimple/WEB-INF/web.xml"> + webxml="${source.resources}/webservice/ws4eesimple/WEB-INF/web.xml"> <classes dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloJavaBean.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloJavaBean.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> </classes> - <webinf dir="${source.resources}/ws4ee/ws4eesimple/META-INF"> + <webinf dir="${source.resources}/webservice/ws4eesimple/META-INF"> <include name="HelloMapping.xml"/> <include name="wsdl/Hello.wsdl"/> </webinf> - <webinf dir="${source.resources}/ws4ee/ws4eesimple/WEB-INF"> + <webinf dir="${source.resources}/webservice/ws4eesimple/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> @@ -5312,12 +5314,12 @@ <!-- build ws4eesimple-client.ear --> <jar destfile="${build.lib}/ws4eesimple-client.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientApp.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientApp.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/> </fileset> - <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF"> + <metainf dir="${source.resources}/webservice/ws4eesimple-client/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="HelloMapping.xml"/> @@ -5325,31 +5327,31 @@ </metainf> </jar> <war warfile="${build.lib}/ws4eesimple-client.war" - webxml="${source.resources}/ws4ee/ws4eesimple-client/WEB-INF/web.xml"> + webxml="${source.resources}/webservice/ws4eesimple-client/WEB-INF/web.xml"> <classes dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientServlet.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientServlet.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> </classes> - <webinf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF"> + <webinf dir="${source.resources}/webservice/ws4eesimple-client/META-INF"> <include name="HelloMapping.xml"/> <include name="wsdl/HelloClient.wsdl"/> </webinf> </war> <jar destfile="${build.lib}/ws4eesimple-client-ejb.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloClientBean.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloClientBean.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/> </fileset> - <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF"> + <metainf dir="${source.resources}/webservice/ws4eesimple-client/META-INF"> <include name="ejb-jar.xml"/> <include name="HelloMapping.xml"/> <include name="wsdl/HelloClient.wsdl"/> </metainf> </jar> <ear destfile="${build.lib}/ws4eesimple-client.ear" manifest="${build.etc}/manifest.mf" - appxml="${source.res... [truncated message content] |
|
From: Steve E. <ste...@us...> - 2004-08-04 17:21:48
|
User: steveebersole
Date: 04/08/04 10:21:41
Modified: . build.xml
Log:
merging hibernate module onto head (4.0)
Revision Changes Path
1.388 +46 -5 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- build.xml 4 Aug 2004 09:14:24 -0000 1.387
+++ build.xml 4 Aug 2004 17:21:40 -0000 1.388
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.387 2004/08/04 09:14:24 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.388 2004/08/04 17:21:40 steveebersole Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -110,7 +110,12 @@
<!-- needed for proxy tests -->
<path refid="apache.bcel.classpath"/>
<!-- needed for security login module tests -->
- <path refid="hsqldb.hsqldb.classpath"/>
+ <path refid="hsqldb.hsqldb.classpath"/>
+
+ <!-- Need hibernate jar for hibernate-based tests -->
+ <path refid="hibernate2.classpath"/>
+ <path refid="odmg.classpath"/>
+ <path refid="cglib.classpath"/>
</path>
<!-- ======= -->
@@ -135,6 +140,7 @@
<path refid="jboss.cache.classpath"/>
<path refid="jboss.cluster.classpath"/>
<path refid="jboss.common.classpath"/>
+ <path refid="jboss.hibernate.classpath"/>
<path refid="jboss.iiop.classpath"/>
<path refid="jboss.internal-server.classpath"/>
<path refid="jboss.j2ee.classpath"/>
@@ -150,7 +156,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
- <path refid="jboss.webservice.classpath"/>
+ <path refid="jboss.webservice.classpath"/>
</path>
<!-- ===== -->
@@ -1431,6 +1437,7 @@
_jars-hello,
_jars-helloiiop,
_jars-hellojrmpiiop,
+ _jars-hibernate,
_jars-idgen,
_jars-iiop,
_jars-invokers,
@@ -1456,7 +1463,7 @@
_jars-security,
_jars-testbean,
_jars-testbeancluster,
- _jars-httpsessionreplication,
+ _jars-httpsessionreplication,
_jars-threading,
_jars-timer,
_jars-tm,
@@ -5558,7 +5565,41 @@
<include name="**/*.xml"/>
</fileset>
</jar>
- </target>
+ </target>
+
+ <target name="_jars-hibernate">
+ <mkdir dir="${build.lib}"/>
+
+ <jar basedir="${build.classes}" destfile="${build.lib}/hib-test.har">
+ <metainf dir="${source.resources}/hibernate/mappings">
+ <include name="*"/>
+ </metainf>
+ <metainf dir="${source.resources}/hibernate/har-deployment">
+ <include name="*"/>
+ </metainf>
+ <include name="org/jboss/test/hibernate/model/*"/>
+ </jar>
+
+ <jar basedir="${build.classes}" destfile="${build.lib}/hib-test-ejb.jar">
+ <metainf dir="${source.resources}/hibernate/ejb/META-INF">
+ <include name="*"/>
+ </metainf>
+ <include name="org/jboss/test/hibernate/ejb/**"/>
+ <include name="org/jboss/test/hibernate/ProfileService.class"/>
+ </jar>
+
+ <ear earfile="${build.lib}/hib-test.ear"
+ appxml="${source.resources}/hibernate/ear/application.xml">
+ <metainf dir="${source.resources}/hibernate/ear">
+ <include name="jboss-app.xml" />
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="hib-test-ejb.jar" />
+ <include name="hib-test.har" />
+ </fileset>
+ </ear>
+ </target>
+
<!-- ================================================================== -->
<!-- Install & Release -->
|
|
From: Scott M S. <st...@us...> - 2004-08-06 02:19:28
|
User: starksm
Date: 04/08/05 19:19:22
Modified: . build.xml
Log:
Remove the unused jsse, jce and jdom classpaths
Revision Changes Path
1.389 +1 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- build.xml 4 Aug 2004 17:21:40 -0000 1.388
+++ build.xml 6 Aug 2004 02:19:21 -0000 1.389
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.388 2004/08/04 17:21:40 steveebersole Exp $ -->
+<!-- $Id: build.xml,v 1.389 2004/08/06 02:19:21 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -96,10 +96,7 @@
<path refid="jgroups.jgroups.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
- <path refid="jdom.classpath"/>
<path refid="javassist.classpath"/>
- <path refid="sun.jce.classpath"/>
- <path refid="sun.jsse.classpath"/>
<path refid="sun.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="trove.classpath"/>
|
|
From: Scott M S. <st...@us...> - 2004-08-07 15:29:56
|
User: starksm Date: 04/08/07 08:29:46 Modified: . build.xml Log: Keep the jars target depends and _jars-xxx targets in the same order so that comparison to other versions is easier Revision Changes Path 1.390 +7471 -7469jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- build.xml 6 Aug 2004 02:19:21 -0000 1.389 +++ build.xml 7 Aug 2004 15:29:45 -0000 1.390 @@ -1,7469 +1,7471 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent"> - <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> - <!ENTITY mqstress SYSTEM "mqstress.xml"> -]> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: build.xml,v 1.389 2004/08/06 02:19:21 starksm Exp $ --> - -<project default="main" name="JBoss/Testsuite"> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <!-- - | Include the common Buildmagic elements. - | - | This defines several different targets, properties and paths. - | It also sets up the basic extention tasks amoung other things. - --> - - &buildmagic; - - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> - - <target name="init" depends="_buildmagic:init"> - <tstamp> - <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> - </tstamp> - <echo message="${TIMENOW}" file="run.tstamp"/> - <echo message="Set timestamp to: ${TIMENOW}"/> - </target> - - - <property name="results_web" value="http://jboss.sourceforge.net//junit-results/32"/> - - <!-- ================================================================== --> - <!-- Configuration --> - <!-- ================================================================== --> - - <!-- - | Configure the build system. - | - | This target is invoked by the Buildmagic initialization logic and - | should contain module specific configuration elements. - --> - - <target name="configure" unless="configure.disable"> - <!-- Give user a chance to override without editing this file - (and without typing -D each time they run it) --> - <property file=".ant.properties"/> - - <!-- =================== --> - <!-- Basic Configuration --> - <!-- =================== --> - - <!-- Module name(s) & version --> - <property name="module.name" value="testsuite"/> - <property name="module.Name" value="JBoss Testsuite"/> - <property name="module.version" value="DEV"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - - &libraries; - <!-- The combined library classpath --> - <path id="library.classpath"> - <path refid="apache.avalon.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="oswego.concurrent.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="javassist.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="trove.classpath"/> - - <!-- needed for JBossMQ selector tests --> - <path refid="gnu.regexp.classpath"/> - - <!-- needed for proxy tests --> - <path refid="apache.bcel.classpath"/> - <!-- needed for security login module tests --> - <path refid="hsqldb.hsqldb.classpath"/> - - <!-- Need hibernate jar for hibernate-based tests --> - <path refid="hibernate2.classpath"/> - <path refid="odmg.classpath"/> - <path refid="cglib.classpath"/> - </path> - - <!-- ======= --> - <!-- Modules --> - <!-- ======= --> - &modules; - <!-- InternalServer --> - <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate - tests that need internal jboss classes from those that don't. When I put it in, only - the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> - <property name="jboss.internal-server.root" value="${project.root}/server/output"/> - <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> - <path id="jboss.internal-server.classpath"> - <pathelement path="${jboss.server.lib}/jboss.jar"/> - <pathelement path="${jboss.server.lib}/jboss-system.jar"/> - </path> - - <!-- The combined dependant module classpath --> - <path id="dependentmodule.classpath"> - <path refid="jboss.aop.classpath"/> - <path refid="jboss.aspects.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jboss.cluster.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.hibernate.classpath"/> - <path refid="jboss.iiop.classpath"/> - <path refid="jboss.internal-server.classpath"/> - <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jbossnet.classpath"/> - <path refid="jboss.jca.classpath"/> - <path refid="jboss.management.classpath"/> - <path refid="jboss.media.classpath"/> - <path refid="jboss.messaging.classpath"/> - <path refid="jboss.naming.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="jboss.security.classpath"/> - <path refid="jboss.server.classpath"/> - <path refid="jboss.system.classpath"/> - <path refid="jboss.transaction.classpath"/> - <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> - </path> - - <!-- ===== --> - <!-- Tasks --> - <!-- ===== --> - - <!-- Where source files live --> - <property name="source.java" value="${module.source}/main"/> - <property name="source.etc" value="${module.source}/etc"/> - <property name="source.docs" value="${module.source}/docs"/> - <property name="source.resources" value="${module.source}/resources"/> - <property name="source.stylesheets" value="${module.source}/stylesheets"/> - - <!-- Where build generated files will go --> - <property name="build.classes" value="${module.output}/classes"/> - <property name="build.lib" value="${module.output}/lib"/> - <property name="build.api" value="${module.output}/api"/> - <property name="build.etc" value="${module.output}/etc"/> - <property name="build.docs" value="${module.output}/docs"/> - <property name="build.resources" value="${module.output}/resources"/> - <property name="build.stylesheets" value="${module.output}/stylesheets"/> - <property name="build.reports" value="${module.output}/reports"/> - <property name="build.testlog" value="${module.output}/log"/> - - <!--xdoclet output directories--> - <property name="build.gen-src" value="${module.output}/gen-src/"/> - <!-- put ejb-jar.xml and other resources into build.resources--> - - <!-- Install/Release structure --> - <property name="install.id" value="${module.name}-${module.version}"/> - <property name="release.id" value="${install.id}"/> - <property name="install.root" value="${module.output}/${install.id}"/> - - <!-- The combined thirdparty classpath --> - <path id="thirdparty.classpath"> - <path refid="library.classpath"/> - <path refid="dependentmodule.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=""/> - - <!-- Classpath to build and run the tests --> - <path id="tests.classpath"> - <pathelement path="${classpath}"/> - <pathelement path="${local.classpath}"/> - <pathelement path="${project.tools}/lib/ant.jar"/> - <pathelement path="${project.tools}/lib/ant-junit.jar"/> - <path refid="jboss.jmx.classpath"/> - <path refid="thirdparty.classpath"/> - </path> - - <!-- The classpath required to build javadocs. --> - <path id="javadoc.classpath"> - <path refid="tests.classpath"/> - </path> - - <!-- Packages to include when generating api documentation --> - <property name="javadoc.packages" value="org.jboss.*"/> - - <!-- Override JUnit defaults --> - <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> - <property name="jbosstest.iterationcount" value="10"/> - <property name="jbosstest.threadcount" value="5"/> - <property name="jbosstest.beancount" value="5"/> - <property name="jbosstest.nodeploy" value="false"/> - <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> - <!-- Override JUnit Marathon defaults --> - <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> - <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> - <property name="marathon.threadcount" value="100"/> - <echo><![CDATA[ -junit.timeout: ${junit.timeout} -jbosstest.iterationcount: ${jbosstest.iterationcount} -jbosstest.threadcount: ${jbosstest.threadcount} -jbosstest.beancount: ${jbosstest.beancount} -marathon.timeout: ${marathon.timeout} -marathon.duration: ${marathon.duration} -marathon.threadcount: ${marathon.threadcount} - ]]></echo> - - <!-- xdoclet --> - <path id="xdoclet.task.classpath"> - <path refid="tests.classpath"/> - <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"/> - - <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> - - <!-- Setup the version 1 classes so the tests compile --> - <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> - <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" - file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" - overwrite="false"/> - <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> - <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" - file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" - overwrite="false"/> - - </target> - - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - <target name="compile" - depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources" - description="Compile all source files."/> - - <!-- Compile EJB beans with XDoclet --> - <target name="compile-bean-sources" depends="init" unless="noxdoclet"> - <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/> - - <mkdir dir="${build.gen-src}"/> - - <!--ejbconf--> - <mkdir dir="${build.resources}/ejb-conf/readonly/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/ejb-conf/readonly"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/ejbconf/readonly/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/ejbconf/readonly/META-INF" - mergedir="${source.resources}/ejbconf/readonly/" - Datasource="java:/DefaultDS" - Typemapping="Hypersonic SQL" - /> - </ejbdoclet> - - <!--eardeployment, SessionA--> - <mkdir dir="${build.resources}/jmx/eardeployment/a/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardeployment/a"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardeployment/a/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardeployment/a/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jmx/eardeployment/a/META-INF" - mergedir="${source.resources}/jmx/eardeployment/a/"/> - </ejbdoclet> - - <!--eardeployment, SessionB--> - <mkdir dir="${build.resources}/jmx/eardeployment/b/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardeployment/b"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardeployment/b/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardeployment/b/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jmx/eardeployment/b/META-INF" - mergedir="${source.resources}/jmx/eardeployment/b/"/> - </ejbdoclet> - - <!-- eardepends Dependent[A/B] --> - <mkdir dir="${build.resources}/jmx/eardepends/depend/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardepends/dependent/META-INF"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardepends/dependent/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <homeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardepends/dependent/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.2" - destdir="${build.resources}/jmx/eardepends/dependent/META-INF" - mergedir="${source.resources}/jmx/eardepends/dependent/META-INF"/> - </ejbdoclet> - - <!-- eardepends Independent --> - <mkdir dir="${build.resources}/jmx/eardepends/independent/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardepends/independent/META-INF"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardepends/independent/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <homeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardepends/independent/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.2" - destdir="${build.resources}/jmx/eardepends/independent/META-INF" - mergedir="${source.resources}/jmx/eardepends/independent/META-INF"/> - </ejbdoclet> - - <!-- cmr written after post create --> - <mkdir dir="${build.resources}/cmp2/cmr/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/cmr"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/cmr/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/cmr/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/cmp2/cmr/META-INF" - mergedir="${source.resources}/cmp2/cmr/" - Datasource="java:/DefaultDS" - Typemapping="Hypersonic SQL"/> - </ejbdoclet> - - <!-- cmp2 passivation integrity test --> - <mkdir dir="${build.resources}/cmp2/passivation/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/passivation"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/passivation/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/passivation/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/passivation/META-INF" - validatexml="${validatexml}" - mergedir="${source.resources}/cmp2/passivation"/> - </ejbdoclet> - - <!-- optimistic lock test --> - <mkdir dir="${build.resources}/cmp2/optimisticlock/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/optimisticlock"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/optimisticlock/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - </ejbdoclet> - - <!-- foreign key mapping tests --> - <mkdir dir="${build.resources}/cmp2/fkmapping/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/fkmapping"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/fkmapping/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/fkmapping/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/fkmapping/META-INF" - validatexml="${validatexml}"/> - </ejbdoclet> - - <!-- foreign key mapping stack overflow error tests --> - <mkdir dir="${build.resources}/cmp2/fkstackoverflow/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/fkstackoverflow"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/fkstackoverflow/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/fkstackoverflow/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/fkstackoverflow/META-INF" - validatexml="${validatexml}"/> - </ejbdoclet> - - <!-- dbindex and post-table-create tests --> - <mkdir dir="${build.resources}/cmp2/idxandusersql/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/idxandusersql"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/idxandusersql/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <!-- Don't build the DD, haswe have our own one - prepared. Can change in the future if the - jboss-xdoclet supports dbindex etc. - <deploymentdescriptor - destdir="${build.resources}/cmp2/idxandusersql/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/idxandusersql/META-INF" - validatexml="${validatexml}"/> - --> - </ejbdoclet> - - <!-- ejbselect tests --> - <mkdir dir="${build.resources}/cmp2/ejbselect/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/ejbselect"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/ejbselect/*Bean.java"/> - </fileset> - <localinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/ejbselect/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/ejbselect/META-INF" - validatexml="${validatexml}"/> - </ejbdoclet> - - <!-- cmp2 relationship stress tests --> - <mkdir dir="${build.resources}/cmp2/cmrstress/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/cmrstress"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/cmrstress/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <utilobject cacheHomes="true" includeGUID="false" kind="physical"/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/cmrstress/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/cmp2/cmrstress/META-INF" - datasource="java:/DefaultDS" - datasourceMapping="Hypersonic SQL" - /> - </ejbdoclet> - - <!-- cmp2 enum tests --> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/enum"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/enum/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <utilobject cacheHomes="true" includeGUID="false" kind="physical"/> - </ejbdoclet> - - <!--undeploy of broken packages--> - <mkdir dir="${build.resources}/jmx/undeploy/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <!--mergedir="${source.resources}/jmx/ejb"--> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/ejb/Entity*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/undeploy/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jmx/undeploy/META-INF" - mergedir="${source.resources}/jmx/undeploy/" - Datasource="java:/DefaultDS" - Typemapping="Hypersonic SQL" - /> - </ejbdoclet> - - <!--jca framework tests--> - <mkdir dir="${build.resources}/jca/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <!--mergedir="${source.resources}/jca/ejb"--> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jca/ejb/*Bean.java"/> - <exclude name="org/jboss/test/jca/ejb/Unshareable*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jca/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jca/META-INF" - mergedir="${source.resources}/jca/"/> - </ejbdoclet> - - <mkdir dir="${build.resources}/jca/bank/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <!--mergedir="${source.resources}/jca/ejb"--> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jca/bank/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jca/bank/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jca/bank/META-INF" - mergedir="${source.resources}/jca/bank/"/> - </ejbdoclet> - - <mkdir dir="${build.resources}/banknew/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <!--mergedir="${source.resources}/jca/ejb"--> - <fileset dir="${source.java}"> - <include name="org/jboss/test/banknew/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <entitycmp cmpspec="2.x"/> - <session/> - <remoteinterface/> - <!-- <localinterfac... [truncated message content] |
|
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>
|
|
From: Claudio V. <ca...@us...> - 2004-08-17 11:02:00
|
User: cazzius Date: 04/08/17 04:01:41 Modified: . build.xml Log: on tests-security-basic-unit, added sysproperties jbosstest.threadcount, jbosstest.threadcount and jbosstest.beancount fix newline Revision Changes Path 1.391 +7474 -7471jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- build.xml 7 Aug 2004 15:29:45 -0000 1.390 +++ build.xml 17 Aug 2004 11:01:39 -0000 1.391 @@ -1,7471 +1,7474 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent"> - <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> - <!ENTITY mqstress SYSTEM "mqstress.xml"> -]> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: build.xml,v 1.390 2004/08/07 15:29:45 starksm Exp $ --> - -<project default="main" name="JBoss/Testsuite"> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <!-- - | Include the common Buildmagic elements. - | - | This defines several different targets, properties and paths. - | It also sets up the basic extention tasks amoung other things. - --> - - &buildmagic; - - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - | Initialize the build system. Must depend on '_buildmagic:init'. - | Other targets should depend on 'init' or things will mysteriously fail. - --> - - <target name="init" depends="_buildmagic:init"> - <tstamp> - <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> - </tstamp> - <echo message="${TIMENOW}" file="run.tstamp"/> - <echo message="Set timestamp to: ${TIMENOW}"/> - </target> - - - <property name="results_web" value="http://jboss.sourceforge.net//junit-results/32"/> - - <!-- ================================================================== --> - <!-- Configuration --> - <!-- ================================================================== --> - - <!-- - | Configure the build system. - | - | This target is invoked by the Buildmagic initialization logic and - | should contain module specific configuration elements. - --> - - <target name="configure" unless="configure.disable"> - <!-- Give user a chance to override without editing this file - (and without typing -D each time they run it) --> - <property file=".ant.properties"/> - - <!-- =================== --> - <!-- Basic Configuration --> - <!-- =================== --> - - <!-- Module name(s) & version --> - <property name="module.name" value="testsuite"/> - <property name="module.Name" value="JBoss Testsuite"/> - <property name="module.version" value="DEV"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - - &libraries; - <!-- The combined library classpath --> - <path id="library.classpath"> - <path refid="apache.avalon.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="oswego.concurrent.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="javassist.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="trove.classpath"/> - - <!-- needed for JBossMQ selector tests --> - <path refid="gnu.regexp.classpath"/> - - <!-- needed for proxy tests --> - <path refid="apache.bcel.classpath"/> - <!-- needed for security login module tests --> - <path refid="hsqldb.hsqldb.classpath"/> - - <!-- Need hibernate jar for hibernate-based tests --> - <path refid="hibernate2.classpath"/> - <path refid="odmg.classpath"/> - <path refid="cglib.classpath"/> - </path> - - <!-- ======= --> - <!-- Modules --> - <!-- ======= --> - &modules; - <!-- InternalServer --> - <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate - tests that need internal jboss classes from those that don't. When I put it in, only - the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)--> - <property name="jboss.internal-server.root" value="${project.root}/server/output"/> - <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/> - <path id="jboss.internal-server.classpath"> - <pathelement path="${jboss.server.lib}/jboss.jar"/> - <pathelement path="${jboss.server.lib}/jboss-system.jar"/> - </path> - - <!-- The combined dependant module classpath --> - <path id="dependentmodule.classpath"> - <path refid="jboss.aop.classpath"/> - <path refid="jboss.aspects.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jboss.cluster.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.hibernate.classpath"/> - <path refid="jboss.iiop.classpath"/> - <path refid="jboss.internal-server.classpath"/> - <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jbossnet.classpath"/> - <path refid="jboss.jca.classpath"/> - <path refid="jboss.management.classpath"/> - <path refid="jboss.media.classpath"/> - <path refid="jboss.messaging.classpath"/> - <path refid="jboss.naming.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="jboss.security.classpath"/> - <path refid="jboss.server.classpath"/> - <path refid="jboss.system.classpath"/> - <path refid="jboss.transaction.classpath"/> - <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> - </path> - - <!-- ===== --> - <!-- Tasks --> - <!-- ===== --> - - <!-- Where source files live --> - <property name="source.java" value="${module.source}/main"/> - <property name="source.etc" value="${module.source}/etc"/> - <property name="source.docs" value="${module.source}/docs"/> - <property name="source.resources" value="${module.source}/resources"/> - <property name="source.stylesheets" value="${module.source}/stylesheets"/> - - <!-- Where build generated files will go --> - <property name="build.classes" value="${module.output}/classes"/> - <property name="build.lib" value="${module.output}/lib"/> - <property name="build.api" value="${module.output}/api"/> - <property name="build.etc" value="${module.output}/etc"/> - <property name="build.docs" value="${module.output}/docs"/> - <property name="build.resources" value="${module.output}/resources"/> - <property name="build.stylesheets" value="${module.output}/stylesheets"/> - <property name="build.reports" value="${module.output}/reports"/> - <property name="build.testlog" value="${module.output}/log"/> - - <!--xdoclet output directories--> - <property name="build.gen-src" value="${module.output}/gen-src/"/> - <!-- put ejb-jar.xml and other resources into build.resources--> - - <!-- Install/Release structure --> - <property name="install.id" value="${module.name}-${module.version}"/> - <property name="release.id" value="${install.id}"/> - <property name="install.root" value="${module.output}/${install.id}"/> - - <!-- The combined thirdparty classpath --> - <path id="thirdparty.classpath"> - <path refid="library.classpath"/> - <path refid="dependentmodule.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=""/> - - <!-- Classpath to build and run the tests --> - <path id="tests.classpath"> - <pathelement path="${classpath}"/> - <pathelement path="${local.classpath}"/> - <pathelement path="${project.tools}/lib/ant.jar"/> - <pathelement path="${project.tools}/lib/ant-junit.jar"/> - <path refid="jboss.jmx.classpath"/> - <path refid="thirdparty.classpath"/> - </path> - - <!-- The classpath required to build javadocs. --> - <path id="javadoc.classpath"> - <path refid="tests.classpath"/> - </path> - - <!-- Packages to include when generating api documentation --> - <property name="javadoc.packages" value="org.jboss.*"/> - - <!-- Override JUnit defaults --> - <property name="junit.timeout" value="180000"/> <!-- 3 minutes --> - <property name="jbosstest.iterationcount" value="10"/> - <property name="jbosstest.threadcount" value="5"/> - <property name="jbosstest.beancount" value="5"/> - <property name="jbosstest.nodeploy" value="false"/> - <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> - <!-- Override JUnit Marathon defaults --> - <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> - <property name="marathon.duration" value="3600000"/> <!-- 60 minutes --> - <property name="marathon.threadcount" value="100"/> - <echo><![CDATA[ -junit.timeout: ${junit.timeout} -jbosstest.iterationcount: ${jbosstest.iterationcount} -jbosstest.threadcount: ${jbosstest.threadcount} -jbosstest.beancount: ${jbosstest.beancount} -marathon.timeout: ${marathon.timeout} -marathon.duration: ${marathon.duration} -marathon.threadcount: ${marathon.threadcount} - ]]></echo> - - <!-- xdoclet --> - <path id="xdoclet.task.classpath"> - <path refid="tests.classpath"/> - <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"/> - - <property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/> - - <!-- Setup the version 1 classes so the tests compile --> - <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/> - <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java" - file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt" - overwrite="false"/> - <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/> - <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java" - file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" - overwrite="false"/> - - </target> - - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - <target name="compile" - depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources" - description="Compile all source files."/> - - <!-- Compile EJB beans with XDoclet --> - <target name="compile-bean-sources" depends="init" unless="noxdoclet"> - <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/> - - <mkdir dir="${build.gen-src}"/> - - <!--ejbconf--> - <mkdir dir="${build.resources}/ejb-conf/readonly/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/ejb-conf/readonly"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/ejbconf/readonly/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/ejbconf/readonly/META-INF" - mergedir="${source.resources}/ejbconf/readonly/" - Datasource="java:/DefaultDS" - Typemapping="Hypersonic SQL" - /> - </ejbdoclet> - - <!--eardeployment, SessionA--> - <mkdir dir="${build.resources}/jmx/eardeployment/a/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardeployment/a"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardeployment/a/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardeployment/a/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jmx/eardeployment/a/META-INF" - mergedir="${source.resources}/jmx/eardeployment/a/"/> - </ejbdoclet> - - <!--eardeployment, SessionB--> - <mkdir dir="${build.resources}/jmx/eardeployment/b/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardeployment/b"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardeployment/b/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardeployment/b/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jmx/eardeployment/b/META-INF" - mergedir="${source.resources}/jmx/eardeployment/b/"/> - </ejbdoclet> - - <!-- eardepends Dependent[A/B] --> - <mkdir dir="${build.resources}/jmx/eardepends/depend/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardepends/dependent/META-INF"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardepends/dependent/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <homeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardepends/dependent/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.2" - destdir="${build.resources}/jmx/eardepends/dependent/META-INF" - mergedir="${source.resources}/jmx/eardepends/dependent/META-INF"/> - </ejbdoclet> - - <!-- eardepends Independent --> - <mkdir dir="${build.resources}/jmx/eardepends/independent/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/eardepends/independent/META-INF"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/eardepends/independent/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <homeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/eardepends/independent/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.2" - destdir="${build.resources}/jmx/eardepends/independent/META-INF" - mergedir="${source.resources}/jmx/eardepends/independent/META-INF"/> - </ejbdoclet> - - <!-- cmr written after post create --> - <mkdir dir="${build.resources}/cmp2/cmr/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/cmr"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/cmr/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/cmr/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/cmp2/cmr/META-INF" - mergedir="${source.resources}/cmp2/cmr/" - Datasource="java:/DefaultDS" - Typemapping="Hypersonic SQL"/> - </ejbdoclet> - - <!-- cmp2 passivation integrity test --> - <mkdir dir="${build.resources}/cmp2/passivation/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/passivation"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/passivation/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/passivation/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/passivation/META-INF" - validatexml="${validatexml}" - mergedir="${source.resources}/cmp2/passivation"/> - </ejbdoclet> - - <!-- optimistic lock test --> - <mkdir dir="${build.resources}/cmp2/optimisticlock/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/optimisticlock"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/optimisticlock/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - </ejbdoclet> - - <!-- foreign key mapping tests --> - <mkdir dir="${build.resources}/cmp2/fkmapping/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/fkmapping"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/fkmapping/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/fkmapping/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/fkmapping/META-INF" - validatexml="${validatexml}"/> - </ejbdoclet> - - <!-- foreign key mapping stack overflow error tests --> - <mkdir dir="${build.resources}/cmp2/fkstackoverflow/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/fkstackoverflow"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/fkstackoverflow/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/fkstackoverflow/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/fkstackoverflow/META-INF" - validatexml="${validatexml}"/> - </ejbdoclet> - - <!-- dbindex and post-table-create tests --> - <mkdir dir="${build.resources}/cmp2/idxandusersql/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/idxandusersql"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/idxandusersql/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <!-- Don't build the DD, haswe have our own one - prepared. Can change in the future if the - jboss-xdoclet supports dbindex etc. - <deploymentdescriptor - destdir="${build.resources}/cmp2/idxandusersql/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/idxandusersql/META-INF" - validatexml="${validatexml}"/> - --> - </ejbdoclet> - - <!-- ejbselect tests --> - <mkdir dir="${build.resources}/cmp2/ejbselect/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.etc}/cmp2/ejbselect"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/ejbselect/*Bean.java"/> - </fileset> - <localinterface/> - <localhomeinterface/> - <entitypk/> - <utilobject cacheHomes="true" includeGUID="false"/> - <entitycmp/> - <session/> - <deploymentdescriptor - destdir="${build.resources}/cmp2/ejbselect/META-INF" - validatexml="${validatexml}"/> - <jboss - version="3.2" - xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/ejbselect/META-INF" - validatexml="${validatexml}"/> - </ejbdoclet> - - <!-- cmp2 relationship stress tests --> - <mkdir dir="${build.resources}/cmp2/cmrstress/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/cmrstress"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/cmrstress/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <utilobject cacheHomes="true" includeGUID="false" kind="physical"/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/cmp2/cmrstress/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/cmp2/cmrstress/META-INF" - datasource="java:/DefaultDS" - datasourceMapping="Hypersonic SQL" - /> - </ejbdoclet> - - <!-- cmp2 enum tests --> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author" - mergedir="${source.resources}/cmp2/enum"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/cmp2/enum/ejb/*Bean.java"/> - </fileset> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <utilobject cacheHomes="true" includeGUID="false" kind="physical"/> - </ejbdoclet> - - <!--undeploy of broken packages--> - <mkdir dir="${build.resources}/jmx/undeploy/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <!--mergedir="${source.resources}/jmx/ejb"--> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jmx/ejb/Entity*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jmx/undeploy/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jmx/undeploy/META-INF" - mergedir="${source.resources}/jmx/undeploy/" - Datasource="java:/DefaultDS" - Typemapping="Hypersonic SQL" - /> - </ejbdoclet> - - <!--jca framework tests--> - <mkdir dir="${build.resources}/jca/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <!--mergedir="${source.resources}/jca/ejb"--> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jca/ejb/*Bean.java"/> - <exclude name="org/jboss/test/jca/ejb/Unshareable*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jca/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jca/META-INF" - mergedir="${source.resources}/jca/"/> - </ejbdoclet> - - <mkdir dir="${build.resources}/jca/bank/META-INF"/> - <ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <!--mergedir="${source.resources}/jca/ejb"--> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jca/bank/ejb/*Bean.java"/> - </fileset> - <packageSubstitution packages="ejb" substituteWith="interfaces"/> - <remoteinterface/> - <localinterface/> - <homeinterface/> - <localhomeinterface/> - <!--session/--> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jca/bank/META-INF"/> - <jboss xmlencoding=... [truncated message content] |
|
From: Adrian B. <ej...@us...> - 2004-08-17 12:44:10
|
User: ejort
Date: 04/08/17 05:39:32
Modified: . build.xml
Log:
Add tests for message driven beans using jms message inflow.
Revision Changes Path
1.392 +33 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- build.xml 17 Aug 2004 11:01:39 -0000 1.391
+++ build.xml 17 Aug 2004 12:39:25 -0000 1.392
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.391 2004/08/17 11:01:39 cazzius Exp $ -->
+<!-- $Id: build.xml,v 1.392 2004/08/17 12:39:25 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1453,6 +1453,7 @@
_jars-marathon,
_jars-mdb,
_jars-media,
+ _jars-messagedriven,
_jars-naming,
_jars-perf,
_jars-pooled,
@@ -4394,6 +4395,37 @@
</jar>
</target>
+ <!-- messagedriven test -->
+ <target name="_jars-messagedriven">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build mdbqueuexa.jar -->
+ <jar jarfile="${build.lib}/mdbqueuexa.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/messagedriven/beans/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/messagedriven/queuexa">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="${build.resources}/messagedriven">
+ <include name="jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build mdbtopicxa.jar -->
+ <jar jarfile="${build.lib}/mdbtopicxa.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/messagedriven/beans/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/messagedriven/topicxa">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="${build.resources}/messagedriven">
+ <include name="jboss-service.xml"/>
+ </fileset>
+ </jar>
+ </target>
+
<!-- JBoss Media tests -->
<target name="_jars-media">
<mkdir dir="${build.lib}"/>
|
|
From: Thomas D. <tdi...@us...> - 2004-08-20 22:00:34
|
User: tdiesler
Date: 04/08/20 15:00:27
Modified: . build.xml
Log:
Add jaxrpc classpath
Revision Changes Path
1.393 +2 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- build.xml 17 Aug 2004 12:39:25 -0000 1.392
+++ build.xml 20 Aug 2004 22:00:25 -0000 1.393
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.392 2004/08/17 12:39:25 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.393 2004/08/20 22:00:25 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -141,6 +141,7 @@
<path refid="jboss.iiop.classpath"/>
<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.management.classpath"/>
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X