You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/15 19:49:08 UTC
svn commit: r529039 - in /incubator/tuscany/java/sca/modules:
interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperation.java
interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java
Author: rfeng
Date: Sun Apr 15 10:49:08 2007
New Revision: 529039
URL: http://svn.apache.org/viewvc?view=rev&rev=529039
Log:
Populate default databinding to the wrapper
Modified:
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperation.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperation.java?view=diff&rev=529039&r1=529038&r2=529039
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperation.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/introspect/WSDLOperation.java Sun Apr 15 10:49:08 2007
@@ -197,8 +197,12 @@
operationModel.setConversationSequence(Operation.ConversationSequence.NO_CONVERSATION);
operationModel.setInputType(getInputType());
operationModel.setOutputType(getOutputType());
-
- // FIXME: Need to set the wrapper style flag on the operation
+
+ operationModel.setWrapperStyle(isWrapperStyle());
+ if (isWrapperStyle()) {
+ WrapperInfo wrapperInfo = getWrapper().getWrapperInfo();
+ operationModel.setWrapper(wrapperInfo);
+ }
}
return operationModel;
}
@@ -320,9 +324,9 @@
private List<XmlSchemaElement> outputElements;
- private DataType<List<DataType<XMLType>>> unwrappedInputType;
-
- private DataType<XMLType> unwrappedOutputType;
+// private DataType<List<DataType<XMLType>>> unwrappedInputType;
+//
+// private DataType<XMLType> unwrappedOutputType;
private transient WrapperInfo wrapperInfo;
Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java?view=diff&rev=529039&r1=529038&r2=529039
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/interfacedef/impl/InterfaceImpl.java Sun Apr 15 10:49:08 2007
@@ -25,6 +25,7 @@
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.Interface;
import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.interfacedef.util.WrapperInfo;
/**
* Represents a service interface.
@@ -132,6 +133,23 @@
for (DataType d : faultTypes) {
if (d.getDataBinding() == null) {
d.setDataBinding(dataBinding);
+ }
+ }
+ }
+ if (op.isWrapperStyle()) {
+ WrapperInfo wrapper = op.getWrapper();
+ if (wrapper != null) {
+ DataType<List<DataType>> unwrappedInputType = wrapper.getUnwrappedInputType();
+ if (unwrappedInputType != null) {
+ for (DataType d : unwrappedInputType.getLogical()) {
+ if (d.getDataBinding() == null) {
+ d.setDataBinding(dataBinding);
+ }
+ }
+ }
+ DataType unwrappedOutputType = wrapper.getUnwrappedOutputType();
+ if (unwrappedOutputType != null && unwrappedOutputType.getDataBinding() == null) {
+ unwrappedOutputType.setDataBinding(dataBinding);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org