[jboss-svn-commits] JBossWS SVN: r920 - in branches/jbossws-1.0/src/test: ant java/org/jboss/test/ws/jaxrpc/samples/jmstransport java/org/jboss/test/ws/jaxrpc/wsaddressing/action java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto java/org/jboss/test/ws/jaxrpc/wseventing java/org/jboss/test/ws/jaxrpc/xop java/org/jboss/test/ws/jaxws/jsr181/handlerchain java/org/jboss/test/ws/jaxws/jsr181/oneway java/org/jboss/test/ws/jaxws/jsr181/soapbinding java/org/jboss/test/ws/jaxws/jsr181/webmethod java/org/jboss/test/ws/tools java/org/jboss/test/ws/tools/jsr181/webservice java/org/jboss/test/ws/tools/validation java/org/jboss/test/ws/tools/xmlschema resources/jaxrpc/marshall-doclit resources/jaxrpc/marshall-doclit/META-INF resources/jaxrpc/marshall-doclit/WEB-INF resources/jaxrpc/marshall-rpclit resources/jaxrpc/marshall-rpclit/META-INF resources/jaxrpc/marshall-rpclit/WEB-INF resources/jaxrpc/overloaded/WEB-INF resources/jaxrpc/wsaddressing/action/META-INF/wsdl resources/jaxrpc/wsaddressing/repl! yto/FaultTo-META-INF resources/jaxrpc/wsaddressing/replyto/Initial-META-INF resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF resources/jaxrpc/wseventing/META-INF resources/jaxrpc/wseventing/WEB-INF/wsdl resources/jaxrpc/wsse/rpc/WEB-INF resources/jaxrpc/wsse/store-pass-encrypt-class-cmd resources/jaxrpc/wsse/username/META-INF resources/jaxrpc/wsse/webclient/WEB-INF resources/jaxrpc/xop resources/jaxws/jsr181/complex resources/jaxws/jsr181/complex/WEB-INF resources/jaxws/jsr181/soapbinding resources/jaxws/jsr181/webresult

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Sep 8 19:08:22 EDT 2006


Author: thomas.diesler at jboss.com
Date: 2006-09-08 19:07:24 -0400 (Fri, 08 Sep 2006)
New Revision: 920

Modified:
   branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/AddressingActionTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/AddressingReplyToTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ClientHandler.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/DIIClientTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingSupport.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/NotificationTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToWSDL20TestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/jaxrpc-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/webservices.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/jaxrpc-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/overloaded/WEB-INF/jboss-web.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/action/META-INF/wsdl/ActionRpcService.wsdl
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF/jboss-client.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF/jboss-client.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/eventing.wsdl
   branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl
   branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind_inherit.wsdl
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml
   branches/jbossws-1.0/src/test/resources/jaxrpc/xop/circular.xsd
   branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/WEB-INF/web.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/config.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/bare-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/jaxrpc-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/wrapped-mapping.xml
   branches/jbossws-1.0/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml
Log:
Reorganize tests
ALL GOOD

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-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -953,34 +953,6 @@
       </metainf>
     </jar>
     
-    <!-- jaxrpc-samples-eventing.war -->
-    <war warfile="${build.test.dir}/libs/jaxrpc-samples-eventing.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
-      <classes dir="${build.test.dir}/classes">
-        <include name="org/jboss/ws/samples/wseventing/*.class"/>
-        <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/>
-      </classes>
-      <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
-        <include name="jaxrpc-mapping.xml"/>
-        <include name="webservices.xml"/>
-        <include name="wsdl/sysmon.wsdl"/>
-        <include name="wsdl/jbwse.wsdl"/>
-        <include name="wsdl/jbwse.xsd"/>
-      </webinf>
-    </war>
-    <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-eventing-client.jar">
-      <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/ws/samples/wseventing/*.class"/>
-      </fileset>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
-        <include name="jaxrpc-mapping.xml"/>
-        <include name="wsdl/**"/>
-      </metainf>
-      <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/META-INF">
-        <include name="application-client.xml"/>
-        <include name="jboss-client.xml"/>
-      </metainf>
-    </jar>
-    
     <!-- jaxrpc-samples-exception -->
     <war destfile="${build.test.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
       <classes dir="${build.test.dir}/classes">
@@ -1379,12 +1351,40 @@
       <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wsaddressing/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
-        <include name="jaxrpc-client-config.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">
+        <include name="org/jboss/ws/samples/wseventing/*.class"/>
+        <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/>
+      </classes>
+      <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="webservices.xml"/>
+        <include name="wsdl/sysmon.wsdl"/>
+        <include name="wsdl/jbwse.wsdl"/>
+        <include name="wsdl/jbwse.xsd"/>
+      </webinf>
+    </war>
+    <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wseventing-client.jar">
+      <fileset dir="${build.test.dir}/classes">
+        <include name="org/jboss/ws/samples/wseventing/*.class"/>
+      </fileset>
+      <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="wsdl/**"/>
+      </metainf>
+      <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/META-INF">
+        <include name="application-client.xml"/>
+        <include name="jboss-client.xml"/>
+      </metainf>
+    </jar>
+    
     <!-- jaxrpc-samples-wssecurity-sign -->
     <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
       <classes dir="${build.test.dir}/classes">
@@ -1515,7 +1515,7 @@
       <metainf dir="${build.test.dir}/resources/jaxrpc/wsaddressing/action/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
-        <include name="jaxrpc-client-config.xml"/>
+        <include name="jbossws-client-config.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
@@ -1539,7 +1539,7 @@
       <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-client-config.xml"/>
+        <include name="jaxrpc-jbossws-client-config.xml"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
@@ -1560,7 +1560,7 @@
       <metainf dir="${build.test.dir}/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
-        <include name="jaxrpc-client-config.xml"/>
+        <include name="jbossws-client-config.xml"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
@@ -1577,15 +1577,15 @@
       <metainf dir="${build.test.dir}/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
-        <include name="jaxrpc-client-config.xml"/>
+        <include name="jbossws-client-config.xml"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wseventing -->
-    <war warfile="${build.test.dir}/libs/jaxrpc-test-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
+    <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">
-        <include name="org/jboss/ws/wseventing/*.class"/>
+        <include name="org/jboss/ws/eventing/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wseventing/*.class"/>
       </classes>
       <webinf dir="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF">
@@ -1594,9 +1594,9 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${build.test.dir}/libs/jaxrpc-test-wseventing-client.jar">
+    <jar jarfile="${build.test.dir}/libs/jaxrpc-wseventing-client.jar">
       <fileset dir="${build.test.dir}/classes">
-        <include name="org/jboss/ws/wseventing/*.class"/>
+        <include name="org/jboss/ws/eventing/*.class"/>
       </fileset>
       <metainf dir="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -87,7 +87,9 @@
       sender.send(message);
       sender.close();
 
-      count.await();
+      // Please explain to me why this does not work relieably
+      // count.await();
+      Thread.sleep(500);
       
       assertNotNull("Expected response message", responseListener.resMessage);
       assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage));

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/AddressingActionTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/AddressingActionTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/action/AddressingActionTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -42,7 +42,7 @@
 
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxrpc-addressing-action-rpc.war, jaxrpc-addressing-action-rpc-client.jar");
+      return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxrpc-wsaddressing-action-rpc.war, jaxrpc-wsaddressing-action-rpc-client.jar");
    }
 
    protected void setUp() throws Exception

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/AddressingReplyToTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/AddressingReplyToTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -50,9 +50,9 @@
    public static Test suite()
    {
       return JBossWSTestSetup.newTestSetup(AddressingReplyToTestCase.class,
-            "jaxrpc-addressing-initial.war,jaxrpc-addressing-initial-client.jar," +
-            "jaxrpc-addressing-replyto.war,jaxrpc-addressing-replyto-client.jar," +
-            "jaxrpc-addressing-faultto.war,jaxrpc-addressing-faultto-client.jar");
+            "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");
    }
 
    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-addressing-replyto/ReplyToService");
+      URL epURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-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-addressing-faultto/FaultToService");
+      URL epURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-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/jaxrpc/wsaddressing/replyto/ClientHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ClientHandler.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wsaddressing/replyto/ClientHandler.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -59,13 +59,13 @@
       {
          AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
          AddressingProperties outProps = builder.newAddressingProperties();
-         outProps.setTo(builder.newURI("uri:jaxrpc-addressing-initial/InitialService"));
-         outProps.setAction(builder.newURI("http://org.jboss.ws/addressing/replyto/action"));
+         outProps.setTo(builder.newURI("uri:jaxrpc-wsaddressing-initial/InitialService"));
+         outProps.setAction(builder.newURI("http://org.jboss.ws/jaxrpc/wsaddressing/replyto/action"));
 
-         EndpointReference eprReplyTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-addressing-replyto/ReplyToService"));
+         EndpointReference eprReplyTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-wsaddressing-replyto/ReplyToService"));
          outProps.setReplyTo(eprReplyTo);
          outProps.setMessageID(builder.newURI("urn:uuid:" + UUIDGenerator.generateRandomUUIDString()));
-         EndpointReference eprFaultTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-addressing-faultto/FaultToService"));
+         EndpointReference eprFaultTo = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-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/jaxrpc/wseventing/DIIClientTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/DIIClientTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/DIIClientTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -77,14 +77,14 @@
 
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(DIIClientTestCase.class, "jaxrpc-test-eventing.war");
+      return JBossWSTestSetup.newTestSetup(DIIClientTestCase.class, "jaxrpc-wseventing.war");
    }
 
    public void setUp() throws Exception
    {
       super.setUp();
       eventSourceURI = new URI("http://schemas.xmlsoap.org/ws/2004/08/eventing/Warnings");
-      wsdlLocation = "http://" + getServerHost() + ":8080/jaxrpc-test-eventing/subscribe?wsdl";
+      wsdlLocation = "http://" + getServerHost() + ":8080/jaxrpc-wseventing/subscribe?wsdl";
    }
 
    public void testSubscription() throws Exception
@@ -127,7 +127,7 @@
     */
    private ServiceExt buildService() throws Exception
    {
-      File mappingFile = new File("resources/jaxrpc/eventing/WEB-INF/jaxrpc-mapping.xml");
+      File mappingFile = new File("resources/jaxrpc/wseventing/WEB-INF/jaxrpc-mapping.xml");
       assertTrue("jaxrpc-mapping.xml found", mappingFile.exists());
       
       // construct service and setup handlers

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingSupport.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingSupport.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingSupport.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -150,7 +150,7 @@
          DeliveryType delivery = new DeliveryType();
          delivery.setMode(EventingConstants.getDeliveryPush());
          EndpointReference notifyEPR = new EndpointReference();
-         notifyEPR.setAddress(new URI("http://" + getServerHost() + ":8080/jaxrpc-test-eventing/eventSink"));
+         notifyEPR.setAddress(new URI("http://" + getServerHost() + ":8080/jaxrpc-wseventing/eventSink"));
          delivery.setNotifyTo(notifyEPR);
          return delivery;
       }
@@ -209,7 +209,7 @@
 
    protected void assertWSDLAccess() throws MalformedURLException
    {
-      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-test-eventing/subscribe?wsdl");
+      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-wseventing/subscribe?wsdl");
       WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
       WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
       assertNotNull(wsdlDefinitions);

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -54,7 +54,7 @@
 
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(EventingTestCase.class, "jaxrpc-test-eventing.war, jaxrpc-test-eventing-client.jar");
+      return JBossWSTestSetup.newTestSetup(EventingTestCase.class, "jaxrpc-wseventing.war, jaxrpc-wseventing-client.jar");
    }
 
    // ----------------------------------------------------------------------------

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/NotificationTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/NotificationTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/NotificationTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -43,7 +43,7 @@
 {
    public static Test suite()
    {
-      return JBossWSTestSetup.newTestSetup(NotificationTestCase.class, "jaxrpc-test-eventing.war, jaxrpc-test-eventing-client.jar");
+      return JBossWSTestSetup.newTestSetup(NotificationTestCase.class, "jaxrpc-wseventing.war, jaxrpc-wseventing-client.jar");
    }
 
    public void testNotification() throws Exception {

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -80,7 +80,7 @@
       try
       {
          EventingEndpointDI deploymentInfo = new EventingEndpointDI("http://schemas.xmlsoap.org/ws/2004/08/eventing/Warnings", null);
-         deploymentInfo.setEndpointAddress("http://localhost:8080/jaxrpc-test-eventing/manage");
+         deploymentInfo.setEndpointAddress("http://localhost:8080/jaxrpc-wseventing/manage");
          deploymentInfo.setPortName("SubscriptionManagerPort");
          
          subscriptionManager = new SubscriptionManager();         

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -1,6 +1,9 @@
 package org.jboss.test.ws.jaxrpc.xop;
 
+import java.io.File;
+
 import junit.framework.TestCase;
+
 import org.apache.xerces.xs.XSComplexTypeDefinition;
 import org.apache.xerces.xs.XSModel;
 import org.apache.xerces.xs.XSTypeDefinition;
@@ -10,36 +13,34 @@
 import org.jboss.ws.xop.XOPScanner;
 import org.jboss.xb.binding.NamespaceRegistry;
 
-import java.io.File;
-
 /**
  * @author Heiko Braun <heiko.braun at jboss.com>
  * @since Jun 9, 2006
  */
-public class XOPTypeDefTestCase extends TestCase {
-
-   //String prefix = "C:/dev/prj/jbossws/branches/jaxrpc-1.0/src/test/";
-   String prefix = "";
-   
-   public XOPTypeDefTestCase(String string) {
+public class XOPTypeDefTestCase extends TestCase
+{
+   public XOPTypeDefTestCase(String string)
+   {
       super(string);
    }
 
-   protected void setUp() throws Exception {
+   protected void setUp() throws Exception
+   {
       super.setUp();
    }
 
-  public void testCircularReferences() throws Exception{
+   public void testCircularReferences() throws Exception
+   {
       SchemaUtils utils = SchemaUtils.getInstance();
-      File f = new File(prefix+"resources/jaxrpc/xop/circular.xsd");
+      File f = new File("resources/jaxrpc/xop/circular.xsd");
       assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
 
       XSModel xsModel = utils.parseSchema(f.toURL());
       assertNotNull(xsModel);
-      WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.ws.test.jboss.org/jaws");
-      JBossXSModel schemaModel= wsUtil.getJBossXSModel(xsModel);
+      WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
+      JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
 
-      XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.ws.test.jboss.org/jaws");
+      XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws");
 
       assertNotNull("Root type def not found", xsType);
       XOPScanner scanner = new XOPScanner();
@@ -56,13 +57,13 @@
    public void testXOPElementScan() throws Exception
    {
       SchemaUtils utils = SchemaUtils.getInstance();
-      File f = new File(prefix+"resources/jaxrpc/xop/schema.xsd");
+      File f = new File("resources/jaxrpc/xop/schema.xsd");
       assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
 
       XSModel xsModel = utils.parseSchema(f.toURL());
       assertNotNull(xsModel);
       WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
-      JBossXSModel schemaModel= wsUtil.getJBossXSModel(xsModel);
+      JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel);
 
       XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit");
 
@@ -92,27 +93,27 @@
    public void testMSFTElementScan() throws Exception
    {
       /*
-      SchemaUtils utils = SchemaUtils.getInstance();
-      File f = new File(prefix +"resources/jaxrpc/xop/schema.xsd");
-      assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
+       SchemaUtils utils = SchemaUtils.getInstance();
+       File f = new File(prefix +"resources/jaxrpc/xop/schema.xsd");
+       assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists());
 
-      XSModel xsModel = utils.parseSchema(f.toURL());
-      assertNotNull(xsModel);
-      WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
-      JBossXSModel schemaModel= wsUtil.getJBossXSModel(xsModel);
+       XSModel xsModel = utils.parseSchema(f.toURL());
+       assertNotNull(xsModel);
+       WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit");
+       JBossXSModel schemaModel= wsUtil.getJBossXSModel(xsModel);
 
-      XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit");
+       XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit");
 
-      assertNotNull("Root type def not found", xsType);
-      XOPScanner scanner = new XOPScanner();
+       assertNotNull("Root type def not found", xsType);
+       XOPScanner scanner = new XOPScanner();
 
-      if (xsType instanceof XSComplexTypeDefinition)
-      {
-         XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
-         XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
-         assertNotNull("Unable to find xop typedef in schema", resultType);
-      }
-      */
+       if (xsType instanceof XSComplexTypeDefinition)
+       {
+       XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType;
+       XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType);
+       assertNotNull("Unable to find xop typedef in schema", resultType);
+       }
+       */
       System.out.println("FIXME: testMSFTElementScan");
    }
 }

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -41,7 +41,7 @@
  */
 public class JSR181HandlerChainTestCase extends JBossWSTest
 {
-   private static final String targetNS = "http://handlerchain.jsr181.ws.test.jboss.org/jaws";
+   private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/jaws";
 
    public static Test suite()
    {

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -42,7 +42,7 @@
  */
 public class JSR181OneWayTestCase extends JBossWSTest
 {
-   private static final String targetNS = "http://oneway.jsr181.ws.test.jboss.org/jaws";
+   private static final String targetNS = "http://oneway.jsr181.jaxws.ws.test.jboss.org/jaws";
 
    public static Test suite()
    {

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -54,7 +54,7 @@
  */
 public class JSR181SOAPBindingTestCase extends JBossWSTest
 {
-   private String targetNS = "http://soapbinding.jsr181.ws.test.jboss.org/jaws";
+   private String targetNS = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws";
 
    public static Test suite()
    {

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -51,7 +51,7 @@
 public class JSR181WebMethodTestCase extends JBossWSTest
 {
    private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jsr181-webmethod/TestService";
-   private String targetNS = "http://webmethod.jsr181.ws.test.jboss.org/jaws";
+   private String targetNS = "http://webmethod.jsr181.jaxws.ws.test.jboss.org/jaws";
 
    public static Test suite()
    {

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -53,7 +53,7 @@
    public void testPrimitiveTypes() throws Exception
    {
       Class seiClass = PrimitiveTypes.class;
-      String fixturefile = "resources/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
 
@@ -61,7 +61,7 @@
    public void testStandardJavaTypes() throws Exception
    {
       Class seiClass = StandardJavaTypes.class;
-      String fixturefile = "resources/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
 
@@ -69,7 +69,7 @@
    public void testCustomTypes() throws Exception
    {
       Class seiClass = CustomInterface.class;
-      String fixturefile = "resources/wsdlfixture/CustomInterfaceService_RPC_11.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
 
@@ -77,7 +77,7 @@
    public void testExceptionTypes() throws Exception
    {
       Class seiClass = ServiceException.class;
-      String fixturefile = "resources/wsdlfixture/ServiceExceptionService_RPC_11.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/ServiceExceptionService_RPC_11.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
 
@@ -85,7 +85,7 @@
    public void testComplexTypes() throws Exception
    {
       Class seiClass = ComplexTypes.class;
-      String fixturefile = "resources/wsdlfixture/ComplexTypesService_RPC_11.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/ComplexTypesService_RPC_11.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
 
@@ -93,8 +93,8 @@
    public void testArrayTypes() throws Exception
    {
       Class seiClass = ArrayInterface.class;
-      // String fixturefile = "resources/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl";
-      String fixturefile = "resources/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl";
+      // String fixturefile = "resources/tools/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
    
@@ -102,7 +102,7 @@
    public void testPrimitiveArrayTypes() throws Exception
    {
       Class seiClass = PrimitiveArrayTypes.class;
-      String fixturefile = "resources/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
    
@@ -110,7 +110,7 @@
    public void testInterfaceInheritence() throws Exception
    {
       Class seiClass = InheritenceChildInterface.class;
-      String fixturefile = "resources/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl";
+      String fixturefile = "resources/tools/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl";
       doWSDLTest(seiClass, fixturefile);
    }
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -76,7 +76,7 @@
 
    public void testW3CSample() throws Exception
    {
-      File wsdlFile = new File("resources/wsdlfixture/W3CExample_DOC_11.wsdl");
+      File wsdlFile = new File("resources/tools/wsdlfixture/W3CExample_DOC_11.wsdl");
       assertTrue(wsdlFile.exists());
       WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(wsdlFile);
    }
@@ -99,7 +99,7 @@
 
    private WSDLDefinitions getWSDLDefinitions(Class seiClass, String wsdlFileName) throws Exception
    {
-      File wsdlFile = new File("resources/wsdlfixture/" + wsdlFileName);
+      File wsdlFile = new File("resources/tools/wsdlfixture/" + wsdlFileName);
       assertTrue(wsdlFile.exists());
 
       WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(wsdlFile);

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToWSDL20TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToWSDL20TestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/WSDL11ToWSDL20TestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -102,7 +102,7 @@
 
    private WSDLDefinitions getWSDLDefinitions(Class seiClass, String wsdlFileName) throws Exception
    {
-      File wsdlFile = new File("resources/wsdlfixture/" + wsdlFileName);
+      File wsdlFile = new File("resources/tools/wsdlfixture/" + wsdlFileName);
       assertTrue(wsdlFile.exists());
 
       WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
@@ -125,7 +125,7 @@
     */
    private WSDLDefinitions doWSDLTest(String wsdlFileName) throws Exception
    {
-      File wsdlFile = new File("resources/wsdlfixture/" + wsdlFileName);
+      File wsdlFile = new File("resources/tools/wsdlfixture/" + wsdlFileName);
       assertTrue(wsdlFile.exists()); 
       WSDLToJavaIntf wsdljava = new WSDLToJava();
       wsdljava.setTypeMapping(new LiteralTypeMapping());

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -52,7 +52,7 @@
       WSDLDefinitions wsdlDefs = javaToWSDL.generate(EndpointInterface.class);
       assertNotNull(wsdlDefs);
 
-      String fixFile = "resources/wsdlfixture/jsr181/webservice/TestService.wsdl";
+      String fixFile = "resources/tools/wsdlfixture/jsr181/webservice/TestService.wsdl";
       validate(wsdlDefs, fixFile);
    }
 
@@ -66,7 +66,7 @@
       WSDLDefinitions wsdlDefs = javaToWSDL.generate(JSEBean01.class);
       assertNotNull(wsdlDefs);
 
-      String fixFile = "resources/wsdlfixture/jsr181/webservice/TestService.wsdl";
+      String fixFile = "resources/tools/wsdlfixture/jsr181/webservice/TestService.wsdl";
       validate(wsdlDefs, fixFile);
    }
 
@@ -80,7 +80,7 @@
       WSDLDefinitions wsdlDefs = javaToWSDL.generate(JSEBean03.class);
       assertNotNull(wsdlDefs);
 
-      String fixFile = "resources/wsdlfixture/jsr181/webservice/TestService.wsdl";
+      String fixFile = "resources/tools/wsdlfixture/jsr181/webservice/TestService.wsdl";
       validate(wsdlDefs, fixFile);
    }
 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -43,7 +43,7 @@
    public void testSimpleCase() throws Exception
    {
       //File wsdlFile = new File("resources/wsdl11/DocLitSimple.wsdl");
-      File wsdlFile = new File("resources/wsdlfixture/CustomInterfaceService_RPC_11.wsdl");  
+      File wsdlFile = new File("resources/tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl");  
       assertTrue(wsdlFile.exists());
 
       WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
@@ -73,7 +73,7 @@
     */
    public void testDocLitCase() throws Exception
    {
-      File wsdlFile = new File("resources/wsdl11/DocLitSimple.wsdl");
+      File wsdlFile = new File("resources/common/wsdl11/DocLitSimple.wsdl");
       assertTrue(wsdlFile.exists());
 
       WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -44,7 +44,7 @@
    public void testXMLTypeReturned()
    {
       String filename = "StandardJavaTypesService_DOC_11.wsdl";
-      File wsdlFile = new File("resources/wsdlfixture/" + filename);
+      File wsdlFile = new File("resources/tools/wsdlfixture/" + filename);
       WSDLTypes types = null;
       try
       { 
@@ -68,7 +68,7 @@
    public void testXMLSchemaReturned()
    {
       String filename = "StandardJavaTypesService_DOC_11.wsdl";
-      File wsdlFile = new File("resources/wsdlfixture/" + filename);
+      File wsdlFile = new File("resources/tools/wsdlfixture/" + filename);
       WSDLTypes types = null;
       try
       { 

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -46,7 +46,7 @@
    public void testXMLTypeReturned() throws MalformedURLException
    {
       String filename = "CustomInterface20.xsd";
-      File xsdFile = new File("resources/wsdlfixture/" + filename);
+      File xsdFile = new File("resources/tools/wsdlfixture/" + filename);
       XSModel xsmodel = parseSchema(xsdFile.toURL());
       assertNotNull("XSModel is null?", xsmodel);
       XSNamedMap xsmap = xsmodel.getComponentsByNamespace(XSConstants.ELEMENT_DECLARATION, "http://org.jboss.ws/types");

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java	2006-09-08 23:07:24 UTC (rev 920)
@@ -90,7 +90,7 @@
    {
       String typeNS = "http://org.jboss.ws/types";
       XSLoader xsloader = SchemaUtils.getInstance().getXSLoader();
-      XSModel xsmodel = xsloader.loadURI("resources/wsdlfixture/CustomInterface20.xsd");
+      XSModel xsmodel = xsloader.loadURI("resources/tools/wsdlfixture/CustomInterface20.xsd");
       assertNotNull("XSModel is null?", xsmodel);
 
       XSNamedMap xsnamedmap = getXSNamedMap(xsmodel, typeNS);
@@ -111,8 +111,8 @@
       String arrTypeNS = "http://org.jboss/types/arrays/org/jboss/test/ws/tools/jbws_161/custom";
 
       Map map = new HashMap();
-      map.put(typeNS,new File("resources/wsdlfixture/customtype/CustomTypeObj.xsd").toURL());
-      map.put(arrTypeNS,new File("resources/wsdlfixture/customtype/CustomTypeArrays.xsd").toURL());
+      map.put(typeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd").toURL());
+      map.put(arrTypeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd").toURL());
 
       XSModel xsmodel = new JavaToXSD().parseSchema(map);
       assertNotNull("XSModel is null?", xsmodel);
@@ -137,7 +137,7 @@
       assertEquals("HelloObj", name);
 
       //Test the case when the schema files are parsed one by one
-      XSModel newxsmodel = utils.parseSchema("resources/wsdlfixture/customtype/CustomTypeObj.xsd");
+      XSModel newxsmodel = utils.parseSchema("resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd");
       assertNotNull("XSModel is null?", newxsmodel);
       xsnamedmap = getXSNamedMap(newxsmodel, typeNS);
       assertNotNull("XSNamedMap is null?", xsnamedmap);
@@ -146,7 +146,7 @@
       assertEquals("HelloObj", xobj.getName());
       assertTrue("HelloObj is a complex type?",xobj instanceof XSComplexTypeDefinition);
 
-      newxsmodel = utils.parseSchema("resources/wsdlfixture/customtype/CustomTypeArrays.xsd");
+      newxsmodel = utils.parseSchema("resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd");
       assertNotNull("XSModel is null?", newxsmodel);
       xsnamedmap = getXSNamedMap(newxsmodel, arrTypeNS);
       assertNotNull("XSNamedMap is null?", xsnamedmap);
@@ -173,12 +173,12 @@
       SchemaUtils utils = SchemaUtils.getInstance();
       String typeNS = "http://org.jboss/types";
       String arrTypeNS = "http://org.jboss/types/arrays/org/jboss/test/ws/tools/jbws_161/custom";
-      String arr[] = {"resources/wsdlfixture/customtype/CustomTypeObj.xsd",
-                      "resources/wsdlfixture/customtype/CustomTypeArrays.xsd"};
+      String arr[] = {"resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd",
+                      "resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd"};
       XSLoader xsloader = utils.getXSLoader();
       Map map = new HashMap();
-      map.put(typeNS,new File("resources/wsdlfixture/customtype/CustomTypeObj.xsd").toURL());
-      map.put(arrTypeNS,new File("resources/wsdlfixture/customtype/CustomTypeArrays.xsd").toURL());
+      map.put(typeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd").toURL());
+      map.put(arrTypeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd").toURL());
 
       ((XMLSchemaLoader)xsloader).setEntityResolver(new JBossXSEntityResolver(new JBossWSEntityResolver(), map));
       //Construct a StringList

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/application-client.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -13,7 +13,7 @@
     <wsdl-file>META-INF/wsdl/MarshallService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.marshall.StandardTypes</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface>
     </port-component-ref>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/jaxrpc-mapping.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/jaxrpc-mapping.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -1,14 +1,14 @@
 <?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.marshall.types</package-type>
+  <package-type>org.jboss.test.ws.jaxrpc.marshall.types</package-type>
   <namespaceURI>http://types.marshall.jaxrpc.ws.test.jboss.org/jaws</namespaceURI>
  </package-mapping>
  <package-mapping>
-  <package-type>org.jboss.test.ws.marshall</package-type>
+  <package-type>org.jboss.test.ws.jaxrpc.marshall</package-type>
   <namespaceURI>http://org.jboss.ws/marshall/doclit/types</namespaceURI>
  </package-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigDecimalTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigDecimalTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigDecimalTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -17,7 +17,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigDecimalTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigDecimalTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigDecimalTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -26,7 +26,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigDecimalArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigDecimalArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigDecimalArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -35,7 +35,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigDecimalArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigDecimalArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigDecimalArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -44,7 +44,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigDecimalMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigDecimalMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigDecimalMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -53,7 +53,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigDecimalMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigDecimalMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigDecimalMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -62,7 +62,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigIntegerTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigIntegerTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigIntegerTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -71,7 +71,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigIntegerTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigIntegerTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigIntegerTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -80,7 +80,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigIntegerArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigIntegerArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigIntegerArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -89,7 +89,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigIntegerArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigIntegerArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigIntegerArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -98,7 +98,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigIntegerMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigIntegerMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigIntegerMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -107,7 +107,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_bigIntegerMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_bigIntegerMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:bigIntegerMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -116,7 +116,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -125,7 +125,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -134,7 +134,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -143,7 +143,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -152,7 +152,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -161,7 +161,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -170,7 +170,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanWrapperTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanWrapperTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanWrapperTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -179,7 +179,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanWrapperTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanWrapperTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanWrapperTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -188,7 +188,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanWrapperArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanWrapperArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanWrapperArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -197,7 +197,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanWrapperArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanWrapperArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanWrapperArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -206,7 +206,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanWrapperMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanWrapperMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanWrapperMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -215,7 +215,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_booleanWrapperMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_booleanWrapperMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:booleanWrapperMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -224,7 +224,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -233,7 +233,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -242,7 +242,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -251,7 +251,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -260,7 +260,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -269,7 +269,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -278,7 +278,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteWrapperTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteWrapperTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteWrapperTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -287,7 +287,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteWrapperTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteWrapperTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteWrapperTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -296,7 +296,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteWrapperArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteWrapperArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteWrapperArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -305,7 +305,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteWrapperArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteWrapperArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteWrapperArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -314,7 +314,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteWrapperMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteWrapperMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteWrapperMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -323,7 +323,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_byteWrapperMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_byteWrapperMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:byteWrapperMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -332,7 +332,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_qnameTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_qnameTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:qnameTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -341,7 +341,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_qnameTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_qnameTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:qnameTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -350,7 +350,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_qnameArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_qnameArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:qnameArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -359,7 +359,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_qnameArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_qnameArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:qnameArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -368,7 +368,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_qnameMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_qnameMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:qnameMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -377,7 +377,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_qnameMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_qnameMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:qnameMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -386,7 +386,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_base64BinaryTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_base64BinaryTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:base64BinaryTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -395,7 +395,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_base64BinaryTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_base64BinaryTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:base64BinaryTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -404,7 +404,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_hexBinaryTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_hexBinaryTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:hexBinaryTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -413,7 +413,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_hexBinaryTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_hexBinaryTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:hexBinaryTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -422,7 +422,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_calendarTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_calendarTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:calendarTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -431,7 +431,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_calendarTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_calendarTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:calendarTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -440,7 +440,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_calendarArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_calendarArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:calendarArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -449,7 +449,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_calendarArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_calendarArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:calendarArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -458,7 +458,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_calendarMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_calendarMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:calendarMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -467,7 +467,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_calendarMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_calendarMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:calendarMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -476,7 +476,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -485,7 +485,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -494,7 +494,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -503,7 +503,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -512,7 +512,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -521,7 +521,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -530,7 +530,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleWrapperTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleWrapperTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleWrapperTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -539,7 +539,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleWrapperTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleWrapperTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleWrapperTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -548,7 +548,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleWrapperArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleWrapperArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleWrapperArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -557,7 +557,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleWrapperArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleWrapperArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleWrapperArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -566,7 +566,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleWrapperMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleWrapperMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleWrapperMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -575,7 +575,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_doubleWrapperMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_doubleWrapperMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:doubleWrapperMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -584,7 +584,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -593,7 +593,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -602,7 +602,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -611,7 +611,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -620,7 +620,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -629,7 +629,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -638,7 +638,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatWrapperTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatWrapperTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatWrapperTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -647,7 +647,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatWrapperTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatWrapperTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatWrapperTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -656,7 +656,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatWrapperArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatWrapperArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatWrapperArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -665,7 +665,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatWrapperArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatWrapperArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatWrapperArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -674,7 +674,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatWrapperMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatWrapperMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatWrapperMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -683,7 +683,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_floatWrapperMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_floatWrapperMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:floatWrapperMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -692,7 +692,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -701,7 +701,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -710,7 +710,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -719,7 +719,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -728,7 +728,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -737,7 +737,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -746,7 +746,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intWrapperTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intWrapperTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intWrapperTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -755,7 +755,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intWrapperTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intWrapperTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intWrapperTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -764,7 +764,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intWrapperArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intWrapperArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intWrapperArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -773,7 +773,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intWrapperArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intWrapperArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intWrapperArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -782,7 +782,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intWrapperMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intWrapperMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intWrapperMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -791,7 +791,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_intWrapperMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_intWrapperMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:intWrapperMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -800,7 +800,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.types.JavaBean2</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean2</java-type>
   <root-type-qname xmlns:typeNS='http://types.marshall.jaxrpc.ws.test.jboss.org/jaws'>typeNS:JavaBean2</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -849,7 +849,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.types.JavaBean</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean</java-type>
   <root-type-qname xmlns:typeNS='http://types.marshall.jaxrpc.ws.test.jboss.org/jaws'>typeNS:JavaBean</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -902,7 +902,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_javaBeanTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_javaBeanTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:javaBeanTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -911,7 +911,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_javaBeanTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_javaBeanTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:javaBeanTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -920,7 +920,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_javaBeanArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_javaBeanArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:javaBeanArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -929,7 +929,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_javaBeanArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_javaBeanArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:javaBeanArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -938,7 +938,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -947,7 +947,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -956,7 +956,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -965,7 +965,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -974,7 +974,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -983,7 +983,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -992,7 +992,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longWrapperTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longWrapperTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longWrapperTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1001,7 +1001,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longWrapperTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longWrapperTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longWrapperTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1010,7 +1010,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longWrapperArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longWrapperArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longWrapperArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1019,7 +1019,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longWrapperArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longWrapperArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longWrapperArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1028,7 +1028,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longWrapperMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longWrapperMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longWrapperMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1037,7 +1037,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_longWrapperMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_longWrapperMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:longWrapperMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1046,7 +1046,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1055,7 +1055,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1064,7 +1064,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1073,7 +1073,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1082,7 +1082,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1091,7 +1091,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1100,7 +1100,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortWrapperTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortWrapperTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortWrapperTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1109,7 +1109,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortWrapperTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortWrapperTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortWrapperTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1118,7 +1118,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortWrapperArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortWrapperArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortWrapperArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1127,7 +1127,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortWrapperArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortWrapperArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortWrapperArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1136,7 +1136,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortWrapperMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortWrapperMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortWrapperMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1145,7 +1145,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_shortWrapperMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_shortWrapperMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:shortWrapperMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1154,7 +1154,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_stringTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_stringTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:stringTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1163,7 +1163,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_stringTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_stringTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:stringTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1172,7 +1172,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_stringArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_stringArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:stringArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1181,7 +1181,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_stringArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_stringArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:stringArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1190,7 +1190,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_stringMultiArrayTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_stringMultiArrayTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:stringMultiArrayTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1199,7 +1199,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_stringMultiArrayTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_stringMultiArrayTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:stringMultiArrayTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -1208,17 +1208,17 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_voidTest_RequestStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_voidTest_RequestStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:voidTest</root-type-qname>
   <qname-scope>complexType</qname-scope>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.StandardTypes_voidTest_ResponseStruct</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.StandardTypes_voidTest_ResponseStruct</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/doclit/types'>typeNS:voidTestResponse</root-type-qname>
   <qname-scope>complexType</qname-scope>
  </java-xml-type-mapping>
  <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.marshall.MarshallService</service-interface>
+  <service-interface>org.jboss.test.ws.jaxrpc.marshall.MarshallService</service-interface>
   <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/marshall/doclit'>serviceNS:MarshallService</wsdl-service-name>
   <port-mapping>
    <port-name>StandardTypesPort</port-name>
@@ -1226,7 +1226,7 @@
   </port-mapping>
  </service-interface-mapping>
  <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.marshall.StandardTypes</service-endpoint-interface>
+  <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface>
   <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/marshall/doclit'>portTypeNS:StandardTypes</wsdl-port-type>
   <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/marshall/doclit'>bindingNS:StandardTypesBinding</wsdl-binding>
   <service-endpoint-method-mapping>
@@ -2071,7 +2071,7 @@
    <wrapped-element/>
    <method-param-parts-mapping>
     <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.marshall.types.JavaBean</param-type>
+    <param-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean</param-type>
     <wsdl-message-mapping>
      <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/doclit'>wsdlMsgNS:StandardTypes_javaBeanTest</wsdl-message>
      <wsdl-message-part-name>JavaBean_1</wsdl-message-part-name>
@@ -2079,7 +2079,7 @@
     </wsdl-message-mapping>
    </method-param-parts-mapping>
    <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.marshall.types.JavaBean</method-return-value>
+    <method-return-value>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean</method-return-value>
     <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/doclit'>wsdlMsgNS:StandardTypes_javaBeanTestResponse</wsdl-message>
     <wsdl-message-part-name>result</wsdl-message-part-name>
    </wsdl-return-value-mapping>
@@ -2090,7 +2090,7 @@
    <wrapped-element/>
    <method-param-parts-mapping>
     <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.marshall.types.JavaBean[]</param-type>
+    <param-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean[]</param-type>
     <wsdl-message-mapping>
      <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/doclit'>wsdlMsgNS:StandardTypes_javaBeanArrayTest</wsdl-message>
      <wsdl-message-part-name>arrayOfJavaBean_1</wsdl-message-part-name>
@@ -2098,7 +2098,7 @@
     </wsdl-message-mapping>
    </method-param-parts-mapping>
    <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.marshall.types.JavaBean[]</method-return-value>
+    <method-return-value>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean[]</method-return-value>
     <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/doclit'>wsdlMsgNS:StandardTypes_javaBeanArrayTestResponse</wsdl-message>
     <wsdl-message-part-name>result</wsdl-message-part-name>
    </wsdl-return-value-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>StandardTypes</servlet-name>
-    <servlet-class>org.jboss.test.ws.marshall.StandardTypesBean</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class>
   </servlet>
 
   <servlet-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/webservices.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/webservices.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -13,7 +13,7 @@
     <port-component>
       <port-component-name>StandardTypesPort</port-component-name>
       <wsdl-port>impl:StandardTypesPort</wsdl-port>
-      <service-endpoint-interface>org.jboss.test.ws.marshall.StandardTypes</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface>
       <service-impl-bean>
         <servlet-link>StandardTypes</servlet-link>
       </service-impl-bean>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/wstools-config.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/wstools-config.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -30,7 +30,7 @@
      xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
    <java-wsdl>
      <service name="MarshallService" 
-              endpoint="org.jboss.test.ws.marshall.StandardTypes"
+              endpoint="org.jboss.test.ws.jaxrpc.marshall.StandardTypes"
               style="document">
      </service>
      <namespaces target-namespace="http://org.jboss.ws/marshall/doclit"

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/application-client.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -13,7 +13,7 @@
     <wsdl-file>META-INF/wsdl/MarshallService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
     <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.marshall.StandardTypes</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface>
     </port-component-ref>
   </service-ref>
 

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/jaxrpc-mapping.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/jaxrpc-mapping.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -1,14 +1,14 @@
 <?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.marshall.types</package-type>
+  <package-type>org.jboss.test.ws.jaxrpc.marshall.types</package-type>
   <namespaceURI>http://types.marshall.jaxrpc.ws.test.jboss.org/jaws</namespaceURI>
  </package-mapping>
  <package-mapping>
-  <package-type>org.jboss.test.ws.marshall</package-type>
+  <package-type>org.jboss.test.ws.jaxrpc.marshall</package-type>
   <namespaceURI>http://org.jboss.ws/marshall/rpclit/types</namespaceURI>
  </package-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.types.JavaBean2</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean2</java-type>
   <root-type-qname xmlns:typeNS='http://types.marshall.jaxrpc.ws.test.jboss.org/jaws'>typeNS:JavaBean2</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -57,7 +57,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.marshall.types.JavaBean</java-type>
+  <java-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean</java-type>
   <root-type-qname xmlns:typeNS='http://org.jboss.ws/marshall/rpclit/types'>typeNS:JavaBean</root-type-qname>
   <qname-scope>complexType</qname-scope>
   <variable-mapping>
@@ -110,7 +110,7 @@
   </variable-mapping>
  </java-xml-type-mapping>
  <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.marshall.MarshallService</service-interface>
+  <service-interface>org.jboss.test.ws.jaxrpc.marshall.MarshallService</service-interface>
   <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/marshall/rpclit'>serviceNS:MarshallService</wsdl-service-name>
   <port-mapping>
    <port-name>StandardTypesPort</port-name>
@@ -118,7 +118,7 @@
   </port-mapping>
  </service-interface-mapping>
  <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.marshall.StandardTypes</service-endpoint-interface>
+  <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface>
   <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/marshall/rpclit'>portTypeNS:StandardTypes</wsdl-port-type>
   <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/marshall/rpclit'>bindingNS:StandardTypesBinding</wsdl-binding>
   <service-endpoint-method-mapping>
@@ -918,7 +918,7 @@
    <wsdl-operation>javaBeanTest</wsdl-operation>
    <method-param-parts-mapping>
     <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.marshall.types.JavaBean</param-type>
+    <param-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean</param-type>
     <wsdl-message-mapping>
      <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/rpclit'>wsdlMsgNS:StandardTypes_javaBeanTest</wsdl-message>
      <wsdl-message-part-name>JavaBean_1</wsdl-message-part-name>
@@ -926,7 +926,7 @@
     </wsdl-message-mapping>
    </method-param-parts-mapping>
    <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.marshall.types.JavaBean</method-return-value>
+    <method-return-value>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean</method-return-value>
     <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/rpclit'>wsdlMsgNS:StandardTypes_javaBeanTestResponse</wsdl-message>
     <wsdl-message-part-name>result</wsdl-message-part-name>
    </wsdl-return-value-mapping>
@@ -936,7 +936,7 @@
    <wsdl-operation>javaBeanArrayTest</wsdl-operation>
    <method-param-parts-mapping>
     <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.marshall.types.JavaBean[]</param-type>
+    <param-type>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean[]</param-type>
     <wsdl-message-mapping>
      <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/rpclit'>wsdlMsgNS:StandardTypes_javaBeanArrayTest</wsdl-message>
      <wsdl-message-part-name>arrayOfJavaBean_1</wsdl-message-part-name>
@@ -944,7 +944,7 @@
     </wsdl-message-mapping>
    </method-param-parts-mapping>
    <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.marshall.types.JavaBean[]</method-return-value>
+    <method-return-value>org.jboss.test.ws.jaxrpc.marshall.types.JavaBean[]</method-return-value>
     <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/marshall/rpclit'>wsdlMsgNS:StandardTypes_javaBeanArrayTestResponse</wsdl-message>
     <wsdl-message-part-name>result</wsdl-message-part-name>
    </wsdl-return-value-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>StandardTypes</servlet-name>
-    <servlet-class>org.jboss.test.ws.marshall.StandardTypesBean</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class>
   </servlet>
 
   <servlet-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -13,7 +13,7 @@
     <port-component>
       <port-component-name>StandardTypesPort</port-component-name>
       <wsdl-port>impl:StandardTypesPort</wsdl-port>
-      <service-endpoint-interface>org.jboss.test.ws.marshall.StandardTypes</service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface>
       <service-impl-bean>
         <servlet-link>StandardTypes</servlet-link>
       </service-impl-bean>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/wstools-config.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/wstools-config.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -20,7 +20,7 @@
      xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
    <java-wsdl>
      <service name="MarshallService" 
-              endpoint="org.jboss.test.ws.marshall.StandardTypes"
+              endpoint="org.jboss.test.ws.jaxrpc.marshall.StandardTypes"
               style="rpc">
      </service>
      <namespaces target-namespace="http://org.jboss.ws/marshall/rpclit"

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/overloaded/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/overloaded/WEB-INF/jboss-web.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/overloaded/WEB-INF/jboss-web.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -3,5 +3,5 @@
 <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
 
 <jboss-web>
-  <context-root>jbossws-overloaded</context-root>
+  <context-root>jaxrpc-overloaded</context-root>
 </jboss-web>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/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 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/action/META-INF/wsdl/ActionRpcService.wsdl	2006-09-08 23:07:24 UTC (rev 920)
@@ -48,7 +48,7 @@
   </binding>
   <service name="ActionRpcService">
     <port name="ActionEndpointPort" binding="tns:ActionEndpointBinding">
-      <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-addressing-action-rpc/ActionRpcService"/>
+      <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-action-rpc/ActionRpcService"/>
     </port>
   </service>
 </definitions>
\ No newline at end of file

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/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 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF/jboss-client.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -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-addressing-faultto/FaultToService?wsdl</wsdl-override>
+    <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-faultto/FaultToService?wsdl</wsdl-override>
   </service-ref>
 </jboss-client>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/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 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/FaultTo-META-INF/wstools-config.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -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-addressing-faultto/FaultToEndpoint?wsdl">    
+  <wsdl-java file="http://localhost:8080/jaxrpc-wsaddressing-faultto/FaultToEndpoint?wsdl">    
     <mapping file="jaxrpc-mapping.xml" />
   </wsdl-java>
   

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/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 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF/jboss-client.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -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-addressing-initial/InitialService?wsdl</wsdl-override> 
+    <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-initial/InitialService?wsdl</wsdl-override> 
   </service-ref>
 </jboss-client>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/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 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/Initial-META-INF/wstools-config.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -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-addressing-initial/InitialService?wsdl">
+  <wsdl-java file="http://localhost:8080/jaxrpc-wsaddressing-initial/InitialService?wsdl">
     <mapping file="jaxrpc-mapping.xml" />
   </wsdl-java>
   

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/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 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -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-addressing-replyto/ReplyToService?wsdl</wsdl-override>
+    <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override>
   </service-ref>
 </jboss-client>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/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 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -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-addressing-replyto/ReplyToService?wsdl">    
+  <wsdl-java file="http://localhost:8080/jaxrpc-wsaddressing-replyto/ReplyToService?wsdl">    
     <mapping file="jaxrpc-mapping.xml" />
   </wsdl-java>
   

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/META-INF/jboss-client.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -9,7 +9,7 @@
 
     <service-ref>
         <service-ref-name>service/EventingService</service-ref-name>
-        <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-test-eventing/subscribe?wsdl</wsdl-override>
+        <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wseventing/subscribe?wsdl</wsdl-override>
     </service-ref>
 
 </jboss-client>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/eventing.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/eventing.wsdl	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/eventing.wsdl	2006-09-08 23:07:24 UTC (rev 920)
@@ -123,11 +123,11 @@
 
    <wsdl:service name="EventingService">
       <wsdl:port name="EventSourcePort" binding="wse:EventSourceBinding">
-         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-test-eventing/ws4ee/EventSourcePortType"/>
+         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wseventing/ws4ee/EventSourcePortType"/>
       </wsdl:port>
       <wsdl:port name="SubscriptionManagerPort" binding="wse:SubscriptionManagerBinding">
-         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-test-eventing/ws4ee/SubscriptionManagerPortType"/>
+         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wseventing/ws4ee/SubscriptionManagerPortType"/>
       </wsdl:port>
    </wsdl:service>
    
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl	2006-09-08 23:07:24 UTC (rev 920)
@@ -168,11 +168,11 @@
 
    <wsdl:service name="EventingService">
       <wsdl:port name="EventSourcePort" binding="wse:EventSourceBinding">
-         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-test-eventing/ws4ee/EventSourcePortType"/>
+         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wseventing/ws4ee/EventSourcePortType"/>
       </wsdl:port>
       <wsdl:port name="SubscriptionManagerPort" binding="wse:SubscriptionManagerBinding">
-         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-test-eventing/ws4ee/SubscriptionManagerPortType"/>
+         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wseventing/ws4ee/SubscriptionManagerPortType"/>
       </wsdl:port>
    </wsdl:service>
 
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind_inherit.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind_inherit.wsdl	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind_inherit.wsdl	2006-09-08 23:07:24 UTC (rev 920)
@@ -56,11 +56,11 @@
 
    <wsdl:service name="EventingService">
       <wsdl:port name="EventSourcePort" binding="wse:EventSourceBinding">
-         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-test-eventing/ws4ee/EventSourcePortType"/>
+         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wseventing/ws4ee/EventSourcePortType"/>
       </wsdl:port>
       <wsdl:port name="SubscriptionManagerPort" binding="wse:SubscriptionManagerBinding">
-         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-test-eventing/ws4ee/SubscriptionManagerPortType"/>
+         <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-wseventing/ws4ee/SubscriptionManagerPortType"/>
       </wsdl:port>
    </wsdl:service>
 
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -4,7 +4,7 @@
 
 <jboss-web>
   
-	<context-root>jbossws-wsse-rpc</context-root>
+	<context-root>jaxrpc-wsse-rpc</context-root>
 	
 	<webservice-description>
 		<webservice-description-name>HelloService</webservice-description-name>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -2,10 +2,10 @@
 <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
   <key-store-file>WEB-INF/wsse.keystore</key-store-file>
   <!--Note ${buildpath} will be replaced with the actual build directory path -->
-  <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil ${buildpath}/resources/wsse/keystore.password</key-store-password>
+  <key-store-password>{EXT}java -cp ${buildpath}/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil ${buildpath}/resources/jaxrpc/wsse/keystore.password</key-store-password>
   <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
   <!--Note ${buildpath} will be replaced with the actual build directory path -->
-  <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/wsse/keystore.password</trust-store-password>
+  <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:${buildpath}/resources/jaxrpc/wsse/keystore.password</trust-store-password>
   <config>
     <sign type="x509v3" alias="wsse"/>
     <encrypt type="x509v3" alias="wsse"/>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -17,7 +17,7 @@
       <ejb-name>TestService</ejb-name>
       <port-component>
         <port-component-name>TestServicePort</port-component-name>
-        <port-component-uri>/jbossws-wsse-username/*</port-component-uri>
+        <port-component-uri>/jaxrpc-wsse-username/*</port-component-uri>
       </port-component>
     </session>
   </enterprise-beans>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -3,7 +3,7 @@
 <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
 
 <jboss-web>
-  <context-root>jbossws-wsse-rpc</context-root>
+  <context-root>jaxrpc-wsse-rpc</context-root>
   
   <webservice-description>
     <webservice-description-name>HelloService</webservice-description-name>

Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/circular.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/circular.xsd	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/circular.xsd	2006-09-08 23:07:24 UTC (rev 920)
@@ -1,10 +1,10 @@
-<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxrpc.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ns2="http://extra.complex.jsr181.jaxrpc.ws.test.jboss.org/jaws"
+<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"
         xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/"
-        xmlns:tns="http://complex.jsr181.jaxrpc.ws.test.jboss.org/jaws"
+        xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-   <import namespace="http://extra.complex.jsr181.jaxrpc.ws.test.jboss.org/jaws"/>
+   <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/>
 
    <complexType name="Address">
       <sequence>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/WEB-INF/web.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/WEB-INF/web.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -7,7 +7,7 @@
 
   <servlet>
     <servlet-name>RegistrationService</servlet-name>
-    <servlet-class>org.jboss.test.ws.jsr181.complex.RegistrationService</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.jsr181.complex.RegistrationService</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>RegistrationService</servlet-name>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/config.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/config.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -7,5 +7,5 @@
 -->
 
 <configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> 
-<wsdl location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/RegistrationService?wsdl" packageName="org.jboss.test.ws.jsr181.complex.client"/>    
+<wsdl location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/RegistrationService?wsdl" packageName="org.jboss.test.ws.jaxws.jsr181.complex.client"/>    
 </configuration>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jsr181.complex.client</package-type>
-<namespaceURI>http://complex.jsr181.ws.test.jboss.org/jaws</namespaceURI>
+<package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type>
+<namespaceURI>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI>
 </package-mapping>
 <package-mapping>
-<package-type>org.jboss.test.ws.jsr181.complex.client</package-type>
-<namespaceURI>http://extra.complex.jsr181.ws.test.jboss.org/jaws</namespaceURI>
+<package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type>
+<namespaceURI>http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI>
 </package-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.Register</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:Register</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Register</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Register</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>customer</java-variable-name>
@@ -22,8 +22,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.Statistics</java-type>
-<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.ws.test.jboss.org/jaws">typeNS:Statistics</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</java-type>
+<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Statistics</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>activationTime</java-variable-name>
@@ -35,8 +35,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.InvoiceCustomer</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:InvoiceCustomer</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:InvoiceCustomer</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>address</java-variable-name>
@@ -64,8 +64,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.BulkRegister</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:BulkRegister</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegister</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:BulkRegister</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>customers</java-variable-name>
@@ -77,8 +77,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.ValidationException</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:ValidationException</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:ValidationException</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>message</java-variable-name>
@@ -90,8 +90,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.Address</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:Address</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Address</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Address</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>city</java-variable-name>
@@ -111,8 +111,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.Name</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:Name</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Name</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Name</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>firstName</java-variable-name>
@@ -128,8 +128,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.BulkRegisterResponse</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:BulkRegisterResponse</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegisterResponse</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:BulkRegisterResponse</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>registeredIDs</java-variable-name>
@@ -137,8 +137,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.PhoneNumber</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:PhoneNumber</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.PhoneNumber</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:PhoneNumber</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>areaCode</java-variable-name>
@@ -154,8 +154,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.RegisterForInvoiceResponse</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:RegisterForInvoiceResponse</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoiceResponse</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:RegisterForInvoiceResponse</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>done</java-variable-name>
@@ -163,8 +163,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.RegisterForInvoice</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:RegisterForInvoice</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoice</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:RegisterForInvoice</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>invoiceCustomer</java-variable-name>
@@ -172,8 +172,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.RegisterResponse</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:RegisterResponse</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterResponse</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:RegisterResponse</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>registeredID</java-variable-name>
@@ -181,8 +181,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.GetStatistics</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:GetStatistics</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatistics</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:GetStatistics</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>customer</java-variable-name>
@@ -190,8 +190,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.GetStatisticsResponse</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:GetStatisticsResponse</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatisticsResponse</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:GetStatisticsResponse</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>statistics</java-variable-name>
@@ -199,8 +199,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.Customer</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:Customer</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:Customer</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>address</java-variable-name>
@@ -224,8 +224,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.AlreadyRegisteredException</java-type>
-<root-type-qname xmlns:typeNS="http://complex.jsr181.ws.test.jboss.org/jaws">typeNS:AlreadyRegisteredException</root-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</java-type>
+<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:AlreadyRegisteredException</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>message</java-variable-name>
@@ -237,57 +237,57 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.Customer[]</java-type>
-<anonymous-type-qname>http://complex.jsr181.ws.test.jboss.org/jaws:BulkRegister&gt;Customers[0,unbounded]</anonymous-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type>
+<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:BulkRegister&gt;Customers[0,unbounded]</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
 <java-type>long[]</java-type>
-<anonymous-type-qname>http://complex.jsr181.ws.test.jboss.org/jaws:BulkRegisterResponse&gt;RegisteredIDs[0,unbounded]</anonymous-type-qname>
+<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:BulkRegisterResponse&gt;RegisteredIDs[0,unbounded]</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>org.jboss.test.ws.jsr181.complex.client.Customer[]</java-type>
-<anonymous-type-qname>http://complex.jsr181.ws.test.jboss.org/jaws:Customer&gt;referredCustomers[0,unbounded]</anonymous-type-qname>
+<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type>
+<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:Customer&gt;referredCustomers[0,unbounded]</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 </java-xml-type-mapping>
 <exception-mapping>
-<exception-type>org.jboss.test.ws.jsr181.complex.client.ValidationException</exception-type>
-<wsdl-message xmlns:exMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">exMsgNS:ValidationException</wsdl-message>
+<exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</exception-type>
+<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">exMsgNS:ValidationException</wsdl-message>
 <constructor-parameter-order>
 <element-name>message</element-name>
 <element-name>failiedCustomers</element-name>
 </constructor-parameter-order>
 </exception-mapping>
 <exception-mapping>
-<exception-type>org.jboss.test.ws.jsr181.complex.client.AlreadyRegisteredException</exception-type>
-<wsdl-message xmlns:exMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">exMsgNS:AlreadyRegisteredException</wsdl-message>
+<exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</exception-type>
+<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">exMsgNS:AlreadyRegisteredException</wsdl-message>
 <constructor-parameter-order>
 <element-name>message</element-name>
 <element-name>existingId</element-name>
 </constructor-parameter-order>
 </exception-mapping>
 <service-interface-mapping>
-<service-interface>org.jboss.test.ws.jsr181.complex.client.RegistrationServiceService</service-interface>
-<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.ws.test.jboss.org/jaws">serviceNS:RegistrationServiceService</wsdl-service-name>
+<service-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationServiceService</service-interface>
+<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">serviceNS:RegistrationServiceService</wsdl-service-name>
 <port-mapping>
 <port-name>RegistrationServicePort</port-name>
 <java-port-name>RegistrationServicePort</java-port-name>
 </port-mapping>
 </service-interface-mapping>
 <service-endpoint-interface-mapping>
-<service-endpoint-interface>org.jboss.test.ws.jsr181.complex.client.RegistrationService</service-endpoint-interface>
-<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.ws.test.jboss.org/jaws">portTypeNS:RegistrationService</wsdl-port-type>
-<wsdl-binding xmlns:bindingNS="http://complex.jsr181.ws.test.jboss.org/jaws">bindingNS:RegistrationServiceBinding</wsdl-binding>
+<service-endpoint-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationService</service-endpoint-interface>
+<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">portTypeNS:RegistrationService</wsdl-port-type>
+<wsdl-binding xmlns:bindingNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">bindingNS:RegistrationServiceBinding</wsdl-binding>
 <service-endpoint-method-mapping>
 <java-method-name>bulkRegister</java-method-name>
 <wsdl-operation>BulkRegister</wsdl-operation>
 <wrapped-element/>
 <method-param-parts-mapping>
 <param-position>0</param-position>
-<param-type>org.jboss.test.ws.jsr181.complex.client.Customer[]</param-type>
+<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message>
 <wsdl-message-part-name>Customers</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
@@ -296,14 +296,14 @@
 <param-position>1</param-position>
 <param-type>java.util.Calendar</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegister</wsdl-message>
 <wsdl-message-part-name>When</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
 <method-return-value>long[]</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegisterResponse</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_BulkRegisterResponse</wsdl-message>
 <wsdl-message-part-name>RegisteredIDs</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>
@@ -313,16 +313,16 @@
 <wrapped-element/>
 <method-param-parts-mapping>
 <param-position>0</param-position>
-<param-type>org.jboss.test.ws.jsr181.complex.client.Customer</param-type>
+<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_GetStatistics</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_GetStatistics</wsdl-message>
 <wsdl-message-part-name>Customer</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
-<method-return-value>org.jboss.test.ws.jsr181.complex.client.Statistics</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_GetStatisticsResponse</wsdl-message>
+<method-return-value>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</method-return-value>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_GetStatisticsResponse</wsdl-message>
 <wsdl-message-part-name>Statistics</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>
@@ -332,9 +332,9 @@
 <wrapped-element/>
 <method-param-parts-mapping>
 <param-position>0</param-position>
-<param-type>org.jboss.test.ws.jsr181.complex.client.Customer</param-type>
+<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_Register</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_Register</wsdl-message>
 <wsdl-message-part-name>Customer</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
@@ -343,14 +343,14 @@
 <param-position>1</param-position>
 <param-type>java.util.Calendar</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_Register</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_Register</wsdl-message>
 <wsdl-message-part-name>When</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
 <method-return-value>long</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterResponse</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterResponse</wsdl-message>
 <wsdl-message-part-name>RegisteredID</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>
@@ -360,16 +360,16 @@
 <wrapped-element/>
 <method-param-parts-mapping>
 <param-position>0</param-position>
-<param-type>org.jboss.test.ws.jsr181.complex.client.InvoiceCustomer</param-type>
+<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterForInvoice</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterForInvoice</wsdl-message>
 <wsdl-message-part-name>InvoiceCustomer</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
 <method-return-value>boolean</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterForInvoiceResponse</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:RegistrationService_RegisterForInvoiceResponse</wsdl-message>
 <wsdl-message-part-name>done</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/bare-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/bare-mapping.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/bare-mapping.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -2,11 +2,11 @@
 <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jaxws.jsr181.soapbinding</package-type>
-<namespaceURI>http://soapbinding.jsr181.ws.test.jboss.org/jaws</namespaceURI>
+<namespaceURI>http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI>
 </package-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.SubmitBareResponse</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:SubmitBareResponse</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:SubmitBareResponse</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>product</java-variable-name>
@@ -15,7 +15,7 @@
 </java-xml-type-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.SubmitBareRequest</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:SubmitBareRequest</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:SubmitBareRequest</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>product</java-variable-name>
@@ -24,7 +24,7 @@
 </java-xml-type-mapping>
 <service-interface-mapping>
 <service-interface>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocBareServiceService</service-interface>
-<wsdl-service-name xmlns:serviceNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">serviceNS:DocBareServiceService</wsdl-service-name>
+<wsdl-service-name xmlns:serviceNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">serviceNS:DocBareServiceService</wsdl-service-name>
 <port-mapping>
 <port-name>DocBareServicePort</port-name>
 <java-port-name>DocBareServicePort</java-port-name>
@@ -32,8 +32,8 @@
 </service-interface-mapping>
 <service-endpoint-interface-mapping>
 <service-endpoint-interface>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocBareService</service-endpoint-interface>
-<wsdl-port-type xmlns:portTypeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">portTypeNS:DocBareService</wsdl-port-type>
-<wsdl-binding xmlns:bindingNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">bindingNS:DocBareServiceBinding</wsdl-binding>
+<wsdl-port-type xmlns:portTypeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">portTypeNS:DocBareService</wsdl-port-type>
+<wsdl-binding xmlns:bindingNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">bindingNS:DocBareServiceBinding</wsdl-binding>
 <service-endpoint-method-mapping>
 <java-method-name>submitNamespacedPO</java-method-name>
 <wsdl-operation>SubmitNamespacedPO</wsdl-operation>
@@ -41,14 +41,14 @@
 <param-position>0</param-position>
 <param-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.SubmitBareRequest</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitNamespacedPO</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitNamespacedPO</wsdl-message>
 <wsdl-message-part-name>parameters</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
 <method-return-value>org.jboss.test.ws.jaxws.jsr181.soapbinding.SubmitBareResponse</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitNamespacedPOResponse</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitNamespacedPOResponse</wsdl-message>
 <wsdl-message-part-name>result</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>
@@ -59,14 +59,14 @@
 <param-position>0</param-position>
 <param-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.SubmitBareRequest</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitPO</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitPO</wsdl-message>
 <wsdl-message-part-name>parameters</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
 <method-return-value>org.jboss.test.ws.jaxws.jsr181.soapbinding.SubmitBareResponse</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitPOResponse</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocBareService_SubmitPOResponse</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/jsr181/soapbinding/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/jaxrpc-mapping.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/jaxrpc-mapping.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -5,7 +5,7 @@
    
    <package-mapping>
       <package-type>org.jboss.test.ws.jaxws.jsr181.soapbinding</package-type>
-      <namespaceURI>http://soapbinding.jsr181.ws.test.jboss.org/jaws</namespaceURI>
+      <namespaceURI>http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI>
    </package-mapping>
    
 </java-wsdl-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/wrapped-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/wrapped-mapping.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/soapbinding/wrapped-mapping.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -2,11 +2,11 @@
 <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jaxws.jsr181.soapbinding</package-type>
-<namespaceURI>http://soapbinding.jsr181.ws.test.jboss.org/jaws</namespaceURI>
+<namespaceURI>http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI>
 </package-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedService_SubmitNamespacedPO_RequestStruct</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:SubmitNamespacedPO</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:SubmitNamespacedPO</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>namespacedPurchaseOrder</java-variable-name>
@@ -19,7 +19,7 @@
 </java-xml-type-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedService_SubmitNamespacedPO_ResponseStruct</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:SubmitNamespacedPOResponse</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:SubmitNamespacedPOResponse</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>namespacedPurchaseOrderAck</java-variable-name>
@@ -28,7 +28,7 @@
 </java-xml-type-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedService_SubmitPO_ResponseStruct</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:SubmitPOResponse</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:SubmitPOResponse</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>purchaseOrderAck</java-variable-name>
@@ -37,7 +37,7 @@
 </java-xml-type-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedService_SubmitPO_RequestStruct</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:SubmitPO</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:SubmitPO</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>purchaseOrder</java-variable-name>
@@ -46,7 +46,7 @@
 </java-xml-type-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.PurchaseOrderAck</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:PurchaseOrderAck</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:PurchaseOrderAck</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>product</java-variable-name>
@@ -55,7 +55,7 @@
 </java-xml-type-mapping>
 <java-xml-type-mapping>
 <java-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.PurchaseOrder</java-type>
-<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">typeNS:PurchaseOrder</root-type-qname>
+<root-type-qname xmlns:typeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">typeNS:PurchaseOrder</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>product</java-variable-name>
@@ -64,7 +64,7 @@
 </java-xml-type-mapping>
 <service-interface-mapping>
 <service-interface>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedServiceService</service-interface>
-<wsdl-service-name xmlns:serviceNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">serviceNS:DocWrappedServiceService</wsdl-service-name>
+<wsdl-service-name xmlns:serviceNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">serviceNS:DocWrappedServiceService</wsdl-service-name>
 <port-mapping>
 <port-name>DocWrappedServicePort</port-name>
 <java-port-name>DocWrappedServicePort</java-port-name>
@@ -72,8 +72,8 @@
 </service-interface-mapping>
 <service-endpoint-interface-mapping>
 <service-endpoint-interface>org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedService</service-endpoint-interface>
-<wsdl-port-type xmlns:portTypeNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">portTypeNS:DocWrappedService</wsdl-port-type>
-<wsdl-binding xmlns:bindingNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">bindingNS:DocWrappedServiceBinding</wsdl-binding>
+<wsdl-port-type xmlns:portTypeNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">portTypeNS:DocWrappedService</wsdl-port-type>
+<wsdl-binding xmlns:bindingNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">bindingNS:DocWrappedServiceBinding</wsdl-binding>
 <service-endpoint-method-mapping>
 <java-method-name>submitNamespacedPO</java-method-name>
 <wsdl-operation>SubmitNamespacedPO</wsdl-operation>
@@ -82,7 +82,7 @@
 <param-position>0</param-position>
 <param-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.PurchaseOrder</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitNamespacedPO</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitNamespacedPO</wsdl-message>
 <wsdl-message-part-name>NamespacedPurchaseOrder</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
@@ -91,14 +91,14 @@
 <param-position>1</param-position>
 <param-type>java.lang.String</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitNamespacedPO</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitNamespacedPO</wsdl-message>
 <wsdl-message-part-name>NamespacedString</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
 <method-return-value>org.jboss.test.ws.jaxws.jsr181.soapbinding.PurchaseOrderAck</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitNamespacedPOResponse</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitNamespacedPOResponse</wsdl-message>
 <wsdl-message-part-name>NamespacedPurchaseOrderAck</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>
@@ -110,14 +110,14 @@
 <param-position>0</param-position>
 <param-type>org.jboss.test.ws.jaxws.jsr181.soapbinding.PurchaseOrder</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitPO</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitPO</wsdl-message>
 <wsdl-message-part-name>PurchaseOrder</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
 <method-return-value>org.jboss.test.ws.jaxws.jsr181.soapbinding.PurchaseOrderAck</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitPOResponse</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws">wsdlMsgNS:DocWrappedService_SubmitPOResponse</wsdl-message>
 <wsdl-message-part-name>PurchaseOrderAck</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml	2006-09-08 22:12:40 UTC (rev 919)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml	2006-09-08 23:07:24 UTC (rev 920)
@@ -5,7 +5,7 @@
    
    <package-mapping>
       <package-type>org.jboss.test.ws.jaxws.jsr181.webresult</package-type>
-      <namespaceURI>http://webresult.jsr181.ws.test.jboss.org/jaws</namespaceURI>
+      <namespaceURI>http://webresult.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI>
    </package-mapping>
    
 </java-wsdl-mapping>




More information about the jboss-svn-commits mailing list