[jboss-svn-commits] JBossWS SVN: r933 - in branches/jbossws-1.0/src/test: . ant java/org/jboss/test/ws/jaxrpc java/org/jboss/test/ws/jaxrpc/samples java/org/jboss/test/ws/jaxrpc/wsaddressing java/org/jboss/test/ws/jaxws java/org/jboss/test/ws/jaxws/jbws860 java/org/jboss/test/ws/jaxws/jbws871 java/org/jboss/test/ws/jaxws/jbws944 java/org/jboss/test/ws/jaxws/samples java/org/jboss/test/ws/jaxws/samples/wsaddressing java/org/jboss/test/ws/jaxws/wsaddressing java/org/jboss/test/ws/jaxws/wsaddressing/action java/org/jboss/test/ws/jaxws/wsaddressing/replyto resources/jaxrpc resources/jaxrpc/samples resources/jaxws resources/jaxws/jbws860/WEB-INF resources/jaxws/jbws871/META-INF resources/jaxws/jbws871/META-INF/wsdl resources/jaxws/jbws871/WEB-INF-rpc resources/jaxws/jbws944/META-INF resources/jaxws/jbws944/META-INF/wsdl resources/jaxws/samples resources/jaxws/samples/wsaddressing resources/jaxws/samples/wsaddressing/META-INF resources/jaxws/samples/wsaddressing/META-INF/wsdl resources/jaxw! s/samples/wsaddressing/WEB-INF resources/jaxws/wsaddressing/action/META-INF resources/jaxws/wsaddressing/action/META-INF/wsdl resources/jaxws/wsaddressing/action/WEB-INF resources/jaxws/wsaddressing/replyto/FaultTo-META-INF resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF resources/jaxws/wsaddressing/replyto/Initial-META-INF resources/jaxws/wsaddressing/replyto/Initial-WEB-INF resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Sep 11 08:23:07 EDT 2006


Author: thomas.diesler at jboss.com
Date: 2006-09-11 08:21:31 -0400 (Mon, 11 Sep 2006)
New Revision: 933

Added:
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/
   branches/jbossws-1.0/src/test/resources/jaxws/jbws860/
   branches/jbossws-1.0/src/test/resources/jaxws/jbws871/
   branches/jbossws-1.0/src/test/resources/jaxws/jbws944/
   branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/
Removed:
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws860/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws871/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws944/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/AddressingHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/EndpointReferenceTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/SOAPAddressingPropertiesTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/
   branches/jbossws-1.0/src/test/resources/jaxrpc/jbws860/
   branches/jbossws-1.0/src/test/resources/jaxrpc/jbws871/
   branches/jbossws-1.0/src/test/resources/jaxrpc/jbws944/
   branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wsaddressing/
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/
Modified:
   branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
   branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
   branches/jbossws-1.0/src/test/build.xml
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientDocHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java
   branches/jbossws-1.0/src/test/resources/jaxws/jbws860/WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/jaxrpc-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl
   branches/jbossws-1.0/src/test/resources/jaxws/jbws871/WEB-INF-rpc/web.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jbws944/META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jbws944/META-INF/wsdl/TestService.wsdl
   branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl
   branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml
   branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/config.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/jaxrpc-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/wsdl/ActionRpcService.wsdl
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/jboss-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml
Log:
Move all jsr181 tests to jaxws

Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml	2006-09-11 10:57:55 UTC (rev 932)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -479,56 +479,6 @@
       </metainf>
     </jar>
     
-    <!-- jaxrpc-jbws860 -->
-    <war warfile="${build.test.dir}/libs/jaxrpc-jbws860.war" webxml="${build.test.dir}/resources/jaxrpc/jbws860/WEB-INF/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/jbws860/*.class"/>
-        <exclude name="org/jboss/test/ws/jaxrpc/jbws860/*TestCase.class"/>
-      </classes>
-      <webinf dir="${build.test.dir}/resources/jaxrpc/jbws860/WEB-INF">
-        <include name="jboss-web.xml"/>
-      </webinf>
-    </war>
-    
-    <!-- jaxrpc-jbws871 -->
-    <war warfile="${build.test.dir}/libs/jaxrpc-jbws871-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/jbws871/WEB-INF-rpc/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/jbws871/RpcArrayEndpointImpl.class"/>
-      </classes>
-    </war>
-    <jar destfile="${build.test.dir}/libs/jaxrpc-jbws871-rpc-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/jbws871/IntegerArray.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/jbws871/RpcArrayEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/jbws871/RpcArrayEndpointService.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/jbws871/META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="jaxrpc-mapping.xml"/>
-        <include name="wsdl/**"/>
-      </metainf>
-    </jar>
-    
-    <!-- jaxrpc-jbws944 -->
-    <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws944.ejb3">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/jbws944/EJB3Bean01.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/jbws944/EJB3RemoteInterface.class"/>
-      </fileset>
-    </jar>
-    <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws944-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/jbws944/EndpointInterface.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/jbws944/META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="jaxrpc-mapping.xml"/>
-        <include name="wsdl/**"/>
-      </metainf>
-    </jar>
-    
     <!-- jaxrpc-jbws950 -->
     <war warfile="${build.test.dir}/libs/jaxrpc-jbws950.war" webxml="${build.test.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml">
       <classes dir="${build.test.dir}/classes">
@@ -1332,31 +1282,6 @@
       </metainf>
     </jar>
     
-    <!-- jaxrpc-samples-wsaddressing -->
-    <war warfile="${build.test.dir}/libs/jaxrpc-samples-wsaddressing.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wsaddressing/WEB-INF/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/samples/wsaddressing/StatefulEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/samples/wsaddressing/StatefulEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/samples/wsaddressing/ServerHandler.class"/>
-      </classes>
-      <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wsaddressing/WEB-INF">
-        <include name="jaxws-handlers.xml"/>
-      </webinf>
-    </war>
-    <jar destfile="${build.test.dir}/libs/jaxrpc-samples-wsaddressing-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/samples/wsaddressing/StatefulEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/samples/wsaddressing/ClientHandler.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wsaddressing/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>
-    
     <!-- jaxrpc-samples-wseventing.war -->
     <war warfile="${build.test.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
       <classes dir="${build.test.dir}/classes">
@@ -1498,90 +1423,6 @@
       </metainf>
     </jar>
     
-    <!-- jaxrpc-wsaddressing-action -->
-    <war warfile="${build.test.dir}/libs/jaxrpc-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/wsaddressing/action/WEB-INF/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/action/ActionRpcEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/action/ActionEndpoint.class"/>
-      </classes>
-      <webinf dir="${build.test.dir}/resources/jaxrpc/wsaddressing/action/META-INF">
-        <include name="wsdl/**"/>
-      </webinf>
-    </war>
-    <jar destfile="${build.test.dir}/libs/jaxrpc-wsaddressing-action-rpc-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/action/ActionEndpoint.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/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>
-    
-    <!-- jaxrpc-wsaddressing-replyto -->
-    <war warfile="${build.test.dir}/libs/jaxrpc-wsaddressing-initial.war" webxml="${build.test.dir}/resources/jaxrpc/wsaddressing/replyto/Initial-WEB-INF/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
-      </classes>
-    </war>
-    <jar destfile="${build.test.dir}/libs/jaxrpc-wsaddressing-initial-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-        <include name="jaxrpc-jbossws-client-config.xml"/>
-        <include name="jaxrpc-mapping.xml"/>
-      </metainf>
-    </jar>
-    <war warfile="${build.test.dir}/libs/jaxrpc-wsaddressing-replyto.war" webxml="${build.test.dir}/resources/jaxrpc/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
-      </classes>
-    </war>
-    <jar destfile="${build.test.dir}/libs/jaxrpc-wsaddressing-replyto-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpoint.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/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="${build.test.dir}/libs/jaxrpc-wsaddressing-faultto.war" webxml="${build.test.dir}/resources/jaxrpc/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/FaultToEndpointImpl.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/FaultToEndpoint.class"/>
-      </classes>
-    </war>
-    <jar destfile="${build.test.dir}/libs/jaxrpc-wsaddressing-faultto-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/test/ws/jaxrpc/wsaddressing/replyto/FaultToEndpoint.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/wsaddressing/replyto/FaultTo-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>
-    
     <!-- jaxrpc-wseventing -->
     <war warfile="${build.test.dir}/libs/jaxrpc-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
       <classes dir="${build.test.dir}/classes">

Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml	2006-09-11 10:57:55 UTC (rev 932)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -18,6 +18,56 @@
   
   <target name="build-jars" description="Build the deployments.">
     
+    <!-- jaxws-jbws860 -->
+    <war warfile="${build.test.dir}/libs/jaxws-jbws860.war" webxml="${build.test.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
+      <classes dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
+        <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
+      </classes>
+      <webinf dir="${build.test.dir}/resources/jaxws/jbws860/WEB-INF">
+        <include name="jboss-web.xml"/>
+      </webinf>
+    </war>
+    
+    <!-- jaxws-jbws871 -->
+    <war warfile="${build.test.dir}/libs/jaxws-jbws871-rpc.war" webxml="${build.test.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+      <classes dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
+      </classes>
+    </war>
+    <jar destfile="${build.test.dir}/libs/jaxws-jbws871-rpc-client.jar">
+      <fileset dir="${build.test.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="${build.test.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="${build.test.dir}/libs/jaxws-jbws944.ejb3">
+      <fileset dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
+      </fileset>
+    </jar>
+    <jar jarfile="${build.test.dir}/libs/jaxws-jbws944-client.jar">
+      <fileset dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/jbws944/EndpointInterface.class"/>
+      </fileset>
+      <metainf dir="${build.test.dir}/resources/jaxws/jbws944/META-INF">
+        <include name="application-client.xml"/>
+        <include name="jboss-client.xml"/>
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="wsdl/**"/>
+      </metainf>
+    </jar>
+    
     <!-- jaxws-jsr181-complex -->
     <war warfile="${build.test.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.test.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
       <classes dir="${build.test.dir}/classes">
@@ -235,6 +285,115 @@
       </metainf>
     </jar>
 
+    <!-- jaxws-samples-wsaddressing -->
+    <war warfile="${build.test.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+      <classes dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
+      </classes>
+      <webinf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+        <include name="jaxws-handlers.xml"/>
+      </webinf>
+    </war>
+    <jar destfile="${build.test.dir}/libs/jaxws-samples-wsaddressing-client.jar">
+      <fileset dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
+      </fileset>
+      <metainf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/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-wsaddressing-action -->
+    <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+      <classes dir="${build.test.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="${build.test.dir}/resources/jaxws/wsaddressing/action/META-INF">
+        <include name="wsdl/**"/>
+      </webinf>
+    </war>
+    <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
+      <fileset dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
+      </fileset>
+      <metainf dir="${build.test.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-wsaddressing-replyto -->
+    <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+      <classes dir="${build.test.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="${build.test.dir}/libs/jaxws-wsaddressing-initial-client.jar">
+      <fileset dir="${build.test.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="${build.test.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="${build.test.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+      <classes dir="${build.test.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="${build.test.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
+      <fileset dir="${build.test.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="${build.test.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="${build.test.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+      <classes dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
+        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
+      </classes>
+    </war>
+    <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-faultto-client.jar">
+      <fileset dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
+      </fileset>
+      <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-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>
+    
   </target>
   
 </project>

Modified: branches/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/jbossws-1.0/src/test/build.xml	2006-09-11 10:57:55 UTC (rev 932)
+++ branches/jbossws-1.0/src/test/build.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -259,9 +259,6 @@
     <mkdir dir="${build.test.dir}/wstools/java"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
-    <move todir="${build.test.dir}/wstools/java">
-      <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
-    </move>
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
@@ -277,13 +274,14 @@
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
     <!-- wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/swa/wstools-config.xml"/-->
-    <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxrpc/samples/wsaddressing/wstools-config.xml"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/>
     <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/>
-    <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"
-      config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/>
+    <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/>
+    <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
+    
     <move todir="${build.test.dir}/wstools/java">
+      <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
       <fileset dir="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" includes="org/**"/>
     </move>
   </target>

Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/AddressingHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/AddressingHandler.java	2006-09-11 10:57:55 UTC (rev 932)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/AddressingHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.wsaddressing;
-
-import javax.xml.rpc.handler.GenericHandler;
-
-/**
- * An abstract handler for the ws-addressing
- *
- * @author Thomas.Diesler at jboss.org
- * @since 29-Nov-2005
- */
-public abstract class AddressingHandler extends GenericHandler
-{
-   /**
-    * Get the JBoss server host from system property "jbosstest.server.host"
-    * This defaults to "" + getServerHost() + ""
-    */
-   public String getServerHost()
-   {
-      String hostName = System.getProperty("jbosstest.server.host", "localhost");
-      return hostName;
-   }
-}

Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/EndpointReferenceTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/EndpointReferenceTestCase.java	2006-09-11 10:57:55 UTC (rev 932)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/EndpointReferenceTestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.wsaddressing;
-
-//$Id$
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.addressing.EndpointReferenceImpl;
-import org.jboss.ws.utils.DOMUtils;
-import org.w3c.dom.Element;
-
-/** 
- * Test the EndpointReferenceImpl
- *
- * @author Thomas.Diesler at jboss.org
- * @since 13-Nov-2005
- */
-public class EndpointReferenceTestCase extends JBossWSTest
-{
-   public void testEndpointReferenceParser() throws Exception
-   {
-      String inStr = 
-         "<wsa:EndpointReference fabrikam:eprAttr='eprAttrValue' xmlns:wsa='http://www.w3.org/2005/08/addressing' xmlns:fabrikam='http://www.fabrikam.com/ns'>" +
-         "  <wsa:Address fabrikam:addrAttr='addrAttrValue'>http://www.fabrikam123.example/acct</wsa:Address>" +
-         "  <wsa:ReferenceParameters fabrikam:paramAttr='paramAttrValue'>" +
-         "    <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>" +
-         "    <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>" +
-         "  </wsa:ReferenceParameters>" +
-         "  <wsa:Metadata fabrikam:metaAttr='metaAttrValue'>" +
-         "    <wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wsswssecurity-secext-1.0.xsd'>" + 
-         "      <wsp:ExactlyOne>" + 
-         "        <wsp:All>" + 
-         "          <wsse:SecurityToken>" +
-         "            <wsse:TokenType>wsse:Kerberosv5TGT</wsse:TokenType>" +
-         "          </wsse:SecurityToken>" + 
-         "        </wsp:All>" +
-         "      </wsp:ExactlyOne>" +
-         "    </wsp:Policy>" +
-         "  </wsa:Metadata>" +
-         "  <fabrikam:eprElement>123456789</fabrikam:eprElement>" +
-         "</wsa:EndpointReference>";
-      
-      Element inElement = DOMUtils.parse(inStr);
-      EndpointReferenceImpl epr = new EndpointReferenceImpl(inElement);
-      Element outElement = epr.toElement();
-      
-      System.out.println("FIXME: JBWS-1130");
-      //assertEquals(inElement, outElement);
-   }
-}

Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/SOAPAddressingPropertiesTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/SOAPAddressingPropertiesTestCase.java	2006-09-11 10:57:55 UTC (rev 932)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/SOAPAddressingPropertiesTestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -1,126 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.wsaddressing;
-
-// $Id: SOAPAddressingPropertiesTestCase.java,v 1.2 2005/11/24 21:40:55 tdiesler
-// Exp $
-
-import java.io.ByteArrayInputStream;
-import java.net.URI;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
-import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
-
-import org.jboss.test.ws.JBossWSTest;
-
-/**
- * Test the SOAPAddressingProperties
- * 
- * @author Thomas.Diesler at jboss.org
- * @since 13-Nov-2005
- */
-public class SOAPAddressingPropertiesTestCase extends JBossWSTest 
-{
-   private SOAPAddressingProperties addrProps;
-   
-	private String reqEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"
-			+ "  <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>"
-         + "    <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>"
-			+ "    <wsa:ReplyTo>"
-			+ "      <wsa:Address>http://business456.example/client1</wsa:Address>"
-			+ "      <wsa:ReferenceParameters>"
-			+ "        <ns1:sessionid xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>"
-			+ "      </wsa:ReferenceParameters>"
-			+ "    </wsa:ReplyTo>"
-         + "    <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>"
-         + "    <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>"
-			+ "  </env:Header>" 
-         + "  <env:Body/>" 
-         + "</env:Envelope>";
-
-	private String resEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
-         "  <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
-         "    <wsa:To>http://business456.example/client1</wsa:To>" +
-         "    <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" +
-         "    <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo>" +
-         "    <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" +
-         "  </env:Header>" +
-         "  <env:Body/>" +
-         "</env:Envelope>";
-
-   public void setUp() throws Exception
-   {
-      super.setUp();
-      
-      MessageFactory factory = MessageFactory.newInstance();
-      SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
-
-      AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
-      addrProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
-      addrProps.readHeaders(soapMessage);
-   }
-   
-	public void testReadHeaders() throws Exception
-   {
-      assertEquals(new URI("uuid:6B29FC40-CA47-1067-B31D-00DD010662DA"), addrProps.getMessageID().getURI());
-      assertEquals(new URI("http://business456.example/client1"), addrProps.getReplyTo().getAddress().getURI());
-      assertEquals(new URI("http://fabrikam123.example/Purchasing"), addrProps.getTo().getURI());
-      assertEquals(new URI("http://fabrikam123.example/SubmitPO"), addrProps.getAction().getURI());
-   }
-
-   public void testWriteHeaders() throws Exception
-   {
-      MessageFactory factory = MessageFactory.newInstance();
-      SOAPMessage soapMessage = factory.createMessage();
-      addrProps.writeHeaders(soapMessage);
-      SOAPEnvelope wasEnv = soapMessage.getSOAPPart().getEnvelope();
-
-      SOAPMessage msgOut = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
-      SOAPEnvelope expEnv = msgOut.getSOAPPart().getEnvelope();
-      
-      System.out.println("FIXME: JBWS-1130");
-      //assertEquals(expEnv, wasEnv);
-   }
-
-   public void testReplyToHeaders() throws Exception
-   {
-      AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
-      SOAPAddressingProperties replyProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
-      replyProps.initializeAsReply(addrProps, false);
-      replyProps.setAction(addrBuilder.newURI("http://fabrikam123.example/ReplyPO"));
-      
-      MessageFactory factory = MessageFactory.newInstance();
-      SOAPMessage soapMessage = factory.createMessage();
-      replyProps.writeHeaders(soapMessage);
-      SOAPEnvelope wasEnv = soapMessage.getSOAPPart().getEnvelope();
-
-      SOAPMessage msgOut = factory.createMessage(null, new ByteArrayInputStream(resEnvStr.getBytes()));
-      SOAPEnvelope expEnv = msgOut.getSOAPPart().getEnvelope();
-
-      System.out.println("FIXME: JBWS-1130");
-      //assertEquals(expEnv, wasEnv);
-   }
-}

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860 (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws860)

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws860/InventoryWebService.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.jbws860;
+package org.jboss.test.ws.jaxws.jbws860;
 
 // $Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws860/JBWS860TestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.jbws860;
+package org.jboss.test.ws.jaxws.jbws860;
 
 // $Id$
 
@@ -47,7 +47,7 @@
 {
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(JBWS860TestCase.class, "jaxrpc-jbws860.war");
+      return JBossWSTestSetup.newTestSetup(JBWS860TestCase.class, "jaxws-jbws860.war");
    }
 
    public void testAccessInventoryServiceWsdl() throws Exception

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws860/TestServlet.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.jbws860;
+package org.jboss.test.ws.jaxws.jbws860;
 
 // $Id$
 

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871 (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws871)

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws871/JBWS871TestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.jbws871;
+package org.jboss.test.ws.jaxws.jbws871;
 
 import javax.naming.InitialContext;
 
@@ -42,7 +42,7 @@
 
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(JBWS871TestCase.class, "jaxrpc-jbws871-rpc.war, jaxrpc-jbws871-rpc-client.jar");
+      return JBossWSTestSetup.newTestSetup(JBWS871TestCase.class, "jaxws-jbws871-rpc.war, jaxws-jbws871-rpc-client.jar");
    }
 
    protected void setUp() throws Exception

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws871/RpcArrayEndpoint.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -7,7 +7,7 @@
  * the generator that produced it. Consult the input for the copyright and
  * terms of use that apply to this source code.
  */
-package org.jboss.test.ws.jaxrpc.jbws871;
+package org.jboss.test.ws.jaxws.jbws871;
 public interface  RpcArrayEndpoint extends java.rmi.Remote
 {
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws871/RpcArrayEndpointImpl.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.jbws871;
+package org.jboss.test.ws.jaxws.jbws871;
 
 import java.util.Arrays;
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws871/RpcArrayEndpointService.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -4,7 +4,7 @@
  */
 
 //Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxrpc.jbws871;
+package org.jboss.test.ws.jaxws.jbws871;
 
 import javax.xml.rpc.Service;
 import javax.xml.rpc.ServiceException;

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944 (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws944)

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws944/EJB3Bean01.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
   * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   */
-package org.jboss.test.ws.jaxrpc.jbws944;
+package org.jboss.test.ws.jaxws.jbws944;
 
 import javax.ejb.Remote;
 import javax.ejb.Stateless;

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws944/EJB3RemoteInterface.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
   * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   */
-package org.jboss.test.ws.jaxrpc.jbws944;
+package org.jboss.test.ws.jaxws.jbws944;
 
 /**
  * An EJB3 remote interface

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws944/EndpointInterface.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
   * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   */
-package org.jboss.test.ws.jaxrpc.jbws944;
+package org.jboss.test.ws.jaxws.jbws944;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws944/JBWS944TestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.jbws944;
+package org.jboss.test.ws.jaxws.jbws944;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -43,13 +43,13 @@
  */
 public class JBWS944TestCase extends JBossWSTest
 {
-   public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-jbws944/FooBean01";
+   public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws944/FooBean01";
 
    private static EndpointInterface port;
 
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(JBWS944TestCase.class, "jaxrpc-jbws944.ejb3, jaxrpc-jbws944-client.jar");
+      return JBossWSTestSetup.newTestSetup(JBWS944TestCase.class, "jaxws-jbws944.ejb3, jaxws-jbws944-client.jar");
    }
 
    protected void setUp() throws Exception

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing)

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing/AddressingHandler.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.samples.wsaddressing;
+package org.jboss.test.ws.jaxws.samples.wsaddressing;
 
 import javax.xml.rpc.handler.GenericHandler;
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing/AddressingStatefulTestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.samples.wsaddressing;
+package org.jboss.test.ws.jaxws.samples.wsaddressing;
 
 import java.io.File;
 import java.net.URL;
@@ -53,7 +53,7 @@
 
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(AddressingStatefulTestCase.class, "jaxrpc-samples-wsaddressing.war, jaxrpc-samples-wsaddressing-client.jar");
+      return JBossWSTestSetup.newTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war, jaxws-samples-wsaddressing-client.jar");
    }
 
    protected void setUp() throws Exception
@@ -73,8 +73,8 @@
          else
          {
             ServiceFactoryImpl factory = new ServiceFactoryImpl();
-            URL wsdlURL = new File("resources/jaxrpc/samples/wsaddressing/META-INF/wsdl/TestService.wsdl").toURL();
-            URL mappingURL = new File("resources/jaxrpc/samples/wsaddressing/META-INF/jaxrpc-mapping.xml").toURL();
+            URL wsdlURL = new File("resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl").toURL();
+            URL mappingURL = new File("resources/jaxws/samples/wsaddressing/META-INF/jaxrpc-mapping.xml").toURL();
             
             QName serviceName = new QName("http://org.jboss.ws/samples/wsaddressing", "TestService");
             QName portName = new QName("http://org.jboss.ws/samples/wsaddressing", "StatefulEndpointPort");

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing/ClientHandler.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.samples.wsaddressing;
+package org.jboss.test.ws.jaxws.samples.wsaddressing;
 
 import java.net.URI;
 import java.net.URISyntaxException;

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing/ServerHandler.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.samples.wsaddressing;
+package org.jboss.test.ws.jaxws.samples.wsaddressing;
 
 import java.net.URISyntaxException;
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing/StatefulEndpoint.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.samples.wsaddressing;
+package org.jboss.test.ws.jaxws.samples.wsaddressing;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddressing/StatefulEndpointImpl.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.samples.wsaddressing;
+package org.jboss.test.ws.jaxws.samples.wsaddressing;
 
 //$Id$
 

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/AddressingHandler.java)
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/AddressingHandler.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.wsaddressing;
+
+import javax.xml.rpc.handler.GenericHandler;
+
+/**
+ * An abstract handler for the ws-addressing
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 29-Nov-2005
+ */
+public abstract class AddressingHandler extends GenericHandler
+{
+   /**
+    * Get the JBoss server host from system property "jbosstest.server.host"
+    * This defaults to "" + getServerHost() + ""
+    */
+   public String getServerHost()
+   {
+      String hostName = System.getProperty("jbosstest.server.host", "localhost");
+      return hostName;
+   }
+}


Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/EndpointReferenceTestCase.java)
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/EndpointReferenceTestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.wsaddressing;
+
+//$Id$
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.ws.addressing.EndpointReferenceImpl;
+import org.jboss.ws.utils.DOMUtils;
+import org.w3c.dom.Element;
+
+/** 
+ * Test the EndpointReferenceImpl
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 13-Nov-2005
+ */
+public class EndpointReferenceTestCase extends JBossWSTest
+{
+   public void testEndpointReferenceParser() throws Exception
+   {
+      String inStr = 
+         "<wsa:EndpointReference fabrikam:eprAttr='eprAttrValue' xmlns:wsa='http://www.w3.org/2005/08/addressing' xmlns:fabrikam='http://www.fabrikam.com/ns'>" +
+         "  <wsa:Address fabrikam:addrAttr='addrAttrValue'>http://www.fabrikam123.example/acct</wsa:Address>" +
+         "  <wsa:ReferenceParameters fabrikam:paramAttr='paramAttrValue'>" +
+         "    <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>" +
+         "    <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>" +
+         "  </wsa:ReferenceParameters>" +
+         "  <wsa:Metadata fabrikam:metaAttr='metaAttrValue'>" +
+         "    <wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wsswssecurity-secext-1.0.xsd'>" + 
+         "      <wsp:ExactlyOne>" + 
+         "        <wsp:All>" + 
+         "          <wsse:SecurityToken>" +
+         "            <wsse:TokenType>wsse:Kerberosv5TGT</wsse:TokenType>" +
+         "          </wsse:SecurityToken>" + 
+         "        </wsp:All>" +
+         "      </wsp:ExactlyOne>" +
+         "    </wsp:Policy>" +
+         "  </wsa:Metadata>" +
+         "  <fabrikam:eprElement>123456789</fabrikam:eprElement>" +
+         "</wsa:EndpointReference>";
+      
+      Element inElement = DOMUtils.parse(inStr);
+      EndpointReferenceImpl epr = new EndpointReferenceImpl(inElement);
+      Element outElement = epr.toElement();
+      
+      System.out.println("FIXME: JBWS-1130");
+      //assertEquals(inElement, outElement);
+   }
+}


Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/SOAPAddressingPropertiesTestCase.java)
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/SOAPAddressingPropertiesTestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.wsaddressing;
+
+// $Id: SOAPAddressingPropertiesTestCase.java,v 1.2 2005/11/24 21:40:55 tdiesler
+// Exp $
+
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
+import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
+
+import org.jboss.test.ws.JBossWSTest;
+
+/**
+ * Test the SOAPAddressingProperties
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 13-Nov-2005
+ */
+public class SOAPAddressingPropertiesTestCase extends JBossWSTest 
+{
+   private SOAPAddressingProperties addrProps;
+   
+	private String reqEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"
+			+ "  <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>"
+         + "    <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>"
+			+ "    <wsa:ReplyTo>"
+			+ "      <wsa:Address>http://business456.example/client1</wsa:Address>"
+			+ "      <wsa:ReferenceParameters>"
+			+ "        <ns1:sessionid xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>"
+			+ "      </wsa:ReferenceParameters>"
+			+ "    </wsa:ReplyTo>"
+         + "    <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>"
+         + "    <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>"
+			+ "  </env:Header>" 
+         + "  <env:Body/>" 
+         + "</env:Envelope>";
+
+	private String resEnvStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+         "  <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
+         "    <wsa:To>http://business456.example/client1</wsa:To>" +
+         "    <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action>" +
+         "    <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo>" +
+         "    <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" +
+         "  </env:Header>" +
+         "  <env:Body/>" +
+         "</env:Envelope>";
+
+   public void setUp() throws Exception
+   {
+      super.setUp();
+      
+      MessageFactory factory = MessageFactory.newInstance();
+      SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
+
+      AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
+      addrProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
+      addrProps.readHeaders(soapMessage);
+   }
+   
+	public void testReadHeaders() throws Exception
+   {
+      assertEquals(new URI("uuid:6B29FC40-CA47-1067-B31D-00DD010662DA"), addrProps.getMessageID().getURI());
+      assertEquals(new URI("http://business456.example/client1"), addrProps.getReplyTo().getAddress().getURI());
+      assertEquals(new URI("http://fabrikam123.example/Purchasing"), addrProps.getTo().getURI());
+      assertEquals(new URI("http://fabrikam123.example/SubmitPO"), addrProps.getAction().getURI());
+   }
+
+   public void testWriteHeaders() throws Exception
+   {
+      MessageFactory factory = MessageFactory.newInstance();
+      SOAPMessage soapMessage = factory.createMessage();
+      addrProps.writeHeaders(soapMessage);
+      SOAPEnvelope wasEnv = soapMessage.getSOAPPart().getEnvelope();
+
+      SOAPMessage msgOut = factory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
+      SOAPEnvelope expEnv = msgOut.getSOAPPart().getEnvelope();
+      
+      System.out.println("FIXME: JBWS-1130");
+      //assertEquals(expEnv, wasEnv);
+   }
+
+   public void testReplyToHeaders() throws Exception
+   {
+      AddressingBuilder addrBuilder = SOAPAddressingBuilder.getAddressingBuilder();
+      SOAPAddressingProperties replyProps = (SOAPAddressingProperties)addrBuilder.newAddressingProperties();
+      replyProps.initializeAsReply(addrProps, false);
+      replyProps.setAction(addrBuilder.newURI("http://fabrikam123.example/ReplyPO"));
+      
+      MessageFactory factory = MessageFactory.newInstance();
+      SOAPMessage soapMessage = factory.createMessage();
+      replyProps.writeHeaders(soapMessage);
+      SOAPEnvelope wasEnv = soapMessage.getSOAPPart().getEnvelope();
+
+      SOAPMessage msgOut = factory.createMessage(null, new ByteArrayInputStream(resEnvStr.getBytes()));
+      SOAPEnvelope expEnv = msgOut.getSOAPPart().getEnvelope();
+
+      System.out.println("FIXME: JBWS-1130");
+      //assertEquals(expEnv, wasEnv);
+   }
+}


Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action)

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/ActionEndpoint.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.action;
+package org.jboss.test.ws.jaxws.wsaddressing.action;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/ActionRpcEndpointImpl.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.action;
+package org.jboss.test.ws.jaxws.wsaddressing.action;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/AddressingActionTestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.action;
+package org.jboss.test.ws.jaxws.wsaddressing.action;
 
 import javax.xml.rpc.Service;
 
@@ -42,7 +42,7 @@
 
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxrpc-wsaddressing-action-rpc.war, jaxrpc-wsaddressing-action-rpc-client.jar");
+      return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war, jaxws-wsaddressing-action-rpc-client.jar");
    }
 
    protected void setUp() throws Exception

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientDocHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/ClientDocHandler.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientDocHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.action;
+package org.jboss.test.ws.jaxws.wsaddressing.action;
 
 import java.net.URISyntaxException;
 
@@ -30,7 +30,7 @@
 import javax.xml.ws.addressing.JAXWSAConstants;
 
 import org.jboss.logging.Logger;
-import org.jboss.test.ws.jaxrpc.wsaddressing.AddressingHandler;
+import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler;
 
 /**
  * A client side handler for the ws-addressing

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/ClientRpcHandler.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ClientRpcHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.action;
+package org.jboss.test.ws.jaxws.wsaddressing.action;
 
 import java.net.URISyntaxException;
 

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto (from rev 921, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto)

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/AddressingReplyToTestCase.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 import java.io.ByteArrayInputStream;
 import java.net.URL;
@@ -50,9 +50,9 @@
    public static Test suite()
    {
       return JBossWSTestSetup.newTestSetup(AddressingReplyToTestCase.class,
-            "jaxrpc-wsaddressing-initial.war,jaxrpc-wsaddressing-initial-client.jar," +
-            "jaxrpc-wsaddressing-replyto.war,jaxrpc-wsaddressing-replyto-client.jar," +
-            "jaxrpc-wsaddressing-faultto.war,jaxrpc-wsaddressing-faultto-client.jar");
+            "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-client.jar," +
+            "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-client.jar," +
+            "jaxws-wsaddressing-faultto.war,jaxws-wsaddressing-faultto-client.jar");
    }
 
    protected void setUp() throws Exception
@@ -88,7 +88,7 @@
       SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
       SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
 
-      URL epURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsaddressing-replyto/ReplyToService");
+      URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-replyto/ReplyToService");
       con.call(reqMsg, epURL);
 
       assertEquals("Mars Bar", replyto.getLastItem());
@@ -113,7 +113,7 @@
       SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
       SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
 
-      URL epURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsaddressing-faultto/FaultToService");
+      URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService");
       con.call(reqMsg, epURL);
 
       assertEquals("java.lang.IllegalArgumentException: Mars Bar", faultto.getLastFault());

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ClientHandler.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -32,7 +32,7 @@
 import javax.xml.ws.addressing.JAXWSAConstants;
 
 import org.jboss.logging.Logger;
-import org.jboss.test.ws.jaxrpc.wsaddressing.AddressingHandler;
+import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler;
 import org.jboss.ws.utils.UUIDGenerator;
 
 /**
@@ -59,13 +59,13 @@
       {
          AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
          AddressingProperties outProps = builder.newAddressingProperties();
-         outProps.setTo(builder.newURI("uri:jaxrpc-wsaddressing-initial/InitialService"));
-         outProps.setAction(builder.newURI("http://org.jboss.ws/jaxrpc/wsaddressing/replyto/action"));
+         outProps.setTo(builder.newURI("uri:jaxws-wsaddressing-initial/InitialService"));
+         outProps.setAction(builder.newURI("http://org.jboss.ws/jaxws/wsaddressing/replyto/action"));
 
-         EndpointReference eprReplyTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-wsaddressing-replyto/ReplyToService"));
+         EndpointReference eprReplyTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxws-wsaddressing-replyto/ReplyToService"));
          outProps.setReplyTo(eprReplyTo);
          outProps.setMessageID(builder.newURI("urn:uuid:" + UUIDGenerator.generateRandomUUIDString()));
-         EndpointReference eprFaultTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-wsaddressing-faultto/FaultToService"));
+         EndpointReference eprFaultTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"));
          outProps.setFaultTo(eprFaultTo);
 
          msgContext.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps);

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/FaultToEndpoint.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/FaultToEndpointImpl.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpoint.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/InitialEndpointImpl.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpoint.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 //$Id$
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ReplyToEndpointImpl.java	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java	2006-09-11 12:21:31 UTC (rev 933)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.ws.jaxrpc.wsaddressing.replyto;
+package org.jboss.test.ws.jaxws.wsaddressing.replyto;
 
 //$Id$
 

Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws860 (from rev 921, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws860)

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws860/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws860/WEB-INF/web.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws860/WEB-INF/web.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -5,12 +5,12 @@
   
   <servlet>
     <servlet-name>InventoryWebService</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.jbws860.InventoryWebService</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.jbws860.InventoryWebService</servlet-class>
   </servlet>
   
   <servlet>
     <servlet-name>TestServlet</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.jbws860.TestServlet</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.jbws860.TestServlet</servlet-class>
   </servlet>
   
   <servlet-mapping>

Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws871 (from rev 921, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws871)

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws871/META-INF/application-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/application-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -9,11 +9,11 @@
 
   <service-ref>
     <service-ref-name>service/RpcArrayEndpointService</service-ref-name>
-    <service-interface>org.jboss.test.ws.jaxrpc.jbws871.RpcArrayEndpointService</service-interface>
+    <service-interface>org.jboss.test.ws.jaxws.jbws871.RpcArrayEndpointService</service-interface>
     <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws871.RpcArrayEndpoint</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws871.RpcArrayEndpoint</service-endpoint-interface>
     </port-component-ref>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws871/META-INF/jaxrpc-mapping.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/jaxrpc-mapping.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
  <package-mapping>
-  <package-type>org.jboss.test.ws.jaxrpc.jbws871</package-type>
-  <namespaceURI>http://jbws871.jaxrpc.ws.test.jboss.org/jaws</namespaceURI>
+  <package-type>org.jboss.test.ws.jaxws.jbws871</package-type>
+  <namespaceURI>http://jbws871.jaxws.ws.test.jboss.org/jaws</namespaceURI>
  </package-mapping>
  <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jaxrpc.jbws871.RpcArrayEndpointService</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://jbws871.jaxrpc.ws.test.jboss.org/jaws'>serviceNS:RpcArrayEndpointService</wsdl-service-name>
+  <service-interface>org.jboss.test.ws.jaxws.jbws871.RpcArrayEndpointService</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://jbws871.jaxws.ws.test.jboss.org/jaws'>serviceNS:RpcArrayEndpointService</wsdl-service-name>
   <port-mapping>
    <port-name>RpcArrayEndpointPort</port-name>
    <java-port-name>RpcArrayEndpointPort</java-port-name>
   </port-mapping>
  </service-interface-mapping>
  <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws871.RpcArrayEndpoint</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://jbws871.jaxrpc.ws.test.jboss.org/jaws'>portTypeNS:RpcArrayEndpoint</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://jbws871.jaxrpc.ws.test.jboss.org/jaws'>bindingNS:RpcArrayEndpointBinding</wsdl-binding>
+  <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws871.RpcArrayEndpoint</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://jbws871.jaxws.ws.test.jboss.org/jaws'>portTypeNS:RpcArrayEndpoint</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://jbws871.jaxws.ws.test.jboss.org/jaws'>bindingNS:RpcArrayEndpointBinding</wsdl-binding>
   <service-endpoint-method-mapping>
    <java-method-name>intArr</java-method-name>
    <wsdl-operation>intArr</wsdl-operation>
@@ -22,7 +22,7 @@
     <param-position>0</param-position>
     <param-type>java.lang.String</param-type>
     <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://jbws871.jaxrpc.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArr</wsdl-message>
+     <wsdl-message xmlns:wsdlMsgNS='http://jbws871.jaxws.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArr</wsdl-message>
      <wsdl-message-part-name>String_1</wsdl-message-part-name>
      <parameter-mode>IN</parameter-mode>
     </wsdl-message-mapping>
@@ -31,14 +31,14 @@
     <param-position>1</param-position>
     <param-type>java.lang.Integer[]</param-type>
     <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://jbws871.jaxrpc.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArr</wsdl-message>
+     <wsdl-message xmlns:wsdlMsgNS='http://jbws871.jaxws.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArr</wsdl-message>
      <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
      <parameter-mode>IN</parameter-mode>
     </wsdl-message-mapping>
    </method-param-parts-mapping>
    <wsdl-return-value-mapping>
     <method-return-value>java.lang.Integer[]</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://jbws871.jaxrpc.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArrResponse</wsdl-message>
+    <wsdl-message xmlns:wsdlMsgNS='http://jbws871.jaxws.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArrResponse</wsdl-message>
     <wsdl-message-part-name>result</wsdl-message-part-name>
    </wsdl-return-value-mapping>
   </service-endpoint-method-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws871/META-INF/wsdl/TestEndpoint.wsdl	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl	2006-09-11 12:21:31 UTC (rev 933)
@@ -1,6 +1,6 @@
-<definitions name='RpcArrayEndpointService' targetNamespace='http://jbws871.jaxrpc.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws871.jaxrpc.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+<definitions name='RpcArrayEndpointService' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
  <types>
-  <schema elementFormDefault='qualified' targetNamespace='http://jbws871.jaxrpc.ws.test.jboss.org/jaws' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws871.jaxrpc.ws.test.jboss.org/jaws' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <schema elementFormDefault='qualified' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
    <complexType name='Integer.Array'>
     <sequence>
      <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='int'/>
@@ -26,16 +26,16 @@
   <operation name='intArr'>
    <soap:operation soapAction=''/>
    <input>
-    <soap:body namespace='http://jbws871.jaxrpc.ws.test.jboss.org/jaws' use='literal'/>
+    <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' use='literal'/>
    </input>
    <output>
-    <soap:body namespace='http://jbws871.jaxrpc.ws.test.jboss.org/jaws' use='literal'/>
+    <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' use='literal'/>
    </output>
   </operation>
  </binding>
  <service name='RpcArrayEndpointService'>
   <port binding='tns:RpcArrayEndpointBinding' name='RpcArrayEndpointPort'>
-   <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-jbws871-rpc/TestEndpoint'/>
+   <soap:address location='http://@jbosstest.host.name@:8080/jaxws-jbws871-rpc/TestEndpoint'/>
   </port>
  </service>
 </definitions>
\ No newline at end of file

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws871/WEB-INF-rpc/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws871/WEB-INF-rpc/web.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws871/WEB-INF-rpc/web.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>TestEndpoint</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.jbws871.RpcArrayEndpointImpl</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.jbws871.RpcArrayEndpointImpl</servlet-class>
   </servlet>
 
   <servlet-mapping>

Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws944 (from rev 921, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws944)

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws944/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws944/META-INF/application-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws944/META-INF/application-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -13,7 +13,7 @@
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws944.EndpointInterface</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws944.EndpointInterface</service-endpoint-interface>
     </port-component-ref>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws944/META-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws944/META-INF/wsdl/TestService.wsdl	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws944/META-INF/wsdl/TestService.wsdl	2006-09-11 12:21:31 UTC (rev 933)
@@ -26,7 +26,7 @@
  </binding>
  <service name='TestService'>
   <port binding='tns:EndpointInterfaceBinding' name='EndpointInterfacePort'>
-   <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-jbws944/FooBean01'/>
+   <soap:address location='http://@jbosstest.host.name@:8080/jaxws-jbws944/FooBean01'/>
   </port>
  </service>
 </definitions>
\ No newline at end of file

Copied: branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing (from rev 921, branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wsaddressing)

Modified: branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wsaddressing/META-INF/application-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/META-INF/application-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -13,11 +13,11 @@
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.wsaddressing.StatefulEndpoint</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.wsaddressing.StatefulEndpoint</service-endpoint-interface>
     </port-component-ref>
     <handler>
       <handler-name>ClientHandler</handler-name>
-      <handler-class>org.jboss.test.ws.jaxrpc.samples.wsaddressing.ClientHandler</handler-class>
+      <handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ClientHandler</handler-class>
     </handler>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wsaddressing/META-INF/wsdl/TestService.wsdl	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl	2006-09-11 12:21:31 UTC (rev 933)
@@ -56,7 +56,7 @@
  </binding>
  <service name='TestService'>
   <port binding='tns:StatefulEndpointBinding' name='StatefulEndpointPort'>
-   <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-samples-wsaddressing/TestService'/>
+   <soap:address location='http://@jbosstest.host.name@:8080/jaxws-samples-wsaddressing/TestService'/>
   </port>
  </service>
 </definitions>
\ No newline at end of file

Modified: branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wsaddressing/WEB-INF/jaxws-handlers.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -8,7 +8,7 @@
     <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
 		<handler>
 			<handler-name>Application Server Handler</handler-name>
-			<handler-class>org.jboss.test.ws.jaxrpc.samples.wsaddressing.ServerHandler</handler-class>
+			<handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServerHandler</handler-class>
 		</handler>
 	</handler-chain>
 </handler-chains>
\ No newline at end of file

Modified: branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wsaddressing/WEB-INF/web.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>TestService</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.samples.wsaddressing.StatefulEndpointImpl</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.samples.wsaddressing.StatefulEndpointImpl</servlet-class>
   </servlet>
 
   <servlet-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wsaddressing/wstools-config.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -8,7 +8,7 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
   
-  <wsdl-java file="resources/jaxrpc/samples/wsaddressing/META-INF/wsdl/TestService.wsdl">
+  <wsdl-java file="resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl">
     <mapping file="jaxrpc-mapping.xml"/>
   </wsdl-java>
   

Copied: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing (from rev 921, branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing)

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/action/META-INF/application-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/application-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -13,11 +13,11 @@
     <wsdl-file>META-INF/wsdl/ActionRpcService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsaddressing.action.ActionEndpoint</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint</service-endpoint-interface>
     </port-component-ref>
     <handler>
       <handler-name>ClientHandler</handler-name>
-      <handler-class>org.jboss.test.ws.jaxrpc.wsaddressing.action.ClientRpcHandler</handler-class>
+      <handler-class>org.jboss.test.ws.jaxws.wsaddressing.action.ClientRpcHandler</handler-class>
     </handler>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/action/META-INF/config.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/config.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -10,8 +10,8 @@
   <service name="ActionRpcService"
     targetNamespace="http://org.jboss.ws/addressing/action"
     typeNamespace="http://org.jboss.ws/addressing/action"
-    packageName="org.jboss.test.ws.jaxrpc.wsaddressing.action">
-    <interface name="org.jboss.test.ws.jaxrpc.wsaddressing.action.ActionEndpoint"/>
+    packageName="org.jboss.test.ws.jaxws.wsaddressing.action">
+    <interface name="org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint"/>
   </service>
 
 </configuration>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/action/META-INF/jaxrpc-mapping.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/jaxrpc-mapping.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -2,15 +2,15 @@
 <java-wsdl-mapping version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
   <package-mapping>
-    <package-type>org.jboss.test.ws.jaxrpc.wsaddressing.action</package-type>
+    <package-type>org.jboss.test.ws.jaxws.wsaddressing.action</package-type>
     <namespaceURI>http://org.jboss.ws/addressing/action</namespaceURI>
   </package-mapping>
   <package-mapping>
-    <package-type>org.jboss.test.ws.jaxrpc.wsaddressing.action</package-type>
+    <package-type>org.jboss.test.ws.jaxws.wsaddressing.action</package-type>
     <namespaceURI>http://org.jboss.ws/addressing/action</namespaceURI>
   </package-mapping>
   <service-interface-mapping>
-    <service-interface>org.jboss.test.ws.jaxrpc.wsaddressing.action.ActionRpcService</service-interface>
+    <service-interface>org.jboss.test.ws.jaxws.wsaddressing.action.ActionRpcService</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/addressing/action">serviceNS:ActionRpcService</wsdl-service-name>
     <port-mapping>
       <port-name>ActionEndpointPort</port-name>
@@ -18,7 +18,7 @@
     </port-mapping>
   </service-interface-mapping>
   <service-endpoint-interface-mapping>
-    <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsaddressing.action.ActionEndpoint</service-endpoint-interface>
+    <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint</service-endpoint-interface>
     <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/addressing/action">portTypeNS:ActionEndpoint</wsdl-port-type>
     <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/addressing/action">bindingNS:ActionEndpointBinding</wsdl-binding>
     <service-endpoint-method-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/wsdl/ActionRpcService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/action/META-INF/wsdl/ActionRpcService.wsdl	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/META-INF/wsdl/ActionRpcService.wsdl	2006-09-11 12:21:31 UTC (rev 933)
@@ -48,7 +48,7 @@
   </binding>
   <service name="ActionRpcService">
     <port name="ActionEndpointPort" binding="tns:ActionEndpointBinding">
-      <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-action-rpc/ActionRpcService"/>
+      <soap:address location="http://@jbosstest.host.name@:8080/jaxws-wsaddressing-action-rpc/ActionRpcService"/>
     </port>
   </service>
 </definitions>
\ No newline at end of file

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/action/WEB-INF/web.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/action/WEB-INF/web.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>ActionRpcService</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.wsaddressing.action.ActionRpcEndpointImpl</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.wsaddressing.action.ActionRpcEndpointImpl</servlet-class>
   </servlet>
 
   <servlet-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF/application-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/application-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -13,11 +13,11 @@
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.FaultToEndpoint</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.FaultToEndpoint</service-endpoint-interface>
     </port-component-ref>
      <handler>
       <handler-name>ClientHandler</handler-name>
-      <handler-class>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.ClientHandler</handler-class>
+      <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class>
     </handler>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF/jboss-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/jboss-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -10,6 +10,6 @@
   <service-ref>
     <service-ref-name>service/FaultToService</service-ref-name>
     <config-name>Standard WSAddressing Client</config-name>
-    <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-faultto/FaultToService?wsdl</wsdl-override>
+    <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-wsaddressing-faultto/FaultToService?wsdl</wsdl-override>
   </service-ref>
 </jboss-client>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF/wstools-config.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/wstools-config.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -8,7 +8,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
   
-  <wsdl-java file="http://localhost:8080/jaxrpc-wsaddressing-faultto/FaultToEndpoint?wsdl">    
+  <wsdl-java file="http://localhost:8080/jaxws-wsaddressing-faultto/FaultToEndpoint?wsdl">    
     <mapping file="jaxrpc-mapping.xml" />
   </wsdl-java>
   

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-WEB-INF/web.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>FaultToService</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.FaultToEndpointImpl</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.FaultToEndpointImpl</servlet-class>
   </servlet>
 
   <servlet-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF/application-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/application-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -13,11 +13,11 @@
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface>
     </port-component-ref>
     <handler>
       <handler-name>ClientHandler</handler-name>
-      <handler-class>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.ClientHandler</handler-class>
+      <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class>
     </handler>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF/jboss-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/jboss-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -9,6 +9,6 @@
   <service-ref>
     <service-ref-name>service/InitialService</service-ref-name>
     <config-name>Standard WSAddressing Client</config-name>
-    <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-initial/InitialService?wsdl</wsdl-override> 
+    <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-wsaddressing-initial/InitialService?wsdl</wsdl-override> 
   </service-ref>
 </jboss-client>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF/wstools-config.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -8,7 +8,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
   
-  <wsdl-java file="http://localhost:8080/jaxrpc-wsaddressing-initial/InitialService?wsdl">
+  <wsdl-java file="http://localhost:8080/jaxws-wsaddressing-initial/InitialService?wsdl">
     <mapping file="jaxrpc-mapping.xml" />
   </wsdl-java>
   

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-WEB-INF/web.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>InitialService</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.InitialEndpointImpl</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpointImpl</servlet-class>
   </servlet>
 
   <servlet-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/application-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/application-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -13,11 +13,11 @@
     <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface>
     </port-component-ref>
      <handler>
       <handler-name>ClientHandler</handler-name>
-      <handler-class>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.ClientHandler</handler-class>
+      <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class>
     </handler>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jaxrpc-mapping.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
  <package-mapping>
-  <package-type>org.jboss.test.ws.jaxrpc.wsaddressing.replyto</package-type>
+  <package-type>org.jboss.test.ws.jaxws.wsaddressing.replyto</package-type>
   <namespaceURI>http://org.jboss.ws/addressing/replyto</namespaceURI>
  </package-mapping>
  <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.ReplyToEndpointService</service-interface>
+  <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpointService</service-interface>
   <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:ReplyToEndpointService</wsdl-service-name>
   <port-mapping>
    <port-name>ReplyToEndpointPort</port-name>
@@ -12,7 +12,7 @@
   </port-mapping>
  </service-interface-mapping>
  <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface>
+  <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface>
   <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:ReplyToEndpoint</wsdl-port-type>
   <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:ReplyToEndpointBinding</wsdl-binding>
   <service-endpoint-method-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -9,6 +9,6 @@
   <service-ref>
     <service-ref-name>service/ReplyToService</service-ref-name>
     <config-name>Standard WSAddressing Client</config-name>
-    <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override>
+    <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override>
   </service-ref>
 </jboss-client>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -8,7 +8,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
   
-  <wsdl-java file="http://localhost:8080/jaxrpc-wsaddressing-replyto/ReplyToService?wsdl">    
+  <wsdl-java file="http://localhost:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl">    
     <mapping file="jaxrpc-mapping.xml" />
   </wsdl-java>
   

Modified: branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml	2006-09-08 23:24:21 UTC (rev 921)
+++ branches/jbossws-1.0/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml	2006-09-11 12:21:31 UTC (rev 933)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>ReplyToService</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxrpc.wsaddressing.replyto.ReplyToEndpointImpl</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpointImpl</servlet-class>
   </servlet>
 
   <servlet-mapping>




More information about the jboss-svn-commits mailing list