You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2010/10/17 04:28:52 UTC
svn commit: r1023411 - in /cxf/trunk/tools:
corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/
corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/
wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/pr...
Author: bimargulies
Date: Sun Oct 17 02:28:52 2010
New Revision: 1023411
URL: http://svn.apache.org/viewvc?rev=1023411&view=rev
Log:
Fix rest of tooling
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java?rev=1023411&r1=1023410&r2=1023411&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java Sun Oct 17 02:28:52 2010
@@ -341,7 +341,7 @@ public class OperationVisitor extends Vi
XmlSchemaType schemaType,
Scope fqName,
String name) {
- XmlSchemaElement element = new XmlSchemaElement(schema, true);
+ XmlSchemaElement element = new XmlSchemaElement(schema, false);
element.setName(name);
if (schemaType != null) {
element.setSchemaTypeName(schemaType.getQName());
@@ -352,6 +352,7 @@ public class OperationVisitor extends Vi
wsdlVisitor.getDeferredActions().
add(fqName, new OperationDeferredAction(element));
}
+ schemaSequence.getItems().add(element);
return element;
}
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java?rev=1023411&r1=1023410&r2=1023411&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java Sun Oct 17 02:28:52 2010
@@ -301,6 +301,7 @@ public class WSDLToCorbaHelper {
if (schemaType == null) {
if (element.getRef().getTarget() != null) {
schemaType = findSchemaType(element.getRef().getTarget().getSchemaTypeName());
+ schemaName = element.getRef().getTargetQName();
} else {
schemaType = findSchemaType(element.getSchemaTypeName());
}
@@ -1594,6 +1595,9 @@ public class WSDLToCorbaHelper {
private boolean getElementQualification(XmlSchemaElement element, String uri) {
QName schemaName = element.getQName();
+ if (element.isRef()) {
+ schemaName = element.getRef().getTargetQName();
+ }
if (schemaName.getNamespaceURI().equals("")) {
schemaName = new QName(uri, schemaName.getLocalPart());
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java?rev=1023411&r1=1023410&r2=1023411&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java Sun Oct 17 02:28:52 2010
@@ -389,7 +389,7 @@ public final class ProcessorUtil {
XmlSchemaElement subElement = (XmlSchemaElement)seqMember;
if (subElement.getQName() != null) {
- qnames.add(new WrapperElement(subElement.getQName(), subElement.getSchemaTypeName()));
+ qnames.add(new WrapperElement(subElement.getWireName(), subElement.getSchemaTypeName()));
} else {
qnames.add(new WrapperElement(subElement.getRef().getTargetQName(),
subElement.getSchemaTypeName()));