[jbossws-commits] JBossWS SVN: r1661 - in branches/dlofthouse/JBWS-1260/src: main/java/org/jboss/ws/tools/helpers test/java/org/jboss/test/ws/tools/validation test/resources/tools/jbws1260/scenario_AA test/resources/tools/jbws1260/scenario_G test/resources/tools/jbws1260/scenario_H test/resources/tools/jbws1260/scenario_I test/resources/tools/jbws1260/scenario_P test/resources/tools/jbws1260/scenario_Q test/resources/tools/jbws1260/scenario_R

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Sat Dec 16 13:01:16 EST 2006 

Author: darran.lofthouse at jboss.com
Date: 2006-12-16 13:01:08 -0500 (Sat, 16 Dec 2006)
New Revision: 1661

Modified:
   branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
   branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
   branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml
   branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml
   branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml
   branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml
   branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml
   branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml
   branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml
Log:
JBWS-1260 - Removed checks for mapping arrays as anonymous types.

Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java	2006-12-16 18:01:08 UTC (rev 1661)
@@ -653,7 +653,7 @@
          {
             XSElementDeclaration xe = (XSElementDeclaration)xsterm;
             XSTypeDefinition typeDefinition = xe.getTypeDefinition();
-            addJavaXMLTypeMap(typeDefinition, xe.getName(), containingElement, containingType, jwm, true);
+            addJavaXMLTypeMap(typeDefinition, xe.getName(), containingElement, containingType, jwm, !isDocStyle());
          }
       }
    }

Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java	2006-12-16 18:01:08 UTC (rev 1661)
@@ -134,12 +134,11 @@
 
    private boolean validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1, JavaXmlTypeMapping[] jm2)
    {
-      boolean bool = true;
       int len1 = jm1 != null ? jm1.length : 0;
       int len2 = jm2 != null ? jm2.length : 0;
       if (len1 != len2)
       {
-         throw new IllegalStateException("Length of JavaXmlTypeMapping[] do not match");
+         throw new IllegalStateException("Length of JavaXmlTypeMapping[] do not match expected=" + len1 + " actual=" + len2);
       }
 
       // Don't need the order to be the same so cope with this.

Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml	2006-12-16 18:01:08 UTC (rev 1661)
@@ -62,16 +62,19 @@
       <xml-element-name>text</xml-element-name>
     </variable-mapping>
   </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  
+  <!-- Anonymous wrapping of arrays not required for JBossWS -->
+  <!--java-xml-type-mapping>
     <java-type>org.jboss.test.ws.jbws1260.Telephone[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;TelephoneNumber&gt;Number&gt;number[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  <!--java-xml-type-mapping>
     <java-type>org.jboss.test.ws.jbws1260.Title[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;Person&gt;Name&gt;surname[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  
   <service-interface-mapping>
     <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml	2006-12-16 18:01:08 UTC (rev 1661)
@@ -26,16 +26,19 @@
       <xml-element-name>surname</xml-element-name>
     </variable-mapping>
   </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  
+  <!-- Anonymous wrapping of arrays not required for JBossWS -->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;lookupResponse&gt;number[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;lookup&gt;surname[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  
   <service-interface-mapping>
     <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml	2006-12-16 18:01:08 UTC (rev 1661)
@@ -26,16 +26,19 @@
       <xml-element-name>surname</xml-element-name>
     </variable-mapping>
   </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  
+  <!-- Anonymous wrapping of arrays not required for JBossWS -->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:TelephoneNumber&gt;number[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:Person&gt;surname[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  
   <service-interface-mapping>
     <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml	2006-12-16 18:01:08 UTC (rev 1661)
@@ -44,16 +44,19 @@
       <xml-element-name>Name</xml-element-name>
     </variable-mapping>
   </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  
+  <!-- Anonymous wrapping of arrays not required for JBossWS -->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;Person&gt;Name&gt;surname[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;TelephoneNumber&gt;Number&gt;number[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  
   <service-interface-mapping>
     <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml	2006-12-16 18:01:08 UTC (rev 1661)
@@ -34,16 +34,19 @@
       <xml-element-name>number</xml-element-name>
     </variable-mapping>
   </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  
+  <!-- Anonymous wrapping of arrays not required for JBossWS -->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;lookup&gt;surname[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;lookupResponse&gt;number[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  
   <service-interface-mapping>
     <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml	2006-12-16 18:01:08 UTC (rev 1661)
@@ -34,16 +34,19 @@
       <xml-element-name>number</xml-element-name>
     </variable-mapping>
   </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  
+  <!-- Anonymous wrapping of arrays not required for JBossWS -->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:Person&gt;surname[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:TelephoneNumber&gt;number[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  
   <service-interface-mapping>
     <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml	2006-12-15 15:59:56 UTC (rev 1660)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml	2006-12-16 18:01:08 UTC (rev 1661)
@@ -52,16 +52,19 @@
       <xml-element-name>number</xml-element-name>
     </variable-mapping>
   </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  
+  <!-- Anonymous wrapping of arrays not required for JBossWS -->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;Person&gt;Name&gt;surname[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
-  <java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  <!--java-xml-type-mapping>
     <java-type>java.lang.String[]</java-type>
     <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;TelephoneNumber&gt;Number&gt;number[1,unbounded]</anonymous-type-qname>
     <qname-scope>complexType</qname-scope>
-  </java-xml-type-mapping>
+  </java-xml-type-mapping-->
+  
   <service-interface-mapping>
     <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
     <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

More information about the jbossws-commits mailing list