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/04 03:41:07 UTC
svn commit: r525349 [1/2] - in
/incubator/tuscany/java/sca/modules/databinding: ./
src/main/java/org/apache/tuscany/databinding/
src/main/java/org/apache/tuscany/databinding/impl/
src/main/java/org/apache/tuscany/databinding/javabeans/ src/main/java/or...
Author: jsdelfino
Date: Tue Apr 3 18:41:03 2007
New Revision: 525349
URL: http://svn.apache.org/viewvc?view=rev&rev=525349
Log:
Fixed databinding compile errors. Removed dependencies on the Tuscany and SCA APIs. Moved DataType annotation from tuscany-api to this module.
Added:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java (with props)
Modified:
incubator/tuscany/java/sca/modules/databinding/pom.xml
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/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/impl/MediatorImpl.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformationContextImpl.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/Java2XMLMapperException.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/javabeans/XML2JavaMapperException.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/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/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/XMLGroupDataBinding.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/main/java/org/apache/tuscany/spi/databinding/DataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBindingRegistry.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/ExceptionHandler.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/Mediator.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationContext.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationException.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/WrapperHandler.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/Java2SimpleTypeTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.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/DataBindingTestCase.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/javabeans/DOMNode2JavaBeanTransformerTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtensionTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtensionTestCase.java
Modified: incubator/tuscany/java/sca/modules/databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/pom.xml?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding/pom.xml Tue Apr 3 18:41:03 2007
@@ -18,28 +18,21 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>parent</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.0-alpha1-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-framework</artifactId>
- <packaging>jar</packaging>
+ <artifactId>tuscany-databinding</artifactId>
<name>Apache Tuscany DataBinding Framework</name>
- <description>Apache Tuscany DataBinding Framework</description>
+
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-spi</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-idl</artifactId>
+ <version>1.0-alpha1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -49,15 +42,10 @@
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.0</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</project>
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java?view=auto&rev=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java Tue Apr 3 18:41:03 2007
@@ -0,0 +1,42 @@
+/*
+ * 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 static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * A key/value pair to represent information pertaining to a {@link DataType}
+ */
+@Target(ANNOTATION_TYPE)
+@Retention(RUNTIME)
+public @interface DataContext {
+ /**
+ * @return key for the context entry
+ */
+ String key();
+
+ /**
+ * @return key for the context value
+ */
+ String value();
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java?view=auto&rev=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java Tue Apr 3 18:41:03 2007
@@ -0,0 +1,61 @@
+/*
+ * 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 static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Used to demarcate expected data types for an operation
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface DataType {
+
+ /**
+ * Returns the unique name of the data binding
+ * @return the unique name of the data binding
+ */
+ String name();
+
+ /**
+ * Returns the logical data type
+ * @return the logical data type
+ */
+ Class logicalType() default Object.class;
+
+ /**
+ * Returns the physical data type
+ * @return the physical data type
+ */
+ Class physicalType() default Object.class;
+
+ /**
+ * Returns an array of extensibility elements
+ * @return an array of extensibility elements
+ */
+ DataContext[] context() default {};
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/DataType.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImpl.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DataBindingRegistryImpl.java Tue Apr 3 18:41:03 2007
@@ -26,17 +26,16 @@
import java.util.Set;
import org.apache.tuscany.databinding.javabeans.JavaBeansDataBinding;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
-import org.apache.tuscany.spi.model.DataType;
-import org.osoa.sca.annotations.EagerInit;
/**
* The default implementation of a data binding registry
*
* @version $Rev$ $Date$
*/
-@EagerInit
public class DataBindingRegistryImpl implements DataBindingRegistry {
private final Map<String, DataBinding> bindings = new HashMap<String, DataBinding>();
@@ -115,7 +114,7 @@
return dataType;
}
}
- return new DataType<Class>(JavaBeansDataBinding.NAME, value.getClass(), value.getClass());
+ return new DataTypeImpl<Class>(JavaBeansDataBinding.NAME, value.getClass(), value.getClass());
}
}
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=525349&r1=525348&r2=525349
==============================================================================
--- 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 Tue Apr 3 18:41:03 2007
@@ -19,20 +19,16 @@
package org.apache.tuscany.databinding.impl;
+import org.apache.tuscany.idl.DataType;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
/**
* This is a special transformer to transform the output from one IDL to the
* other one
*/
-@Service(Transformer.class)
public class Group2GroupTransformer extends TransformerExtension<Object, Object> implements
PullTransformer<Object, Object> {
@@ -48,7 +44,6 @@
/**
* @param mediator the mediator to set
*/
- @Reference
public void setMediator(Mediator mediator) {
this.mediator = mediator;
}
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=525349&r1=525348&r2=525349
==============================================================================
--- 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 Tue Apr 3 18:41:03 2007
@@ -23,8 +23,8 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import org.apache.tuscany.idl.DataType;
import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
-import org.apache.tuscany.spi.model.DataType;
/**
* The base class for a special databinding which represents a group of other databindings
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=525349&r1=525348&r2=525349
==============================================================================
--- 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 Tue Apr 3 18:41:03 2007
@@ -21,7 +21,8 @@
import java.util.List;
import java.util.Map;
-import org.osoa.sca.annotations.Reference;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.DataPipe;
import org.apache.tuscany.spi.databinding.Mediator;
@@ -31,20 +32,16 @@
import org.apache.tuscany.spi.databinding.TransformationException;
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.TransformerRegistry;
-import org.apache.tuscany.spi.model.DataType;
-import org.osoa.sca.annotations.Scope;
/**
* Default Mediator implementation
*/
-@Scope("COMPOSITE")
public class MediatorImpl implements Mediator {
private DataBindingRegistry dataBindingRegistry;
private TransformerRegistry transformerRegistry;
- @Reference
public void setTransformerRegistry(TransformerRegistry transformerRegistry) {
this.transformerRegistry = transformerRegistry;
}
@@ -52,7 +49,6 @@
/**
* @param dataBindingRegistry the dataBindingRegistry to set
*/
- @Reference
public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
@@ -107,10 +103,10 @@
Transformer transformer,
Map<Class<?>, Object> metadata) {
DataType sourceType =
- (index == 0) ? sourceDataType : new DataType<Object>(transformer.getSourceDataBinding(),
+ (index == 0) ? sourceDataType : new DataTypeImpl<Object>(transformer.getSourceDataBinding(),
Object.class, null);
DataType targetType =
- (index == size - 1) ? targetDataType : new DataType<Object>(transformer.getTargetDataBinding(),
+ (index == size - 1) ? targetDataType : new DataTypeImpl<Object>(transformer.getTargetDataBinding(),
Object.class, null);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
TransformationContext context =
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformationContextImpl.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformationContextImpl.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformationContextImpl.java Tue Apr 3 18:41:03 2007
@@ -22,8 +22,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.tuscany.idl.DataType;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.DataType;
public class TransformationContextImpl implements TransformationContext {
private DataType sourceDataType;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java Tue Apr 3 18:41:03 2007
@@ -21,9 +21,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.EagerInit;
-
-import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.Transformer;
@@ -32,7 +29,6 @@
/**
* @version $Rev$ $Date$
*/
-@EagerInit
public class TransformerRegistryImpl implements TransformerRegistry {
private DataBindingRegistry dataBindingRegistry;
@@ -79,7 +75,6 @@
/**
* @param dataBindingRegistry the dataBindingRegistry to set
*/
- @Reference
public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
this.dataBindingRegistry = dataBindingRegistry;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformer.java Tue Apr 3 18:41:03 2007
@@ -21,8 +21,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.spi.databinding.Transformer;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -30,7 +28,6 @@
/**
* Transformer to convert data from DOM Node to JavaBean
*/
-@Service(Transformer.class)
public class DOMNode2JavaBeanTransformer extends XML2JavaBeanTransformer<Node> {
@Override
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/Java2XMLMapperException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/Java2XMLMapperException.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/Java2XMLMapperException.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/Java2XMLMapperException.java Tue Apr 3 18:41:03 2007
@@ -21,13 +21,11 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.api.TuscanyRuntimeException;
-
/**
* This exception is used to encapsulate and rethrow exceptions that arise out
* of converting JavaBean objects to XML
*/
-public class Java2XMLMapperException extends TuscanyRuntimeException {
+public class Java2XMLMapperException extends RuntimeException {
private static final long serialVersionUID = 6811924384399578686L;
private QName xmlElementName;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformer.java Tue Apr 3 18:41:03 2007
@@ -21,16 +21,13 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
/**
* Transformer to convert data from a JavaBean object to DOM Node
*/
-@Service(Transformer.class)
public class JavaBean2DOMNodeTransformer extends JavaBean2XMLTransformer<Node> {
public static final String COLON = ":";
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLStreamReader.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLStreamReader.java Tue Apr 3 18:41:03 2007
@@ -25,11 +25,8 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
-@Service(Transformer.class)
public class JavaBean2XMLStreamReader extends TransformerExtension<Object, XMLStreamReader> implements
PullTransformer<Object, XMLStreamReader> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLTransformer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBean2XMLTransformer.java Tue Apr 3 18:41:03 2007
@@ -31,15 +31,12 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
/**
* Transformer to convert data from a JavaBean object to xml
*/
-@Service(Transformer.class)
public abstract class JavaBean2XMLTransformer<T> extends TransformerExtension<Object, T> implements
PullTransformer<Object, T> {
@@ -57,10 +54,13 @@
}
public T transform(Object source, TransformationContext context) {
- QName rootElementName = (QName)context.getTargetDataType().getMetadata("RootElementName");
- if (rootElementName == null) {
- rootElementName = new QName(resolveRootElementName(source.getClass()));
- }
+
+ //FIXME See how/if we still need to get the metadata here
+ //QName rootElementName = (QName)context.getTargetDataType().getMetadata("RootElementName");
+ //if (rootElementName == null) {
+ QName rootElementName = new QName(resolveRootElementName(source.getClass()));
+ //}
+
T root = createElement(rootElementName);
appendChildElements(root,
resolveElementName(source.getClass()),
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBeansDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBeansDataBinding.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBeansDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/JavaBeansDataBinding.java Tue Apr 3 18:41:03 2007
@@ -29,14 +29,11 @@
import java.io.OutputStream;
import java.io.Serializable;
-import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
-import org.osoa.sca.annotations.Service;
/**
* DataBinding for JavaBeans
*/
-@Service(DataBinding.class)
public class JavaBeansDataBinding extends DataBindingExtension {
/**
* Defining a weight to a very high number so that the transformer won't be picked
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaBeanTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaBeanTransformer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaBeanTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaBeanTransformer.java Tue Apr 3 18:41:03 2007
@@ -29,18 +29,15 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.apache.tuscany.spi.model.XMLType;
-import org.osoa.sca.annotations.Service;
/**
* Transformer to convert data from XML to JavaBean
*/
-@Service(Transformer.class)
public abstract class XML2JavaBeanTransformer<T> extends TransformerExtension<T, Object> implements
PullTransformer<T, Object> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaMapperException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaMapperException.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaMapperException.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/javabeans/XML2JavaMapperException.java Tue Apr 3 18:41:03 2007
@@ -21,13 +21,11 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.api.TuscanyRuntimeException;
-
/**
* This exception is used to encapsulate and rethrow exceptions that arise out
* of converting XML Data to Java Objects.
*/
-public class XML2JavaMapperException extends TuscanyRuntimeException {
+public class XML2JavaMapperException extends RuntimeException {
private static final long serialVersionUID = 6596530102591630642L;
private QName xmlElementName;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/BeanUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/BeanUtil.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/BeanUtil.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/BeanUtil.java Tue Apr 3 18:41:03 2007
@@ -33,8 +33,8 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
+import org.apache.tuscany.idl.util.TypeInfo;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
-import org.apache.tuscany.spi.model.TypeInfo;
public final class BeanUtil {
private static final Object[] NULL = (Object[])null;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/DOMWrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/DOMWrapperHandler.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/DOMWrapperHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/DOMWrapperHandler.java Tue Apr 3 18:41:03 2007
@@ -25,11 +25,11 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.tuscany.idl.util.ElementInfo;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
import org.apache.tuscany.spi.databinding.WrapperHandler;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
-import org.apache.tuscany.spi.model.ElementInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2Node.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2Node.java Tue Apr 3 18:41:03 2007
@@ -25,16 +25,13 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
/**
* Push DOM InputSource to Node
*/
-@Service(Transformer.class)
public class InputSource2Node extends TransformerExtension<InputSource, Node> implements
PullTransformer<InputSource, Node> {
private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2SAX.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputSource2SAX.java Tue Apr 3 18:41:03 2007
@@ -21,9 +21,7 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -32,7 +30,6 @@
/**
* Push InputSource to SAX
*/
-@Service(Transformer.class)
public class InputSource2SAX extends TransformerExtension<InputSource, ContentHandler> implements
PushTransformer<InputSource, ContentHandler> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2Node.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2Node.java Tue Apr 3 18:41:03 2007
@@ -27,16 +27,13 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
/**
* Push DOM InputSource to Node
*/
-@Service(Transformer.class)
public class InputStream2Node extends TransformerExtension<InputStream, Node> implements
PullTransformer<InputStream, Node> {
private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2SAX.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/InputStream2SAX.java Tue Apr 3 18:41:03 2007
@@ -23,9 +23,7 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -34,7 +32,6 @@
/**
* Push InputStream to SAX
*/
-@Service(Transformer.class)
public class InputStream2SAX extends TransformerExtension<InputStream, ContentHandler> implements
PushTransformer<InputStream, ContentHandler> {
public void transform(InputStream source, ContentHandler target, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2OutputStream.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2OutputStream.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2OutputStream.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2OutputStream.java Tue Apr 3 18:41:03 2007
@@ -28,15 +28,12 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Push DOM Node to OutputStream
*/
-@Service(Transformer.class)
public class Node2OutputStream extends TransformerExtension<Node, OutputStream> implements
PushTransformer<Node, OutputStream> {
private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2String.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2String.java Tue Apr 3 18:41:03 2007
@@ -24,13 +24,11 @@
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Transform DOM Node to XML String
*/
-@Service(org.apache.tuscany.spi.databinding.Transformer.class)
public class Node2String extends TransformerExtension<Node, String> implements PullTransformer<Node, String> {
private static final Node2Writer TRANSFORMER = new Node2Writer();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2Writer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2Writer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2Writer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2Writer.java Tue Apr 3 18:41:03 2007
@@ -28,15 +28,12 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Push DOM Node to Writer
*/
-@Service(Transformer.class)
public class Node2Writer extends TransformerExtension<Node, Writer> implements PushTransformer<Node, Writer> {
private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2XMLStreamReader.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Node2XMLStreamReader.java Tue Apr 3 18:41:03 2007
@@ -23,15 +23,12 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Transform DOM Node to XML XMLStreamReader
*/
-@Service(Transformer.class)
public class Node2XMLStreamReader extends TransformerExtension<Node, XMLStreamReader> implements
PullTransformer<Node, XMLStreamReader> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2Node.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2Node.java Tue Apr 3 18:41:03 2007
@@ -27,15 +27,12 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Push DOM Reader to Node
*/
-@Service(Transformer.class)
public class Reader2Node extends TransformerExtension<Reader, Node> implements PullTransformer<Reader, Node> {
private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2SAX.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Reader2SAX.java Tue Apr 3 18:41:03 2007
@@ -23,16 +23,13 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
/**
* Transform XML string to SAX
*/
-@Service(Transformer.class)
public class Reader2SAX extends TransformerExtension<Reader, ContentHandler> implements
PushTransformer<Reader, ContentHandler> {
public void transform(Reader source, ContentHandler target, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/SAX2DOMPipe.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/SAX2DOMPipe.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/SAX2DOMPipe.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/SAX2DOMPipe.java Tue Apr 3 18:41:03 2007
@@ -21,13 +21,10 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.tuscany.spi.databinding.DataPipe;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
-@Service(Transformer.class)
public class SAX2DOMPipe extends TransformerExtension<ContentHandler, Node> implements
DataPipe<ContentHandler, Node> {
private SAX2DOM pipe;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Source2ResultTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Source2ResultTransformer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Source2ResultTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Source2ResultTransformer.java Tue Apr 3 18:41:03 2007
@@ -26,12 +26,10 @@
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
/**
* Transform TrAX Source to Result
*/
-@Service(org.apache.tuscany.spi.databinding.Transformer.class)
public class Source2ResultTransformer extends TransformerExtension<Source, Result> implements
PushTransformer<Source, Result> {
private static final TransformerFactory FACTORY = TransformerFactory.newInstance();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StAXDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StAXDataBinding.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StAXDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StAXDataBinding.java Tue Apr 3 18:41:03 2007
@@ -23,9 +23,9 @@
import javax.xml.stream.XMLStreamReader;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
/**
* A DataBinding for the StAX
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StreamDataPipe.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StreamDataPipe.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StreamDataPipe.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/StreamDataPipe.java Tue Apr 3 18:41:03 2007
@@ -24,11 +24,8 @@
import java.io.OutputStream;
import org.apache.tuscany.spi.databinding.DataPipe;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
-@Service(Transformer.class)
public class StreamDataPipe extends TransformerExtension<OutputStream, InputStream> implements
DataPipe<OutputStream, InputStream> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2Node.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2Node.java Tue Apr 3 18:41:03 2007
@@ -25,14 +25,11 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-@Service(Transformer.class)
public class String2Node extends TransformerExtension<String, Node> implements PullTransformer<String, Node> {
public Node transform(String source, TransformationContext context) {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2SAX.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2SAX.java Tue Apr 3 18:41:03 2007
@@ -23,16 +23,13 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
/**
* Transform XML string to SAX
*/
-@Service(Transformer.class)
public class String2SAX extends TransformerExtension<String, ContentHandler> implements
PushTransformer<String, ContentHandler> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java Tue Apr 3 18:41:03 2007
@@ -24,11 +24,8 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
-@Service(Transformer.class)
public class String2XMLStreamReader extends TransformerExtension<String, XMLStreamReader> implements
PullTransformer<String, XMLStreamReader> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Writer2ReaderDataPipe.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Writer2ReaderDataPipe.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Writer2ReaderDataPipe.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/Writer2ReaderDataPipe.java Tue Apr 3 18:41:03 2007
@@ -24,11 +24,8 @@
import java.io.Writer;
import org.apache.tuscany.spi.databinding.DataPipe;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
-@Service(Transformer.class)
public class Writer2ReaderDataPipe extends TransformerExtension<Writer, Reader> implements DataPipe<Writer, Reader> {
private StringWriter writer = new StringWriter();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLGroupDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLGroupDataBinding.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLGroupDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLGroupDataBinding.java Tue Apr 3 18:41:03 2007
@@ -33,7 +33,7 @@
import javax.xml.transform.Source;
import org.apache.tuscany.databinding.impl.GroupDataBinding;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.util.XMLType;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java Tue Apr 3 18:41:03 2007
@@ -23,15 +23,12 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Transform DOM Node to XML XMLStreamReader
*/
-@Service(Transformer.class)
public class XMLStreamReader2Node extends TransformerExtension<XMLStreamReader, Node> implements
PullTransformer<XMLStreamReader, Node> {
private SAX2DOMPipe pipe = new SAX2DOMPipe();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2SAX.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2SAX.java Tue Apr 3 18:41:03 2007
@@ -23,15 +23,12 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
/**
* XMLStreamReader to SAX events
*/
-@Service(Transformer.class)
public class XMLStreamReader2SAX extends TransformerExtension<XMLStreamReader, ContentHandler> implements
PushTransformer<XMLStreamReader, ContentHandler> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java Tue Apr 3 18:41:03 2007
@@ -24,11 +24,8 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
-import org.osoa.sca.annotations.Service;
-@Service(Transformer.class)
public class XMLStreamReader2String extends TransformerExtension<XMLStreamReader, String> implements
PullTransformer<XMLStreamReader, String> {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStringDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStringDataBinding.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStringDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/xml/XMLStringDataBinding.java Tue Apr 3 18:41:03 2007
@@ -21,9 +21,9 @@
import java.lang.annotation.Annotation;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
/**
* A DataBinding for the XML string
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBinding.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBinding.java Tue Apr 3 18:41:03 2007
@@ -21,7 +21,7 @@
import java.lang.annotation.Annotation;
-import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.idl.DataType;
/**
* DataBinding represents a data representation, for example, SDO, JAXB and AXIOM
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBindingRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBindingRegistry.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBindingRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/DataBindingRegistry.java Tue Apr 3 18:41:03 2007
@@ -20,7 +20,7 @@
import java.lang.annotation.Annotation;
-import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.idl.DataType;
/**
* The registry for data bindings
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/ExceptionHandler.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/ExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/ExceptionHandler.java Tue Apr 3 18:41:03 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.spi.databinding;
-import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.idl.DataType;
/**
* ExceptionHandler provides databinding-specific logic for exception handling
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/Mediator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/Mediator.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/Mediator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/Mediator.java Tue Apr 3 18:41:03 2007
@@ -20,7 +20,7 @@
import java.util.Map;
-import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.idl.DataType;
/**
* This interface will be used as a Tuscany system service to perform data mediations
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationContext.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationContext.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationContext.java Tue Apr 3 18:41:03 2007
@@ -20,7 +20,7 @@
import java.util.Map;
-import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.idl.DataType;
/**
* Context for data transformation
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationException.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationException.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/TransformationException.java Tue Apr 3 18:41:03 2007
@@ -18,12 +18,11 @@
*/
package org.apache.tuscany.spi.databinding;
-import org.apache.tuscany.api.TuscanyRuntimeException;
/**
* Reports problems during data transformation
*/
-public class TransformationException extends TuscanyRuntimeException {
+public class TransformationException extends RuntimeException {
private static final long serialVersionUID = 7662385613693006428L;
private String sourceDataBinding;
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/WrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/WrapperHandler.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/WrapperHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/WrapperHandler.java Tue Apr 3 18:41:03 2007
@@ -21,7 +21,7 @@
import java.util.List;
-import org.apache.tuscany.spi.model.ElementInfo;
+import org.apache.tuscany.idl.util.ElementInfo;
/**
* A contract for transformers to deal with wrapping/unwrapping for WSDL wrapper style operations
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtension.java Tue Apr 3 18:41:03 2007
@@ -22,26 +22,19 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
import org.apache.tuscany.spi.databinding.WrapperHandler;
-import org.apache.tuscany.spi.model.DataType;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
/**
* Base Implementation of DataBinding
*
* @version $Rev$ $Date$
*/
-@Service(DataBinding.class)
-@Scope("COMPOSITE")
-@EagerInit
public abstract class DataBindingExtension implements DataBinding {
protected DataBindingRegistry registry;
@@ -87,12 +80,10 @@
this.aliases = aliases;
}
- @Reference
public void setDataBindingRegistry(DataBindingRegistry registry) {
this.registry = registry;
}
- @Init
public void init() {
registry.register(this);
}
@@ -115,10 +106,10 @@
return false;
}
- protected static org.apache.tuscany.api.annotation.DataType getDataTypeAnnotation(Annotation[] annotations) {
+ protected static org.apache.tuscany.databinding.DataType getDataTypeAnnotation(Annotation[] annotations) {
for (Annotation a : annotations) {
- if (a.annotationType() == org.apache.tuscany.api.annotation.DataType.class) {
- return (org.apache.tuscany.api.annotation.DataType) a;
+ if (a.annotationType() == org.apache.tuscany.databinding.DataType.class) {
+ return (org.apache.tuscany.databinding.DataType) a;
}
}
return null;
@@ -128,7 +119,7 @@
if (value == null) {
return null;
} else {
- DataType<Class> dataType = new DataType<Class>(value.getClass(), value.getClass());
+ DataType<Class> dataType = new DataTypeImpl<Class>(value.getClass(), value.getClass());
if (introspect(dataType, null)) {
return dataType;
} else {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/Java2SimpleTypeTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/Java2SimpleTypeTransformer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/Java2SimpleTypeTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/Java2SimpleTypeTransformer.java Tue Apr 3 18:41:03 2007
@@ -20,10 +20,10 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.XMLType;
/**
* Transformer to convert data from a simple java object to a databinding's representation
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java Tue Apr 3 18:41:03 2007
@@ -18,10 +18,10 @@
*/
package org.apache.tuscany.spi.databinding.extension;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.XMLType;
/**
* Transformer to convert data from a databinding's representation of simple
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java Tue Apr 3 18:41:03 2007
@@ -30,9 +30,9 @@
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.util.TypeInfo;
import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.TypeInfo;
public class SimpleTypeMapperExtension extends XSDDataTypeConverter implements SimpleTypeMapper {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/spi/databinding/extension/TransformerExtension.java Tue Apr 3 18:41:03 2007
@@ -20,20 +20,12 @@
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.TransformerRegistry;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
/**
* Base Implementation of Transformer which provides the registration to the transformer registry
*
* @version $Rev$ $Date$
*/
-@Service(Transformer.class)
-@Scope("COMPOSITE")
-@EagerInit
public abstract class TransformerExtension<S, T> implements Transformer {
protected TransformerRegistry registry;
@@ -42,12 +34,10 @@
super();
}
- @Reference
public void setTransformerRegistry(TransformerRegistry registry) {
this.registry = registry;
}
- @Init
public void init() {
registry.registerTransformer(this);
}
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=525349&r1=525348&r2=525349
==============================================================================
--- 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 Tue Apr 3 18:41:03 2007
@@ -28,9 +28,10 @@
import junit.framework.TestCase;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
-import org.apache.tuscany.spi.model.DataType;
import org.easymock.EasyMock;
import org.xml.sax.ContentHandler;
@@ -53,7 +54,7 @@
DataBinding db1 = createMock(DataBinding.class);
expect(db1.getAliases()).andReturn(new String[] {"db1"}).anyTimes();
expect(db1.getName()).andReturn(ContentHandler.class.getName()).anyTimes();
- DataType<Class> dataType1 = new DataType<Class>(ContentHandler.class, ContentHandler.class);
+ DataType<Class> dataType1 = new DataTypeImpl<Class>(ContentHandler.class, ContentHandler.class);
expect(db1.introspect(dataType1, null)).andReturn(true);
expect(db1.introspect(EasyMock.not(EasyMock.same(dataType1)), (Annotation[])EasyMock.isNull()))
.andReturn(false).anyTimes();
@@ -64,7 +65,7 @@
DataBinding db2 = createMock(DataBinding.class);
expect(db2.getAliases()).andReturn(new String[] {"db2"}).anyTimes();
expect(db2.getName()).andReturn(XMLStreamReader.class.getName()).anyTimes();
- DataType<Class> dataType2 = new DataType<Class>(XMLStreamReader.class, XMLStreamReader.class);
+ DataType<Class> dataType2 = new DataTypeImpl<Class>(XMLStreamReader.class, XMLStreamReader.class);
expect(db2.introspect(dataType2, null)).andReturn(true);
expect(db2.introspect(EasyMock.not(EasyMock.same(dataType2)), (Annotation[])EasyMock.isNull()))
.andReturn(false).anyTimes();
@@ -81,7 +82,7 @@
DataBinding db5 = registry.getDataBinding("db1");
assertSame(db1, db5);
- DataType dt = new DataType(ContentHandler.class, null);
+ DataType dt = new DataTypeImpl<Class>(ContentHandler.class, null);
registry.introspectType(dt, null);
assertEquals(dataType1.getLogical(), ContentHandler.class);
assertTrue(dt.getDataBinding().equalsIgnoreCase("java.lang.Object"));
@@ -90,7 +91,7 @@
DataBinding db4 = registry.getDataBinding(name);
assertNull(db4);
- dt = new DataType(null, String.class, null);
+ dt = new DataTypeImpl<Class>(null, String.class, null);
registry.introspectType(dt, null);
assertEquals("java.lang.Object", dt.getDataBinding());
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/DataBindingTestCase.java Tue Apr 3 18:41:03 2007
@@ -23,23 +23,21 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.api.annotation.DataType;
-
public class DataBindingTestCase extends TestCase {
@SuppressWarnings("unused")
public void testDataType() throws Exception {
Class<Test> testClass = Test.class;
- DataType d = testClass.getAnnotation(DataType.class);
+ org.apache.tuscany.databinding.DataType d = testClass.getAnnotation(org.apache.tuscany.databinding.DataType.class);
Assert.assertEquals(d.name(), "sdo");
Method method = testClass.getMethod("test", new Class[] {Object.class});
- DataType d2 = method.getAnnotation(DataType.class);
+ org.apache.tuscany.databinding.DataType d2 = method.getAnnotation(org.apache.tuscany.databinding.DataType.class);
Assert.assertEquals(d2.name(), "jaxb");
}
- @DataType(name = "sdo")
+ @org.apache.tuscany.databinding.DataType(name = "sdo")
private static interface Test {
- @DataType(name = "jaxb")
+ @org.apache.tuscany.databinding.DataType(name = "jaxb")
Object test(Object object);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org