Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
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>
|
