cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r1023415 - in /cxf/trunk/rt: core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Date Sun, 17 Oct 2010 02:30:17 GMT
Author: bimargulies
Date: Sun Oct 17 02:30:16 2010
New Revision: 1023415

URL: http://svn.apache.org/viewvc?rev=1023415&view=rev
Log:
Putthe correct concrete name in place

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1023415&r1=1023414&r2=1023415&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Sun Oct
17 02:30:16 2010
@@ -750,9 +750,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.getWireName());
+                    mpi.setElementQName(el.getWireName());
                     mpi.setXmlSchema(el);
                 } else if (el.getRef().getTargetQName() != null) {
                     MessagePartInfo mpi = wrapper.addMessagePart(el.getRef().getTargetQName());
@@ -768,7 +768,7 @@ public class WSDLServiceBuilder {
                 } else {
                     // anonymous type
                     MessagePartInfo mpi = wrapper.addMessagePart(new QName(namespaceURI,
el.getName()));
-                    mpi.setConcreteName(el.getQName());
+                    mpi.setConcreteName(el.getWireName());
                     mpi.setElementQName(mpi.getName());
                     mpi.setElement(true);
                     mpi.setXmlSchema(el);

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1023415&r1=1023414&r2=1023415&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Sun Oct 17 02:30:16 2010
@@ -1247,7 +1247,7 @@ public class ReflectionServiceFactoryBea
 
         for (MessagePartInfo mpi : unwrappedMessage.getMessageParts()) {
             el = new XmlSchemaElement(schema, false);
-            // We hope that we can't have parts that differe only in namespace.
+            // We hope that we can't have parts that different only in namespace.
             el.setName(mpi.getName().getLocalPart());
             Map<Class, Boolean> jaxbAnnoMap = getJaxbAnnoMap(mpi);
             if (mpi.isElement()) {



Mime
View raw message