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 2007/04/16 18:45:46 UTC
svn commit: r529323 - 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/test/java/org...
Author: jsdelfino
Date: Mon Apr 16 09:45:43 2007
New Revision: 529323
URL: http://svn.apache.org/viewvc?view=rev&rev=529323
Log:
Renamed DataBindingRegistry to DataBindingExtensionPoint and TransformerRegistry to TransformerExtensionPoint.
Added:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java (with props)
Removed:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingRegistry.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerRegistry.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImpl.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.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/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/DataBindingExtension.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/TransformerExtension.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/DataBindingExtensionTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/TransformerExtensionTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImplTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.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=529323&r1=529322&r2=529323
==============================================================================
--- 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 Mon Apr 16 09:45:43 2007
@@ -27,13 +27,13 @@
import org.apache.tuscany.core.databinding.transformers.Input2InputTransformer;
import org.apache.tuscany.core.databinding.transformers.Output2OutputTransformer;
import org.apache.tuscany.core.databinding.wire.DataBindingWirePostProcessor;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultDataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultTransformerExtensionPoint;
import org.apache.tuscany.databinding.Mediator;
-import org.apache.tuscany.databinding.TransformerRegistry;
-import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.impl.Group2GroupTransformer;
import org.apache.tuscany.databinding.impl.MediatorImpl;
-import org.apache.tuscany.databinding.impl.TransformerRegistryImpl;
import org.apache.tuscany.databinding.javabeans.DOMNode2JavaBeanTransformer;
import org.apache.tuscany.databinding.javabeans.JavaBean2DOMNodeTransformer;
import org.apache.tuscany.databinding.javabeans.JavaBeansDataBinding;
@@ -73,11 +73,11 @@
public Map<Class, Object> getExtensionPoints() {
Map<Class, Object> map = new HashMap<Class, Object>();
- DataBindingRegistryImpl dataBindingRegistryImpl = new DataBindingRegistryImpl();
- map.put(DataBindingRegistry.class, dataBindingRegistryImpl);
- TransformerRegistryImpl transformerRegistryImpl = new TransformerRegistryImpl();
+ DefaultDataBindingExtensionPoint dataBindingRegistryImpl = new DefaultDataBindingExtensionPoint();
+ map.put(DataBindingExtensionPoint.class, dataBindingRegistryImpl);
+ DefaultTransformerExtensionPoint transformerRegistryImpl = new DefaultTransformerExtensionPoint();
transformerRegistryImpl.setDataBindingRegistry(dataBindingRegistryImpl);
- map.put(TransformerRegistry.class, transformerRegistryImpl);
+ map.put(TransformerExtensionPoint.class, transformerRegistryImpl);
MediatorImpl mediatorImpl = new MediatorImpl();
mediatorImpl.setDataBindingRegistry(dataBindingRegistryImpl);
mediatorImpl.setTransformerRegistry(transformerRegistryImpl);
@@ -86,7 +86,7 @@
}
public void start(ExtensionPointRegistry registry) {
- TransformerRegistry transformerRegistry = registry.getExtensionPoint(TransformerRegistry.class);
+ TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
Mediator mediator = registry.getExtensionPoint(Mediator.class);
Input2InputTransformer input2InputTransformer = new Input2InputTransformer();
input2InputTransformer.setMediator(mediator);
@@ -111,7 +111,7 @@
ComponentManager componentManager = registry.getExtensionPoint(ComponentManager.class);
wirePostProcessorRegistry.register(new DataBindingWirePostProcessor(componentManager, mediator));
- DataBindingRegistry dataBindingRegistry = registry.getExtensionPoint(DataBindingRegistry.class);
+ DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
DOMDataBinding domDataBinding = new DOMDataBinding();
domDataBinding.setDataBindingRegistry(dataBindingRegistry);
dataBindingRegistry.register(domDataBinding);
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=529323&r1=529322&r2=529323
==============================================================================
--- 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 Mon Apr 16 09:45:43 2007
@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.databinding.annotation.DataBinding;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
@@ -39,10 +39,10 @@
* @version $Rev$ $Date$
*/
public class DataBindingJavaInterfaceProcessor implements JavaInterfaceIntrospectorExtension {
- private DataBindingRegistry dataBindingRegistry;
+ private DataBindingExtensionPoint dataBindingRegistry;
public DataBindingJavaInterfaceProcessor(@Reference
- DataBindingRegistry dataBindingRegistry) {
+ DataBindingExtensionPoint dataBindingRegistry) {
super();
this.dataBindingRegistry = dataBindingRegistry;
}
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=529323&r1=529322&r2=529323
==============================================================================
--- 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 16 09:45:43 2007
@@ -21,9 +21,9 @@
import junit.framework.TestCase;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultDataBindingExtensionPoint;
import org.apache.tuscany.databinding.annotation.DataBinding;
-import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
import org.apache.tuscany.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
@@ -50,7 +50,7 @@
* @throws InvalidServiceContractException
*/
public final void testVisitInterface() throws InvalidInterfaceException {
- DataBindingRegistry registry = new DataBindingRegistryImpl();
+ DataBindingExtensionPoint registry = new DefaultDataBindingExtensionPoint();
DataBindingJavaInterfaceProcessor processor = new DataBindingJavaInterfaceProcessor(registry);
JavaInterface contract = new JavaInterfaceImpl();
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java Mon Apr 16 09:45:43 2007
@@ -21,8 +21,8 @@
import java.util.Map;
-import org.apache.tuscany.databinding.DataBindingRegistry;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.axiom.AxiomDataBinding;
import org.apache.tuscany.databinding.axiom.OMElement2Object;
import org.apache.tuscany.databinding.axiom.OMElement2String;
@@ -45,10 +45,10 @@
}
public void start(ExtensionPointRegistry registry) {
- DataBindingRegistry dataBindingRegistry = registry.getExtensionPoint(DataBindingRegistry.class);
+ DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
dataBindingRegistry.register(new AxiomDataBinding());
- TransformerRegistry transformerRegistry = registry.getExtensionPoint(TransformerRegistry.class);
+ TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
transformerRegistry.registerTransformer(new Object2OMElement());
transformerRegistry.registerTransformer(new OMElement2Object());
transformerRegistry.registerTransformer(new OMElement2String());
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java Mon Apr 16 09:45:43 2007
@@ -21,8 +21,8 @@
import java.util.Map;
-import org.apache.tuscany.databinding.DataBindingRegistry;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.jaxb.JAXB2Node;
import org.apache.tuscany.databinding.jaxb.JAXBDataBinding;
import org.apache.tuscany.databinding.jaxb.JAXWSJavaInterfaceProcessor;
@@ -45,10 +45,10 @@
}
public void start(ExtensionPointRegistry registry) {
- DataBindingRegistry dataBindingRegistry = registry.getExtensionPoint(DataBindingRegistry.class);
+ DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
dataBindingRegistry.register(new JAXBDataBinding());
- TransformerRegistry transformerRegistry = registry.getExtensionPoint(TransformerRegistry.class);
+ TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
transformerRegistry.registerTransformer(new JAXB2Node());
transformerRegistry.registerTransformer(new Node2JAXB());
transformerRegistry.registerTransformer(new Reader2JAXB());
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java Mon Apr 16 09:45:43 2007
@@ -21,7 +21,7 @@
import java.util.Map;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.sdo2om.DataObject2OMElement;
import org.apache.tuscany.databinding.sdo2om.XMLDocument2OMElement;
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
@@ -39,7 +39,7 @@
}
public void start(ExtensionPointRegistry registry) {
- TransformerRegistry transformerRegistry = registry.getExtensionPoint(TransformerRegistry.class);
+ TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
transformerRegistry.registerTransformer(new DataObject2OMElement());
transformerRegistry.registerTransformer(new XMLDocument2OMElement());
}
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java Mon Apr 16 09:45:43 2007
@@ -23,8 +23,8 @@
import java.util.Map;
import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.databinding.DataBindingRegistry;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.sdo.DataObject2String;
import org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader;
import org.apache.tuscany.databinding.sdo.HelperContextProcessor;
@@ -53,7 +53,7 @@
}
public void start(ExtensionPointRegistry registry) {
- DataBindingRegistry dataBindingRegistry = registry.getExtensionPoint(DataBindingRegistry.class);
+ DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
dataBindingRegistry.register(new SDODataBinding());
StAXArtifactProcessorExtensionPoint processorRegistry = registry
@@ -61,7 +61,7 @@
HelperContextRegistry contextRegistry = registry.getExtensionPoint(HelperContextRegistry.class);
processorRegistry.addExtension(new ImportSDOProcessor(contextRegistry));
- TransformerRegistry transformerRegistry = registry.getExtensionPoint(TransformerRegistry.class);
+ TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
transformerRegistry.registerTransformer(new DataObject2String());
transformerRegistry.registerTransformer(new DataObject2XMLStreamReader());
transformerRegistry.registerTransformer(new XMLDocument2String());
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java?view=auto&rev=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java Mon Apr 16 09:45:43 2007
@@ -0,0 +1,70 @@
+/*
+ * 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;
+
+import java.lang.annotation.Annotation;
+
+import org.apache.tuscany.interfacedef.DataType;
+
+/**
+ * The registry for data bindings
+ */
+public interface DataBindingExtensionPoint {
+ /**
+ * Register a data binding
+ *
+ * @param dataBinding
+ */
+ void register(DataBinding dataBinding);
+
+ /**
+ * Look up a data binding by id
+ *
+ * @param id The name of the databinding
+ * @return The databinding
+ */
+ DataBinding getDataBinding(String id);
+
+ /**
+ * Unregister a data binding
+ *
+ * @param id
+ * @return The unregistered databinding
+ */
+ DataBinding unregister(String id);
+
+ /**
+ * Introspect the java class to figure out what DataType supports it
+ *
+ * @param DataType The initial data type
+ * @param annotations The java annotations
+ * @return A DataType representing the java type or null if no databinding
+ * recognizes the java type
+ */
+ boolean introspectType(DataType dataType, Annotation[] annotations);
+
+ /**
+ * Introspect the value to figure out the corresponding DataType
+ *
+ * @param value The object value
+ * @return A DataType representing the value or null if no databinding
+ * recognizes the value
+ */
+ DataType introspectType(Object value);
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java?view=auto&rev=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java Mon Apr 16 09:45:43 2007
@@ -0,0 +1,116 @@
+/*
+ * 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;
+
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.tuscany.databinding.javabeans.JavaBeansDataBinding;
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
+
+/**
+ * The default implementation of a data binding extension point.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefaultDataBindingExtensionPoint implements DataBindingExtensionPoint {
+ private final Map<String, DataBinding> bindings = new HashMap<String, DataBinding>();
+
+ public DataBinding getDataBinding(String id) {
+ if (id == null) {
+ return null;
+ }
+ return bindings.get(id.toLowerCase());
+ }
+
+ public void register(DataBinding dataBinding) {
+ bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
+ String[] aliases = dataBinding.getAliases();
+ if (aliases != null) {
+ for (String alias : aliases) {
+ bindings.put(alias.toLowerCase(), dataBinding);
+ }
+ }
+ }
+
+ public DataBinding unregister(String id) {
+ if (id == null) {
+ return null;
+ }
+ DataBinding dataBinding = bindings.remove(id.toLowerCase());
+ if (dataBinding != null) {
+ String[] aliases = dataBinding.getAliases();
+ if (aliases != null) {
+ for (String alias : aliases) {
+ bindings.remove(alias.toLowerCase());
+ }
+ }
+ }
+ return dataBinding;
+ }
+
+ private Set<DataBinding> getDataBindings() {
+ return new HashSet<DataBinding>(bindings.values());
+ }
+
+ public boolean introspectType(DataType dataType, Annotation[] annotations) {
+ for (DataBinding binding : getDataBindings()) {
+ // don't introspect for JavaBeansDatabinding as all javatypes will
+ // anyways match to its basetype
+ // which is java.lang.Object. Default to this only if no databinding
+ // results
+ if (!binding.getName().equals(JavaBeansDataBinding.NAME)) {
+ if (binding.introspect(dataType, annotations)) {
+ return true;
+ }
+ }
+ }
+ // FIXME: Should we honor the databinding from operation/interface
+ // level?
+ Class physical = dataType.getPhysical();
+ if (physical == Object.class || Throwable.class.isAssignableFrom((Class)physical)) {
+ return false;
+ }
+ dataType.setDataBinding(JavaBeansDataBinding.NAME);
+ return false;
+ }
+
+ public DataType introspectType(Object value) {
+ DataType dataType = null;
+ for (DataBinding binding : getDataBindings()) {
+ // don't introspect for JavaBeansDatabinding as all javatypes will
+ // anyways match to its basetype
+ // which is java.lang.Object. Default to this only if no databinding
+ // results
+ if (!binding.getName().equals(JavaBeansDataBinding.NAME)) {
+ dataType = binding.introspect(value);
+ }
+ if (dataType != null) {
+ return dataType;
+ }
+ }
+ return new DataTypeImpl<Class>(JavaBeansDataBinding.NAME, value.getClass(), value.getClass());
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java?view=auto&rev=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java Mon Apr 16 09:45:43 2007
@@ -0,0 +1,93 @@
+/*
+ * 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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.databinding.impl.DirectedGraph;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DefaultTransformerExtensionPoint implements TransformerExtensionPoint {
+ private DataBindingExtensionPoint dataBindingRegistry;
+
+ private final DirectedGraph<Object, Transformer> graph = new DirectedGraph<Object, Transformer>();
+
+ public void registerTransformer(String sourceType, String resultType, int weight, Transformer transformer) {
+ graph.addEdge(sourceType, resultType, transformer, weight);
+ }
+
+ public void registerTransformer(Transformer transformer) {
+ graph.addEdge(transformer.getSourceDataBinding(),
+ transformer.getTargetDataBinding(),
+ transformer,
+ transformer.getWeight());
+ }
+
+ public boolean unregisterTransformer(String sourceType, String resultType) {
+ return graph.removeEdge(sourceType, resultType);
+ }
+
+ public Transformer getTransformer(String sourceType, String resultType) {
+ DirectedGraph<Object, Transformer>.Edge edge = graph.getEdge(sourceType, resultType);
+ return (edge == null) ? null : edge.getValue();
+ }
+
+ public List<Transformer> getTransformerChain(String sourceType, String resultType) {
+ String source = normalize(sourceType);
+ String result = normalize(resultType);
+ List<Transformer> transformers = new ArrayList<Transformer>();
+ DirectedGraph<Object, Transformer>.Path path = graph.getShortestPath(source, result);
+ if (path == null) {
+ return null;
+ }
+ for (DirectedGraph<Object, Transformer>.Edge edge : path.getEdges()) {
+ transformers.add(edge.getValue());
+ }
+ return transformers;
+ }
+
+ public String toString() {
+ return graph.toString();
+ }
+
+ /**
+ * @param dataBindingRegistry the dataBindingRegistry to set
+ */
+ public void setDataBindingRegistry(DataBindingExtensionPoint dataBindingRegistry) {
+ this.dataBindingRegistry = dataBindingRegistry;
+ }
+
+ /**
+ * Normalize the id to a name of a data binding as databindings may have aliases
+ * @param id
+ * @return
+ */
+ private String normalize(String id) {
+ if (dataBindingRegistry != null) {
+ DataBinding dataBinding = dataBindingRegistry.getDataBinding(id);
+ return dataBinding == null ? id : dataBinding.getName();
+ } else {
+ return id;
+ }
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java Mon Apr 16 09:45:43 2007
@@ -57,11 +57,11 @@
* Get the DataBinding registry
* @return
*/
- DataBindingRegistry getDataBindingRegistry();
+ DataBindingExtensionPoint getDataBindingRegistry();
/**
* Get the Transformer registry
* @return
*/
- TransformerRegistry getTransformerRegistry();
+ TransformerExtensionPoint getTransformerRegistry();
}
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java?view=auto&rev=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java Mon Apr 16 09:45:43 2007
@@ -0,0 +1,75 @@
+/*
+ * 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;
+
+import java.util.List;
+
+/**
+ * Registry for data transformers
+ */
+public interface TransformerExtensionPoint {
+ /**
+ * Register a transformer
+ *
+ * @param sourceDataBinding
+ * @param targetDataBinding
+ * @param weight
+ * @param transformer
+ */
+ void registerTransformer(String sourceDataBinding,
+ String targetDataBinding,
+ int weight,
+ Transformer transformer);
+
+ /**
+ * Register a transformer
+ *
+ * @param transformer
+ */
+ void registerTransformer(Transformer transformer);
+
+ /**
+ * Unregister a transformer
+ *
+ * @param sourceDataBinding
+ * @param targetDataBinding
+ * @return
+ */
+ boolean unregisterTransformer(String sourceDataBinding, String targetDataBinding);
+
+ /**
+ * Get the direct Transformer which can transform data from source type to
+ * result type
+ *
+ * @param sourceDataBinding
+ * @param targetDataBinding
+ * @return
+ */
+ Transformer getTransformer(String sourceDataBinding, String targetDataBinding);
+
+ /**
+ * Get the a chain of Transformers which can transform data from source type
+ * to result type
+ *
+ * @param sourceDataBinding
+ * @param targetDataBinding
+ * @return
+ */
+ List<Transformer> getTransformerChain(String sourceDataBinding, String targetDataBinding);
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/DataBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/DataBindingExtension.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/DataBindingExtension.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/DataBindingExtension.java Mon Apr 16 09:45:43 2007
@@ -23,7 +23,7 @@
import java.lang.reflect.Type;
import org.apache.tuscany.databinding.DataBinding;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.databinding.ExceptionHandler;
import org.apache.tuscany.databinding.SimpleTypeMapper;
import org.apache.tuscany.databinding.WrapperHandler;
@@ -37,7 +37,7 @@
*/
public abstract class DataBindingExtension implements DataBinding {
- protected DataBindingRegistry registry;
+ protected DataBindingExtensionPoint registry;
protected Class<?> baseType;
@@ -80,7 +80,7 @@
this.aliases = aliases;
}
- public void setDataBindingRegistry(DataBindingRegistry registry) {
+ public void setDataBindingRegistry(DataBindingExtensionPoint registry) {
this.registry = registry;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/TransformerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/TransformerExtension.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/TransformerExtension.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/TransformerExtension.java Mon Apr 16 09:45:43 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.databinding.extension;
import org.apache.tuscany.databinding.Transformer;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
/**
* Base Implementation of Transformer which provides the registration to the transformer registry
@@ -28,13 +28,13 @@
*/
public abstract class TransformerExtension<S, T> implements Transformer {
- protected TransformerRegistry registry;
+ protected TransformerExtensionPoint registry;
protected TransformerExtension() {
super();
}
- public void setTransformerRegistry(TransformerRegistry registry) {
+ public void setTransformerRegistry(TransformerExtensionPoint registry) {
this.registry = registry;
}
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=529323&r1=529322&r2=529323
==============================================================================
--- 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 Mon Apr 16 09:45:43 2007
@@ -21,7 +21,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.databinding.DataPipe;
import org.apache.tuscany.databinding.Mediator;
import org.apache.tuscany.databinding.PullTransformer;
@@ -29,7 +29,7 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
import org.apache.tuscany.databinding.Transformer;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
@@ -38,18 +38,18 @@
*/
public class MediatorImpl implements Mediator {
- private DataBindingRegistry dataBindingRegistry;
+ private DataBindingExtensionPoint dataBindingRegistry;
- private TransformerRegistry transformerRegistry;
+ private TransformerExtensionPoint transformerRegistry;
- public void setTransformerRegistry(TransformerRegistry transformerRegistry) {
+ public void setTransformerRegistry(TransformerExtensionPoint transformerRegistry) {
this.transformerRegistry = transformerRegistry;
}
/**
* @param dataBindingRegistry the dataBindingRegistry to set
*/
- public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
+ public void setDataBindingRegistry(DataBindingExtensionPoint dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
@@ -165,14 +165,14 @@
/**
* @return the dataBindingRegistry
*/
- public DataBindingRegistry getDataBindingRegistry() {
+ public DataBindingExtensionPoint getDataBindingRegistry() {
return dataBindingRegistry;
}
/**
* @return the transformerRegistry
*/
- public TransformerRegistry getTransformerRegistry() {
+ public TransformerExtensionPoint getTransformerRegistry() {
return transformerRegistry;
}
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/DataBindingExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/DataBindingExtensionTestCase.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/DataBindingExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/DataBindingExtensionTestCase.java Mon Apr 16 09:45:43 2007
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.databinding.extension.DataBindingExtension;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
@@ -51,7 +51,7 @@
assertFalse(binding1.introspect(dt2, null));
assertNull(binding1.getWrapperHandler());
- DataBindingRegistry registry = EasyMock.createMock(DataBindingRegistry.class);
+ DataBindingExtensionPoint registry = EasyMock.createMock(DataBindingExtensionPoint.class);
registry.register(binding1);
EasyMock.expect(registry.getDataBinding(Node.class.getName())).andReturn(binding1);
EasyMock.replay(registry);
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/TransformerExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/TransformerExtensionTestCase.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/TransformerExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/TransformerExtensionTestCase.java Mon Apr 16 09:45:43 2007
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.databinding.Transformer;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.extension.TransformerExtension;
import org.easymock.EasyMock;
import org.w3c.dom.Node;
@@ -46,7 +46,7 @@
assertEquals(Node.class.getName(), transformer.getSourceDataBinding());
assertEquals(XMLStreamReader.class.getName(), transformer.getTargetDataBinding());
assertEquals(50, transformer.getWeight());
- TransformerRegistry registry = EasyMock.createMock(TransformerRegistry.class);
+ TransformerExtensionPoint registry = EasyMock.createMock(TransformerExtensionPoint.class);
registry.registerTransformer(EasyMock.isA(Transformer.class));
EasyMock
.expect(registry.getTransformer(transformer.getSourceDataBinding(), transformer.getTargetDataBinding()))
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImplTestCase.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImplTestCase.java Mon Apr 16 09:45:43 2007
@@ -29,7 +29,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.databinding.DataBinding;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultDataBindingExtensionPoint;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
import org.easymock.EasyMock;
@@ -39,14 +40,14 @@
*
*/
public class DataBindingRegistryImplTestCase extends TestCase {
- private DataBindingRegistry registry;
+ private DataBindingExtensionPoint registry;
/**
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
- registry = new DataBindingRegistryImpl();
+ registry = new DefaultDataBindingExtensionPoint();
}
@SuppressWarnings("unchecked")
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java Mon Apr 16 09:45:43 2007
@@ -24,9 +24,11 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultDataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultTransformerExtensionPoint;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.xml.Node2String;
import org.apache.tuscany.databinding.xml.Node2Writer;
import org.apache.tuscany.databinding.xml.SAX2DOMPipe;
@@ -76,7 +78,7 @@
protected void setUp() throws Exception {
super.setUp();
- TransformerRegistry registry = new TransformerRegistryImpl();
+ TransformerExtensionPoint registry = new DefaultTransformerExtensionPoint();
registry.registerTransformer(new String2SAX());
registry.registerTransformer(new SAX2DOMPipe());
registry.registerTransformer(new Node2String());
@@ -85,7 +87,7 @@
mediator = new MediatorImpl();
mediator.setTransformerRegistry(registry);
- DataBindingRegistry dataBindingRegistry = new DataBindingRegistryImpl();
+ DataBindingExtensionPoint dataBindingRegistry = new DefaultDataBindingExtensionPoint();
mediator.setDataBindingRegistry(dataBindingRegistry);
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java Mon Apr 16 09:45:43 2007
@@ -28,22 +28,22 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.tuscany.databinding.DefaultTransformerExtensionPoint;
import org.apache.tuscany.databinding.Transformer;
-import org.apache.tuscany.databinding.TransformerRegistry;
-import org.apache.tuscany.databinding.impl.TransformerRegistryImpl;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
/**
*
*/
public class TransformerRegistryImplTestCase extends TestCase {
- private TransformerRegistry registry;
+ private TransformerExtensionPoint registry;
/**
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
- registry = new TransformerRegistryImpl();
+ registry = new DefaultTransformerExtensionPoint();
}
public void testRegisterTransformer1() {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java Mon Apr 16 09:45:43 2007
@@ -22,7 +22,7 @@
import org.apache.tuscany.assembly.ComponentProperty;
import org.apache.tuscany.core.wire.WireObjectFactory;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.java.JavaInterface;
import org.apache.tuscany.interfacedef.java.impl.JavaInterfaceUtil;
@@ -38,7 +38,7 @@
*/
public class JavaAtomicComponent extends PojoAtomicComponent {
private JavaPropertyValueObjectFactory propertyValueFactory;
- private DataBindingRegistry dataBindingRegistry;
+ private DataBindingExtensionPoint dataBindingRegistry;
public JavaAtomicComponent(PojoConfiguration configuration) {
super(configuration);
@@ -84,7 +84,7 @@
this.propertyValueFactory = propertyValueFactory;
}
- public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
+ public void setDataBindingRegistry(DataBindingExtensionPoint dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java Mon Apr 16 09:45:43 2007
@@ -21,7 +21,7 @@
import java.net.URI;
import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.impl.Resource;
@@ -42,7 +42,7 @@
*/
public class JavaComponentBuilder extends ComponentBuilderExtension<JavaImplementation> {
private JavaPropertyValueObjectFactory propertyValueObjectFactory;
- private DataBindingRegistry dataBindingRegistry;
+ private DataBindingExtensionPoint dataBindingRegistry;
private ResourceHost host;
@@ -112,7 +112,7 @@
this.propertyValueObjectFactory = propertyValueObjectFactory;
}
- public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
+ public void setDataBindingRegistry(DataBindingExtensionPoint dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java Mon Apr 16 09:45:43 2007
@@ -24,14 +24,14 @@
import java.util.StringTokenizer;
import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultDataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DefaultTransformerExtensionPoint;
import org.apache.tuscany.databinding.Mediator;
import org.apache.tuscany.databinding.SimpleTypeMapper;
-import org.apache.tuscany.databinding.TransformerRegistry;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.extension.SimpleTypeMapperExtension;
-import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
import org.apache.tuscany.databinding.impl.MediatorImpl;
-import org.apache.tuscany.databinding.impl.TransformerRegistryImpl;
import org.apache.tuscany.databinding.javabeans.DOMNode2JavaBeanTransformer;
import org.apache.tuscany.databinding.javabeans.JavaBeansDataBinding;
import org.apache.tuscany.databinding.xml.DOMDataBinding;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java Mon Apr 16 09:45:43 2007
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.tuscany.databinding.DataBinding;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -39,7 +39,7 @@
* @version $Rev$ $Date$
*/
public class PassByValueInvoker extends JavaTargetInvoker {
- private DataBindingRegistry registry;
+ private DataBindingExtensionPoint registry;
private Operation operation;
/**
@@ -48,7 +48,7 @@
* @param scopeContainer
* @param passByValue
*/
- public PassByValueInvoker(DataBindingRegistry registry, Operation operation, Method method, AtomicComponent component, ScopeContainer scopeContainer) {
+ public PassByValueInvoker(DataBindingExtensionPoint registry, Operation operation, Method method, AtomicComponent component, ScopeContainer scopeContainer) {
super(method, component, scopeContainer);
this.registry = registry;
this.operation = operation;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=529323&r1=529322&r2=529323
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Mon Apr 16 09:45:43 2007
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.databinding.DataBindingRegistry;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.databinding.Mediator;
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
@@ -116,7 +116,7 @@
JavaPropertyValueObjectFactory factory = new JavaPropertyValueObjectFactory(mediator);
builder.setPropertyValueObjectFactory(factory);
- DataBindingRegistry dataBindingRegistry = extensionPointRegistry.getExtensionPoint(DataBindingRegistry.class);
+ DataBindingExtensionPoint dataBindingRegistry = extensionPointRegistry.getExtensionPoint(DataBindingExtensionPoint.class);
builder.setDataBindingRegistry(dataBindingRegistry);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org