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/03/16 20:11:52 UTC
svn commit: r519105 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/databinding/impl/
core/src/test/java/org/apache/tuscany/core/databinding/impl/
spi/src/main/java/org/apache/tuscany/spi/model/
Author: rfeng
Date: Fri Mar 16 12:11:50 2007
New Revision: 519105
URL: http://svn.apache.org/viewvc?view=rev&rev=519105
Log:
Fix the compilation error due to different level of code
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java?view=diff&rev=519105&r1=519104&r2=519105
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Input2InputTransformer.java Fri Mar 16 12:11:50 2007
@@ -38,6 +38,7 @@
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.WrapperInfo;
+import org.apache.tuscany.spi.model.XMLType;
/**
* This is a special transformer to transform the input from one IDL to the other one
@@ -141,11 +142,11 @@
if (source == null) {
return new Object[]{targetWrapper};
}
- List<DataType<QName>> argTypes = wrapper.getUnwrappedInputType().getLogical();
+ List<DataType<XMLType>> argTypes = wrapper.getUnwrappedInputType().getLogical();
for (int i = 0; i < source.length; i++) {
ElementInfo argElement = wrapper.getInputChildElements().get(i);
- DataType<QName> argType = argTypes.get(i);
+ DataType<XMLType> argType = argTypes.get(i);
Object child = source[i];
child =
mediator.mediate(source[i], sourceType.getLogical().get(i), argType, context
@@ -180,7 +181,7 @@
for (int i = 0; i < childElements.size(); i++) {
ElementInfo childElement = childElements.get(i);
Object child = sourceWrapperHandler.getChild(sourceWrapper, i, childElement);
- DataType<QName> childType =
+ DataType<XMLType> childType =
sourceOp.getWrapper().getUnwrappedInputType().getLogical().get(i);
target[i] =
mediator.mediate(child, childType, targetType.getLogical().get(i), context
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java?view=diff&rev=519105&r1=519104&r2=519105
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/Output2OutputTransformer.java Fri Mar 16 12:11:50 2007
@@ -38,6 +38,7 @@
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.WrapperInfo;
+import org.apache.tuscany.spi.model.XMLType;
/**
* This is a special transformer to transform the output from one IDL to the other one
@@ -155,7 +156,7 @@
return targetWrapper;
}
ElementInfo argElement = childElements.get(0);
- DataType<QName> argType = wrapper.getUnwrappedOutputType();
+ DataType<XMLType> argType = wrapper.getUnwrappedOutputType();
Object child = response;
child = mediator.mediate(response, sourceType.getLogical(), argType, context.getMetadata());
targetWrapperHandler.setChild(targetWrapper, 0, argElement, child);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java?view=diff&rev=519105&r1=519104&r2=519105
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java Fri Mar 16 12:11:50 2007
@@ -156,9 +156,8 @@
responseType.setOperation(op);
WrapperInfo wrapperInfo =
- new WrapperInfo(inputElement, outputElement, inputElements, outputElements, inputType, statusType);
+ new WrapperInfo(DOMDataBinding.NAME, inputElement, outputElement, inputElements, outputElements);
op.setWrapper(wrapperInfo);
- op.setDataBinding(DOMDataBinding.NAME);
MediatorImpl m = new MediatorImpl();
TransformerRegistryImpl tr = new TransformerRegistryImpl();
@@ -197,6 +196,7 @@
new DataType<DataType>("idl:output", Object.class, op.getOutputType());
sourceType.setOperation(op.getOutputType().getOperation());
+ sourceType.setMetadata(ElementInfo.class.getName(), outputElement);
context1.setSourceDataType(sourceType);
DataType<DataType> targetType =
new DataType<DataType>("idl:output", Object.class,
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java?view=diff&rev=519105&r1=519104&r2=519105
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java Fri Mar 16 12:11:50 2007
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-
/**
* The "Wrapper Style" WSDL operation is defined by The Java API for XML-Based
* Web Services (JAX-WS) 2.0 specification, section 2.3.1.2 Wrapper Style. <p/>
@@ -109,12 +108,11 @@
List<DataType<XMLType>> childTypes = new ArrayList<DataType<XMLType>>();
for (ElementInfo element : getInputChildElements()) {
DataType<XMLType> type = new DataType<XMLType>(dataBinding, Object.class, new XMLType(element));
- // type.setMetadata(ElementInfo.class.getName(),
- // getElementInfo(element));
+ type.setMetadata(ElementInfo.class.getName(), element);
childTypes.add(type);
}
- unwrappedInputType =
- new DataType<List<DataType<XMLType>>>("idl:unwrapped.input", Object[].class, childTypes);
+ unwrappedInputType = new DataType<List<DataType<XMLType>>>("idl:unwrapped.input", Object[].class,
+ childTypes);
}
return unwrappedInputType;
}
@@ -131,7 +129,9 @@
throw new IllegalArgumentException("Multi-part output is not supported");
}
ElementInfo element = elements.get(0);
+
unwrappedOutputType = new DataType<XMLType>(dataBinding, Object.class, new XMLType(element));
+ unwrappedOutputType.setMetadata(ElementInfo.class.getName(), element);
}
}
return unwrappedOutputType;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org