[jbossws-commits] JBossWS SVN: r3547 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb and 3 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Tue Jun 12 06:58:54 EDT 2007


Author: heiko.braun at jboss.com
Date: 2007-06-12 06:58:54 -0400 (Tue, 12 Jun 2007)
New Revision: 3547

Removed:
   trunk/jbossws-core/ant-import-tests/build-interop.xml
Modified:
   trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
   trunk/jbossws-core/ant-import-tests/build-testsuite.xml
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java
   trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
Log:
revamp interop endpoints

Deleted: trunk/jbossws-core/ant-import-tests/build-interop.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-interop.xml	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/ant-import-tests/build-interop.xml	2007-06-12 10:58:54 UTC (rev 3547)
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!--  JBoss, the OpenSource J2EE webOS                            -->
-<!--  Distributable under LGPL license.                           -->
-<!--  See terms of license at http://www.gnu.org.                 -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project name="JBossWS-Interop" default="interop.build" basedir="../">
-
-   <import file="../build.xml"/>
-
-   <property name="jwsdp.home" value="C:/dev/env/jwsdp-1.6"/>
-   <property name="wsdl.update.marker" value="${test.resources.dir}/interop/wsdl.update"/>
-   <property name="jbossws.client.jar" value="jbossws-client.jar"/>
-
-   <property name="test.java.dir" value="src/main/java"/>
-   <property name="test.resources.dir" value="src/main/resources"/>
-   <property name="build.tests.dir" value="output"/>
-   <property name="build.test.dir" value="output"/>
-
-   <path id="jwsdp.classpath">
-      <!--fileset dir="${jwsdp.home}/jaxrpc/lib"/>
-      <fileset dir="${jwsdp.home}/jwsdp-shared/lib">
-         <include name="activation.jar"/>
-         <include name="mail.jar"/>
-         <include name="jax-qname.jar"/>
-      </fileset>
-      <fileset dir="${jwsdp.home}/saaj/lib"/>
-      <fileset dir="${jwsdp.home}/jaxp/lib"/-->
-   </path>
-
-   <path id="wscompile.tools.classpath">
-      <fileset dir="${env.JAVA_HOME}/lib">
-         <include name="*.jar"/>
-      </fileset>
-   </path>
-
-   <path id="build.classpath">
-      <path refid="javac.classpath"/>
-   </path>
-
-   <!--taskdef name="wscompile" classname="com.sun.xml.rpc.tools.ant.Wscompile">
-      <classpath refid="jwsdp.classpath"/>
-   </taskdef>
-
-   <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
-      <classpath refid="javac.classpath"/>
-      <classpath path="${build.test.dir}/classes"/>
-   </taskdef-->
-
-   <!--
-      BUILD MACROS
-   -->
-
-   <macrodef name="create-client">
-
-      <attribute name="company"/>
-      <attribute name="module"/>
-      <attribute name="features"/>
-      <attribute name="config" default="config.xml"/>
-      <attribute name="verbose" default="false"/>
-
-      <sequential>
-
-         <echo>Generating interop/@{company}/@{module}</echo>
-
-         <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/META-INF"/>
-
-         <wscompile
-             keep="true"
-             client="true"
-             base="${build.test.dir}/classes"
-             sourceBase="${test.java.dir}"
-             nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
-             mapping="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/jaxrpc-mapping.xml"
-             features="@{features}"
-             xPrintStackTrace="true"
-             fork="true"
-             verbose="@{verbose}"
-             debug="true"
-             config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
-
-            <classpath>
-               <path refid="wscompile.tools.classpath"/>
-               <path refid="jwsdp.classpath"/>
-               <path refid="build.classpath"/>
-            </classpath>
-         </wscompile>
-      </sequential>
-   </macrodef>
-
-   <macrodef name="create-server">
-
-      <attribute name="company"/>
-      <attribute name="module"/>
-      <attribute name="features"/>
-      <attribute name="config" default="config.xml"/>
-      <attribute name="verbose" default="false"/>
-
-      <attribute name="import" default="true"/>
-      <attribute name="server" default="false"/>
-
-      <sequential>
-
-         <echo>Generating interop/@{company}/@{module}</echo>
-
-         <wscompile
-             keep="true"
-             import="@{import}"
-             server="@{server}"
-             base="${build.test.dir}/classes"
-             sourceBase="${test.java.dir}"
-             nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
-             mapping="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/jaxrpc-mapping.xml"
-             features="@{features}"
-             xPrintStackTrace="true"
-             fork="true"
-             verbose="@{verbose}"
-             debug="true"
-             config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
-
-            <classpath>
-               <path refid="wscompile.tools.classpath"/>
-               <path refid="jwsdp.classpath"/>
-               <path refid="build.classpath"/>
-            </classpath>
-         </wscompile>
-
-      </sequential>
-   </macrodef>
-
-   <macrodef name="fetch-wsdl">
-      <attribute name="company"/>
-      <attribute name="module"/>
-      <attribute name="source"/>
-      <attribute name="localName" default="service.wsdl"/>
-
-      <sequential>
-
-         <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF"/>
-         <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl"/>
-
-         <get src="@{source}"
-              dest="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl/@{localName}"
-              verbose="true"
-              usetimestamp="true"/>
-      </sequential>
-   </macrodef>
-
-   <!--
-      CLIENT AND ENDPOINT GENERATION
-   -->
-   <target name="interop.prepare">
-      <mkdir dir="${build.test.dir}/libs/"/>
-      <mkdir dir="${build.test.dir}/classes/"/>
-      <mkdir dir="${build.test.dir}/reports/"/>
-
-      <uptodate property="create.required" targetfile="${wsdl.update.marker}" >
-         <srcfiles dir= "${test.resources.dir}/interop" includes="**/WEB-INF/jaxrpc-mapping.xml"/>
-      </uptodate>
-   </target>
-
-   <target name="sync-wsdl-files" description="sync the local WSDL copies">
-      <fetch-wsdl
-          source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesDocLitB.svc?wsdl"
-          module="soapwsdl/BaseDataTypesDocLitB"
-          company="microsoft"/>
-
-      <fetch-wsdl
-          source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesDocLitW.svc?wsdl"
-          module="soapwsdl/BaseDataTypesDocLitW"
-          company="microsoft"/>
-
-      <fetch-wsdl
-          source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesRpcLit.svc?wsdl"
-          module="soapwsdl/BaseDataTypesRPCLit"
-          company="microsoft"/>
-
-      <fetch-wsdl
-          source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesDocLitB.svc?wsdl"
-          module="soapwsdl/ComplexDataTypesDocLitB"
-          company="microsoft"/>
-
-      <fetch-wsdl
-          source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesDocLitW.svc?wsdl"
-          module="soapwsdl/ComplexDataTypesDocLitW"
-          company="microsoft"/>
-
-      <fetch-wsdl
-          source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesRpcLit.svc?wsdl"
-          module="soapwsdl/ComplexDataTypesRpcLit"
-          company="microsoft"/>
-
-      <!--  OneWay.svc -->
-      <fetch-wsdl source="http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc?wsdl"
-                  module="addressing/wsa10"
-                  company="microsoft"/>
-
-      <!-- touch the wsdl.update marker -->
-      <touch file="${wsdl.update.marker}"/>
-
-   </target>
-
-   <target name="create-all" depends="interop.prepare, create-client, create-server, create-not-required"/>
-
-   <target name="create-not-required" unless="create.required">
-      <echo>Local WSDL copies seem to be uptodate. No build required.</echo>
-   </target>
-
-   <target name="re-create-all">
-      <property name="create.required" value="true"/>
-      <antcall target="create-all"/>
-   </target>
-
-   <target name="create-client" if="create.required" description="create the client side artifacts">
-
-      <!--create-client
-            company="microsoft" module="soapwsdl/BaseDataTypesDocLitB"
-            features="documentliteral,wsi"/>
-
-      <create-client
-            company="microsoft" module="soapwsdl/BaseDataTypesDocLitW"
-            features="documentliteral,wsi,unwrap"/>
-
-      <create-client
-            company="microsoft" module="soapwsdl/BaseDataTypesRPCLit"
-            features="rpcliteral,wsi"/>
-
-      <create-client
-            company="microsoft" module="soapwsdl/ComplexDataTypesDocLitB"
-            features="documentliteral,wsi"/>
-
-      <create-client
-            company="microsoft" module="soapwsdl/ComplexDataTypesDocLitW"
-            features="documentliteral,wsi,unwrap"/>
-
-      <create-client
-            company="microsoft" module="soapwsdl/ComplexDataTypesRpcLit"
-            features="rpcliteral,wsi"/-->
-
-   </target>
-
-   <target name="create-server" description="create the server side artifacts">
-
-      <!--create-server
-            features="documentliteral,wsi"
-            module="addressing/wsaTestService"
-            company="microsoft" verbose="false"/>
-
-      <create-server
-            features="documentliteral,wsi"
-            module="soapwsdl/BaseDataTypesDocLitB_Service"
-            company="microsoft" verbose="false"/>
-
-      <create-server
-            features="documentliteral,wsi,unwrap"
-            module="soapwsdl/BaseDataTypesDocLitW_Service"
-            company="microsoft" verbose="false"
-            import="false" server="true"/>
-
-       <create-server
-            features="rpcliteral,wsi"
-            module="soapwsdl/BaseDataTypesRpcLit_Service"
-            company="microsoft" verbose="false"
-            import="false" server="true"/-->
-
-   </target>
-
-   <target name="create-addressing" description="create the addressing artifcats">
-       <!--create-client
-            company="microsoft" module="addressing/sep06/wsa10"
-            features="documentliteral,wsi,useonewayoperations,unwrap,novalidation"
-            verbose="false"/-->
-       <wstools dest="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/WEB-INF"
-               config="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/wstools-config.xml"/>
-   </target>
-
-   <target name="create-security">
-      <!--create-client
-          company="microsoft" module="security/wsse10"
-          features="documentliteral,wsi,useonewayoperations"
-          verbose="false"/>
-
-      <create-client
-          company="microsoft" module="security/wsse10Encrypt"
-          features="documentliteral,wsi,useonewayoperations"
-          verbose="false"/-->
-
-      <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/WEB-INF"
-               config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/wstools-config.xml"/>
-
-      <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF"
-               config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/wstools-config.xml"/>
-
-   </target>
-
-   <target name="create-mtom">
-      <!--create-server
-            features="documentliteral,wsi"
-            module="mtom/utf8"
-            company="microsoft" verbose="false"
-            import="false" server="true"/-->
-
-   </target>
-   <!--
-      COMMON BUILD TARGETS
-   -->
-
-   <target name="interop.build" depends="interop.prepare, copy-resources, interop.compile"
-           description="Compiles and builds the interop clients and endpoints">
-      <ant antfile="ant-import/build-interop-jars.xml" target="build-interop-jars"/>
-   </target>
-
-   <target name="interop.compile" depends="interop.prepare, init" description="Compiles the interop clients and endpoints">
-      <mkdir dir="${build.test.dir}/classes"/>
-      <javac srcdir="${test.java.dir}" destdir="${build.test.dir}/classes"
-             classpathref="build.classpath"
-             source="1.5"
-             nowarn="off"
-             debug="on"
-             fork="yes">
-         <classpath refid="jwsdp.classpath"/>
-         <classpath refid="javac.classpath"/>
-         <include name="org/jboss/test/ws/interop/**/*"/>
-      </javac>
-   </target>
-
-   <target name="interop.deploy" depends="interop.prepare" description="Deploy the test endpoints locally">
-      <antcall target="deploy-root"/>
-      <antcall target="deploy-soapwsdl"/>
-      <antcall target="deploy-addressing"/>
-      <antcall target="deploy-security"/>
-      <antcall target="deploy-mtom"/>
-   </target>
-
-   <target name="deploy-root">
-      <copy todir="${jboss.home}/server/default/deploy/">
-         <fileset dir="${build.test.dir}/libs">
-            <include name="*interop-root.war"/>
-         </fileset>
-      </copy>
-   </target>
-
-   <target name="deploy-soapwsdl">
-      <copy todir="${jboss.home}/server/default/deploy/">
-         <fileset dir="${build.test.dir}/libs">
-            <include name="*interop*_Service.war"/>
-         </fileset>
-      </copy>
-   </target>
-
-   <target name="deploy-addressing">
-      <copy todir="${jboss.home}/server/default/deploy/">
-         <fileset dir="${build.test.dir}/libs">
-            <include name="*interop-wsa10*.war"/>
-         </fileset>
-      </copy>
-   </target>
-
-   <target name="deploy-security">
-      <copy todir="${jboss.home}/server/default/deploy/">
-         <fileset dir="${build.test.dir}/libs">
-            <include name="*interop-wsse*.war"/>
-         </fileset>
-      </copy>
-   </target>
-
-   <target name="deploy-mtom">
-      <copy todir="${jboss.home}/server/default/deploy/">
-         <fileset dir="${build.test.dir}/libs">
-            <include name="*interop-mtom*.war"/>
-         </fileset>
-      </copy>
-   </target>
-
-   <target name="interop.undeploy" description="Undeploy the local test endpoints">
-      <delete>
-         <fileset dir="${jboss.home}/server/default/deploy/">
-            <include name="*interop*.war"/>
-         </fileset>
-      </delete>
-   </target>
-
-   <target name="interop.clean" description="Clean local build artifacts">
-      <delete>
-         <fileset dir="${build.test.dir}/classes">
-            <include name="**/interop/**/*"/>
-         </fileset>
-      </delete>
-
-      <delete>
-         <fileset dir="${build.test.dir}/libs">
-            <include name="*interop*"/>
-         </fileset>
-      </delete>
-   </target>
-
-</project>

Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-12 10:58:54 UTC (rev 3547)
@@ -10,430 +10,550 @@
 
 <project>
 
-  <description>JBossWS test archive builder</description>
+	<description>JBossWS test archive builder</description>
 
-  <!-- ================================================================== -->
-  <!-- Building                                                           -->
-  <!-- ================================================================== -->
+	<!-- ================================================================== -->
+	<!-- Building                                                           -->
+	<!-- ================================================================== -->
 
-  <target name="build-jars-jaxws" description="Build the deployments.">
+	<target name="build-jars-jaxws" description="Build the deployments.">
 
-    <mkdir dir="${tests.output.dir}/libs"/>
+		<mkdir dir="${tests.output.dir}/libs"/>
 
-    <!-- jaxws-anonymous -->
-    <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/>
-        <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/>
-        <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/>
-        <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-anonymous -->
+		<war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/>
+				<include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/>
+				<include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/>
+				<include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-benchmark-doclit -->
-    <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
-        <include name="wsdl/**"/>
-      </webinf>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
-        <include name="handlers.xml"/>
-      </webinf>
-    </war>
+		<!-- jaxws-benchmark-doclit -->
+		<war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
+				<include name="wsdl/**"/>
+			</webinf>
+			<webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
+				<include name="handlers.xml"/>
+			</webinf>
+		</war>
 
-    <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
-        <include name="wsdl/**"/>
-      </webinf>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
-        <include name="handlers.xml"/>
-        <include name="sun-jaxws.xml"/>
-      </webinf>
-    </war>
+		<war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
+				<include name="wsdl/**"/>
+			</webinf>
+			<webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
+				<include name="handlers.xml"/>
+				<include name="sun-jaxws.xml"/>
+			</webinf>
+		</war>
 
-    <!-- jaxws-binding -->
-    <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-binding -->
+		<war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/>
+				<include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-complex -->
-    <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/complex/*.class"/>
-        <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/>
-        <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/>
-        <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-complex -->
+		<war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/complex/*.class"/>
+				<include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/>
+				<include name="org/jboss/test/ws/jaxws/complex/types/*.class"/>
+				<exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-endpoint-servlet -->
-    <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/>
-        <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
-        <include name="wsdl/**"/>
-      </webinf>
-    </war>
+		<!-- jaxws-endpoint-servlet -->
+		<war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/>
+				<include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/>
+				<include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF">
+				<include name="wsdl/**"/>
+			</webinf>
+		</war>
 
-    <!-- jaxws-handlerlifecycle -->
-    <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF">
-        <include name="jaxws-endpoint-config.xml"/>
-      </webinf>
-    </war>
+		<!-- jaxws-handlerlifecycle -->
+		<war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF">
+				<include name="jaxws-endpoint-config.xml"/>
+			</webinf>
+		</war>
 
-     <jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar">
-     <metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF">
-        <include name="*.xml"/>
-     </metainf>
-     </jar>
+		<jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar">
+			<metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF">
+				<include name="*.xml"/>
+			</metainf>
+		</jar>
 
-     <!-- jaxws-handlerscope -->
-    <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/>
-        <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/>
-      </classes>
-    </war>
+		<!-- jaxws-handlerscope -->
+		<war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/>
+				<include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-jbws860 -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
-        <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
-        <include name="jboss-web.xml"/>
-      </webinf>
-    </war>
+		<!-- jaxws-jbws860 -->
+		<war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
+				<exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+		</war>
 
-    <!-- jaxws-jbws871 -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
-      </classes>
-    </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="jaxrpc-mapping.xml"/>
-        <include name="wsdl/**"/>
-      </metainf>
-    </jar>
+		<!-- jaxws-jbws871 -->
+		<war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
+			</classes>
+		</war>
+		<jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="jaxrpc-mapping.xml"/>
+				<include name="wsdl/**"/>
+			</metainf>
+		</jar>
 
-    <!-- jaxws-jbws944 -->
-    <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/>
-      </fileset>
-    </jar>
+		<!-- jaxws-jbws944 -->
+		<jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/>
+			</fileset>
+		</jar>
 
-    <!-- jaxws-jbws981 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
-      </fileset>
-    </jar>
+		<!-- jaxws-jbws981 -->
+		<jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
+			</fileset>
+		</jar>
 
-    <!-- jaxws-jbws1178 -->
-    <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-jbws1178 -->
+		<war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-jbws1190 -->
-    <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-jbws1190 -->
+		<war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-jbws1357 -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
-      </classes>
-      <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357">
-        <include name="hello.jsp"/>
-      </fileset>
-    </war>
+		<!-- jaxws-jbws1357 -->
+		<war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/>
+			</classes>
+			<fileset dir="${tests.output.dir}/resources/jaxws/jbws1357">
+				<include name="hello.jsp"/>
+			</fileset>
+		</war>
 
-    <!-- jaxws-jbws1529 -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-jbws1529 -->
+		<war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/>
+			</classes>
+		</war>
 
-	  <!-- jaxws-jbws1566-->
-	  <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
-		  <fileset dir="${tests.output.dir}/classes">
-			  <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
-		  </fileset>		 
-	  </jar>
+		<!-- jaxws-jbws1566-->
+		<jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
+			</fileset>
+		</jar>
 
-	 <!-- jaxws-jbws1581 -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF">
-        <include name="jboss-web.xml"/>
-      </webinf>
-    </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear">
-      <fileset dir="${tests.output.dir}/libs">
-        <include name="jaxws-jbws1581.war"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
-        <include name="application.xml"/>
-        <include name="jboss-app.xml"/>
-      </metainf>
-    </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
-        <include name="wsdl/**"/>
-      </metainf>
-    </jar>
+		<!-- jaxws-jbws1581 -->
+		<war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+		</war>
+		<jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear">
+			<fileset dir="${tests.output.dir}/libs">
+				<include name="jaxws-jbws1581.war"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
+				<include name="application.xml"/>
+				<include name="jboss-app.xml"/>
+			</metainf>
+		</jar>
+		<jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/>
+				<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
+				<include name="wsdl/**"/>
+			</metainf>
+		</jar>
 
-	  <!-- jaxws-jbws1283 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>        
-      </fileset>
-    </jar>
+		<!-- jaxws-jbws1283 -->
+		<jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>
+			</fileset>
+		</jar>
 
-	  <!-- jaxws-jbws1422 -->
-	  <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
-		  <fileset dir="${tests.output.dir}/classes">
-			  <include name="org/jboss/test/ws/jaxws/jbws1422/*.*"/>
-		  </fileset>
-	  </jar>
-	  
-	  <!-- jaxws-jbws1505 -->
-	  <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar">
-		 <fileset dir="${tests.output.dir}/classes">
-			<include name="org/jboss/test/ws/jaxws/jbws1505/*.*"/>
-		</fileset>
-	 </jar>
+		<!-- jaxws-jbws1422 -->
+		<jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1422/*.*"/>
+			</fileset>
+		</jar>
 
-	 <!-- jaxws namespace -->
-    <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF">
-        <include name="jboss-web.xml"/>
-      </webinf>
-    </war>
+		<!-- jaxws-jbws1505 -->
+		<jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/jbws1505/*.*"/>
+			</fileset>
+		</jar>
 
-    <!-- jaxws-serviceref -->
-    <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/>
-      </classes>
-    </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/serviceref/ApplicationClient.class"/>
-        <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
-        <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="wsdl/**"/>
-      </metainf>
-    </jar>
-    <war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/serviceref/ServletClient.class"/>
-        <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
-        <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
-        <include name="wsdl/**"/>
-      </webinf>
-       <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF">
-        <include name="jboss-web.xml"/>
-      </webinf>
-    </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/serviceref/EJBClient.class"/>
-        <include name="org/jboss/test/ws/jaxws/serviceref/EJBRemote.class"/>
-        <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
-        <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
-        <include name="ejb-jar.xml"/>
-        <include name="jboss.xml"/>
-        <include name="wsdl/**"/>
-      </metainf>
-    </jar>
-    
-    <!-- jaxws-wrapped-accessor -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
-        <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
-        <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
-      </classes>
-    </war>
+		<!-- jaxws namespace -->
+		<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
+				<include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+		</war>
 
-    <!-- jaxws-holder -->
-    <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-serviceref -->
+		<war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/>
+			</classes>
+		</war>
+		<jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/serviceref/ApplicationClient.class"/>
+				<include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
+				<include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="wsdl/**"/>
+			</metainf>
+		</jar>
+		<war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/serviceref/ServletClient.class"/>
+				<include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
+				<include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
+				<include name="wsdl/**"/>
+			</webinf>
+			<webinf dir="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+		</war>
+		<jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/serviceref/EJBClient.class"/>
+				<include name="org/jboss/test/ws/jaxws/serviceref/EJBRemote.class"/>
+				<include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/>
+				<include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF">
+				<include name="ejb-jar.xml"/>
+				<include name="jboss.xml"/>
+				<include name="wsdl/**"/>
+			</metainf>
+		</jar>
 
-    <!-- jaxws-wsdd -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wsdd.war"
-         webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsdd/*.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF">
-        <include name="webservices.xml"/>
-      </webinf>
-    </war>
+		<!-- jaxws-wrapped-accessor -->
+		<war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
+				<include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
+				<include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-wsaddressing-action -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
-        <include name="wsdl/**"/>
-      </webinf>
-    </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="jbossws-client-config.xml"/>
-        <include name="jaxrpc-mapping.xml"/>
-        <include name="wsdl/**"/>
-      </metainf>
-    </jar>
+		<!-- jaxws-holder -->
+		<war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/>
+			</classes>
+		</war>
 
-    <!-- jaxws-wsaddressing-replyto -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
-      </classes>
-    </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="jaxws-jbossws-client-config.xml"/>
-        <include name="jaxrpc-mapping.xml"/>
-      </metainf>
-    </jar>
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
-      </classes>
-    </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
-      </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="jbossws-client-config.xml"/>
-        <include name="jaxrpc-mapping.xml"/>
-      </metainf>
-    </jar>
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
-        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
-      </classes>
-    </war>
+		<!-- jaxws-wsdd -->
+		<war warfile="${tests.output.dir}/libs/jaxws-wsdd.war"
+			  webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsdd/*.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF">
+				<include name="webservices.xml"/>
+			</webinf>
+		</war>
 
-    <!-- jaxws-wseventing -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-        <include name="org/jboss/ws/eventing/*.class"/>
-        <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
-      </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
-        <include name="wsdl/**"/>
-      </webinf>
-    </war>
+		<!-- jaxws-wsaddressing-action -->
+		<war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+				<include name="wsdl/**"/>
+			</webinf>
+		</war>
+		<jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="jbossws-client-config.xml"/>
+				<include name="jaxrpc-mapping.xml"/>
+				<include name="wsdl/**"/>
+			</metainf>
+		</jar>
 
-    <!-- Please add alphabetically -->
+		<!-- jaxws-wsaddressing-replyto -->
+		<war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
+			</classes>
+		</war>
+		<jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="jaxws-jbossws-client-config.xml"/>
+				<include name="jaxrpc-mapping.xml"/>
+			</metainf>
+		</jar>
+		<war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
+			</classes>
+		</war>
+		<jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="jbossws-client-config.xml"/>
+				<include name="jaxrpc-mapping.xml"/>
+			</metainf>
+		</jar>
+		<war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
+				<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
+			</classes>
+		</war>
 
-  </target>
+		<!-- jaxws-wseventing -->
+		<war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/ws/eventing/*.class"/>
+				<include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
+				<include name="wsdl/**"/>
+			</webinf>
+		</war>
 
+		<!-- Please add alphabetically -->
+
+		<antcall target="build-interop-jars"/>
+
+	</target>
+
+	<target name="build-interop-jars">
+
+		<!-- Root.war -->
+		<war warfile="${tests.output.dir}/libs/jbossws-interop-root.war"
+			  webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml">
+			<webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+			<fileset dir="${tests.output.dir}/resources/interop/root">
+				<include name="*.*"/>
+			</fileset>
+		</war>
+
+		<!-- BaseDataTypesDocLitB client -->
+		<jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/interop/*.class"/>
+				<include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
+				<include name="wsdl/**.*"/>
+			</metainf>
+			<metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="scenarios.xml"/>
+			</metainf>
+		</jar>
+
+		<!-- BaseDataTypesDocLitB.war -->
+		<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
+			  webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
+				<include name="org/jboss/test/ws/interop/*.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">				
+				<include name="wsdl/**.*"/>
+				<include name="jboss-web.xml"/>
+				<include name="scenarios.xml"/>
+			</webinf>
+			<fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB">
+				<include name="*.*"/>
+			</fileset>
+		</war>
+
+		<!-- BaseDataTypesDocLitW client -->
+		<jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
+				<include name="org/jboss/test/ws/interop/*.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
+				<include name="jaxrpc-mapping.xml"/>
+				<include name="wsdl/**"/>
+			</metainf>
+			<metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="scenarios.xml"/>
+			</metainf>
+		</jar>
+
+		<!-- BaseDataTypesDocLitW.war -->
+		<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
+			  webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
+				<include name="org/jboss/test/ws/interop/*.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
+				<include name="wsdl/**"/>
+				<include name="jboss-web.xml"/>
+				<include name="scenarios.xml"/>
+			</webinf>
+			<fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW">
+				<include name="*.*"/>
+			</fileset>
+		</war>
+		
+		<!-- BaseDataTypesRpcLit client -->
+		<jar jarfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
+			<fileset dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
+				<include name="org/jboss/test/ws/interop/*.class"/>
+			</fileset>
+			<metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
+				<include name="jaxrpc-mapping.xml"/>
+				<include name="wsdl/**"/>
+			</metainf>
+			<metainf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/META-INF">
+				<include name="application-client.xml"/>
+				<include name="jboss-client.xml"/>
+				<include name="scenarios.xml"/>
+			</metainf>
+		</jar>
+
+		<!-- BaseDataTypesRpcLit.war -->
+		<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
+			  webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
+			<classes dir="${tests.output.dir}/classes">
+				<include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
+				<include name="org/jboss/test/ws/interop/*.class"/>
+			</classes>
+			<webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">			
+				<include name="wsdl/**"/>
+				<include name="jboss-web.xml"/>
+				<include name="scenarios.xml"/>
+			</webinf>
+			<fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit">
+				<include name="*.*"/>
+			</fileset>
+		</war>
+
+
+
+	</target>
+
 </project>

Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml	2007-06-12 10:58:54 UTC (rev 3547)
@@ -9,221 +9,221 @@
 <!-- $Id$ -->
 
 <project>
-  
-  <property name="tests.output.dir" value="${core.dir}/output/tests"/>
-  <import file="${build.dir}/ant-import/build-testsuite.xml"/>
-  
-  <property name="tests.dir" value="${core.dir}/src/test"/>
-  <property name="tests.java.dir" value="${tests.dir}/java"/>
-  <property name="tests.resources.dir" value="${tests.dir}/resources"/>
-  
-  <!-- Define excluded tests -->
-  <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
-  <property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>
-  
-  <!--
-    Init the various classpaths
-  -->
-  <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
 
-    <path id="ws.stack.classpath">
-      <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
-      <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
-      <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
-      <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
-      <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>      
-    </path>
+	<property name="tests.output.dir" value="${core.dir}/output/tests"/>
+	<import file="${build.dir}/ant-import/build-testsuite.xml"/>
 
-    <path id="tests.extra.classpath">
-      <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
-      <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-      <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
-      <pathelement location="${core.dir}/thirdparty/jboss-remoting.jar"/>
-      <pathelement location="${core.dir}/thirdparty/policy.jar"/>
-      <pathelement location="${core.dir}/thirdparty/qdox.jar"/>
-      <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
-      <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/>
-      <pathelement location="${core.dir}/thirdparty/wstx.jar"/>
-    </path>
+	<property name="tests.dir" value="${core.dir}/src/test"/>
+	<property name="tests.java.dir" value="${tests.dir}/java"/>
+	<property name="tests.resources.dir" value="${tests.dir}/resources"/>
 
-    <!-- The jBPM BPEL classpath -->
-    <path id="jbpm.bpel.classpath">
-      <path refid="ws.stack.classpath"/>
-      <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
-      <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" />
-      <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" />
-      <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" />
-      <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/>
-      <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/>
-      <pathelement location="${core.dir}/thirdparty/dom4j.jar"/>
-      <pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
-      <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
-      <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
-      <!--
-      <pathelement location="${core.dir}/thirdparty/log4j.jar"/>
-      <pathelement location="${tests.etc.dir}"/>
-      -->
-    </path>
-    
-  </target>
+	<!-- Define excluded tests -->
+	<property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
+	<property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>
 
-  <!-- ================================================================== -->
-  <!-- Generating sources                                                 -->
-  <!-- ================================================================== -->
+	<!--
+		 Init the various classpaths
+	  -->
+	<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
 
-  <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts">
+		<path id="ws.stack.classpath">
+			<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
+			<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
+			<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
+			<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
+			<pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
+		</path>
 
-    <!-- Define the JAX-WS wsconsume task -->
-    <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
-       <classpath refid="ws.stack.classpath"/>
-       <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
-        
-       <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
-       <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
-       <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
-       <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
-       <classpath location="${core.dir}/thirdparty/stax-api.jar"/>
-       <classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
-       <classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
-       <classpath location="${core.dir}/thirdparty/wstx.jar"/>
-    </taskdef>
+		<path id="tests.extra.classpath">
+			<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+			<pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+			<pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
+			<pathelement location="${core.dir}/thirdparty/jboss-remoting.jar"/>
+			<pathelement location="${core.dir}/thirdparty/policy.jar"/>
+			<pathelement location="${core.dir}/thirdparty/qdox.jar"/>
+			<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+			<pathelement location="${core.dir}/thirdparty/xmlunit.jar"/>
+			<pathelement location="${core.dir}/thirdparty/wstx.jar"/>
+		</path>
 
-    <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-    <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-    <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-    <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-    <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-    <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-  	<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-  	<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-    <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-  </target>
+		<!-- The jBPM BPEL classpath -->
+		<path id="jbpm.bpel.classpath">
+			<path refid="ws.stack.classpath"/>
+			<pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+			<pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" />
+			<pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" />
+			<pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" />
+			<pathelement location="${core.dir}/thirdparty/commons-collections.jar"/>
+			<pathelement location="${core.dir}/thirdparty/commons-logging.jar"/>
+			<pathelement location="${core.dir}/thirdparty/dom4j.jar"/>
+			<pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
+			<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+			<pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
+			<!--
+					<pathelement location="${core.dir}/thirdparty/log4j.jar"/>
+					<pathelement location="${tests.etc.dir}"/>
+					-->
+		</path>
 
-  <!--
-    Generate BPEL sources
-  -->
-  <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources.">
-    <!-- create jbpm process archives -->
-	  <mkdir dir="${tests.output.dir}/libs"/>
-    <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
-      <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
-    </zip>
-    <!-- Copy the BPEL sar -->
-    <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
+	</target>
 
-	  <!-- generate wsdl binding and service definitions for bpel processes -->
-    <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
-      <classpath refid="jbpm.bpel.classpath"/>
-    </taskdef>
-    <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
-      outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
-      bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
-  </target>
+	<!-- ================================================================== -->
+	<!-- Generating sources                                                 -->
+	<!-- ================================================================== -->
 
-  <!--
-    Generate JAX-RPC sources
-  -->
-  <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts.">
-	
-    <!-- Define the JAX-RPC tools task -->
-    <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
-      <classpath refid="ws.stack.classpath"/>
-      <classpath refid="thirdparty.classpath"/>
-      <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
-      <classpath location="${tests.output.dir}/classes"/>
-      <classpath location="${tests.output.dir}"/>
-    </taskdef>    
-    
-    <!-- Generate JAX-RPC artifacts -->
-    <mkdir dir="${tests.output.dir}/wstools/java"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
-    <move todir="${tests.output.dir}/wstools/java">
-      <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
-    </move>
-    
-    <!-- Copy generated resources -->
-    <copy todir="${tests.output.dir}/resources">
-      <fileset dir="${tests.output.dir}/wstools/resources">
-        <include name="**/*.wsdl"/>
-        <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-    <!-- Copy resources that cannot (yet) be generated -->
-    <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
-      <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
-      <filterset>
-        <filter token="jboss.bind.address" value="${node0}"/>
-      </filterset>
-    </copy>
-  </target>
-  
-  <!--
-    Generate JAX-WS sources
-  -->
-  <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts.">
+	<target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts">
 
-     <!-- Define the JAX-WS wsprovide task -->
-     <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
-        <classpath refid="ws.stack.classpath"/>
-        <classpath refid="thirdparty.classpath"/>
-        <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
-        <classpath location="${thirdparty.dir}/commons-logging.jar"/>
-        <classpath location="${tests.output.dir}/classes"/>
-        <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
-     </taskdef>
+		<!-- Define the JAX-WS wsconsume task -->
+		<taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+			<classpath refid="ws.stack.classpath"/>
+			<classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
 
-     <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
-  	 <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
-  </target>
-  
-  <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
-    <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/>
-  </target>
-  
-  <!-- ================================================================== -->
-  <!-- Compiling                                                          -->
-  <!-- ================================================================== -->
+			<classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
+			<classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
+			<classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
+			<classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
+			<classpath location="${core.dir}/thirdparty/stax-api.jar"/>
+			<classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
+			<classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
+			<classpath location="${core.dir}/thirdparty/wstx.jar"/>
+		</taskdef>
 
-  <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
-    <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
-    <macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/>
-    <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/>
-  </target>
-  
-  <!-- ================================================================== -->
-  <!-- Building                                                           -->
-  <!-- ================================================================== -->
-  
-  <!-- Copy resources -->
-  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
-    <macro-copy-resources srcdir="${testsuite.dir}/src"/>
-    <macro-copy-resources srcdir="${tests.dir}"/>
-  </target>
-  
-  <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
-    <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/>
-    <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
-    <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
-    <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
-    <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
-  </target>
+		<wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+	</target>
 
-  <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
-    
+	<!--
+		 Generate BPEL sources
+	  -->
+	<target name="servicegen" depends="tests-compile" description="Generate the BPEL resources.">
+		<!-- create jbpm process archives -->
+		<mkdir dir="${tests.output.dir}/libs"/>
+		<zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+			<fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
+		</zip>
+		<!-- Copy the BPEL sar -->
+		<copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
+
+		<!-- generate wsdl binding and service definitions for bpel processes -->
+		<taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+			<classpath refid="jbpm.bpel.classpath"/>
+		</taskdef>
+		<servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+						outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
+						bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
+	</target>
+
+	<!--
+		 Generate JAX-RPC sources
+	  -->
+	<target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts.">
+
+		<!-- Define the JAX-RPC tools task -->
+		<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
+			<classpath refid="ws.stack.classpath"/>
+			<classpath refid="thirdparty.classpath"/>
+			<classpath location="${core.dir}/thirdparty/concurrent.jar"/>
+			<classpath location="${tests.output.dir}/classes"/>
+			<classpath location="${tests.output.dir}"/>
+		</taskdef>
+
+		<!-- Generate JAX-RPC artifacts -->
+		<mkdir dir="${tests.output.dir}/wstools/java"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
+		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
+		<move todir="${tests.output.dir}/wstools/java">
+			<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+		</move>
+
+		<!-- Copy generated resources -->
+		<copy todir="${tests.output.dir}/resources">
+			<fileset dir="${tests.output.dir}/wstools/resources">
+				<include name="**/*.wsdl"/>
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
+		<!-- Copy resources that cannot (yet) be generated -->
+		<copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
+			<fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
+			<filterset>
+				<filter token="jboss.bind.address" value="${node0}"/>
+			</filterset>
+		</copy>
+	</target>
+
+	<!--
+		 Generate JAX-WS sources
+	  -->
+	<target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts.">
+
+		<!-- Define the JAX-WS wsprovide task -->
+		<taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
+			<classpath refid="ws.stack.classpath"/>
+			<classpath refid="thirdparty.classpath"/>
+			<classpath location="${core.dir}/thirdparty/concurrent.jar"/>
+			<classpath location="${thirdparty.dir}/commons-logging.jar"/>
+			<classpath location="${tests.output.dir}/classes"/>
+			<classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
+		</taskdef>
+
+		<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
+		<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
+	</target>
+
+	<target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
+		<macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/>
+	</target>
+
+	<!-- ================================================================== -->
+	<!-- Compiling                                                          -->
+	<!-- ================================================================== -->
+
+	<target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
+		<macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
+		<macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/>
+		<macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/>
+	</target>
+
+	<!-- ================================================================== -->
+	<!-- Building                                                           -->
+	<!-- ================================================================== -->
+
+	<!-- Copy resources -->
+	<target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+		<macro-copy-resources srcdir="${testsuite.dir}/src"/>
+		<macro-copy-resources srcdir="${tests.dir}"/>
+	</target>
+
+	<target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
+		<ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/>
+		<ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
+		<ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+		<ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+		<ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+	</target>
+
+	<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
 </project>

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java	2007-06-12 10:58:54 UTC (rev 3547)
@@ -56,10 +56,10 @@
       if (targetPort == null)
       {
          URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl").toURL();
-         Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesDocLitBService") );
+         Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "BaseDataTypesDocLitBService") );
          targetPort = service.getPort(IBaseDataTypesDocLitB.class);
          ((BindingProvider)targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-            "http://jbossws.demo.jboss.com:8080/basedoclitb/endpoint");
+            "http://"+getServerHost()+":8080/basedoclitb/endpoint");
          proxy = (BaseDataTypesSEI)BaseDataTypesProxy.newInstance(targetPort);
       }
    }

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java	2007-06-12 10:58:54 UTC (rev 3547)
@@ -37,9 +37,12 @@
  * @since 29.01.2007
  */
 @WebService(
-   endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitb.IBaseDataTypesDocLitB"
+		endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitb.IBaseDataTypesDocLitB",
+		serviceName = "BaseDataTypesDocLitBService",
+		targetNamespace = "http://tempuri.org/"
 )
-public class ServiceImpl implements IBaseDataTypesDocLitB {
+public class ServiceImpl implements IBaseDataTypesDocLitB
+{
    @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesDocLitB/RetBool")
    @WebResult(name = "RetBoolResult", targetNamespace = "http://tempuri.org/", partName = "RetBoolResult")
    public boolean retBool(@WebParam(name = "inBool", targetNamespace = "http://tempuri.org/", partName = "inBool") boolean inBool) {

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java	2007-06-12 10:58:54 UTC (rev 3547)
@@ -55,11 +55,11 @@
       if (targetPort == null)
       {
          URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl").toURL();
-         Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesDocLitWService") );
+         Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "BaseDataTypesDocLitWService") );
          BaseDataTypesDocLitWTestCase.targetPort = service.getPort(IBaseDataTypesDocLitW.class);
          ((BindingProvider)BaseDataTypesDocLitWTestCase.targetPort).getRequestContext().put(
             BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-            "http://jbossws.demo.jboss.com:8080/basedoclitw/endpoint");
+            "http://"+getServerHost()+":8080/basedoclitw/endpoint");
          BaseDataTypesDocLitWTestCase.proxy = (BaseDataTypesSEI) BaseDataTypesProxy.newInstance(BaseDataTypesDocLitWTestCase.targetPort);
       }
    }

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java	2007-06-12 10:58:54 UTC (rev 3547)
@@ -39,9 +39,12 @@
  * @since 29.01.2007
  */
 @WebService(
-   endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.IBaseDataTypesDocLitW"
+		endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.IBaseDataTypesDocLitW",
+		serviceName = "BaseDataTypesDocLitWService",
+		targetNamespace = "http://tempuri.org/"
 )
-public class ServiceImpl implements IBaseDataTypesDocLitW {
+public class ServiceImpl implements IBaseDataTypesDocLitW
+{
    @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetBool")
    @WebResult(name = "RetBoolResult", targetNamespace = "http://tempuri.org/")
    @RequestWrapper(localName = "RetBool", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetBool")

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java	2007-06-12 10:58:54 UTC (rev 3547)
@@ -57,11 +57,11 @@
       if (targetPort == null)
       {
          URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl").toURL();
-         Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesRpcLitService") );
+         Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "BaseDataTypesRpcLitService") );
          targetPort = service.getPort(IBaseDataTypesRpcLit.class);
          ((BindingProvider)targetPort).getRequestContext().put(
             BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-            "http://jbossws.demo.jboss.com:8080/baserpclit/endpoint");
+            "http://"+getServerHost()+":8080/baserpclit/endpoint");
          proxy = (BaseDataTypesSEI)BaseDataTypesProxy.newInstance(targetPort);
       }
    }

Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/ServiceImpl.java	2007-06-12 10:58:54 UTC (rev 3547)
@@ -37,139 +37,142 @@
  * @since 29.01.2007
  */
 @WebService(
-   endpointInterface = "org.jboss.test.ws.interop.soapwsdl.baserpclit.IBaseDataTypesRpcLit"
+		endpointInterface = "org.jboss.test.ws.interop.soapwsdl.baserpclit.IBaseDataTypesRpcLit",
+		serviceName = "BaseDataTypesRpcLitService",
+		targetNamespace = "http://tempuri.org/"
 )
-public class ServiceImpl implements IBaseDataTypesRpcLit {
+public class ServiceImpl implements IBaseDataTypesRpcLit
+{
 
-   @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetBool")
-   @WebResult(name = "RetBoolResult", partName = "RetBoolResult")
-   public boolean retBool(@WebParam(name = "inBool", partName = "inBool") boolean inBool) {
-      return inBool;
-   }
+	@WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetBool")
+	@WebResult(name = "RetBoolResult", partName = "RetBoolResult")
+	public boolean retBool(@WebParam(name = "inBool", partName = "inBool") boolean inBool) {
+		return inBool;
+	}
 
-   @WebMethod(operationName = "RetByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByte")
-   @WebResult(name = "RetByteResult", partName = "RetByteResult")
-   public short retByte(@WebParam(name = "inByte", partName = "inByte") short inByte) {
-      return inByte;
-   }
+	@WebMethod(operationName = "RetByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByte")
+	@WebResult(name = "RetByteResult", partName = "RetByteResult")
+	public short retByte(@WebParam(name = "inByte", partName = "inByte") short inByte) {
+		return inByte;
+	}
 
-   @WebMethod(operationName = "RetSByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSByte")
-   @WebResult(name = "RetSByteResult", partName = "RetSByteResult")
-   public byte retSByte(@WebParam(name = "inSByte", partName = "inSByte") byte inSByte) {
-      return inSByte;
-   }
+	@WebMethod(operationName = "RetSByte", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSByte")
+	@WebResult(name = "RetSByteResult", partName = "RetSByteResult")
+	public byte retSByte(@WebParam(name = "inSByte", partName = "inSByte") byte inSByte) {
+		return inSByte;
+	}
 
-   @WebMethod(operationName = "RetByteArray", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByteArray")
-   @WebResult(name = "RetByteArrayResult", partName = "RetByteArrayResult")
-   public byte[] retByteArray(@WebParam(name = "inByteArray", partName = "inByteArray") byte[] inByteArray) {
-      return inByteArray;
-   }
+	@WebMethod(operationName = "RetByteArray", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetByteArray")
+	@WebResult(name = "RetByteArrayResult", partName = "RetByteArrayResult")
+	public byte[] retByteArray(@WebParam(name = "inByteArray", partName = "inByteArray") byte[] inByteArray) {
+		return inByteArray;
+	}
 
-   @WebMethod(operationName = "RetChar", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetChar")
-   @WebResult(name = "RetCharResult", partName = "RetCharResult")
-   public int retChar(@WebParam(name = "inChar", partName = "inChar") int inChar) {
-      return inChar;
-   }
+	@WebMethod(operationName = "RetChar", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetChar")
+	@WebResult(name = "RetCharResult", partName = "RetCharResult")
+	public int retChar(@WebParam(name = "inChar", partName = "inChar") int inChar) {
+		return inChar;
+	}
 
-   @WebMethod(operationName = "RetDecimal", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDecimal")
-   @WebResult(name = "RetDecimalResult", partName = "RetDecimalResult")
-   public BigDecimal retDecimal(@WebParam(name = "inDecimal", partName = "inDecimal") BigDecimal inDecimal) {
-      return inDecimal;
-   }
+	@WebMethod(operationName = "RetDecimal", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDecimal")
+	@WebResult(name = "RetDecimalResult", partName = "RetDecimalResult")
+	public BigDecimal retDecimal(@WebParam(name = "inDecimal", partName = "inDecimal") BigDecimal inDecimal) {
+		return inDecimal;
+	}
 
-   @WebMethod(operationName = "RetFloat", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetFloat")
-   @WebResult(name = "RetFloatResult", partName = "RetFloatResult")
-   public float retFloat(@WebParam(name = "inFloat", partName = "inFloat") float inFloat) {
-      return inFloat;
-   }
+	@WebMethod(operationName = "RetFloat", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetFloat")
+	@WebResult(name = "RetFloatResult", partName = "RetFloatResult")
+	public float retFloat(@WebParam(name = "inFloat", partName = "inFloat") float inFloat) {
+		return inFloat;
+	}
 
-   @WebMethod(operationName = "RetDouble", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDouble")
-   @WebResult(name = "RetDoubleResult", partName = "RetDoubleResult")
-   public double retDouble(@WebParam(name = "inDouble", partName = "inDouble") double inDouble) {
-      return inDouble;
-   }
+	@WebMethod(operationName = "RetDouble", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDouble")
+	@WebResult(name = "RetDoubleResult", partName = "RetDoubleResult")
+	public double retDouble(@WebParam(name = "inDouble", partName = "inDouble") double inDouble) {
+		return inDouble;
+	}
 
-   @WebMethod(operationName = "RetSingle", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSingle")
-   @WebResult(name = "RetSingleResult", partName = "RetSingleResult")
-   public float retSingle(@WebParam(name = "inSingle", partName = "inSingle") float inSingle) {
-      return inSingle;
-   }
+	@WebMethod(operationName = "RetSingle", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetSingle")
+	@WebResult(name = "RetSingleResult", partName = "RetSingleResult")
+	public float retSingle(@WebParam(name = "inSingle", partName = "inSingle") float inSingle) {
+		return inSingle;
+	}
 
-   @WebMethod(operationName = "RetInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetInt")
-   @WebResult(name = "RetIntResult", partName = "RetIntResult")
-   public int retInt(@WebParam(name = "inInt", partName = "inInt") int inInt) {
-      return inInt;
-   }
+	@WebMethod(operationName = "RetInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetInt")
+	@WebResult(name = "RetIntResult", partName = "RetIntResult")
+	public int retInt(@WebParam(name = "inInt", partName = "inInt") int inInt) {
+		return inInt;
+	}
 
-   @WebMethod(operationName = "RetShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetShort")
-   @WebResult(name = "RetShortResult", partName = "RetShortResult")
-   public short retShort(@WebParam(name = "inShort", partName = "inShort") short inShort) {
-      return inShort;
-   }
+	@WebMethod(operationName = "RetShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetShort")
+	@WebResult(name = "RetShortResult", partName = "RetShortResult")
+	public short retShort(@WebParam(name = "inShort", partName = "inShort") short inShort) {
+		return inShort;
+	}
 
-   @WebMethod(operationName = "RetLong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetLong")
-   @WebResult(name = "RetLongResult", partName = "RetLongResult")
-   public long retLong(@WebParam(name = "inLong", partName = "inLong") long inLong) {
-      return inLong;
-   }
+	@WebMethod(operationName = "RetLong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetLong")
+	@WebResult(name = "RetLongResult", partName = "RetLongResult")
+	public long retLong(@WebParam(name = "inLong", partName = "inLong") long inLong) {
+		return inLong;
+	}
 
-   @WebMethod(operationName = "RetObject", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetObject")
-   @WebResult(name = "RetObjectResult", partName = "RetObjectResult")
-   public Object retObject(@WebParam(name = "inObject", partName = "inObject") Object inObject) {
-      return inObject;
-   }
+	@WebMethod(operationName = "RetObject", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetObject")
+	@WebResult(name = "RetObjectResult", partName = "RetObjectResult")
+	public Object retObject(@WebParam(name = "inObject", partName = "inObject") Object inObject) {
+		return inObject;
+	}
 
-   @WebMethod(operationName = "RetUInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUInt")
-   @WebResult(name = "RetUIntResult", partName = "RetUIntResult")
-   public long retUInt(@WebParam(name = "inUInt", partName = "inUInt") long inUInt) {
-      return inUInt;
-   }
+	@WebMethod(operationName = "RetUInt", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUInt")
+	@WebResult(name = "RetUIntResult", partName = "RetUIntResult")
+	public long retUInt(@WebParam(name = "inUInt", partName = "inUInt") long inUInt) {
+		return inUInt;
+	}
 
-   @WebMethod(operationName = "RetUShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUShort")
-   @WebResult(name = "RetUShortResult", partName = "RetUShortResult")
-   public int retUShort(@WebParam(name = "inUShort", partName = "inUShort") int inUShort) {
-      return inUShort;
-   }
+	@WebMethod(operationName = "RetUShort", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUShort")
+	@WebResult(name = "RetUShortResult", partName = "RetUShortResult")
+	public int retUShort(@WebParam(name = "inUShort", partName = "inUShort") int inUShort) {
+		return inUShort;
+	}
 
-   @WebMethod(operationName = "RetULong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetULong")
-   @WebResult(name = "RetULongResult", partName = "RetULongResult")
-   public BigInteger retULong(@WebParam(name = "inULong", partName = "inULong") BigInteger inULong) {
-      return inULong;
-   }
+	@WebMethod(operationName = "RetULong", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetULong")
+	@WebResult(name = "RetULongResult", partName = "RetULongResult")
+	public BigInteger retULong(@WebParam(name = "inULong", partName = "inULong") BigInteger inULong) {
+		return inULong;
+	}
 
-   @WebMethod(operationName = "RetString", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetString")
-   @WebResult(name = "RetStringResult", partName = "RetStringResult")
-   public String retString(@WebParam(name = "inString", partName = "inString") String inString) {
-      return inString;
-   }
+	@WebMethod(operationName = "RetString", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetString")
+	@WebResult(name = "RetStringResult", partName = "RetStringResult")
+	public String retString(@WebParam(name = "inString", partName = "inString") String inString) {
+		return inString;
+	}
 
-   @WebMethod(operationName = "RetGuid", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetGuid")
-   @WebResult(name = "RetGuidResult", partName = "RetGuidResult")
-   public String retGuid(@WebParam(name = "inGuid", partName = "inGuid") String inGuid) {
-      return inGuid;
-   }
+	@WebMethod(operationName = "RetGuid", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetGuid")
+	@WebResult(name = "RetGuidResult", partName = "RetGuidResult")
+	public String retGuid(@WebParam(name = "inGuid", partName = "inGuid") String inGuid) {
+		return inGuid;
+	}
 
-   @WebMethod(operationName = "RetUri", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUri")
-   @WebResult(name = "RetUriResult", partName = "RetUriResult")
-   public String retUri(@WebParam(name = "inUri", partName = "inUri") String inUri) {
-      return inUri;
-   }
+	@WebMethod(operationName = "RetUri", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetUri")
+	@WebResult(name = "RetUriResult", partName = "RetUriResult")
+	public String retUri(@WebParam(name = "inUri", partName = "inUri") String inUri) {
+		return inUri;
+	}
 
-   @WebMethod(operationName = "RetDateTime", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDateTime")
-   @WebResult(name = "RetDateTimeResult", partName = "RetDateTimeResult")
-   public XMLGregorianCalendar retDateTime(@WebParam(name = "inDateTime", partName = "inDateTime") XMLGregorianCalendar inDateTime) {
-      return inDateTime;
-   }
+	@WebMethod(operationName = "RetDateTime", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetDateTime")
+	@WebResult(name = "RetDateTimeResult", partName = "RetDateTimeResult")
+	public XMLGregorianCalendar retDateTime(@WebParam(name = "inDateTime", partName = "inDateTime") XMLGregorianCalendar inDateTime) {
+		return inDateTime;
+	}
 
-   @WebMethod(operationName = "RetTimeSpan", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetTimeSpan")
-   @WebResult(name = "RetTimeSpanResult", partName = "RetTimeSpanResult")
-   public Duration retTimeSpan(@WebParam(name = "inTimeSpan", partName = "inTimeSpan") Duration inTimeSpan) {
-      return inTimeSpan;
-   }
+	@WebMethod(operationName = "RetTimeSpan", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetTimeSpan")
+	@WebResult(name = "RetTimeSpanResult", partName = "RetTimeSpanResult")
+	public Duration retTimeSpan(@WebParam(name = "inTimeSpan", partName = "inTimeSpan") Duration inTimeSpan) {
+		return inTimeSpan;
+	}
 
-   @WebMethod(operationName = "RetQName", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetQName")
-   @WebResult(name = "RetQNameResult", partName = "RetQNameResult")
-   public QName retQName(@WebParam(name = "inQName", partName = "inQName") QName inQName) {
-      return inQName;  
-   }
+	@WebMethod(operationName = "RetQName", action = "http://tempuri.org/IBaseDataTypesRpcLit/RetQName")
+	@WebResult(name = "RetQNameResult", partName = "RetQNameResult")
+	public QName retQName(@WebParam(name = "inQName", partName = "inQName") QName inQName) {
+		return inQName;
+	}
 }

Modified: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt	2007-06-12 09:59:56 UTC (rev 3546)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt	2007-06-12 10:58:54 UTC (rev 3547)
@@ -1,5 +1,5 @@
 # Always exclude
-org/jboss/test/ws/interop/**
+#org/jboss/test/ws/interop/**
 org/jboss/test/ws/benchmark/**
 
 # Fix before JBoss50 goes final




More information about the jbossws-commits mailing list