[jbossws-commits] JBossWS SVN: r3455 - in trunk: jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl and 15 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Tue Jun 5 13:53:01 EDT 2007


Author: darran.lofthouse at jboss.com
Date: 2007-06-05 13:53:00 -0400 (Tue, 05 Jun 2007)
New Revision: 3455

Added:
   trunk/jbossws-core/src/main/java/org/jboss/ws/tools/HeaderUtil.java
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml
Removed:
   trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml
   trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml
Modified:
   trunk/build/ant-import/build-testsuite.xml
   trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
   trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
   trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
   trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
Log:
JBWS-1597 - WSDL To Java - Add support for bound headers.

Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml	2007-06-05 15:43:46 UTC (rev 3454)
+++ trunk/build/ant-import/build-testsuite.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -192,6 +192,7 @@
       <pathelement location="${jboss.client}/log4j.jar"/>
       <pathelement location="${jboss.client}/wsdl4j.jar"/>
       <pathelement location="${jboss.client}/jbossws-jboss40.jar"/>
+      <pathelement location="${jboss.client}/jboss-saaj.jar"/>
       <pathelement location="${jboss.client}/jbossall-client.jar"/>
       <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
       <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>

Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java	2007-06-05 15:43:46 UTC (rev 3454)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -189,6 +189,11 @@
       WSDLInterfaceOperationOutput opOutput = (WSDLInterfaceOperationOutput)outputs.get(qname);
       return opOutput;
    }
+   
+   public void removeOutput(QName element)
+   {
+      outputs.remove(element);
+   }
 
    public WSDLInterfaceOperationOutput getOutputByPartName(String partName)
    {

Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/HeaderUtil.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/HeaderUtil.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/HeaderUtil.java	                        (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/HeaderUtil.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.tools;
+
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.ws.metadata.wsdl.WSDLBinding;
+import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLInterface;
+import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation;
+import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
+
+/**
+ * Collection of static methods required for processing
+ * bound headers in WSDL to Java so they can be re-used for
+ * the JAX-RPC generation.
+ * 
+ * @author darran.lofthouse at jboss.com
+ * @since 29 May 2007
+ */
+public class HeaderUtil
+{
+
+   public static WSDLBindingOperation getWSDLBindingOperation(final WSDLDefinitions wsdl, final WSDLInterfaceOperation operation)
+   {
+      WSDLBindingOperation bindingOperation = null;
+
+      WSDLInterface wsdlInterface = operation.getWsdlInterface();
+      QName operationName = operation.getName();
+
+      WSDLBinding binding = wsdl.getBindingByInterfaceName(wsdlInterface.getName());
+      bindingOperation = binding.getOperationByRef(operationName);
+
+      return bindingOperation;
+   }
+
+   public static WSDLSOAPHeader[] getSignatureHeaders(final WSDLBindingMessageReference[] refs)
+   {
+      ArrayList<WSDLSOAPHeader> headers = new ArrayList<WSDLSOAPHeader>();
+
+      if (refs != null)
+      {
+         for (WSDLBindingMessageReference current : refs)
+         {
+            for (WSDLSOAPHeader header : current.getSoapHeaders())
+            {
+               headers.add(header);
+            }
+         }
+      }
+
+      return headers.toArray(new WSDLSOAPHeader[headers.size()]);
+   }
+
+   public static boolean containsMatchingPart(WSDLSOAPHeader[] headers, WSDLSOAPHeader header)
+   {
+      for (WSDLSOAPHeader current : headers)
+      {
+         if (current.getPartName().equals(header.getPartName()))
+         {
+            if (current.getElement().equals(header.getElement()))
+            {
+               return true;
+            }
+         }
+      }
+
+      return false;
+   }
+
+}

Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java	2007-06-05 15:43:46 UTC (rev 3454)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -44,6 +44,7 @@
 import org.jboss.ws.Constants;
 import org.jboss.ws.WSException;
 import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
 import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
 import org.jboss.ws.metadata.wsdl.WSDLException;
 import org.jboss.ws.metadata.wsdl.WSDLInterface;
@@ -53,6 +54,7 @@
 import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault;
 import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
 import org.jboss.ws.metadata.wsdl.WSDLRPCPart;
+import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
 import org.jboss.ws.metadata.wsdl.WSDLUtils;
 import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
 import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
@@ -195,7 +197,7 @@
    public void setNamespacePackageMap(Map<String, String> map)
    {
       //Lets convert the package->namespace map to namespace->package map
-      Set keys = map.keySet();
+      Set<String> keys = map.keySet();
       Iterator<String> iter = keys.iterator();
       while (iter != null && iter.hasNext())
       {
@@ -271,10 +273,12 @@
          throw new IllegalArgumentException("Interface " + itfname + " doesn't have operations");
       int len = ops != null ? ops.length : 0;
 
-      // FIXME - Add support for headers
       for (int i = 0; i < len; i++)
       {
          WSDLInterfaceOperation op = ops[i];
+
+         WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdl, op);
+
          //TODO: Take care of multiple outputs
          String returnType = null;
 
@@ -284,11 +288,11 @@
          WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(op);
          if (isDocument())
          {
-            returnType = appendDocParameters(paramBuffer, input, output);
+            returnType = appendDocParameters(paramBuffer, input, output, bindingOperation);
          }
          else
          {
-            returnType = appendRpcParameters(paramBuffer, op, output);
+            returnType = appendRpcParameters(paramBuffer, op, output, bindingOperation);
          }
 
          if (returnType == null)
@@ -334,7 +338,8 @@
       }
    }
 
-   private String appendRpcParameters(StringBuilder paramBuffer, WSDLInterfaceOperation op, WSDLInterfaceOperationOutput output) throws IOException
+   private String appendRpcParameters(StringBuilder paramBuffer, WSDLInterfaceOperation op, WSDLInterfaceOperationOutput output, WSDLBindingOperation bindingOperation)
+         throws IOException
    {
       String returnType = null;
       boolean first = true;
@@ -366,10 +371,16 @@
          returnType = getReturnType(xmlName, xmlType, xt);
       }
 
+      if (bindingOperation != null)
+      {
+         appendHeaderParameters(paramBuffer, bindingOperation);
+      }
+
       return returnType;
    }
 
-   private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output) throws IOException
+   private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output,
+         WSDLBindingOperation bindingOperation) throws IOException
    {
       String returnType = null;
       boolean holder = false;
@@ -391,9 +402,55 @@
          returnType = getReturnType(xmlName, xmlType, xt);
       }
 
+      if (bindingOperation != null)
+      {
+         appendHeaderParameters(paramBuffer, bindingOperation);
+      }
+
       return returnType;
    }
 
+   private void appendHeaderParameters(StringBuilder buf, WSDLBindingOperation bindingOperation) throws IOException
+   {
+      WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs());
+      WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs());
+
+      // Process Inputs First
+      for (WSDLSOAPHeader currentInput : inputHeaders)
+      {
+         boolean holder = HeaderUtil.containsMatchingPart(outputHeaders, currentInput);
+         appendHeaderParameter(buf, currentInput, holder);
+      }
+
+      for (WSDLSOAPHeader currentOutput : outputHeaders)
+      {
+         boolean input = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput);
+
+         if (input == true)
+            continue;
+
+         appendHeaderParameter(buf, currentOutput, true);
+      }
+   }
+
+   private void appendHeaderParameter(StringBuilder buf, WSDLSOAPHeader header, boolean holder) throws IOException
+   {
+      QName elementName = header.getElement();
+
+      JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
+      XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+      XSTypeDefinition xt = xe.getTypeDefinition();
+      QName xmlType = new QName(xt.getNamespace(), xt.getName());
+
+      if (buf.length() > 0)
+      {
+         buf.append(", ");
+      }
+
+      generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder);
+      buf.append(" ").append(header.getPartName());
+   }
+
    private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, WSDLInterfaceOperationOutput output, String containingElement) throws IOException
    {
 
@@ -778,4 +835,5 @@
    {
       this.parameterStyle = paramStyle;
    }
+
 }

Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java	2007-06-05 15:43:46 UTC (rev 3454)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -58,6 +58,7 @@
 import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping;
 import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping;
 import org.jboss.ws.metadata.wsdl.WSDLBinding;
+import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
 import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
 import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
 import org.jboss.ws.metadata.wsdl.WSDLInterface;
@@ -68,11 +69,13 @@
 import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
 import org.jboss.ws.metadata.wsdl.WSDLProperty;
 import org.jboss.ws.metadata.wsdl.WSDLRPCPart;
+import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
 import org.jboss.ws.metadata.wsdl.WSDLService;
 import org.jboss.ws.metadata.wsdl.WSDLTypes;
 import org.jboss.ws.metadata.wsdl.WSDLUtils;
 import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
 import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
+import org.jboss.ws.tools.HeaderUtil;
 import org.jboss.ws.tools.RPCSignature;
 import org.jboss.ws.tools.ToolsUtils;
 import org.jboss.ws.tools.WSToolsConstants;
@@ -216,15 +219,22 @@
          semm.setWsdlOperation(opname);
          semm.setWrappedElement(isWrapped());
 
+         WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, wiop);
+
          if (isDocStyle())
-            constructDOCParameters(semm, wiop);
-         else constructRPCParameters(semm, wiop);
+         {
+            constructDOCParameters(semm, wiop, bindingOperation);
+         }
+         else
+         {
+            constructRPCParameters(semm, wiop, bindingOperation);
+         }
 
          seim.addServiceEndpointMethodMapping(semm);
       }
    }
 
-   private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop)
+   private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation)
    {
       WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop);
       WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop);
@@ -301,26 +311,92 @@
             }
          }
 
-         //Check it is a holder. If it is, return
-         if (wiop.getInputByPartName(xmlName.getLocalPart()) != null)
-            return;
+         //Check it is a holder.
+         if (wiop.getInputByPartName(xmlName.getLocalPart()) == null)
+         {
 
-         if (xt instanceof XSSimpleTypeDefinition)
-            xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
+            if (xt instanceof XSSimpleTypeDefinition)
+               xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
 
-         String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
+            String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
 
-         if (isDocStyle() == false && "void".equals(javaType))
-            return;
+            if ((isDocStyle() == false && "void".equals(javaType)) == false)
+            {
+               WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm);
+               wrvm.setMethodReturnValue(javaType);
+               wrvm.setWsdlMessage(messageName);
+               wrvm.setWsdlMessagePartName(partName);
+               semm.setWsdlReturnValueMapping(wrvm);
+            }
+         }
+      }
 
-         WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm);
-         wrvm.setMethodReturnValue(javaType);
-         wrvm.setWsdlMessage(messageName);
-         wrvm.setWsdlMessagePartName(partName);
-         semm.setWsdlReturnValueMapping(wrvm);
+      if (bindingOperation != null)
+      {
+         constructHeaderParameters(semm, wiop, bindingOperation);
       }
    }
 
+   private void constructHeaderParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation)
+   {
+      WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs());
+      WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs());
+
+      String wsdlMessageName = bindingOperation.getWsdlBinding().getInterface().getName().getLocalPart();
+      int paramPosition = 1;
+
+      for (WSDLSOAPHeader currentInput : inputHeaders)
+      {
+         boolean inOutput = HeaderUtil.containsMatchingPart(outputHeaders, currentInput);
+         String mode = getMode(true, inOutput);
+
+         constructHeaderParameter(semm, currentInput, paramPosition++, wsdlMessageName, mode);
+      }
+
+      for (WSDLSOAPHeader currentOutput : outputHeaders)
+      {
+         boolean inInput = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput);
+
+         if (inInput == true)
+            continue;
+
+         constructHeaderParameter(semm, currentOutput, paramPosition++, wsdlMessageName, "OUT");
+      }
+   }
+
+   private void constructHeaderParameter(ServiceEndpointMethodMapping semm, WSDLSOAPHeader header, int paramPosition, String wsdlMessageName, String mode)
+   {
+      QName elementName = header.getElement();
+
+      JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+      XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+      XSTypeDefinition xt = xe.getTypeDefinition();
+      QName xmlType = new QName(xt.getNamespace(), xt.getName());
+
+      String partName = header.getPartName();
+
+      MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true);
+      semm.addMethodParamPartsMapping(mpin);
+   }
+
+   private String getMode(final boolean input, final boolean output)
+   {
+      if (input == true & output == true)
+      {
+         return "INOUT";
+      }
+      else if (input == true)
+      {
+         return "IN";
+      }
+      else if (output == true)
+      {
+         return "OUT";
+      }
+
+      return "";
+   }
+
    private String getMode(WSDLInterfaceOperation op, String name)
    {
       WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op);
@@ -341,7 +417,7 @@
       return "IN";
    }
 
-   private void constructRPCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop)
+   private void constructRPCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation)
    {
       WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop);
       if (win == null)
@@ -384,6 +460,11 @@
          wrvm.setWsdlMessagePartName(partName);
          semm.setWsdlReturnValueMapping(wrvm);
       }
+      
+      if (bindingOperation != null)
+      {
+         constructHeaderParameters(semm, wiop, bindingOperation);
+      }      
    }
 
    public void constructJavaXmlTypeMapping(JavaWsdlMapping jwm)
@@ -447,10 +528,32 @@
                   jwm.addExceptionMappings(exceptionMapping);
                }
             }
+
+            WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, op);
+            if (bindingOperation != null)
+            {
+               constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getInputs()));
+               constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs()));
+            }
+
          }//end for
       }
    }
 
+   public void constructHeaderJavaXmlTypeMapping(JavaWsdlMapping jwm, WSDLSOAPHeader[] headers)
+   {
+      for (WSDLSOAPHeader current : headers)
+      {
+         QName elementName = current.getElement();
+
+         JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+         XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
+         XSTypeDefinition xt = xe.getTypeDefinition();
+
+         addJavaXMLTypeMap(xt, elementName.getLocalPart(), "", "", jwm, true);
+      }
+   }
+
    private boolean unwrapRequest(ServiceEndpointMethodMapping methodMapping, String messageName, String containingElement, XSTypeDefinition xt)
    {
       if (xt instanceof XSComplexTypeDefinition == false)
@@ -761,14 +864,12 @@
        */
       if (xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) && "anyType".equals(xmlType.getLocalPart()) && javaType == Element.class)
          javaType = SOAPElement.class;
-      javaType = this.makeCustomDecisions(javaType, xmlName, xmlType);
+      javaType = this.makeCustomDecisions(javaType, xmlType);
 
       if (javaType == null)
       {
-         if (log.isDebugEnabled())
-            log.debug("Typemapping lookup failed for " + xmlName);
-         if (log.isDebugEnabled())
-            log.debug("Falling back to identifier generation");
+         log.debug("Typemapping lookup failed for " + xmlName);
+         log.debug("Falling back to identifier generation");
          String className = xmlType.getLocalPart();
          if (className.charAt(0) == '>')
             className = className.substring(1);
@@ -833,7 +934,7 @@
     * @param xmlName
     * @param xmlType
     */
-   private Class makeCustomDecisions(Class javaType, QName xmlName, QName xmlType)
+   private Class makeCustomDecisions(Class javaType, QName xmlType)
    {
       if (javaType != null && xmlType != null)
       {

Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java	2007-06-05 15:43:46 UTC (rev 3454)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1196,7 +1196,7 @@
          {
             WSDLInterfaceOperationOutput destIntfOutput = destIntfOperation.getOutput(element);
             if (destIntfOutput != null)
-               destIntfOperation.removeInput(element);
+               destIntfOperation.removeOutput(element);
          }
 
          public void removeRPCPart(String partName)

Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597 (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597)

Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,136 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1597;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.wsf.spi.test.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * 
- * @author darran.lofthouse at jboss.com
- * @since 27 Apr 2007
- */
-public class JBWS1597TestCase extends JBossWSTest
-{
-
-   public void testGenerateDocLitIn() throws Exception
-   {
-      generateScenario("doclit_in");
-   }
-
-   public void testGenerateDocLitOut() throws Exception
-   {
-      generateScenario("doclit_out");
-   }
-
-   public void testGenerateDocLitInOut() throws Exception
-   {
-      generateScenario("doclit_inout");
-   }
-
-   public void testGenerateDocLitInAndOut() throws Exception
-   {
-      generateScenario("doclit_in_and_out");
-   }
-
-   public void testGenerateRpcLitIn() throws Exception
-   {
-      generateScenario("rpclit_in");
-   }
-
-   public void testGenerateRpcLitOut() throws Exception
-   {
-      generateScenario("rpclit_out");
-   }
-   
-   public void testGenerateRpcLitInOut() throws Exception
-   {
-      generateScenario("rpclit_inout");
-   }
-   
-   public void testGenerateRpcLitInAndOut() throws Exception
-   {
-      generateScenario("rpclit_in_and_out");
-   }
-   
-   protected void generateScenario(final String scenario) throws Exception
-   {
-      String resourceDir = "resources/tools/jbws1597/" + scenario;
-      String toolsDir = "tools/jbws1597/" + scenario;
-      String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
-      new WSTools().generate(args);
-      File resourceDirFile = new File(resourceDir);
-      String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
-         public boolean accept(File dir, String name)
-         {
-            return name.endsWith(".java");
-         }
-      });
-
-      for (int i = 0; i < expectedFiles.length; i++)
-      {
-         String currentFile = expectedFiles[i];
-
-         try
-         {
-            compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1597/" + currentFile);
-         }
-         catch (Exception e)
-         {
-            throw new Exception("Validation of '" + currentFile + "' failed.", e);
-         }
-      }
-
-      File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597");
-      String[] generatedFiles = packageDir.list();
-      for (int i = 0; i < generatedFiles.length; i++)
-      {
-         String currentFile = generatedFiles[i];
-
-         boolean matched = "PhoneBookService.java".equals(currentFile);
-
-         for (int j = 0; j < expectedFiles.length && (matched == false); j++)
-            matched = currentFile.equals(expectedFiles[j]);
-
-         assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
-      }
-
-      JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
-      mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-   }
-
-   private static void compareSource(final String expectedName, final String generatedName) throws Exception
-   {
-      File expected = new File(expectedName);
-      File generated = new File(generatedName);
-
-      JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
-      sc.validate();
-      sc.validateImports();
-   }
-
-}

Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,136 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1597;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * 
+ * @author darran.lofthouse at jboss.com
+ * @since 27 Apr 2007
+ */
+public class JBWS1597TestCase extends JBossWSTest
+{
+
+   public void testGenerateDocLitIn() throws Exception
+   {
+      generateScenario("doclit_in");
+   }
+
+   public void testGenerateDocLitOut() throws Exception
+   {
+      generateScenario("doclit_out");
+   }
+
+   public void testGenerateDocLitInOut() throws Exception
+   {
+      generateScenario("doclit_inout");
+   }
+
+   public void testGenerateDocLitInAndOut() throws Exception
+   {
+      generateScenario("doclit_in_and_out");
+   }
+
+   public void testGenerateRpcLitIn() throws Exception
+   {
+      generateScenario("rpclit_in");
+   }
+
+   public void testGenerateRpcLitOut() throws Exception
+   {
+      generateScenario("rpclit_out");
+   }
+   
+   public void testGenerateRpcLitInOut() throws Exception
+   {
+      generateScenario("rpclit_inout");
+   }
+   
+   public void testGenerateRpcLitInAndOut() throws Exception
+   {
+      generateScenario("rpclit_in_and_out");
+   }
+   
+   protected void generateScenario(final String scenario) throws Exception
+   {
+      String resourceDir = "resources/tools/jbws1597/" + scenario;
+      String toolsDir = "tools/jbws1597/" + scenario;
+      String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+      new WSTools().generate(args);
+      File resourceDirFile = new File(resourceDir);
+      String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+         public boolean accept(File dir, String name)
+         {
+            return name.endsWith(".java");
+         }
+      });
+
+      for (int i = 0; i < expectedFiles.length; i++)
+      {
+         String currentFile = expectedFiles[i];
+
+         try
+         {
+            compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1597/" + currentFile);
+         }
+         catch (Exception e)
+         {
+            throw new Exception("Validation of '" + currentFile + "' failed.", e);
+         }
+      }
+
+      File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597");
+      String[] generatedFiles = packageDir.list();
+      for (int i = 0; i < generatedFiles.length; i++)
+      {
+         String currentFile = generatedFiles[i];
+
+         boolean matched = "PhoneBookService.java".equals(currentFile);
+
+         for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+            matched = currentFile.equals(expectedFiles[j]);
+
+         assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+      }
+
+      JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+      mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+   }
+
+   private static void compareSource(final String expectedName, final String generatedName) throws Exception
+   {
+      File expected = new File(expectedName);
+      File generated = new File(generatedName);
+
+      JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+      sc.validate();
+      sc.validateImports();
+   }
+
+}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597 (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597)

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 15:19:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 15:19:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>     
-
-   <complexType name='TelephoneNumber'>
-    <sequence>
-      <element name='areaCode' nillable='true' type='string'/>
-      <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-      
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <element name='lookup' type='tns:Person'/>
-   <element name='lookupResponse' type='tns:TelephoneNumber'/>
-   <element name='billingAccount' type='tns:BillingAccount'/>
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup'>
-  <part element='ns1:lookup' name='parameters'/>
-  <part element='ns1:billingAccount' name='header'/>  
- </message>
-
- <message name='PhoneBook_lookupResponse'>
-  <part element='ns1:lookupResponse' name='result'/>
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body use='literal' parts='parameters'/>
-    <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
-   </input>
-   <output>
-    <soap:body use='literal'/>
-   </output>
-  </operation>
- </binding>
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>     
+
+   <complexType name='TelephoneNumber'>
+    <sequence>
+      <element name='areaCode' nillable='true' type='string'/>
+      <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+      
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <element name='lookup' type='tns:Person'/>
+   <element name='lookupResponse' type='tns:TelephoneNumber'/>
+   <element name='billingAccount' type='tns:BillingAccount'/>
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup'>
+  <part element='ns1:lookup' name='parameters'/>
+  <part element='ns1:billingAccount' name='header'/>  
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+  <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body use='literal' parts='parameters'/>
+    <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+   </input>
+   <output>
+    <soap:body use='literal'/>
+   </output>
+  </operation>
+ </binding>
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 15:19:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccount header) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccount header) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 15:19:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 15:19:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,89 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>parameters</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>header</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.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,89 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>parameters</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>header</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.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 17:26:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 17:26:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 17:26:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
-{
-
-  public org.jboss.test.ws.jbws1597.BillingAccount value;
-
-  public BillingAccountHolder()
-  {
-    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
-  }
-
-  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
-  {
-    this.value = value;
-  }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 17:26:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+  public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+  public BillingAccountHolder()
+  {
+    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+  }
+
+  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+  {
+    this.value = value;
+  }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 17:26:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  NickName
-{
-
-protected java.lang.String name;
-public NickName(){}
-
-public NickName(java.lang.String name){
-this.name=name;
-}
-public java.lang.String getName() { return name ;}
-
-public void setName(java.lang.String name){ this.name=name; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 17:26:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  NickName
+{
+
+protected java.lang.String name;
+public NickName(){}
+
+public NickName(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 17:26:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 17:26:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <complexType name='NickName'>
-    <sequence>
-     <element name='name' nillable='true' type='string'/>      
-    </sequence>
-   </complexType>     
-
-   <complexType name='TelephoneNumber'>
-    <sequence>
-      <element name='areaCode' nillable='true' type='string'/>
-      <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-      
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <element name='lookup' type='tns:Person'/>
-   <element name='lookupResponse' type='tns:TelephoneNumber'/>
-   <element name='nickName' type='tns:NickName'/>   
-   <element name='billingAccount' type='tns:BillingAccount'/>
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup'>
-  <part element='ns1:lookup' name='parameters'/>  
-  <part element='ns1:nickName' name='inHeader'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
-  <part element='ns1:lookupResponse' name='result'/>
-  <part element='ns1:billingAccount' name='outHeader'/>  
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body use='literal' parts='parameters' />
-    <soap:header use='literal' message='tns:PhoneBook_lookup' part='inHeader' />
-   </input>
-   <output>
-    <soap:body use='literal' parts='result' />
-    <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='outHeader' />    
-   </output>
-  </operation>
- </binding>
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <complexType name='NickName'>
+    <sequence>
+     <element name='name' nillable='true' type='string'/>      
+    </sequence>
+   </complexType>     
+
+   <complexType name='TelephoneNumber'>
+    <sequence>
+      <element name='areaCode' nillable='true' type='string'/>
+      <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+      
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <element name='lookup' type='tns:Person'/>
+   <element name='lookupResponse' type='tns:TelephoneNumber'/>
+   <element name='nickName' type='tns:NickName'/>   
+   <element name='billingAccount' type='tns:BillingAccount'/>
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup'>
+  <part element='ns1:lookup' name='parameters'/>  
+  <part element='ns1:nickName' name='inHeader'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+  <part element='ns1:lookupResponse' name='result'/>
+  <part element='ns1:billingAccount' name='outHeader'/>  
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body use='literal' parts='parameters' />
+    <soap:header use='literal' message='tns:PhoneBook_lookup' part='inHeader' />
+   </input>
+   <output>
+    <soap:body use='literal' parts='result' />
+    <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='outHeader' />    
+   </output>
+  </operation>
+ </binding>
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 17:26:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.NickName inHeader, org.jboss.test.ws.jbws1597.BillingAccountHolder outHeader) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 17:26:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.NickName inHeader, org.jboss.test.ws.jbws1597.BillingAccountHolder outHeader) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 17:26:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 17:26:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,107 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.NickName</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>name</java-variable-name>
-   <xml-element-name>name</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>parameters</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.NickName</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>inHeader</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>2</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>outHeader</wsdl-message-part-name>
-     <parameter-mode>OUT</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,107 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.NickName</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>name</java-variable-name>
+   <xml-element-name>name</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>parameters</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.NickName</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>inHeader</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>2</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>outHeader</wsdl-message-part-name>
+     <parameter-mode>OUT</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <wsdl-return-value-mapping>
+    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:46:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:46:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
-{
-
-  public org.jboss.test.ws.jbws1597.BillingAccount value;
-
-  public BillingAccountHolder()
-  {
-    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
-  }
-
-  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
-  {
-    this.value = value;
-  }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+  public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+  public BillingAccountHolder()
+  {
+    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+  }
+
+  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+  {
+    this.value = value;
+  }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:46:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>     
-
-   <complexType name='TelephoneNumber'>
-    <sequence>
-      <element name='areaCode' nillable='true' type='string'/>
-      <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-      
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <element name='lookup' type='tns:Person'/>
-   <element name='lookupResponse' type='tns:TelephoneNumber'/>
-   <element name='billingAccount' type='tns:BillingAccount'/>
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup'>
-  <part element='ns1:lookup' name='parameters'/>  
-  <part element='ns1:billingAccount' name='header'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
-  <part element='ns1:lookupResponse' name='result'/>
-  <part element='ns1:billingAccount' name='header'/>  
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body use='literal' parts='parameters' />
-    <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
-   </input>
-   <output>
-    <soap:body use='literal' parts='result' />
-    <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />    
-   </output>
-  </operation>
- </binding>
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>     
+
+   <complexType name='TelephoneNumber'>
+    <sequence>
+      <element name='areaCode' nillable='true' type='string'/>
+      <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+      
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <element name='lookup' type='tns:Person'/>
+   <element name='lookupResponse' type='tns:TelephoneNumber'/>
+   <element name='billingAccount' type='tns:BillingAccount'/>
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup'>
+  <part element='ns1:lookup' name='parameters'/>  
+  <part element='ns1:billingAccount' name='header'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+  <part element='ns1:lookupResponse' name='result'/>
+  <part element='ns1:billingAccount' name='header'/>  
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body use='literal' parts='parameters' />
+    <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+   </input>
+   <output>
+    <soap:body use='literal' parts='result' />
+    <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />    
+   </output>
+  </operation>
+ </binding>
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:46:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:46:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:46:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,89 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>parameters</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>header</wsdl-message-part-name>
-     <parameter-mode>INOUT</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,89 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>parameters</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>header</wsdl-message-part-name>
+     <parameter-mode>INOUT</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <wsdl-return-value-mapping>
+    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:35:22 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:35:22 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
-{
-
-  public org.jboss.test.ws.jbws1597.BillingAccount value;
-
-  public BillingAccountHolder()
-  {
-    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
-  }
-
-  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
-  {
-    this.value = value;
-  }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+  public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+  public BillingAccountHolder()
+  {
+    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+  }
+
+  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+  {
+    this.value = value;
+  }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:35:22 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>     
-
-   <complexType name='TelephoneNumber'>
-    <sequence>
-      <element name='areaCode' nillable='true' type='string'/>
-      <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-      
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <element name='lookup' type='tns:Person'/>
-   <element name='lookupResponse' type='tns:TelephoneNumber'/>
-   <element name='billingAccount' type='tns:BillingAccount'/>
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup'>
-  <part element='ns1:lookup' name='parameters'/>  
- </message>
-
- <message name='PhoneBook_lookupResponse'>
-  <part element='ns1:lookupResponse' name='result'/>
-  <part element='ns1:billingAccount' name='header'/>  
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body use='literal'/>
-   </input>
-   <output>
-    <soap:body use='literal' parts='result' />
-    <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />    
-   </output>
-  </operation>
- </binding>
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>     
+
+   <complexType name='TelephoneNumber'>
+    <sequence>
+      <element name='areaCode' nillable='true' type='string'/>
+      <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+      
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <element name='lookup' type='tns:Person'/>
+   <element name='lookupResponse' type='tns:TelephoneNumber'/>
+   <element name='billingAccount' type='tns:BillingAccount'/>
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup'>
+  <part element='ns1:lookup' name='parameters'/>  
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+  <part element='ns1:lookupResponse' name='result'/>
+  <part element='ns1:billingAccount' name='header'/>  
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body use='literal'/>
+   </input>
+   <output>
+    <soap:body use='literal' parts='result' />
+    <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' />    
+   </output>
+  </operation>
+ </binding>
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:35:22 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue May 29 16:35:22 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 29 16:35:22 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,89 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>parameters</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>header</wsdl-message-part-name>
-     <parameter-mode>OUT</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,89 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>parameters</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>header</wsdl-message-part-name>
+     <parameter-mode>OUT</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <wsdl-return-value-mapping>
+    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/doclit_out/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/doclit_out/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:17:30 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:17:30 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:17:30 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:17:30 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-          
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <complexType name='TelephoneNumber'>
-    <sequence>
-     <element name='areaCode' nillable='true' type='string'/>
-     <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-
-
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-      
-   <element name='billingAccount' type='tns:BillingAccount'/>      
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
-  <part name='Person_1' type='ns1:Person'/>
-  <part name='Account_1' element='ns1:billingAccount'/>  
- </message>
- <message name='PhoneBook_lookupResponse'>
-  <part name='result' type='ns1:TelephoneNumber'/>
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup' parameterOrder='Person_1'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
-    <soap:header message="tns:PhoneBook_lookup" 
-              part="Account_1" use="literal" />
-   </input>
-   <output>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
-   </output>
-  </operation>
- </binding>
- 
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+          
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <complexType name='TelephoneNumber'>
+    <sequence>
+     <element name='areaCode' nillable='true' type='string'/>
+     <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+
+
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+      
+   <element name='billingAccount' type='tns:BillingAccount'/>      
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+  <part name='Person_1' type='ns1:Person'/>
+  <part name='Account_1' element='ns1:billingAccount'/>  
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+  <part name='result' type='ns1:TelephoneNumber'/>
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup' parameterOrder='Person_1'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+    <soap:header message="tns:PhoneBook_lookup" 
+              part="Account_1" use="literal" />
+   </input>
+   <output>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+   </output>
+  </operation>
+ </binding>
+ 
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:17:30 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccount Account_1) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:17:30 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccount Account_1) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:17:30 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:17:30 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,89 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>Account_1</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.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,89 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>Account_1</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.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sat Jun 02 16:59:45 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sat Jun 02 16:59:45 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sat Jun 02 16:59:45 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
-{
-
-  public org.jboss.test.ws.jbws1597.BillingAccount value;
-
-  public BillingAccountHolder()
-  {
-    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
-  }
-
-  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
-  {
-    this.value = value;
-  }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sat Jun 02 16:59:45 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+  public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+  public BillingAccountHolder()
+  {
+    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+  }
+
+  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+  {
+    this.value = value;
+  }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sat Jun 02 16:59:45 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  NickName
-{
-
-protected java.lang.String name;
-public NickName(){}
-
-public NickName(java.lang.String name){
-this.name=name;
-}
-public java.lang.String getName() { return name ;}
-
-public void setName(java.lang.String name){ this.name=name; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sat Jun 02 16:59:45 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  NickName
+{
+
+protected java.lang.String name;
+public NickName(){}
+
+public NickName(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sat Jun 02 16:59:45 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sat Jun 02 16:59:45 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-          
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-
-   <complexType name='NickName'>
-    <sequence>
-     <element name='name' nillable='true' type='string'/>      
-    </sequence>
-   </complexType>
-      
-   <complexType name='TelephoneNumber'>
-    <sequence>
-     <element name='areaCode' nillable='true' type='string'/>
-     <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-
-
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <element name='nickName' type='tns:NickName'/>   
-   <element name='billingAccount' type='tns:BillingAccount'/>      
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
-  <part name='Person_1' type='ns1:Person'/>
-  <part name='NickName_1' element='ns1:nickName'/>  
- </message>
- <message name='PhoneBook_lookupResponse'>
-  <part name='result' type='ns1:TelephoneNumber'/>
-  <part name='Account_1' element='ns1:billingAccount'/>  
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup' parameterOrder='Person_1'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
-    <soap:header message="tns:PhoneBook_lookup" 
-              part="NickName_1" use="literal" />
-   </input>
-   <output>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
-    <soap:header message="tns:PhoneBook_lookupResponse" 
-              part="Account_1" use="literal" />    
-   </output>
-  </operation>
- </binding>
- 
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+          
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+
+   <complexType name='NickName'>
+    <sequence>
+     <element name='name' nillable='true' type='string'/>      
+    </sequence>
+   </complexType>
+      
+   <complexType name='TelephoneNumber'>
+    <sequence>
+     <element name='areaCode' nillable='true' type='string'/>
+     <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+
+
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <element name='nickName' type='tns:NickName'/>   
+   <element name='billingAccount' type='tns:BillingAccount'/>      
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+  <part name='Person_1' type='ns1:Person'/>
+  <part name='NickName_1' element='ns1:nickName'/>  
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+  <part name='result' type='ns1:TelephoneNumber'/>
+  <part name='Account_1' element='ns1:billingAccount'/>  
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup' parameterOrder='Person_1'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+    <soap:header message="tns:PhoneBook_lookup" 
+              part="NickName_1" use="literal" />
+   </input>
+   <output>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+    <soap:header message="tns:PhoneBook_lookupResponse" 
+              part="Account_1" use="literal" />    
+   </output>
+  </operation>
+ </binding>
+ 
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sat Jun 02 16:59:45 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.NickName NickName_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sat Jun 02 16:59:45 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.NickName NickName_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sat Jun 02 16:59:45 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sat Jun 02 16:59:45 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,107 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.NickName</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>name</java-variable-name>
-   <xml-element-name>name</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.NickName</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>NickName_1</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>2</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>Account_1</wsdl-message-part-name>
-     <parameter-mode>OUT</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,107 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.NickName</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>name</java-variable-name>
+   <xml-element-name>name</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.NickName</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>NickName_1</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>2</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>Account_1</wsdl-message-part-name>
+     <parameter-mode>OUT</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <wsdl-return-value-mapping>
+    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:41:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:41:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:41:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
-{
-
-  public org.jboss.test.ws.jbws1597.BillingAccount value;
-
-  public BillingAccountHolder()
-  {
-    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
-  }
-
-  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
-  {
-    this.value = value;
-  }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:41:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+  public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+  public BillingAccountHolder()
+  {
+    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+  }
+
+  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+  {
+    this.value = value;
+  }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:41:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:41:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-          
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <complexType name='TelephoneNumber'>
-    <sequence>
-     <element name='areaCode' nillable='true' type='string'/>
-     <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-
-
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-      
-   <element name='billingAccount' type='tns:BillingAccount'/>      
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
-  <part name='Person_1' type='ns1:Person'/>
-  <part name='Account_1' element='ns1:billingAccount'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
-  <part name='result' type='ns1:TelephoneNumber'/>
-  <part name='Account_1' element='ns1:billingAccount'/>  
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup' parameterOrder='Person_1'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
-    <soap:header message="tns:PhoneBook_lookup" 
-              part="Account_1" use="literal" />
-   </input>
-   <output>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
-    <soap:header message="tns:PhoneBook_lookupResponse" 
-              part="Account_1" use="literal" />
-   </output>
-  </operation>
- </binding>
- 
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+          
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <complexType name='TelephoneNumber'>
+    <sequence>
+     <element name='areaCode' nillable='true' type='string'/>
+     <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+
+
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+      
+   <element name='billingAccount' type='tns:BillingAccount'/>      
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+  <part name='Person_1' type='ns1:Person'/>
+  <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+  <part name='result' type='ns1:TelephoneNumber'/>
+  <part name='Account_1' element='ns1:billingAccount'/>  
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup' parameterOrder='Person_1'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+    <soap:header message="tns:PhoneBook_lookup" 
+              part="Account_1" use="literal" />
+   </input>
+   <output>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+    <soap:header message="tns:PhoneBook_lookupResponse" 
+              part="Account_1" use="literal" />
+   </output>
+  </operation>
+ </binding>
+ 
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:41:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:41:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:41:43 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:41:43 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,89 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>Account_1</wsdl-message-part-name>
-     <parameter-mode>INOUT</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,89 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>Account_1</wsdl-message-part-name>
+     <parameter-mode>INOUT</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <wsdl-return-value-mapping>
+    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out)

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:29:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:29:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:29:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
-{
-
-  public org.jboss.test.ws.jbws1597.BillingAccount value;
-
-  public BillingAccountHolder()
-  {
-    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
-  }
-
-  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
-  {
-    this.value = value;
-  }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:29:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+public class BillingAccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+  public org.jboss.test.ws.jbws1597.BillingAccount value;
+
+  public BillingAccountHolder()
+  {
+    this.value = new org.jboss.test.ws.jbws1597.BillingAccount();
+  }
+
+  public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value)
+  {
+    this.value = value;
+  }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:29:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:29:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' 
-             targetNamespace='http://test.jboss.org/ws/jbws1597' 
-             xmlns='http://schemas.xmlsoap.org/wsdl/' 
-             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
-             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
-             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns='http://www.w3.org/2001/XMLSchema' 
-          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
-          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-          
-   <complexType name='Person'>
-    <sequence>
-     <element name='firstName' nillable='true' type='string'/>
-     <element name='surname' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-   
-   <complexType name='TelephoneNumber'>
-    <sequence>
-     <element name='areaCode' nillable='true' type='string'/>
-     <element name='number' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-
-
-   <complexType name='BillingAccount'>
-    <sequence>
-      <element name='sortCode' nillable='true' type='string'/>
-      <element name='accountNumber' nillable='true' type='string'/>
-    </sequence>
-   </complexType>
-      
-   <element name='billingAccount' type='tns:BillingAccount'/>      
-  </schema>
- </types>
- 
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
-  <part name='Person_1' type='ns1:Person'/>  
- </message>
- <message name='PhoneBook_lookupResponse'>
-  <part name='result' type='ns1:TelephoneNumber'/>
-  <part name='Account_1' element='ns1:billingAccount'/>  
- </message>
- 
- <portType name='PhoneBook'>
-  <operation name='lookup' parameterOrder='Person_1'>
-   <input message='tns:PhoneBook_lookup'/>
-   <output message='tns:PhoneBook_lookupResponse'/>
-  </operation>
- </portType>
- 
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
-  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='lookup'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
-
-   </input>
-   <output>
-    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='result' />
-    <soap:header message="tns:PhoneBook_lookupResponse" 
-              part="Account_1" use="literal" />
-   </output>
-  </operation>
- </binding>
- 
- <service name='PhoneBook'>
-  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' 
+             targetNamespace='http://test.jboss.org/ws/jbws1597' 
+             xmlns='http://schemas.xmlsoap.org/wsdl/' 
+             xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' 
+             xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
+             xmlns:tns='http://test.jboss.org/ws/jbws1597' 
+             xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns='http://www.w3.org/2001/XMLSchema' 
+          xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' 
+          xmlns:tns='http://test.jboss.org/ws/jbws1597/types' 
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+          
+   <complexType name='Person'>
+    <sequence>
+     <element name='firstName' nillable='true' type='string'/>
+     <element name='surname' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+   
+   <complexType name='TelephoneNumber'>
+    <sequence>
+     <element name='areaCode' nillable='true' type='string'/>
+     <element name='number' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+
+
+   <complexType name='BillingAccount'>
+    <sequence>
+      <element name='sortCode' nillable='true' type='string'/>
+      <element name='accountNumber' nillable='true' type='string'/>
+    </sequence>
+   </complexType>
+      
+   <element name='billingAccount' type='tns:BillingAccount'/>      
+  </schema>
+ </types>
+ 
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+  <part name='Person_1' type='ns1:Person'/>  
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+  <part name='result' type='ns1:TelephoneNumber'/>
+  <part name='Account_1' element='ns1:billingAccount'/>  
+ </message>
+ 
+ <portType name='PhoneBook'>
+  <operation name='lookup' parameterOrder='Person_1'>
+   <input message='tns:PhoneBook_lookup'/>
+   <output message='tns:PhoneBook_lookupResponse'/>
+  </operation>
+ </portType>
+ 
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='lookup'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+
+   </input>
+   <output>
+    <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='result' />
+    <soap:header message="tns:PhoneBook_lookupResponse" 
+              part="Account_1" use="literal" />
+   </output>
+  </operation>
+ </binding>
+ 
+ <service name='PhoneBook'>
+  <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+  </port>
+ </service>
+</definitions>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:29:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1597;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws  java.rmi.RemoteException;
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:29:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1597;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws1597.TelephoneNumber  lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws  java.rmi.RemoteException;
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Fri Jun 01 17:29:46 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1597;
-
-
-public class  TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Fri Jun 01 17:29:46 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1597;
+
+
+public class  TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,89 +0,0 @@
-<?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.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1597</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>firstName</java-variable-name>
-   <xml-element-name>firstName</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>surname</java-variable-name>
-   <xml-element-name>surname</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>areaCode</java-variable-name>
-   <xml-element-name>areaCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>number</java-variable-name>
-   <xml-element-name>number</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
-  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>sortCode</java-variable-name>
-   <xml-element-name>sortCode</xml-element-name>
-  </variable-mapping>
-  <variable-mapping>
-   <java-variable-name>accountNumber</java-variable-name>
-   <xml-element-name>accountNumber</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
-  <port-mapping>
-   <port-name>PhoneBookPort</port-name>
-   <java-port-name>PhoneBookPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>lookup</java-method-name>
-   <wsdl-operation>lookup</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
-     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <method-param-parts-mapping>
-    <param-position>1</param-position>
-    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
-     <wsdl-message-part-name>Account_1</wsdl-message-part-name>
-     <parameter-mode>OUT</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,89 @@
+<?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.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws1597</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.Person</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>firstName</java-variable-name>
+   <xml-element-name>firstName</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>surname</java-variable-name>
+   <xml-element-name>surname</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>areaCode</java-variable-name>
+   <xml-element-name>areaCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>number</java-variable-name>
+   <xml-element-name>number</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type>
+  <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>sortCode</java-variable-name>
+   <xml-element-name>sortCode</xml-element-name>
+  </variable-mapping>
+  <variable-mapping>
+   <java-variable-name>accountNumber</java-variable-name>
+   <xml-element-name>accountNumber</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name>
+  <port-mapping>
+   <port-name>PhoneBookPort</port-name>
+   <java-port-name>PhoneBookPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+  <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding>
+  <service-endpoint-method-mapping>
+   <java-method-name>lookup</java-method-name>
+   <wsdl-operation>lookup</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.Person</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+     <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <method-param-parts-mapping>
+    <param-position>1</param-position>
+    <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message>
+     <wsdl-message-part-name>Account_1</wsdl-message-part-name>
+     <parameter-mode>OUT</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <wsdl-return-value-mapping>
+    <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml	2007-06-05 15:08:16 UTC (rev 3451)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl" 
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml)
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml	                        (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml	2007-06-05 17:53:00 UTC (rev 3455)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl" 
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>




More information about the jbossws-commits mailing list