[jbossws-commits] JBossWS SVN: r8701 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/tools and 4 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Tue Nov 11 09:34:51 EST 2008


Author: darran.lofthouse at jboss.com
Date: 2008-11-11 09:34:51 -0500 (Tue, 11 Nov 2008)
New Revision: 8701

Added:
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml
Removed:
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml
Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
[JBWS-2389] WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source.

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -100,7 +100,7 @@
    private String typeNamespace;
    private String serviceName = null;
    private String packageName = null;
-   private Map<String, String> namespacePackageMap = new HashMap<String,String>();
+   private Map<String, String> namespacePackageMap = new HashMap<String, String>();
    private Set<String> registeredTypes = new HashSet<String>();
    private Set<String> registeredExceptions = new HashSet<String>();
 
@@ -718,10 +718,11 @@
          XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt;
          XSTypeDefinition baseType = xc.getBaseType();
          short der = xc.getDerivationMethod();
+         String typeQName = "";
 
          if ((baseType != null) && !utils.isBaseTypeIgnorable(baseType, xc))
          {
-               addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types
+            addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types
          }
 
          // handleContentTypeElementsWithDerivationNone
@@ -749,15 +750,17 @@
                javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true);
                StringBuilder temp = new StringBuilder();
                if (containingType != null && containingType.length() > 0)
-                  temp.append(">").append(containingType);
+                  temp.append(containingType);
                temp.append(">").append(name);
                localName = temp.toString();
                jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS"));
+               typeQName = localName;
             }
             else
             {
                javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true);
                jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS"));
+               typeQName = xc.getName();
             }
 
             if (typeNamespace == null)
@@ -794,7 +797,15 @@
          }
 
          if (xm != null)
-            addGroup(xm, name, xc.getName(), jwm);
+         {
+            String container = containingElement;
+            if (container == null || container.length() == 0)
+            {
+               container = name;
+            }
+
+            addGroup(xm, container, typeQName, jwm);
+         }
       }
 
       // Add enum simpleType support
@@ -816,7 +827,7 @@
             XSElementDeclaration xe = (XSElementDeclaration)xsterm;
             VariableMapping vm = new VariableMapping(jxtm);
             String name = xe.getName();
-            
+
             // JBWS-1170 Convert characters which are illegal in Java identifiers
             vm.setJavaVariableName(ToolsUtils.convertInvalidCharacters(Introspector.decapitalize(name)));
             vm.setXmlElementName(name);
@@ -924,7 +935,8 @@
          {
             jtype = JavaUtils.getSourceName(javaType);
          }
-         else jtype = javaType.getName();
+         else
+            jtype = javaType.getName();
       }
 
       return jtype + arraySuffix;

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389 (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389)

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws2389;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test case to test the following fix: -
- * 
- * @see http://jira.jboss.com/jira/browse/JBWS-2389
- * 
- * WSDL To Java - WSDL To Java - Anonymous types 
- * nested within anonymous types not being processed correctly.
- * 
- * @author darran.lofthouse at jboss.com
- * @since Nov 10, 2008
- */
-public class JBWS2389TestCase extends JBossWSTest
-{
-
-   public void testDocumentLiteral() throws Exception
-   {
-      generateScenario("doclit");
-   }
-
-   protected void generateScenario(final String scenario) throws Exception
-   {
-      File resourceDir = createResourceFile("tools/jbws2389/" + scenario);
-      String toolsDir = resourceDir.getAbsolutePath();
-
-      String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" };
-      new WSTools().generate(args);
-
-      String[] expectedFiles = resourceDir.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/jbws2389/" + currentFile);
-         }
-         catch (Exception e)
-         {
-            throw new Exception("Validation of '" + currentFile + "' failed.", e);
-         }
-      }
-
-      File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2389");
-      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]);
-
-         System.out.println(packageDir.getAbsolutePath());
-         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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2389;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case to test the following fix: -
+ * 
+ * @see http://jira.jboss.com/jira/browse/JBWS-2389
+ * 
+ * WSDL To Java - WSDL To Java - Anonymous types 
+ * nested within anonymous types not being processed correctly.
+ * 
+ * @author darran.lofthouse at jboss.com
+ * @since Nov 10, 2008
+ */
+public class JBWS2389TestCase extends JBossWSTest
+{
+
+   public void testDocumentLiteral() throws Exception
+   {
+      generateScenario("doclit");
+   }
+
+   protected void generateScenario(final String scenario) throws Exception
+   {
+      File resourceDir = createResourceFile("tools/jbws2389/" + scenario);
+      String toolsDir = resourceDir.getAbsolutePath();
+
+      String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" };
+      new WSTools().generate(args);
+
+      String[] expectedFiles = resourceDir.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/jbws2389/" + currentFile);
+         }
+         catch (Exception e)
+         {
+            throw new Exception("Validation of '" + currentFile + "' failed.", e);
+         }
+      }
+
+      File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2389");
+      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]);
+
+         System.out.println(packageDir.getAbsolutePath());
+         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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389 (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389)

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit)

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Nov 11 13:48:53 GMT 2008
- *
- * 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.jbws2389;
-
-
-public class  Lookup
-{
-
-protected org.jboss.test.ws.jbws2389.LookupDetails details;
-public Lookup(){}
-
-public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){
-this.details=details;
-}
-public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;}
-
-public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; }
-
-}

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Nov 11 13:48:53 GMT 2008
+ *
+ * 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.jbws2389;
+
+
+public class  Lookup
+{
+
+protected org.jboss.test.ws.jbws2389.LookupDetails details;
+public Lookup(){}
+
+public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){
+this.details=details;
+}
+public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;}
+
+public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; }
+
+}

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Nov 11 13:48:53 GMT 2008
- *
- * 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.jbws2389;
-
-
-public class  LookupDetails
-{
-
-protected org.jboss.test.ws.jbws2389.LookupName name;
-public LookupDetails(){}
-
-public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){
-this.name=name;
-}
-public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;}
-
-public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; }
-
-}

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Nov 11 13:48:53 GMT 2008
+ *
+ * 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.jbws2389;
+
+
+public class  LookupDetails
+{
+
+protected org.jboss.test.ws.jbws2389.LookupName name;
+public LookupDetails(){}
+
+public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){
+this.name=name;
+}
+public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;}
+
+public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; }
+
+}

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Nov 11 13:48:53 GMT 2008
- *
- * 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.jbws2389;
-
-
-public class  LookupName
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public LookupName(){}
-
-public LookupName(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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Nov 11 13:48:53 GMT 2008
+ *
+ * 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.jbws2389;
+
+
+public class  LookupName
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public LookupName(){}
+
+public LookupName(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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Nov 11 13:48:53 GMT 2008
- *
- * 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.jbws2389;
-
-
-public class  LookupResponse
-{
-
-protected org.jboss.test.ws.jbws2389.LookupResponseDetails details;
-public LookupResponse(){}
-
-public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){
-this.details=details;
-}
-public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;}
-
-public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; }
-
-}

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Nov 11 13:48:53 GMT 2008
+ *
+ * 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.jbws2389;
+
+
+public class  LookupResponse
+{
+
+protected org.jboss.test.ws.jbws2389.LookupResponseDetails details;
+public LookupResponse(){}
+
+public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){
+this.details=details;
+}
+public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;}
+
+public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; }
+
+}

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Nov 11 13:48:53 GMT 2008
- *
- * 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.jbws2389;
-
-
-public class  LookupResponseDetails
-{
-
-protected org.jboss.test.ws.jbws2389.LookupResponseNumber number;
-public LookupResponseDetails(){}
-
-public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){
-this.number=number;
-}
-public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;}
-
-public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; }
-
-}

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Nov 11 13:48:53 GMT 2008
+ *
+ * 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.jbws2389;
+
+
+public class  LookupResponseDetails
+{
+
+protected org.jboss.test.ws.jbws2389.LookupResponseNumber number;
+public LookupResponseDetails(){}
+
+public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){
+this.number=number;
+}
+public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;}
+
+public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; }
+
+}

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Nov 11 13:48:53 GMT 2008
- *
- * 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.jbws2389;
-
-
-public class  LookupResponseNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public LookupResponseNumber(){}
-
-public LookupResponseNumber(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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Nov 11 13:48:53 GMT 2008
+ *
+ * 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.jbws2389;
+
+
+public class  LookupResponseNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public LookupResponseNumber(){}
+
+public LookupResponseNumber(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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws2389' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws2389/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws2389' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
-  <schema targetNamespace='http://test.jboss.org/ws/jbws2389/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws2389/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
-   <element name='lookup'>
-    <complexType>
-     <sequence>
-      <element name='Details'>
-       <complexType>
-        <sequence>
-         <element name='Name'>
-          <complexType>
-           <sequence>
-            <element name='firstName' nillable='true' type='string'/>
-            <element name='surname' nillable='true' type='string'/>
-           </sequence>
-          </complexType>
-         </element>
-        </sequence>
-       </complexType>
-      </element>
-     </sequence>
-    </complexType>
-   </element>     
-
-   <element name='lookupResponse'>
-    <complexType>
-     <sequence>
-      <element name='Details'>
-       <complexType>
-        <sequence>
-         <element name='Number'>
-          <complexType>
-           <sequence>
-            <element name='areaCode' nillable='true' type='string'/>
-            <element name='number' nillable='true' type='string'/>
-           </sequence>
-          </complexType>
-         </element>
-        </sequence>
-       </complexType>
-      </element>
-     </sequence>
-    </complexType>
-   </element>        
-
-  </schema>
- </types>
- <message name='PhoneBook_lookup'>
-  <part element='ns1:lookup' name='parameters'/>
- </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'/>
-   </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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws2389' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws2389/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws2389' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+  <schema targetNamespace='http://test.jboss.org/ws/jbws2389/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws2389/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+   <element name='lookup'>
+    <complexType>
+     <sequence>
+      <element name='Details'>
+       <complexType>
+        <sequence>
+         <element name='Name'>
+          <complexType>
+           <sequence>
+            <element name='firstName' nillable='true' type='string'/>
+            <element name='surname' nillable='true' type='string'/>
+           </sequence>
+          </complexType>
+         </element>
+        </sequence>
+       </complexType>
+      </element>
+     </sequence>
+    </complexType>
+   </element>     
+
+   <element name='lookupResponse'>
+    <complexType>
+     <sequence>
+      <element name='Details'>
+       <complexType>
+        <sequence>
+         <element name='Number'>
+          <complexType>
+           <sequence>
+            <element name='areaCode' nillable='true' type='string'/>
+            <element name='number' nillable='true' type='string'/>
+           </sequence>
+          </complexType>
+         </element>
+        </sequence>
+       </complexType>
+      </element>
+     </sequence>
+    </complexType>
+   </element>        
+
+  </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+  <part element='ns1:lookup' name='parameters'/>
+ </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'/>
+   </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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Tue Nov 11 13:48:53 GMT 2008
- *
- * 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.jbws2389;
-public interface  PhoneBook_PortType extends java.rmi.Remote
-{
-
-  public org.jboss.test.ws.jbws2389.LookupResponse  lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws  java.rmi.RemoteException;
-}

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue Nov 11 13:48:53 GMT 2008
+ *
+ * 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.jbws2389;
+public interface  PhoneBook_PortType extends java.rmi.Remote
+{
+
+  public org.jboss.test.ws.jbws2389.LookupResponse  lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws  java.rmi.RemoteException;
+}

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,103 +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.jbws2389</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI>
- </package-mapping>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws2389</package-type>
-  <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type>
-  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookup</anonymous-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>details</java-variable-name>
-   <xml-element-name>Details</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type>
-  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookup&gt;Details</anonymous-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.jbws2389.LookupName</java-type>
-  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookup&gt;Details&gt;Name</anonymous-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.jbws2389.LookupResponse</java-type>
-  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookupResponse</anonymous-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <variable-mapping>
-   <java-variable-name>details</java-variable-name>
-   <xml-element-name>Details</xml-element-name>
-  </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
-  <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type>
-  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookupResponse&gt;Details</anonymous-type-qname>
-  <qname-scope>complexType</qname-scope>
-  <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.jbws2389.LookupResponseNumber</java-type>
-  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookupResponse&gt;Details&gt;Number</anonymous-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>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>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.jbws2389.PhoneBook_PortType</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>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.jbws2389.Lookup</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>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>
-   <wsdl-return-value-mapping>
-    <method-return-value>org.jboss.test.ws.jbws2389.LookupResponse</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,103 @@
+<?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.jbws2389</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jbws2389</package-type>
+  <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type>
+  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookup</anonymous-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>details</java-variable-name>
+   <xml-element-name>Details</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type>
+  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookup&gt;Details</anonymous-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.jbws2389.LookupName</java-type>
+  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookup&gt;Details&gt;Name</anonymous-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.jbws2389.LookupResponse</java-type>
+  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookupResponse</anonymous-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <variable-mapping>
+   <java-variable-name>details</java-variable-name>
+   <xml-element-name>Details</xml-element-name>
+  </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+  <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type>
+  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookupResponse&gt;Details</anonymous-type-qname>
+  <qname-scope>complexType</qname-scope>
+  <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.jbws2389.LookupResponseNumber</java-type>
+  <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:&gt;lookupResponse&gt;Details&gt;Number</anonymous-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>
+ <service-interface-mapping>
+  <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface>
+  <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>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.jbws2389.PhoneBook_PortType</service-endpoint-interface>
+  <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type>
+  <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>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.jbws2389.Lookup</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>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>
+   <wsdl-return-value-mapping>
+    <method-return-value>org.jboss.test.ws.jbws2389.LookupResponse</method-return-value>
+    <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>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: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml	2008-11-11 14:08:59 UTC (rev 8700)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml	2008-11-11 14:34:51 UTC (rev 8701)
@@ -1,6 +0,0 @@
-<configuration>
-  <wsdl-java location="${test.resources.directory}/tools/jbws2389/doclit/PhoneBook.wsdl"
-             parameter-style="bare">
-    <mapping file="jaxrpc-mapping.xml"/>
-  </wsdl-java>
-</configuration>

Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (from rev 8700, stack/native/branches/dlofthouse/JBWS-2389/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml	2008-11-11 14:34:51 UTC (rev 8701)
@@ -0,0 +1,6 @@
+<configuration>
+  <wsdl-java location="${test.resources.directory}/tools/jbws2389/doclit/PhoneBook.wsdl"
+             parameter-style="bare">
+    <mapping file="jaxrpc-mapping.xml"/>
+  </wsdl-java>
+</configuration>




More information about the jbossws-commits mailing list