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/09 21:07:53 UTC
svn commit: r526878 - in
/incubator/tuscany/java/sca/modules/core-databinding: ./
src/main/java/org/apache/tuscany/core/databinding/loader/
src/main/java/org/apache/tuscany/core/databinding/processor/
src/main/java/org/apache/tuscany/core/databinding/t...
Author: rfeng
Date: Mon Apr 9 12:07:32 2007
New Revision: 526878
URL: http://svn.apache.org/viewvc?view=rev&rev=526878
Log:
[Work-in-progress] Start to port core-databinding
Added:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceIntrospector.java
- copied, changed from r526874, incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/JavaInterfaceIntrospector.java
Removed:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/loader/
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/JavaInterfaceIntrospector.java
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/loader/
Modified:
incubator/tuscany/java/sca/modules/core-databinding/pom.xml
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java
Modified: incubator/tuscany/java/sca/modules/core-databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/pom.xml?view=diff&rev=526878&r1=526877&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/pom.xml Mon Apr 9 12:07:32 2007
@@ -40,6 +40,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-spi</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface-java-xml</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
Copied: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceIntrospector.java (from r526874, incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/JavaInterfaceIntrospector.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceIntrospector.java?view=diff&rev=526878&p1=incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/JavaInterfaceIntrospector.java&r1=526874&p2=incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceIntrospector.java&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/JavaInterfaceIntrospector.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceIntrospector.java Mon Apr 9 12:07:32 2007
@@ -40,10 +40,10 @@
*
* @version $Rev$ $Date$
*/
-public class JavaInterfaceIntrospector implements org.apache.tuscany.interfacedef.java.introspection.JavaInterfaceIntrospector {
+public class DataBindingJavaInterfaceIntrospector implements org.apache.tuscany.interfacedef.java.introspection.JavaInterfaceIntrospector {
private static final String UNKNOWN_DATABINDING = null;
- public JavaInterfaceIntrospector() {
+ public DataBindingJavaInterfaceIntrospector() {
}
public <T> JavaServiceContract<T> introspect(Class<T> type) throws InvalidServiceContractException {
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java?view=diff&rev=526878&r1=526877&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java Mon Apr 9 12:07:32 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.databinding.transformers;
+import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
import org.apache.tuscany.spi.databinding.Mediator;
@@ -26,7 +27,6 @@
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.apache.tuscany.spi.model.DataType;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java?view=diff&rev=526878&r1=526877&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java Mon Apr 9 12:07:32 2007
@@ -21,6 +21,11 @@
import java.util.List;
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.interfacedef.util.ElementInfo;
+import org.apache.tuscany.interfacedef.util.WrapperInfo;
+import org.apache.tuscany.interfacedef.util.XMLType;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.databinding.PullTransformer;
@@ -29,11 +34,6 @@
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.WrapperHandler;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.ElementInfo;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.WrapperInfo;
-import org.apache.tuscany.spi.model.XMLType;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
@@ -95,7 +95,7 @@
@SuppressWarnings("unchecked")
public Object[] transform(Object[] source, TransformationContext context) {
DataType<List<DataType<?>>> sourceType = context.getSourceDataType();
- Operation<?> sourceOp = (Operation<?>)sourceType.getOperation();
+ Operation sourceOp = (Operation)sourceType.getOperation();
boolean sourceWrapped = sourceOp != null && sourceOp.isWrapperStyle();
WrapperHandler sourceWrapperHandler = null;
@@ -104,7 +104,7 @@
}
DataType<List<DataType<XMLType>>> targetType = context.getTargetDataType();
- Operation<?> targetOp = (Operation<?>)targetType.getOperation();
+ Operation targetOp = (Operation)targetType.getOperation();
boolean targetWrapped = targetOp != null && targetOp.isWrapperStyle();
WrapperHandler targetWrapperHandler = null;
if (targetWrapped) {
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java?view=diff&rev=526878&r1=526877&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java Mon Apr 9 12:07:32 2007
@@ -21,6 +21,11 @@
import java.util.List;
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.interfacedef.util.ElementInfo;
+import org.apache.tuscany.interfacedef.util.WrapperInfo;
+import org.apache.tuscany.interfacedef.util.XMLType;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.databinding.PullTransformer;
@@ -29,11 +34,6 @@
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.WrapperHandler;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.ElementInfo;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.WrapperInfo;
-import org.apache.tuscany.spi.model.XMLType;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
@@ -95,7 +95,7 @@
return 10;
}
- private WrapperHandler getWrapperHandler(Operation<?> operation) {
+ private WrapperHandler getWrapperHandler(Operation operation) {
String dataBindingId;
dataBindingId = operation.getDataBinding();
DataBinding dataBinding = mediator.getDataBindingRegistry().getDataBinding(dataBindingId);
@@ -116,7 +116,7 @@
public Object transform(Object response, TransformationContext context) {
try {
DataType<DataType> sourceType = context.getSourceDataType();
- Operation<?> sourceOp = (Operation<?>)sourceType.getOperation();
+ Operation sourceOp = (Operation)sourceType.getOperation();
boolean sourceWrapped = sourceOp != null && sourceOp.isWrapperStyle();
WrapperHandler sourceWrapperHandler = null;
if (sourceWrapped) {
@@ -124,7 +124,7 @@
}
DataType<DataType> targetType = context.getTargetDataType();
- Operation<?> targetOp = (Operation<?>)targetType.getOperation();
+ Operation targetOp = (Operation)targetType.getOperation();
boolean targetWrapped = targetOp != null && targetOp.isWrapperStyle();
WrapperHandler targetWrapperHandler = null;
if (targetWrapped) {
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java?view=diff&rev=526878&r1=526877&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java Mon Apr 9 12:07:32 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core.databinding.processor;
-import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
-
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
@@ -28,13 +26,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.api.annotation.DataType;
-import org.apache.tuscany.core.databinding.processor.DataBindingJavaInterfaceProcessor;
+import org.apache.tuscany.databinding.DataType;
import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
+import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
-import org.apache.tuscany.spi.idl.InvalidServiceContractException;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.model.Operation;
import org.osoa.sca.annotations.Remotable;
import org.w3c.dom.Node;
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java?view=diff&rev=526878&r1=526877&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java Mon Apr 9 12:07:32 2007
@@ -28,8 +28,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.core.databinding.transformers.Input2InputTransformer;
-import org.apache.tuscany.core.databinding.transformers.Output2OutputTransformer;
import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
import org.apache.tuscany.databinding.impl.MediatorImpl;
import org.apache.tuscany.databinding.impl.TransformationContextImpl;
@@ -39,15 +37,15 @@
import org.apache.tuscany.databinding.xml.DOMDataBinding;
import org.apache.tuscany.databinding.xml.Node2String;
import org.apache.tuscany.databinding.xml.String2Node;
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.util.ElementInfo;
+import org.apache.tuscany.interfacedef.util.TypeInfo;
+import org.apache.tuscany.interfacedef.util.WrapperInfo;
+import org.apache.tuscany.interfacedef.util.XMLType;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.ElementInfo;
-import org.apache.tuscany.spi.model.TypeInfo;
-import org.apache.tuscany.spi.model.WrapperInfo;
-import org.apache.tuscany.spi.model.XMLType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java?view=diff&rev=526878&r1=526877&r2=526878
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorTestCase.java Mon Apr 9 12:07:32 2007
@@ -33,7 +33,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.core.databinding.processor.JavaInterfaceIntrospector;
+import org.apache.tuscany.core.databinding.processor.DataBindingJavaInterfaceIntrospector;
import org.apache.tuscany.core.databinding.wire.DataBindingWirePostProcessor;
import org.apache.tuscany.databinding.xml.DOMDataBinding;
import org.apache.tuscany.databinding.xml.StAXDataBinding;
@@ -139,9 +139,9 @@
}
private Wire createWire(URI sourceUri, URI targetUri, QName bindingType) throws InvalidServiceContractException {
- ServiceContract<?> contract1 = new JavaInterfaceIntrospector().introspect(TestInterface1.class);
+ ServiceContract<?> contract1 = new DataBindingJavaInterfaceIntrospector().introspect(TestInterface1.class);
contract1.setDataBinding(DOMDataBinding.NAME);
- ServiceContract<?> contract2 = new JavaInterfaceIntrospector().introspect(TestInterface2.class);
+ ServiceContract<?> contract2 = new DataBindingJavaInterfaceIntrospector().introspect(TestInterface2.class);
contract2.setDataBinding(StAXDataBinding.NAME);
Map<Operation<?>, InvocationChain> chains = new HashMap<Operation<?>, InvocationChain>();
for (Operation<?> op : contract1.getOperations().values()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org