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/13 22:49:35 UTC
svn commit: r528658 - in /incubator/tuscany/java/sca/modules:
core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/
core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/
core-databinding/src/main/java/org...
Author: rfeng
Date: Fri Apr 13 13:49:34 2007
New Revision: 528658
URL: http://svn.apache.org/viewvc?view=rev&rev=528658
Log:
More Databinding fix
Added:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/DataBinding.java (with props)
Removed:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.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/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java?view=diff&rev=528658&r1=528657&r2=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java Fri Apr 13 13:49:34 2007
@@ -112,10 +112,18 @@
wirePostProcessorRegistry.register(new DataBindingWirePostProcessor(componentManager, mediator));
DataBindingRegistry dataBindingRegistry = registry.getExtensionPoint(DataBindingRegistry.class);
- dataBindingRegistry.register(new DOMDataBinding());
- dataBindingRegistry.register(new XMLStringDataBinding());
- dataBindingRegistry.register(new XMLGroupDataBinding());
- dataBindingRegistry.register(new JavaBeansDataBinding());
+ DOMDataBinding domDataBinding = new DOMDataBinding();
+ domDataBinding.setDataBindingRegistry(dataBindingRegistry);
+ dataBindingRegistry.register(domDataBinding);
+ XMLStringDataBinding xmlStringDataBinding = new XMLStringDataBinding();
+ xmlStringDataBinding.setDataBindingRegistry(dataBindingRegistry);
+ dataBindingRegistry.register(xmlStringDataBinding);
+ XMLGroupDataBinding xmlGroupDataBinding = new XMLGroupDataBinding();
+ xmlGroupDataBinding.setDataBindingRegistry(dataBindingRegistry);
+ dataBindingRegistry.register(xmlGroupDataBinding);
+ JavaBeansDataBinding javaBeansDataBinding = new JavaBeansDataBinding();
+ javaBeansDataBinding.setDataBindingRegistry(dataBindingRegistry);
+ dataBindingRegistry.register(javaBeansDataBinding);
Group2GroupTransformer group2GroupTransformer= new Group2GroupTransformer();
group2GroupTransformer.setMediator(mediator);
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java?view=diff&rev=528658&r1=528657&r2=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java Fri Apr 13 13:49:34 2007
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.tuscany.databinding.annotation.DataBinding;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.Operation;
@@ -69,17 +70,39 @@
DataType wrapperType = inputType.getLogical().get(0);
if (outputType.getDataBinding().equals(wrapperType.getDataBinding())) {
operation.setWrapperStyle(true);
+ operation.setDataBinding(outputType.getDataBinding());
}
}
private void processInterface(JavaInterface javaInterface, List<Operation> operations) {
Class<?> clazz = javaInterface.getJavaClass();
+ DataBinding dataBinding = clazz.getAnnotation(DataBinding.class);
+ String dataBindingId = null;
+ boolean wrapperStyle = false;
+ if (dataBinding != null) {
+ dataBindingId = dataBinding.value();
+ wrapperStyle = dataBinding.wrapperStyle();
+ }
+
Map<String, Operation> opMap = new HashMap<String, Operation>();
for (Operation op : javaInterface.getOperations()) {
opMap.put(op.getName(), op);
+ if (dataBindingId != null) {
+ op.setDataBinding(dataBindingId);
+ op.setWrapperStyle(wrapperStyle);
+ }
}
for (Method method : clazz.getMethods()) {
Operation operation = opMap.get(method.getName());
+ dataBinding = clazz.getAnnotation(DataBinding.class);
+ dataBindingId = null;
+ wrapperStyle = false;
+ if (dataBinding != null) {
+ dataBindingId = dataBinding.value();
+ wrapperStyle = dataBinding.wrapperStyle();
+ operation.setDataBinding(dataBindingId);
+ operation.setWrapperStyle(wrapperStyle);
+ }
// FIXME: We need a better way to identify simple java types
for (org.apache.tuscany.interfacedef.DataType<?> d : operation.getInputType().getLogical()) {
@@ -91,7 +114,7 @@
for (org.apache.tuscany.interfacedef.DataType<?> d : operation.getFaultTypes()) {
dataBindingRegistry.introspectType(d, method.getAnnotations());
}
-
+
introspectWrapperStyle(operation);
}
}
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=528658&r1=528657&r2=528658
==============================================================================
--- 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 Fri Apr 13 13:49:34 2007
@@ -197,17 +197,7 @@
}
private String getDataBinding(Operation operation) {
- String dataBindingId = null;
- if (operation.getOutputType() != null) {
- // For wrapper style, the output type is not null
- dataBindingId = operation.getOutputType().getDataBinding();
- } else {
- List<DataType> argTypes = operation.getInputType().getLogical();
- if (!argTypes.isEmpty()) {
- dataBindingId = argTypes.get(0).getDataBinding();
- }
- }
- return dataBindingId;
+ return operation.getDataBinding();
}
}
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=528658&r1=528657&r2=528658
==============================================================================
--- 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 Fri Apr 13 13:49:34 2007
@@ -97,16 +97,7 @@
}
private String getDataBinding(Operation operation) {
- String dataBindingId = null;
- if (operation.getOutputType() != null) {
- dataBindingId = operation.getOutputType().getDataBinding();
- } else {
- List<DataType> argTypes = operation.getInputType().getLogical();
- if (!argTypes.isEmpty()) {
- dataBindingId = argTypes.get(0).getDataBinding();
- }
- }
- return dataBindingId;
+ return operation.getDataBinding();
}
private WrapperHandler getWrapperHandler(String dataBindingId, boolean required) {
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=528658&r1=528657&r2=528658
==============================================================================
--- 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 Fri Apr 13 13:49:34 2007
@@ -19,17 +19,10 @@
package org.apache.tuscany.core.databinding.processor;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.databinding.DataType;
+import org.apache.tuscany.databinding.annotation.DataBinding;
import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
-import org.apache.tuscany.interfacedef.Interface;
-import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
@@ -77,12 +70,12 @@
// contract.getOperations().get("call1").getDataBinding());
}
- @DataType(name = "org.w3c.dom.Node")
+ @DataBinding("org.w3c.dom.Node")
@Remotable
public static interface MockInterface {
Node call(Node msg);
- @DataType(name = "xml:string")
+ @DataBinding("xml:string")
String call1(String msg);
}
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=528658&r1=528657&r2=528658
==============================================================================
--- 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 Fri Apr 13 13:49:34 2007
@@ -92,13 +92,22 @@
}
public void testTransform() throws Exception {
- List<DataType> types0 = new ArrayList<DataType>();
+ List<DataType> sourceParamTypes = new ArrayList<DataType>();
DataType<XMLType> wrapperType = new DataTypeImpl<XMLType>(null, Object.class,
new XMLType(new QName(URI_ORDER_XSD,
"checkOrderStatus"), null));
- types0.add(wrapperType);
- DataType<List<DataType>> inputType0 = new DataTypeImpl<List<DataType>>(IDL_INPUT,
- Object[].class, types0);
+ sourceParamTypes.add(wrapperType);
+ DataType<List<DataType>> inputType0 = new DataTypeImpl<List<DataType>>(IDL_INPUT, Object[].class, sourceParamTypes);
+
+ DataType<XMLType> responseType = new DataTypeImpl<XMLType>(null, Object.class,
+ new XMLType(new QName(URI_ORDER_XSD,
+ "checkOrderStatusResponse"),
+ null));
+
+ Operation op1 = new OperationImpl("checkOrderStatus");
+ op1.setInputType(inputType0);
+ op1.setOutputType(responseType);
+ op1.setDataBinding(DOMDataBinding.NAME);
List<DataType> types1 = new ArrayList<DataType>();
DataType<XMLType> customerIdType = new DataTypeImpl<XMLType>(
@@ -117,36 +126,24 @@
DataType<XMLType> statusType = new DataTypeImpl<XMLType>(null, Object.class,
new XMLType(new QName(URI_ORDER_XSD, "status"), null));
- DataType<XMLType> responseType = new DataTypeImpl<XMLType>(null, Object.class,
- new XMLType(new QName(URI_ORDER_XSD,
- "checkOrderStatusResponse"),
- null));
- Operation op = new OperationImpl("checkOrderStatus");
- op.setInputType(inputType0);
- op.setOutputType(responseType);
-// op.setDataBinding(DOMDataBinding.NAME);
-//
-// inputType0.setOperation(op);
- op.setWrapperStyle(true);
+ Operation op2 = new OperationImpl("checkOrderStatus");
+ op2.setInputType(inputType0);
+ op2.setOutputType(responseType);
+ op2.setDataBinding(DOMDataBinding.NAME);
+ //
+ // inputType0.setOperation(op);
+ op2.setWrapperStyle(true);
ElementInfo inputElement = new ElementInfo(new QName(URI_ORDER_XSD, "checkOrderStatus"), new TypeInfo(null,
false,
null));
-// wrapperType.setMetadata(ElementInfo.class.getName(), inputElement);
+ // wrapperType.setMetadata(ElementInfo.class.getName(), inputElement);
ElementInfo customerId = new ElementInfo(new QName("", "customerId"),
SimpleTypeMapperExtension.XSD_SIMPLE_TYPES.get("string"));
ElementInfo order = new ElementInfo(new QName("", "order"), new TypeInfo(new QName(URI_ORDER_XSD), false, null));
ElementInfo flag = new ElementInfo(new QName("", "flag"), SimpleTypeMapperExtension.XSD_SIMPLE_TYPES.get("int"));
-// customerIdType.setMetadata(ElementInfo.class.getName(), customerId);
-// orderType.setMetadata(ElementInfo.class.getName(), order);
-// flagType.setMetadata(ElementInfo.class.getName(), flag);
-//
-// customerIdType.setOperation(op);
-// orderType.setOperation(op);
-// flagType.setOperation(op);
-
List<ElementInfo> inputElements = new ArrayList<ElementInfo>();
inputElements.add(customerId);
inputElements.add(order);
@@ -155,22 +152,16 @@
ElementInfo statusElement = new ElementInfo(new QName("", "status"), SimpleTypeMapperExtension.XSD_SIMPLE_TYPES
.get("string"));
-// statusType.setMetadata(ElementInfo.class.getName(), statusElement);
-// statusType.setOperation(op);
-
List<ElementInfo> outputElements = new ArrayList<ElementInfo>();
outputElements.add(statusElement);
ElementInfo outputElement = new ElementInfo(new QName(URI_ORDER_XSD, "checkOrderStatusResponse"),
new TypeInfo(null, false, null));
-// responseType.setMetadata(ElementInfo.class.getName(), inputElement);
-// responseType.setOperation(op);
-
WrapperInfo wrapperInfo = new WrapperInfo(DOMDataBinding.NAME, inputElement, outputElement, inputElements,
outputElements);
- op.setWrapper(wrapperInfo);
-// op.setDataBinding(DOMDataBinding.NAME);
+ op2.setWrapper(wrapperInfo);
+ op2.setDataBinding(DOMDataBinding.NAME);
MediatorImpl m = new MediatorImpl();
TransformerRegistryImpl tr = new TransformerRegistryImpl();
@@ -188,15 +179,14 @@
t.setMediator(m);
TransformationContext context = new TransformationContextImpl();
- context.setSourceOperation(op);
- List<DataType<Class>> types = new ArrayList<DataType<Class>>();
+ context.setTargetOperation(op2);
+ List<DataType> types = new ArrayList<DataType>();
types.add(new DataTypeImpl<Class>(Object.class.getName(), String.class, String.class));
types.add(new DataTypeImpl<Class>("java.lang.String", String.class, String.class));
types.add(new DataTypeImpl<Class>(Object.class.getName(), int.class, int.class));
- DataType<List<DataType<Class>>> inputType1 = new DataTypeImpl<List<DataType<Class>>>(IDL_INPUT, Object[].class,
- types);
+ DataType<List<DataType>> inputType1 = new DataTypeImpl<List<DataType>>(IDL_INPUT, Object[].class, types);
context.setSourceDataType(inputType1);
- context.setTargetDataType(op.getInputType());
+ context.setTargetDataType(op2.getInputType());
Object[] results = t.transform(source, context);
assertEquals(1, results.length);
assertTrue(results[0] instanceof Element);
@@ -205,7 +195,7 @@
assertEquals("checkOrderStatus", element.getLocalName());
TransformationContext context1 = new TransformationContextImpl();
- DataType<DataType> sourceType = new DataTypeImpl<DataType>(IDL_OUTPUT, Object.class, op.getOutputType());
+ DataType<DataType> sourceType = new DataTypeImpl<DataType>(IDL_OUTPUT, Object.class, op2.getOutputType());
context1.setSourceDataType(sourceType);
DataType<DataType> targetType = new DataTypeImpl<DataType>(IDL_OUTPUT, Object.class,
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java?view=diff&rev=528658&r1=528657&r2=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java Fri Apr 13 13:49:34 2007
@@ -46,7 +46,9 @@
for (org.apache.tuscany.assembly.Service definition : componentType.getServices()) {
try {
Service service = builderRegistry.build((CompositeService)definition, deploymentContext);
- component.register(service);
+ if (service != null) {
+ component.register(service);
+ }
} catch (RegistrationException e) {
throw new BuilderInstantiationException("Error registering service", e);
}
@@ -54,7 +56,9 @@
for (org.apache.tuscany.assembly.Reference definition : componentType.getReferences()) {
try {
Reference reference = builderRegistry.build((CompositeReference)definition, deploymentContext);
- component.register(reference);
+ if (reference != null) {
+ component.register(reference);
+ }
} catch (RegistrationException e) {
throw new BuilderInstantiationException("Error registering reference", e);
}
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/DataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/DataBinding.java?view=auto&rev=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/DataBinding.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/DataBinding.java Fri Apr 13 13:49:34 2007
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.databinding.annotation;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Used to demarcate expected data types for an operation
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface DataBinding {
+
+ /**
+ * Returns the unique name of the data binding
+ * @return the unique name of the data binding
+ */
+ String value();
+ boolean wrapperStyle() default false;
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/DataBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/annotation/DataBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java?view=diff&rev=528658&r1=528657&r2=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java Fri Apr 13 13:49:34 2007
@@ -53,11 +53,6 @@
this.dataBindingRegistry = dataBindingRegistry;
}
- /**
- * @see org.apache.tuscany.spi.databinding.Mediator#mediate(java.lang.Object,
- * org.apache.tuscany.spi.model.DataType,
- * org.apache.tuscany.spi.model.DataType, Map)
- */
@SuppressWarnings("unchecked")
public Object mediate(Object source,
DataType sourceDataType,
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java?view=diff&rev=528658&r1=528657&r2=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java Fri Apr 13 13:49:34 2007
@@ -106,15 +106,6 @@
return false;
}
- protected static org.apache.tuscany.databinding.DataType getDataTypeAnnotation(Annotation[] annotations) {
- for (Annotation a : annotations) {
- if (a.annotationType() == org.apache.tuscany.databinding.DataType.class) {
- return (org.apache.tuscany.databinding.DataType) a;
- }
- }
- return null;
- }
-
public DataType introspect(Object value) {
if (value == null) {
return null;
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java?view=diff&rev=528658&r1=528657&r2=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java Fri Apr 13 13:49:34 2007
@@ -20,6 +20,8 @@
import java.lang.reflect.Method;
+import org.apache.tuscany.databinding.annotation.DataBinding;
+
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -27,17 +29,17 @@
@SuppressWarnings("unused")
public void testDataType() throws Exception {
Class<Test> testClass = Test.class;
- org.apache.tuscany.databinding.DataType d = testClass.getAnnotation(org.apache.tuscany.databinding.DataType.class);
- Assert.assertEquals(d.name(), "sdo");
+ DataBinding d = testClass.getAnnotation(DataBinding.class);
+ Assert.assertEquals(d.value(), "sdo");
Method method = testClass.getMethod("test", new Class[] {Object.class});
- org.apache.tuscany.databinding.DataType d2 = method.getAnnotation(org.apache.tuscany.databinding.DataType.class);
- Assert.assertEquals(d2.name(), "jaxb");
+ DataBinding d2 = method.getAnnotation(DataBinding.class);
+ Assert.assertEquals(d2.value(), "jaxb");
}
- @org.apache.tuscany.databinding.DataType(name = "sdo")
+ @DataBinding("sdo")
private static interface Test {
- @org.apache.tuscany.databinding.DataType(name = "jaxb")
+ @DataBinding("jaxb")
Object test(Object object);
}
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?view=diff&rev=528658&r1=528657&r2=528658
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Fri Apr 13 13:49:34 2007
@@ -159,6 +159,7 @@
// If the WSDL interface has never been resolved yet, do it now
// First, resolve the WSDL definition for the given namespace
WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
+ wsdlDefinition.setUnresolved(true);
wsdlDefinition.setNamespace(wsdlInterface.getName().getNamespaceURI());
wsdlDefinition = resolver.resolve(WSDLDefinition.class, wsdlDefinition);
if (!wsdlDefinition.isUnresolved()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org