You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2011/01/13 20:45:07 UTC
svn commit: r1058717 - in /tuscany/sandbox/sebastien/java/wrapped:
modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/
samples/extending-tuscany/implementation-sample/src/test/resources/
Author: jsdelfino
Date: Thu Jan 13 19:45:06 2011
New Revision: 1058717
URL: http://svn.apache.org/viewvc?rev=1058717&view=rev
Log:
Attempt to fix the logic that triggers wrappering/unwrappering in databinding transformers.
Modified:
tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
tuscany/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl
Modified: tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java?rev=1058717&r1=1058716&r2=1058717&view=diff
==============================================================================
--- tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java (original)
+++ tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java Thu Jan 13 19:45:06 2011
@@ -143,7 +143,7 @@ public class Input2InputTransformer exte
String targetDataBinding = getDataBinding(targetOp);
targetWrapperHandler = getWrapperHandler(targetDataBinding, targetWrapped);
- if ((!sourceWrapped && !sourceBare) && targetWrapped) {
+ if (!sourceWrapped && targetWrapped) {
// Unwrapped --> Wrapped
WrapperInfo wrapper = targetOp.getWrapper();
// ElementInfo wrapperElement = wrapper.getInputWrapperElement();
@@ -200,7 +200,7 @@ public class Input2InputTransformer exte
true);
return new Object[] {targetWrapper};
- } else if (sourceWrapped && (!targetWrapped && !targetBare)) {
+ } else if (sourceWrapped && !targetWrapped) {
// Wrapped to Unwrapped
Object sourceWrapper = source[0];
Object[] target = null;
Modified: tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java?rev=1058717&r1=1058716&r2=1058717&view=diff
==============================================================================
--- tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java (original)
+++ tuscany/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java Thu Jan 13 19:45:06 2011
@@ -165,7 +165,7 @@ public class Output2OutputTransformer ex
String targetDataBinding = getDataBinding(targetOp);
targetWrapperHandler = getWrapperHandler(targetDataBinding, targetWrapped);
- if ((!sourceWrapped &&!sourceBare) && targetWrapped) {
+ if (!sourceWrapped && targetWrapped) {
// Unwrapped --> Wrapped
WrapperInfo wrapper = targetOp.getWrapper();
ElementInfo wrapperElement = wrapper.getOutputWrapperElement();
@@ -225,7 +225,7 @@ public class Output2OutputTransformer ex
targetWrapperHandler.setChildren(targetWrapper, children.toArray(), targetOp, false);
return targetWrapper;
}
- } else if (sourceWrapped && (!targetWrapped && !targetBare)) {
+ } else if (sourceWrapped && !targetWrapped) {
// Wrapped to Unwrapped
Object sourceWrapper = response;
List<ElementInfo> childElements = sourceOp.getWrapper().getOutputChildElements();
Modified: tuscany/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl?rev=1058717&r1=1058716&r2=1058717&view=diff
==============================================================================
--- tuscany/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl (original)
+++ tuscany/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl Thu Jan 13 19:45:06 2011
@@ -31,7 +31,7 @@
<xs:element name="upper">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="param0" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>