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/05/02 20:15:46 UTC
svn commit: r534580 [1/3] - in /incubator/tuscany/java/sca/modules:
core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/
core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/
databinding-axiom/src/main/j...
Author: jsdelfino
Date: Wed May 2 11:15:41 2007
New Revision: 534580
URL: http://svn.apache.org/viewvc?view=rev&rev=534580
Log:
Minor refactoring inside the databinding module. Renamed some classes named XyzExtension to BaseXyz as this is really what they are and moved these base classes to the databinding.impl package.
Added:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseDataBinding.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseTransformer.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DOMHelper.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Java2SimpleTypeTransformer.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/SimpleType2JavaTransformer.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/SimpleTypeMapperImpl.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/XSDDataTypeConverter.java (with props)
Removed:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/extension/
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
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/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/module/AxiomDataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/module/JAXBDataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElement.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/module/SDOAxiomModuleActivator.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/module/SDODataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Group2GroupTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/GroupDataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBeansDataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaBeanTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/BeanUtil.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/DOMDataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/DOMWrapperHandler.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2Node.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2SAX.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2Node.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2SAX.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2OutputStream.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2String.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2Writer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2Node.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2SAX.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/SAX2DOM.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/SAX2DOMPipe.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Source2ResultTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StAXDataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StreamDataPipe.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2Node.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2SAX.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Writer2ReaderDataPipe.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2SAX.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStringDataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/extension/DOMHelperTestCase.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/SimpleTypeMapperExtensionTestCase.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/extension/XSDDataTypeConverterTestCase.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/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/xml/DataPipeTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/xml/Node2StringTestCase.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-script/src/main/java/org/apache/tuscany/implementation/script/ScriptPropertyValueObjectFactory.java
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java Wed May 2 11:15:41 2007
@@ -97,9 +97,9 @@
Exception2ExceptionTransformer exception2ExceptionTransformer = new Exception2ExceptionTransformer();
exception2ExceptionTransformer.setMediator(mediator);
- transformerRegistry.registerTransformer(input2InputTransformer);
- transformerRegistry.registerTransformer(output2OutputTransformer);
- transformerRegistry.registerTransformer(exception2ExceptionTransformer);
+ transformerRegistry.addTransformer(input2InputTransformer);
+ transformerRegistry.addTransformer(output2OutputTransformer);
+ transformerRegistry.addTransformer(exception2ExceptionTransformer);
JavaInterfaceIntrospectorExtensionPoint javaIntrospectorExtensionPoint = registry
.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
@@ -114,48 +114,48 @@
DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
DOMDataBinding domDataBinding = new DOMDataBinding();
domDataBinding.setDataBindingRegistry(dataBindingRegistry);
- dataBindingRegistry.register(domDataBinding);
+ dataBindingRegistry.addDataBinding(domDataBinding);
XMLStringDataBinding xmlStringDataBinding = new XMLStringDataBinding();
xmlStringDataBinding.setDataBindingRegistry(dataBindingRegistry);
- dataBindingRegistry.register(xmlStringDataBinding);
+ dataBindingRegistry.addDataBinding(xmlStringDataBinding);
XMLGroupDataBinding xmlGroupDataBinding = new XMLGroupDataBinding();
xmlGroupDataBinding.setDataBindingRegistry(dataBindingRegistry);
- dataBindingRegistry.register(xmlGroupDataBinding);
+ dataBindingRegistry.addDataBinding(xmlGroupDataBinding);
JavaBeansDataBinding javaBeansDataBinding = new JavaBeansDataBinding();
javaBeansDataBinding.setDataBindingRegistry(dataBindingRegistry);
- dataBindingRegistry.register(javaBeansDataBinding);
+ dataBindingRegistry.addDataBinding(javaBeansDataBinding);
Group2GroupTransformer group2GroupTransformer= new Group2GroupTransformer();
group2GroupTransformer.setMediator(mediator);
- transformerRegistry.registerTransformer(group2GroupTransformer);
+ transformerRegistry.addTransformer(group2GroupTransformer);
- transformerRegistry.registerTransformer(new InputSource2Node());
- transformerRegistry.registerTransformer(new InputSource2SAX());
- transformerRegistry.registerTransformer(new InputStream2Node());
- transformerRegistry.registerTransformer(new InputStream2SAX());
-
- transformerRegistry.registerTransformer(new DOMNode2JavaBeanTransformer());
- transformerRegistry.registerTransformer(new Node2OutputStream());
- transformerRegistry.registerTransformer(new Node2String());
- transformerRegistry.registerTransformer(new Node2Writer());
- transformerRegistry.registerTransformer(new Node2XMLStreamReader());
+ transformerRegistry.addTransformer(new InputSource2Node());
+ transformerRegistry.addTransformer(new InputSource2SAX());
+ transformerRegistry.addTransformer(new InputStream2Node());
+ transformerRegistry.addTransformer(new InputStream2SAX());
+
+ transformerRegistry.addTransformer(new DOMNode2JavaBeanTransformer());
+ transformerRegistry.addTransformer(new Node2OutputStream());
+ transformerRegistry.addTransformer(new Node2String());
+ transformerRegistry.addTransformer(new Node2Writer());
+ transformerRegistry.addTransformer(new Node2XMLStreamReader());
- transformerRegistry.registerTransformer(new JavaBean2DOMNodeTransformer());
- transformerRegistry.registerTransformer(new Reader2Node());
+ transformerRegistry.addTransformer(new JavaBean2DOMNodeTransformer());
+ transformerRegistry.addTransformer(new Reader2Node());
- transformerRegistry.registerTransformer(new Reader2SAX());
- transformerRegistry.registerTransformer(new SAX2DOMPipe());
+ transformerRegistry.addTransformer(new Reader2SAX());
+ transformerRegistry.addTransformer(new SAX2DOMPipe());
- transformerRegistry.registerTransformer(new Source2ResultTransformer());
- transformerRegistry.registerTransformer(new StreamDataPipe());
- transformerRegistry.registerTransformer(new String2Node());
- transformerRegistry.registerTransformer(new String2SAX());
- transformerRegistry.registerTransformer(new String2XMLStreamReader());
- transformerRegistry.registerTransformer(new Writer2ReaderDataPipe());
-
- transformerRegistry.registerTransformer(new XMLStreamReader2Node());
- transformerRegistry.registerTransformer(new XMLStreamReader2SAX());
- transformerRegistry.registerTransformer(new XMLStreamReader2String());
+ transformerRegistry.addTransformer(new Source2ResultTransformer());
+ transformerRegistry.addTransformer(new StreamDataPipe());
+ transformerRegistry.addTransformer(new String2Node());
+ transformerRegistry.addTransformer(new String2SAX());
+ transformerRegistry.addTransformer(new String2XMLStreamReader());
+ transformerRegistry.addTransformer(new Writer2ReaderDataPipe());
+
+ transformerRegistry.addTransformer(new XMLStreamReader2Node());
+ transformerRegistry.addTransformer(new XMLStreamReader2SAX());
+ transformerRegistry.addTransformer(new XMLStreamReader2String());
}
public void stop(ExtensionPointRegistry registry) {
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=534580&r1=534579&r2=534580
==============================================================================
--- 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 Wed May 2 11:15:41 2007
@@ -25,7 +25,7 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.Transformer;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.interfacedef.DataType;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
@@ -35,7 +35,7 @@
* other one
*/
@Service(Transformer.class)
-public class Exception2ExceptionTransformer extends TransformerExtension<Object[], Object[]> implements
+public class Exception2ExceptionTransformer extends BaseTransformer<Object[], Object[]> implements
PullTransformer<Exception, Exception> {
protected Mediator mediator;
@@ -63,7 +63,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getSourceType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
protected Class getSourceType() {
@@ -71,7 +71,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getTargetType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
protected Class getTargetType() {
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=534580&r1=534579&r2=534580
==============================================================================
--- 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 Wed May 2 11:15:41 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.databinding.TransformationException;
import org.apache.tuscany.databinding.Transformer;
import org.apache.tuscany.databinding.WrapperHandler;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
@@ -43,7 +43,7 @@
* other one
*/
@Service(Transformer.class)
-public class Input2InputTransformer extends TransformerExtension<Object[], Object[]> implements
+public class Input2InputTransformer extends BaseTransformer<Object[], Object[]> implements
PullTransformer<Object[], Object[]> {
protected Mediator mediator;
@@ -71,7 +71,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getSourceType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
protected Class getSourceType() {
@@ -79,7 +79,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getTargetType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
protected Class getTargetType() {
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=534580&r1=534579&r2=534580
==============================================================================
--- 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 Wed May 2 11:15:41 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.databinding.TransformationException;
import org.apache.tuscany.databinding.Transformer;
import org.apache.tuscany.databinding.WrapperHandler;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
@@ -43,7 +43,7 @@
* other one
*/
@Service(Transformer.class)
-public class Output2OutputTransformer extends TransformerExtension<Object, Object> implements
+public class Output2OutputTransformer extends BaseTransformer<Object, Object> implements
PullTransformer<Object, Object> {
protected Mediator mediator;
@@ -74,7 +74,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getSourceType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
protected Class getSourceType() {
@@ -82,7 +82,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getTargetType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
protected Class getTargetType() {
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java Wed May 2 11:15:41 2007
@@ -22,12 +22,12 @@
import org.apache.axiom.om.OMElement;
import org.apache.tuscany.databinding.ExceptionHandler;
import org.apache.tuscany.databinding.WrapperHandler;
-import org.apache.tuscany.databinding.extension.DataBindingExtension;
+import org.apache.tuscany.databinding.impl.BaseDataBinding;
/**
* DataBinding for AXIOM
*/
-public class AxiomDataBinding extends DataBindingExtension {
+public class AxiomDataBinding extends BaseDataBinding {
public static final String NAME = OMElement.class.getName();
public static final String[] ALIASES = new String[] {"axiom"};
@@ -37,7 +37,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.DataBindingExtension#getWrapperHandler()
+ * @see org.apache.tuscany.databinding.impl.BaseDataBinding#getWrapperHandler()
*/
@Override
public WrapperHandler getWrapperHandler() {
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java Wed May 2 11:15:41 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.databinding.axiom;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.databinding.extension.SimpleType2JavaTransformer;
+import org.apache.tuscany.databinding.impl.SimpleType2JavaTransformer;
/**
* Transformer to convert data from a simple java bject to OMElement
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java Wed May 2 11:15:41 2007
@@ -26,12 +26,12 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
/**
* Transformer to convert data from an OMElement to XML String
*/
-public class OMElement2String extends TransformerExtension<OMElement, String> implements PullTransformer<OMElement, String> {
+public class OMElement2String extends BaseTransformer<OMElement, String> implements PullTransformer<OMElement, String> {
// private XmlOptions options;
public String transform(OMElement source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java Wed May 2 11:15:41 2007
@@ -23,9 +23,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
-public class OMElement2XMLStreamReader extends TransformerExtension<OMElement, XMLStreamReader> implements PullTransformer<OMElement, XMLStreamReader> {
+public class OMElement2XMLStreamReader extends BaseTransformer<OMElement, XMLStreamReader> implements PullTransformer<OMElement, XMLStreamReader> {
// private XmlOptions options;
public XMLStreamReader transform(OMElement source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java Wed May 2 11:15:41 2007
@@ -24,7 +24,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.extension.Java2SimpleTypeTransformer;
+import org.apache.tuscany.databinding.impl.Java2SimpleTypeTransformer;
/**
* Transformer to convert data from an simple OMElement to Java Object
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java Wed May 2 11:15:41 2007
@@ -25,9 +25,9 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
-public class String2OMElement extends TransformerExtension<String, OMElement> implements
+public class String2OMElement extends BaseTransformer<String, OMElement> implements
PullTransformer<String, OMElement> {
@SuppressWarnings("unchecked")
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java Wed May 2 11:15:41 2007
@@ -25,9 +25,9 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
-public class XMLStreamReader2OMElement extends TransformerExtension<XMLStreamReader, OMElement> implements
+public class XMLStreamReader2OMElement extends BaseTransformer<XMLStreamReader, OMElement> implements
PullTransformer<XMLStreamReader, OMElement> {
public XMLStreamReader2OMElement() {
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/module/AxiomDataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/module/AxiomDataBindingModuleActivator.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/module/AxiomDataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/module/AxiomDataBindingModuleActivator.java Wed May 2 11:15:41 2007
@@ -46,15 +46,15 @@
public void start(ExtensionPointRegistry registry) {
DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
- dataBindingRegistry.register(new AxiomDataBinding());
+ dataBindingRegistry.addDataBinding(new AxiomDataBinding());
TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
- transformerRegistry.registerTransformer(new Object2OMElement());
- transformerRegistry.registerTransformer(new OMElement2Object());
- transformerRegistry.registerTransformer(new OMElement2String());
- transformerRegistry.registerTransformer(new OMElement2XMLStreamReader());
- transformerRegistry.registerTransformer(new String2OMElement());
- transformerRegistry.registerTransformer(new XMLStreamReader2OMElement());
+ transformerRegistry.addTransformer(new Object2OMElement());
+ transformerRegistry.addTransformer(new OMElement2Object());
+ transformerRegistry.addTransformer(new OMElement2String());
+ transformerRegistry.addTransformer(new OMElement2XMLStreamReader());
+ transformerRegistry.addTransformer(new String2OMElement());
+ transformerRegistry.addTransformer(new XMLStreamReader2OMElement());
}
public void stop(ExtensionPointRegistry registry) {
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java Wed May 2 11:15:41 2007
@@ -25,12 +25,12 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.DOMHelper;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.DOMHelper;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-public class JAXB2Node extends TransformerExtension<Object, Node> implements PullTransformer<Object, Node> {
+public class JAXB2Node extends BaseTransformer<Object, Node> implements PullTransformer<Object, Node> {
public Node transform(Object source, TransformationContext tContext) {
if (source == null) {
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java Wed May 2 11:15:41 2007
@@ -28,8 +28,8 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.databinding.ExceptionHandler;
-import org.apache.tuscany.databinding.extension.DOMHelper;
-import org.apache.tuscany.databinding.extension.DataBindingExtension;
+import org.apache.tuscany.databinding.impl.DOMHelper;
+import org.apache.tuscany.databinding.impl.BaseDataBinding;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.util.XMLType;
import org.w3c.dom.Document;
@@ -37,7 +37,7 @@
/**
* JAXB DataBinding
*/
-public class JAXBDataBinding extends DataBindingExtension {
+public class JAXBDataBinding extends BaseDataBinding {
public static final String NAME = JAXBElement.class.getName();
public static final String[] ALIASES = new String[] {"jaxb"};
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java Wed May 2 11:15:41 2007
@@ -24,10 +24,10 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.w3c.dom.Node;
-public class Node2JAXB extends TransformerExtension<Node, Object> implements PullTransformer<Node, Object> {
+public class Node2JAXB extends BaseTransformer<Node, Object> implements PullTransformer<Node, Object> {
public Node2JAXB() {
super();
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java Wed May 2 11:15:41 2007
@@ -27,9 +27,9 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
-public class Reader2JAXB extends TransformerExtension<Reader, Object> implements
+public class Reader2JAXB extends BaseTransformer<Reader, Object> implements
PullTransformer<Reader, Object> {
public Object transform(final Reader source, final TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java Wed May 2 11:15:41 2007
@@ -25,9 +25,9 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
-public class XMLStreamReader2JAXB extends TransformerExtension<XMLStreamReader, Object> implements
+public class XMLStreamReader2JAXB extends BaseTransformer<XMLStreamReader, Object> implements
PullTransformer<XMLStreamReader, Object> {
public XMLStreamReader2JAXB() {
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/module/JAXBDataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/module/JAXBDataBindingModuleActivator.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/module/JAXBDataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/module/JAXBDataBindingModuleActivator.java Wed May 2 11:15:41 2007
@@ -46,13 +46,13 @@
public void start(ExtensionPointRegistry registry) {
DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
- dataBindingRegistry.register(new JAXBDataBinding());
+ dataBindingRegistry.addDataBinding(new JAXBDataBinding());
TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
- transformerRegistry.registerTransformer(new JAXB2Node());
- transformerRegistry.registerTransformer(new Node2JAXB());
- transformerRegistry.registerTransformer(new Reader2JAXB());
- transformerRegistry.registerTransformer(new XMLStreamReader2JAXB());
+ transformerRegistry.addTransformer(new JAXB2Node());
+ transformerRegistry.addTransformer(new Node2JAXB());
+ transformerRegistry.addTransformer(new Reader2JAXB());
+ transformerRegistry.addTransformer(new XMLStreamReader2JAXB());
JavaInterfaceIntrospectorExtensionPoint introspectorExtensionPoint = registry.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
introspectorExtensionPoint.addExtension(new JAXWSJavaInterfaceProcessor());
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java Wed May 2 11:15:41 2007
@@ -26,7 +26,7 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.databinding.sdo.SDOContextHelper;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.util.XMLType;
@@ -39,7 +39,7 @@
*
* @version $Rev$ $Date$
*/
-public class DataObject2OMElement extends TransformerExtension<DataObject, OMElement> implements
+public class DataObject2OMElement extends BaseTransformer<DataObject, OMElement> implements
PullTransformer<DataObject, OMElement> {
public OMElement transform(DataObject source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElement.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElement.java Wed May 2 11:15:41 2007
@@ -24,7 +24,7 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.databinding.sdo.SDOContextHelper;
import commonj.sdo.helper.HelperContext;
@@ -34,7 +34,7 @@
* SDO XMLDocument --> AXIOM OMElement transformer
* @version $Rev$ $Date$
*/
-public class XMLDocument2OMElement extends TransformerExtension<XMLDocument, OMElement> implements
+public class XMLDocument2OMElement extends BaseTransformer<XMLDocument, OMElement> implements
PullTransformer<XMLDocument, OMElement> {
public OMElement transform(XMLDocument source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/module/SDOAxiomModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/module/SDOAxiomModuleActivator.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/module/SDOAxiomModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/module/SDOAxiomModuleActivator.java Wed May 2 11:15:41 2007
@@ -40,8 +40,8 @@
public void start(ExtensionPointRegistry registry) {
TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
- transformerRegistry.registerTransformer(new DataObject2OMElement());
- transformerRegistry.registerTransformer(new XMLDocument2OMElement());
+ transformerRegistry.addTransformer(new DataObject2OMElement());
+ transformerRegistry.addTransformer(new XMLDocument2OMElement());
}
public void stop(ExtensionPointRegistry registry) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java Wed May 2 11:15:41 2007
@@ -23,13 +23,13 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
-public class DataObject2String extends TransformerExtension<DataObject, String> implements
+public class DataObject2String extends BaseTransformer<DataObject, String> implements
PullTransformer<DataObject, String> {
public String transform(DataObject source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java Wed May 2 11:15:41 2007
@@ -25,7 +25,7 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
@@ -34,7 +34,7 @@
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
-public class DataObject2XMLStreamReader extends TransformerExtension<DataObject, XMLStreamReader> implements
+public class DataObject2XMLStreamReader extends BaseTransformer<DataObject, XMLStreamReader> implements
PullTransformer<DataObject, XMLStreamReader> {
public XMLStreamReader transform(DataObject source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java Wed May 2 11:15:41 2007
@@ -26,7 +26,7 @@
import org.apache.tuscany.databinding.ExceptionHandler;
import org.apache.tuscany.databinding.SimpleTypeMapper;
import org.apache.tuscany.databinding.WrapperHandler;
-import org.apache.tuscany.databinding.extension.DataBindingExtension;
+import org.apache.tuscany.databinding.impl.BaseDataBinding;
import org.apache.tuscany.interfacedef.DataType;
import org.apache.tuscany.interfacedef.util.XMLType;
@@ -42,7 +42,7 @@
*
* @version $Reve$ $Date$
*/
-public class SDODataBinding extends DataBindingExtension {
+public class SDODataBinding extends BaseDataBinding {
public static final String NAME = DataObject.class.getName();
public static final String[] ALIASES = new String[] {"sdo"};
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java Wed May 2 11:15:41 2007
@@ -21,13 +21,13 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
-public class String2DataObject extends TransformerExtension<String, DataObject> implements
+public class String2DataObject extends BaseTransformer<String, DataObject> implements
PullTransformer<String, DataObject> {
public DataObject transform(String source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java Wed May 2 11:15:41 2007
@@ -23,13 +23,13 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
-public class XMLDocument2String extends TransformerExtension<XMLDocument, String> implements
+public class XMLDocument2String extends BaseTransformer<XMLDocument, String> implements
PullTransformer<XMLDocument, String> {
public String transform(XMLDocument source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java Wed May 2 11:15:41 2007
@@ -24,14 +24,14 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
-public class XMLDocument2XMLStreamReader extends TransformerExtension<XMLDocument, XMLStreamReader> implements
+public class XMLDocument2XMLStreamReader extends BaseTransformer<XMLDocument, XMLStreamReader> implements
PullTransformer<XMLDocument, XMLStreamReader> {
/**
* @param source
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java Wed May 2 11:15:41 2007
@@ -24,14 +24,14 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
-public class XMLStreamReader2DataObject extends TransformerExtension<XMLStreamReader, DataObject> implements
+public class XMLStreamReader2DataObject extends BaseTransformer<XMLStreamReader, DataObject> implements
PullTransformer<XMLStreamReader, DataObject> {
public DataObject transform(XMLStreamReader source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java Wed May 2 11:15:41 2007
@@ -23,14 +23,14 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
+import org.apache.tuscany.databinding.impl.BaseTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
-public class XMLStreamReader2XMLDocument extends TransformerExtension<XMLStreamReader, XMLDocument> implements
+public class XMLStreamReader2XMLDocument extends BaseTransformer<XMLStreamReader, XMLDocument> implements
PullTransformer<XMLStreamReader, XMLDocument> {
public XMLDocument transform(XMLStreamReader source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/module/SDODataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/module/SDODataBindingModuleActivator.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/module/SDODataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/module/SDODataBindingModuleActivator.java Wed May 2 11:15:41 2007
@@ -53,7 +53,7 @@
public void start(ExtensionPointRegistry registry) {
DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
- dataBindingRegistry.register(new SDODataBinding());
+ dataBindingRegistry.addDataBinding(new SDODataBinding());
StAXArtifactProcessorExtensionPoint processorRegistry = registry
.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
@@ -61,13 +61,13 @@
processorRegistry.addExtension(new ImportSDOProcessor(contextRegistry));
TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
- transformerRegistry.registerTransformer(new DataObject2String());
- transformerRegistry.registerTransformer(new DataObject2XMLStreamReader());
- transformerRegistry.registerTransformer(new XMLDocument2String());
- transformerRegistry.registerTransformer(new String2DataObject());
- transformerRegistry.registerTransformer(new XMLDocument2XMLStreamReader());
- transformerRegistry.registerTransformer(new XMLStreamReader2DataObject());
- transformerRegistry.registerTransformer(new XMLStreamReader2XMLDocument());
+ transformerRegistry.addTransformer(new DataObject2String());
+ transformerRegistry.addTransformer(new DataObject2XMLStreamReader());
+ transformerRegistry.addTransformer(new XMLDocument2String());
+ transformerRegistry.addTransformer(new String2DataObject());
+ transformerRegistry.addTransformer(new XMLDocument2XMLStreamReader());
+ transformerRegistry.addTransformer(new XMLStreamReader2DataObject());
+ transformerRegistry.addTransformer(new XMLStreamReader2XMLDocument());
JavaClassIntrospectorExtensionPoint introspectorExtensionPoint = registry.getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
Modified: 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=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataBindingExtensionPoint.java Wed May 2 11:15:41 2007
@@ -23,15 +23,16 @@
import org.apache.tuscany.interfacedef.DataType;
/**
- * The registry for data bindings
+ * An extension point for data binding extensions.
*/
public interface DataBindingExtensionPoint {
+
/**
* Register a data binding
*
* @param dataBinding
*/
- void register(DataBinding dataBinding);
+ void addDataBinding(DataBinding dataBinding);
/**
* Look up a data binding by id
@@ -47,7 +48,7 @@
* @param id
* @return The unregistered databinding
*/
- DataBinding unregister(String id);
+ DataBinding removeDataBinding(String id);
/**
* Introspect the java class to figure out what DataType supports it
Modified: 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=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultDataBindingExtensionPoint.java Wed May 2 11:15:41 2007
@@ -44,7 +44,7 @@
return bindings.get(id.toLowerCase());
}
- public void register(DataBinding dataBinding) {
+ public void addDataBinding(DataBinding dataBinding) {
bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
String[] aliases = dataBinding.getAliases();
if (aliases != null) {
@@ -54,7 +54,7 @@
}
}
- public DataBinding unregister(String id) {
+ public DataBinding removeDataBinding(String id) {
if (id == null) {
return null;
}
Modified: 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=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DefaultTransformerExtensionPoint.java Wed May 2 11:15:41 2007
@@ -31,18 +31,18 @@
private final DirectedGraph<Object, Transformer> graph = new DirectedGraph<Object, Transformer>();
- public void registerTransformer(String sourceType, String resultType, int weight, Transformer transformer) {
+ public void addTransformer(String sourceType, String resultType, int weight, Transformer transformer) {
graph.addEdge(sourceType, resultType, transformer, weight);
}
- public void registerTransformer(Transformer transformer) {
+ public void addTransformer(Transformer transformer) {
graph.addEdge(transformer.getSourceDataBinding(),
transformer.getTargetDataBinding(),
transformer,
transformer.getWeight());
}
- public boolean unregisterTransformer(String sourceType, String resultType) {
+ public boolean removeTransformer(String sourceType, String resultType) {
return graph.removeEdge(sourceType, resultType);
}
Modified: 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=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/TransformerExtensionPoint.java Wed May 2 11:15:41 2007
@@ -21,9 +21,10 @@
import java.util.List;
/**
- * Registry for data transformers
+ * An extension point for data transformer extensions.
*/
public interface TransformerExtensionPoint {
+
/**
* Register a transformer
*
@@ -32,7 +33,7 @@
* @param weight
* @param transformer
*/
- void registerTransformer(String sourceDataBinding,
+ void addTransformer(String sourceDataBinding,
String targetDataBinding,
int weight,
Transformer transformer);
@@ -42,7 +43,7 @@
*
* @param transformer
*/
- void registerTransformer(Transformer transformer);
+ void addTransformer(Transformer transformer);
/**
* Unregister a transformer
@@ -51,7 +52,7 @@
* @param targetDataBinding
* @return
*/
- boolean unregisterTransformer(String sourceDataBinding, String targetDataBinding);
+ boolean removeTransformer(String sourceDataBinding, String targetDataBinding);
/**
* Get the direct Transformer which can transform data from source type to
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseDataBinding.java?view=auto&rev=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseDataBinding.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseDataBinding.java Wed May 2 11:15:41 2007
@@ -0,0 +1,149 @@
+/*
+ * 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.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import org.apache.tuscany.databinding.DataBinding;
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.ExceptionHandler;
+import org.apache.tuscany.databinding.SimpleTypeMapper;
+import org.apache.tuscany.databinding.WrapperHandler;
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
+
+/**
+ * Base Implementation of DataBinding
+ *
+ * @version $Rev$ $Date$
+ */
+public abstract class BaseDataBinding implements DataBinding {
+
+ protected DataBindingExtensionPoint registry;
+
+ protected Class<?> baseType;
+
+ protected String name;
+ protected String[] aliases;
+
+ /**
+ * Create a databinding with the base java type whose name will be used as
+ * the name of the databinding
+ *
+ * @param baseType The base java class or interface representing the
+ * databinding, for example, org.w3c.dom.Node
+ */
+ protected BaseDataBinding(Class<?> baseType) {
+ this(baseType.getName(), null, baseType);
+ }
+
+ /**
+ * Create a databinding with the name and base java type
+ *
+ * @param name The name of the databinding
+ * @param baseType The base java class or interface representing the
+ * databinding, for example, org.w3c.dom.Node
+ */
+ protected BaseDataBinding(String name, Class<?> baseType) {
+ this(name, null, baseType);
+ }
+
+ /**
+ * Create a databinding with the name and base java type
+ *
+ * @param name The name of the databinding
+ * @param aliases The aliases of the databinding
+ * @param baseType The base java class or interface representing the
+ * databinding, for example, org.w3c.dom.Node
+ */
+ protected BaseDataBinding(String name, String[] aliases, Class<?> baseType) {
+ this.name = name;
+ this.baseType = baseType;
+ this.aliases = aliases;
+ }
+
+ public void setDataBindingRegistry(DataBindingExtensionPoint registry) {
+ this.registry = registry;
+ }
+
+ public void init() {
+ registry.addDataBinding(this);
+ }
+
+ @SuppressWarnings("unchecked")
+ public boolean introspect(DataType type, Annotation[] annotations) {
+ assert type != null;
+ Type physical = type.getPhysical();
+ if (physical instanceof ParameterizedType) {
+ physical = ((ParameterizedType)physical).getRawType();
+ }
+ if (physical instanceof Class) {
+ Class cls = (Class)physical;
+ if (baseType != null && baseType.isAssignableFrom(cls)) {
+ type.setDataBinding(getName());
+ type.setLogical(baseType);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public DataType introspect(Object value) {
+ if (value == null) {
+ return null;
+ } else {
+ DataType<Class> dataType = new DataTypeImpl<Class>(value.getClass(), value.getClass());
+ if (introspect(dataType, null)) {
+ return dataType;
+ } else {
+ return null;
+ }
+ }
+ }
+
+ public final String getName() {
+ return name;
+ }
+
+ /**
+ * @see org.apache.tuscany.databinding.DataBinding#getWrapperHandler()
+ */
+ public WrapperHandler getWrapperHandler() {
+ return null;
+ }
+
+ public ExceptionHandler getExceptionHandler() {
+ return null;
+ }
+
+ public Object copy(Object object) {
+ return object;
+ }
+
+ public SimpleTypeMapper getSimpleTypeMapper() {
+ return new SimpleTypeMapperImpl();
+ }
+
+ public String[] getAliases() {
+ return aliases;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseDataBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseDataBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseTransformer.java?view=auto&rev=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseTransformer.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseTransformer.java Wed May 2 11:15:41 2007
@@ -0,0 +1,62 @@
+/*
+ * 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.impl;
+
+import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
+
+/**
+ * Base Implementation of Transformer which provides the registration to the transformer registry
+ *
+ * @version $Rev$ $Date$
+ */
+public abstract class BaseTransformer<S, T> implements Transformer {
+
+ protected TransformerExtensionPoint registry;
+
+ protected BaseTransformer() {
+ super();
+ }
+
+ public void setTransformerRegistry(TransformerExtensionPoint registry) {
+ this.registry = registry;
+ }
+
+ public void init() {
+ registry.addTransformer(this);
+ }
+
+ protected abstract Class getSourceType();
+
+ protected abstract Class getTargetType();
+
+ public String getSourceDataBinding() {
+ return getSourceType().getName();
+ }
+
+ public String getTargetDataBinding() {
+ return getTargetType().getName();
+ }
+
+ public int getWeight() {
+ // default to 50
+ return 50;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/BaseTransformer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DOMHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DOMHelper.java?view=auto&rev=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DOMHelper.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DOMHelper.java Wed May 2 11:15:41 2007
@@ -0,0 +1,69 @@
+/*
+ * 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.impl;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Helper for DOM
+ */
+public final class DOMHelper {
+ private static final DocumentBuilderFactory FACTORY = DocumentBuilderFactory.newInstance();
+ static {
+ FACTORY.setNamespaceAware(true);
+ }
+
+ private DOMHelper() {
+ }
+
+ public static Document newDocument() throws ParserConfigurationException {
+ return newDocumentBuilder().newDocument();
+ }
+
+ public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+ return FACTORY.newDocumentBuilder();
+ }
+
+ public static QName getQName(Node node) {
+ String ns = node.getNamespaceURI();
+ if (ns == null) {
+ ns = "";
+ }
+ // node.getLocalName() will return null if it is created using DOM Level
+ // 1 method
+ // such as createElement()
+ return new QName(ns, node.getNodeName());
+ }
+
+ public static Element createElement(Document document, QName name) {
+ String prefix = name.getPrefix();
+ String qname =
+ (prefix != null && prefix.length() > 0) ? prefix + ":" + name.getLocalPart() : name
+ .getLocalPart();
+ return document.createElementNS(name.getNamespaceURI(), qname);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DOMHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DOMHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Group2GroupTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Group2GroupTransformer.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Group2GroupTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Group2GroupTransformer.java Wed May 2 11:15:41 2007
@@ -22,14 +22,13 @@
import org.apache.tuscany.databinding.Mediator;
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.extension.TransformerExtension;
import org.apache.tuscany.interfacedef.DataType;
/**
* This is a special transformer to transform the output from one IDL to the
* other one
*/
-public class Group2GroupTransformer extends TransformerExtension<Object, Object> implements
+public class Group2GroupTransformer extends BaseTransformer<Object, Object> implements
PullTransformer<Object, Object> {
protected Mediator mediator;
@@ -59,7 +58,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getSourceType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
protected Class getSourceType() {
@@ -67,7 +66,7 @@
}
/**
- * @see org.apache.tuscany.databinding.extension.TransformerExtension#getTargetType()
+ * @see org.apache.tuscany.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
protected Class getTargetType() {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/GroupDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/GroupDataBinding.java?view=diff&rev=534580&r1=534579&r2=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/GroupDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/GroupDataBinding.java Wed May 2 11:15:41 2007
@@ -23,7 +23,6 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import org.apache.tuscany.databinding.extension.DataBindingExtension;
import org.apache.tuscany.interfacedef.DataType;
/**
@@ -31,7 +30,7 @@
*
* @version $Rev$ $Date$
*/
-public abstract class GroupDataBinding extends DataBindingExtension {
+public abstract class GroupDataBinding extends BaseDataBinding {
public static final String NAME = "databinding:group";
/**
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Java2SimpleTypeTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Java2SimpleTypeTransformer.java?view=auto&rev=534580
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Java2SimpleTypeTransformer.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/Java2SimpleTypeTransformer.java Wed May 2 11:15:41 2007
@@ -0,0 +1,60 @@
+/*
+ * 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.impl;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.databinding.PullTransformer;
+import org.apache.tuscany.databinding.SimpleTypeMapper;
+import org.apache.tuscany.databinding.TransformationContext;
+import org.apache.tuscany.interfacedef.util.XMLType;
+
+/**
+ * Transformer to convert data from a simple java object to a databinding's representation
+ */
+public abstract class Java2SimpleTypeTransformer<T> extends BaseTransformer<Object, T> implements
+ PullTransformer<Object, T> {
+
+ protected SimpleTypeMapper mapper;
+
+ public Java2SimpleTypeTransformer() {
+ this.mapper = new SimpleTypeMapperImpl();
+ }
+
+ public Java2SimpleTypeTransformer(SimpleTypeMapper mapper) {
+ this.mapper = (mapper != null) ? mapper : new SimpleTypeMapperImpl();
+ }
+
+ public T transform(Object source, TransformationContext context) {
+ XMLType xmlType = (XMLType) context.getTargetDataType().getLogical();
+ String text = mapper.toXMLLiteral(xmlType.getTypeName(), source, context);
+ return createElement(xmlType.getElementName(), text, context);
+ }
+
+ public Class getSourceType() {
+ return Object.class;
+ }
+
+ public int getWeight() {
+ return 10000;
+ }
+
+ protected abstract T createElement(QName element, String literal, TransformationContext context);
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org