cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1050157 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl
Date Thu, 16 Dec 2010 21:02:32 GMT
Author: dkulp
Date: Thu Dec 16 21:02:32 2010
New Revision: 1050157

URL: http://svn.apache.org/viewvc?rev=1050157&view=rev
Log:
Merged revisions 1050156 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1050156 | dkulp | 2010-12-16 15:57:37 -0500 (Thu, 16 Dec 2010) | 2 lines
  
  [CXF-3197] Fix NPE in wsdl2java when unwrapping elements that have
  anonymous types.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
    cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 16 21:02:32 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113,1050156

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1050157&r1=1050156&r2=1050157&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Thu Dec 16 21:02:32 2010
@@ -752,9 +752,9 @@ public class WSDLServiceBuilder {
                 if (el.getSchemaTypeName() != null) {
                     MessagePartInfo mpi = wrapper.addMessagePart(new QName(namespaceURI,
el.getName()));
                     mpi.setTypeQName(el.getSchemaTypeName());
-                    mpi.setConcreteName(el.getQName());
                     mpi.setElement(true);
                     mpi.setElementQName(el.getQName());
+                    mpi.setConcreteName(el.getQName());
                     mpi.setXmlSchema(el);
                 } else if (el.getRefName() != null) {
                     MessagePartInfo mpi = wrapper.addMessagePart(el.getRefName());
@@ -770,8 +770,8 @@ public class WSDLServiceBuilder {
                 } else {
                     // anonymous type
                     MessagePartInfo mpi = wrapper.addMessagePart(new QName(namespaceURI,
el.getName()));
-                    mpi.setConcreteName(el.getQName());
                     mpi.setElementQName(mpi.getName());
+                    mpi.setConcreteName(el.getQName());
                     mpi.setElement(true);
                     mpi.setXmlSchema(el);
                 }

Modified: cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl?rev=1050157&r1=1050156&r2=1050157&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl
(original)
+++ cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl
Thu Dec 16 21:02:32 2010
@@ -25,7 +25,13 @@
 			<xsd:element name="DoubleIt">
 				<xsd:complexType>
 					<xsd:sequence>
-						<xsd:element name="numberToDouble" type="xsd:integer" />
+						<xsd:element name="numberToDouble">
+                            <xsd:simpleType>
+								<xsd:restriction base="xsd:integer">
+									<xsd:minInclusive value="0"/>
+								</xsd:restriction>
+							</xsd:simpleType>
+                        </xsd:element>
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>



Mime
View raw message