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 04:54:00 UTC
svn commit: r525367 - in /incubator/tuscany/java/sca/modules: ./
databinding-jaxb/
databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/
databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/
databinding-sdo-axiom/ databindin...
Author: jsdelfino
Date: Tue Apr 3 19:53:57 2007
New Revision: 525367
URL: http://svn.apache.org/viewvc?view=rev&rev=525367
Log:
Started to fix compile errors in the databinding-sdo, databinding-jaxb and databinding-sdo-axiom modules.
Added:
incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/FaultException.java (with props)
Modified:
incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml
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/JAXBContextHelper.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/JAXBExceptionHandler.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessor.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/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml
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/DataObjectSerializer.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/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/MockTransformationContext.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/SDOTransformerTestCaseBase.java
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo/pom.xml
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/DataObjectLoader.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.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/SDOExceptionHandler.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.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/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
incubator/tuscany/java/sca/modules/pom.xml
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml Tue Apr 3 19:53:57 2007
@@ -18,65 +18,42 @@
* 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>
- <artifactId>databinding-jaxb</artifactId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
<name>Apache Tuscany Data Binding for JAXB</name>
- <description>Tuscany JAXB Data Binding</description>
-
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>https://maven-repository.dev.java.net/repository</url>
- <layout>legacy</layout>
- </pluginRepository>
- </pluginRepositories>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-framework</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>1.0-alpha1-incubating-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.0</version>
- <scope>compile</scope>
</dependency>
+
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<!-- Set to 2.1 to make jaxws-maven-plugin happy -->
<version>2.1</version>
- <scope>compile</scope>
</dependency>
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.0.5</version>
<scope>runtime</scope>
- <!-- Relacing stax 1.0 with stax 1.0.1 -->
+ <!-- Replacing stax 1.0 with stax 1.0.1 -->
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
@@ -84,21 +61,33 @@
</exclusion>
</exclusions>
</dependency>
+ </dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>java.net</id>
+ <name>java.net Maven 1.x Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
- </dependencies>
+ <pluginRepositories>
+ <pluginRepository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>java.net</id>
+ <name>java.net Maven 1.x Repository</name>
+ <url>https://maven-repository.dev.java.net/repository</url>
+ <layout>legacy</layout>
+ </pluginRepository>
+ </pluginRepositories>
<build>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 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.Document;
import org.w3c.dom.Node;
-@Service(Transformer.class)
public class JAXB2Node extends TransformerExtension<Object, Node> implements PullTransformer<Object, Node> {
public Node transform(Object source, TransformationContext tContext) {
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java Tue Apr 3 19:53:57 2007
@@ -31,11 +31,11 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.XMLType;
public class JAXBContextHelper {
// TODO: Do we need to set them for source and target?
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -27,11 +27,11 @@
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
import org.w3c.dom.Document;
/**
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandler.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandler.java Tue Apr 3 19:53:57 2007
@@ -25,9 +25,10 @@
import javax.xml.namespace.QName;
import javax.xml.ws.WebFault;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
/**
* JAXB implementation of ExceptionHandler
@@ -96,7 +97,7 @@
// only part in
// the fault message references
DataType<XMLType> faultType =
- new DataType<XMLType>(JAXBDataBinding.NAME, faultBeanClass, new XMLType(element, null));
+ new DataTypeImpl<XMLType>(JAXBDataBinding.NAME, faultBeanClass, new XMLType(element, null));
// faultType.setMetadata(ElementInfo.class.getName(), new
// ElementInfo(element, null));
return faultType;
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java Tue Apr 3 19:53:57 2007
@@ -29,10 +29,10 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
+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.model.ElementInfo;
/**
* JAXB WrapperHandler implementation
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessor.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessor.java Tue Apr 3 19:53:57 2007
@@ -29,12 +29,9 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
-import org.apache.tuscany.spi.idl.InvalidServiceContractException;
-import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorExtension;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
-import org.apache.tuscany.spi.model.ElementInfo;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.WrapperInfo;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.util.ElementInfo;
+import org.apache.tuscany.idl.util.WrapperInfo;
/**
* The databinding annotation processor for java interfaces
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -24,12 +24,9 @@
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;
-@Service(Transformer.class)
public class Node2JAXB extends TransformerExtension<Node, Object> implements PullTransformer<Node, Object> {
public Node2JAXB() {
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -27,11 +27,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 Reader2JAXB extends TransformerExtension<Reader, Object> implements
PullTransformer<Reader, Object> {
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 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 XMLStreamReader2JAXB extends TransformerExtension<XMLStreamReader, Object> implements
PullTransformer<XMLStreamReader, Object> {
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java Tue Apr 3 19:53:57 2007
@@ -26,8 +26,9 @@
import junit.framework.TestCase;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import com.example.ipo.jaxb.ObjectFactory;
import com.example.ipo.jaxb.PurchaseOrderType;
@@ -53,24 +54,24 @@
* {@link org.apache.tuscany.databinding.jaxb.JAXBDataBinding#introspect(java.lang.Class, Annotation)}.
*/
public final void testIntrospect() {
- DataType dataType = new DataType(JAXBElement.class, null);
+ DataType dataType = new DataTypeImpl<Class>(JAXBElement.class, null);
boolean yes = binding.introspect(dataType, null);
assertTrue(yes);
assertTrue(dataType.getDataBinding().equals(binding.getName()));
assertTrue(dataType.getPhysical() == JAXBElement.class && dataType.getLogical() == XMLType.UNKNOWN);
- dataType = new DataType(MockJAXBElement.class, null);
+ dataType = new DataTypeImpl<Class>(MockJAXBElement.class, null);
yes = binding.introspect(dataType, null);
assertTrue(yes);
assertEquals(MockJAXBElement.class, dataType.getPhysical());
assertEquals(new QName("http://www.example.com/IPO", "PurchaseOrderType"), ((XMLType)dataType.getLogical())
.getTypeName());
- dataType = new DataType(USAddress.class, null);
+ dataType = new DataTypeImpl<Class>(USAddress.class, null);
yes = binding.introspect(dataType, null);
assertTrue(yes);
assertEquals(USAddress.class, dataType.getPhysical());
assertEquals(new QName("http://www.example.com/IPO", "USAddress"), ((XMLType)dataType.getLogical())
.getTypeName());
- dataType = new DataType(USState.class, null);
+ dataType = new DataTypeImpl<Class>(USState.class, null);
yes = binding.introspect(dataType, null);
assertTrue(yes);
assertTrue(dataType.getDataBinding().equals(binding.getName()));
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java Tue Apr 3 19:53:57 2007
@@ -25,8 +25,9 @@
import org.apache.tuscany.databinding.jaxb.fault.InvalidSymbolFault;
import org.apache.tuscany.databinding.jaxb.fault.InvalidSymbolFault_Exception;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
/**
* Test case for JAXBExceptionHandler
@@ -44,7 +45,7 @@
}
public void testGetFaultType() {
- DataType exType = new DataType<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
+ DataType exType = new DataTypeImpl<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
DataType<?> dataType = handler.getFaultType(exType);
assertEquals(InvalidSymbolFault.class, dataType.getPhysical());
assertEquals(ELEMENT, ((XMLType) dataType.getLogical()).getElementName());
@@ -52,12 +53,12 @@
}
public void testCreate() {
- DataType execType = new DataType<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
+ DataType execType = new DataTypeImpl<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
DataType<?> faultType = handler.getFaultType(execType);
InvalidSymbolFault fault = new InvalidSymbolFault();
fault.setMessage("ABC");
fault.setSymbol("IBM0");
- DataType<DataType> exType = new DataType<DataType>(InvalidSymbolFault_Exception.class, faultType);
+ DataType<DataType> exType = new DataTypeImpl<DataType>(InvalidSymbolFault_Exception.class, faultType);
Exception ex = handler.createException(exType, "Invalid symbol", fault, null);
assertTrue(ex instanceof InvalidSymbolFault_Exception);
InvalidSymbolFault_Exception exception = (InvalidSymbolFault_Exception)ex;
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java Tue Apr 3 19:53:57 2007
@@ -29,9 +29,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
import org.w3c.dom.Node;
import com.example.ipo.jaxb.ObjectFactory;
@@ -77,7 +78,7 @@
public void testTransform() throws Exception {
Reader2JAXB t0 = new Reader2JAXB();
- DataType targetDataType = new DataType<Class>(Object.class, null);
+ DataType targetDataType = new DataTypeImpl<Class>(Object.class, null);
targetDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
TransformationContext tContext = createMock(TransformationContext.class);
@@ -86,7 +87,7 @@
Object object1 = t0.transform(new StringReader(IPO_XML), tContext);
- DataType sourceDataType = new DataType<Class>(Object.class, null);
+ DataType sourceDataType = new DataTypeImpl<Class>(Object.class, null);
sourceDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
TransformationContext tContext1 = createMock(TransformationContext.class);
@@ -108,7 +109,7 @@
Reader2JAXB t0 = new Reader2JAXB();
QName root = new QName("http://www.example.com/IPO", "purchaseOrder");
- DataType targetDataType = new DataType<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
+ DataType targetDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
// targetDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
TransformationContext tContext = createMock(TransformationContext.class);
@@ -117,7 +118,7 @@
Object object1 = t0.transform(new StringReader(IPO_XML), tContext);
- DataType sourceDataType = new DataType<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
+ DataType sourceDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
// sourceDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
TransformationContext tContext1 = createMock(TransformationContext.class);
@@ -137,7 +138,7 @@
public void testTransform3() throws Exception {
- DataType sourceDataType = new DataType<Class>(PurchaseOrderType.class, null);
+ DataType sourceDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
sourceDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
TransformationContext tContext1 = createMock(TransformationContext.class);
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml Tue Apr 3 19:53:57 2007
@@ -18,22 +18,27 @@
* 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>
- <artifactId>databinding-sdo-axiom</artifactId>
+ <artifactId>tuscany-databinding-sdo-axiom</artifactId>
<name>Apache Tuscany Data Binding for SDO</name>
- <description>Data Binding based on SDO.</description>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-framework</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>1.0-alpha1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.0-alpha1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -56,22 +61,10 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.1</version>
<scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
</dependency>
</dependencies>
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -25,13 +25,11 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.tuscany.databinding.sdo.SDOContextHelper;
+import org.apache.tuscany.idl.DataType;
+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.TransformerExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
-import org.osoa.sca.annotations.Service;
import commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
@@ -41,7 +39,6 @@
*
* @version $Rev$ $Date$
*/
-@Service(Transformer.class)
public class DataObject2OMElement extends TransformerExtension<DataObject, OMElement> implements
PullTransformer<DataObject, OMElement> {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObjectSerializer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObjectSerializer.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObjectSerializer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObjectSerializer.java Tue Apr 3 19:53:57 2007
@@ -11,11 +11,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.tuscany.idl.DataType;
import org.apache.tuscany.sdo.impl.AttributeImpl;
import org.apache.tuscany.sdo.impl.ReferenceImpl;
import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.DataType;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EReference;
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -25,9 +25,7 @@
import org.apache.tuscany.databinding.sdo.SDOContextHelper;
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.osoa.sca.annotations.Service;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
@@ -36,7 +34,6 @@
* SDO XMLDocument --> AXIOM OMElement transformer
* @version $Rev$ $Date$
*/
-@Service(Transformer.class)
public class XMLDocument2OMElement extends TransformerExtension<XMLDocument, OMElement> implements
PullTransformer<XMLDocument, OMElement> {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElementTestCase.java Tue Apr 3 19:53:57 2007
@@ -7,8 +7,9 @@
import junit.framework.Assert;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import commonj.sdo.DataObject;
@@ -19,12 +20,12 @@
@Override
protected DataType<?> getSourceDataType() {
- return new DataType<XMLType>(DataObject.class.getName(), DataObject.class, new XMLType(ORDER_QNAME, null));
+ return new DataTypeImpl<XMLType>(DataObject.class.getName(), DataObject.class, new XMLType(ORDER_QNAME, null));
}
@Override
protected DataType<?> getTargetDataType() {
- return new DataType<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
+ return new DataTypeImpl<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
}
public final void testTransform() throws XMLStreamException {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/MockTransformationContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/MockTransformationContext.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/MockTransformationContext.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/MockTransformationContext.java Tue Apr 3 19:53:57 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 MockTransformationContext implements TransformationContext {
private DataType sourceDataType;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/SDOTransformerTestCaseBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/SDOTransformerTestCaseBase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/SDOTransformerTestCaseBase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/SDOTransformerTestCaseBase.java Tue Apr 3 19:53:57 2007
@@ -23,8 +23,8 @@
import junit.framework.TestCase;
+import org.apache.tuscany.idl.DataType;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.DataType;
import com.example.ipo.sdo.PurchaseOrderType;
import com.example.ipo.sdo.SdoFactory;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/databinding/sdo2om/XMLDocument2OMElementTestCase.java Tue Apr 3 19:53:57 2007
@@ -7,8 +7,9 @@
import junit.framework.Assert;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import commonj.sdo.helper.XMLDocument;
@@ -19,12 +20,12 @@
@Override
protected DataType<?> getSourceDataType() {
- return new DataType<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
+ return new DataTypeImpl<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
}
@Override
protected DataType<?> getTargetDataType() {
- return new DataType<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
+ return new DataTypeImpl<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
}
public final void testTransform() throws XMLStreamException {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/pom.xml?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/pom.xml Tue Apr 3 19:53:57 2007
@@ -18,40 +18,28 @@
* 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>
- <artifactId>databinding-sdo</artifactId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
<name>Apache Tuscany Data Binding for SDO</name>
- <description>Data Binding based on SDO.</description>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-framework</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>1.0-alpha1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </dependency>
</dependencies>
<build>
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 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 commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
-@Service(Transformer.class)
public class DataObject2String extends TransformerExtension<DataObject, String> implements
PullTransformer<DataObject, String> {
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 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 commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
-@Service(Transformer.class)
public class DataObject2XMLStreamReader extends TransformerExtension<DataObject, XMLStreamReader> implements
PullTransformer<DataObject, XMLStreamReader> {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java Tue Apr 3 19:53:57 2007
@@ -24,14 +24,6 @@
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.LoaderExtension;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.ModelObject;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
import commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
@@ -40,13 +32,12 @@
/**
* A SDO model-based Loader to load DataObject from the XML stream
*/
-@EagerInit
public class DataObjectLoader extends LoaderExtension<ModelDataObject> {
private QName elementName;
- public DataObjectLoader(@Reference LoaderRegistry registry,
- @Property(name = "namespace", required = true) String namespace,
- @Property(name = "name", required = true) String name) {
+ public DataObjectLoader(LoaderRegistry registry,
+ String namespace,
+ String name) {
super(registry);
this.elementName = new QName(namespace, name);
}
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java Tue Apr 3 19:53:57 2007
@@ -18,12 +18,11 @@
*/
package org.apache.tuscany.databinding.sdo;
-import org.apache.tuscany.spi.CoreRuntimeException;
/**
* @version $Rev$ $Date$
*/
-public class DuplicateHelperContextException extends CoreRuntimeException {
+public class DuplicateHelperContextException extends RuntimeException {
private static final long serialVersionUID = -5229624905543066038L;
/**
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java Tue Apr 3 19:53:57 2007
@@ -21,8 +21,6 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.model.ModelObject;
-
import commonj.sdo.helper.HelperContext;
/**
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java Tue Apr 3 19:53:57 2007
@@ -32,14 +32,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.LoaderExtension;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.loader.LoaderUtil;
-import org.apache.tuscany.spi.model.ModelObject;
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Reference;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XSDHelper;
@@ -53,8 +45,7 @@
public class ImportSDOLoader extends LoaderExtension {
private HelperContextRegistry helperContextRegistry;
- @Constructor({"registry", "helperContextRegistry"})
- public ImportSDOLoader(@Reference LoaderRegistry registry, @Reference HelperContextRegistry helperContextRegistry) {
+ public ImportSDOLoader(LoaderRegistry registry, HelperContextRegistry helperContextRegistry) {
super(registry);
this.helperContextRegistry = helperContextRegistry;
}
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java Tue Apr 3 19:53:57 2007
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.databinding.sdo;
-import org.apache.tuscany.spi.model.ModelObject;
-
import commonj.sdo.DataObject;
/**
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java Tue Apr 3 19:53:57 2007
@@ -19,17 +19,14 @@
package org.apache.tuscany.databinding.sdo;
+import java.awt.Component;
+
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.CompositeComponentType;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.ModelObject;
-import org.apache.tuscany.spi.model.XMLType;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.impl.HelperProvider;
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -23,12 +23,12 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.util.XMLType;
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.databinding.extension.DataBindingExtension;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java Tue Apr 3 19:53:57 2007
@@ -25,9 +25,10 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
import commonj.sdo.Type;
import commonj.sdo.helper.HelperContext;
@@ -115,7 +116,7 @@
return null;
}
DataType<XMLType> faultType =
- new DataType<XMLType>(SDODataBinding.NAME, faultBeanClass, new XMLType(faultElement, null));
+ new DataTypeImpl<XMLType>(SDODataBinding.NAME, faultBeanClass, new XMLType(faultElement, null));
return faultType;
}
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java Tue Apr 3 19:53:57 2007
@@ -19,9 +19,9 @@
package org.apache.tuscany.databinding.sdo;
-import org.apache.tuscany.spi.component.AbstractSCAObject;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.model.Scope;
+import java.awt.Component;
+
+import sun.reflect.generics.scope.Scope;
import commonj.sdo.helper.HelperContext;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java Tue Apr 3 19:53:57 2007
@@ -25,9 +25,9 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.idl.util.ElementInfo;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.WrapperHandler;
-import org.apache.tuscany.spi.model.ElementInfo;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -21,15 +21,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 commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
-@Service(Transformer.class)
public class String2DataObject extends TransformerExtension<String, DataObject> implements
PullTransformer<String, DataObject> {
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 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 commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
-@Service(Transformer.class)
public class XMLDocument2String extends TransformerExtension<XMLDocument, String> implements
PullTransformer<XMLDocument, String> {
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -26,14 +26,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.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
-@Service(Transformer.class)
public class XMLDocument2XMLStreamReader extends TransformerExtension<XMLDocument, XMLStreamReader> implements
PullTransformer<XMLDocument, XMLStreamReader> {
/**
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 2007
@@ -26,14 +26,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.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
-@Service(Transformer.class)
public class XMLStreamReader2DataObject extends TransformerExtension<XMLStreamReader, DataObject> implements
PullTransformer<XMLStreamReader, DataObject> {
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=525367&r1=525366&r2=525367
==============================================================================
--- 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 Tue Apr 3 19:53:57 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.TransformerExtension;
-import org.osoa.sca.annotations.Service;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
-@Service(Transformer.class)
public class XMLStreamReader2XMLDocument extends TransformerExtension<XMLStreamReader, XMLDocument> implements
PullTransformer<XMLStreamReader, XMLDocument> {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java Tue Apr 3 19:53:57 2007
@@ -21,8 +21,9 @@
import junit.framework.Assert;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import com.example.ipo.sdo.PurchaseOrderType;
import commonj.sdo.DataObject;
@@ -33,12 +34,12 @@
public class DataObject2StringTestCase extends SDOTransformerTestCaseBase {
@Override
protected DataType<?> getSourceDataType() {
- return new DataType<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
+ return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
}
@Override
protected DataType<?> getTargetDataType() {
- return new DataType<Class<String>>(String.class, String.class);
+ return new DataTypeImpl<Class<String>>(String.class, String.class);
}
public final void testTransform() {
@@ -55,7 +56,7 @@
"<foo xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
+ "xmlns:ipo=\"http://www.example.com/IPO\" xsi:type=\"ipo:USAddress\"/>";
DataObject dataObject = new String2DataObject().transform(xml, reversedContext);
- context.setSourceDataType(new DataType<XMLType>(DataObject.class.getName(), DataObject.class, null));
+ context.setSourceDataType(new DataTypeImpl<XMLType>(DataObject.class.getName(), DataObject.class, null));
xml = new DataObject2String().transform(dataObject, context);
Assert.assertTrue(xml.contains("xsi:type=\"ipo:USAddress\""));
}
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java Tue Apr 3 19:53:57 2007
@@ -19,13 +19,13 @@
package org.apache.tuscany.databinding.sdo;
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import com.example.ipo.sdo.PurchaseOrderType;
@@ -36,12 +36,12 @@
@Override
protected DataType<?> getSourceDataType() {
- return new DataType<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
+ return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
}
@Override
protected DataType<?> getTargetDataType() {
- return new DataType<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
+ return new DataTypeImpl<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
}
public final void testTransform() throws XMLStreamException {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java Tue Apr 3 19:53:57 2007
@@ -29,7 +29,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.easymock.EasyMock;
import commonj.sdo.helper.XSDHelper;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java Tue Apr 3 19:53:57 2007
@@ -30,8 +30,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.loader.LoaderException;
import org.easymock.EasyMock;
import com.example.ipo.sdo.SdoFactory;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java Tue Apr 3 19:53:57 2007
@@ -23,8 +23,9 @@
import junit.framework.TestCase;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import com.example.ipo.sdo.PurchaseOrderType;
import com.example.ipo.sdo.SdoFactory;
@@ -53,18 +54,18 @@
}
public final void testIntrospect() {
- DataType dataType = new DataType(DataObject.class, null);
+ DataType dataType = new DataTypeImpl<Class>(DataObject.class, null);
boolean yes = binding.introspect(dataType, null);
assertTrue(yes);
assertTrue(dataType.getDataBinding().equals(binding.getName()));
assertTrue(dataType.getPhysical() == DataObject.class && dataType.getLogical() == XMLType.UNKNOWN);
- dataType = new DataType(PurchaseOrderType.class, null);
+ dataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
yes = binding.introspect(dataType, null);
assertTrue(yes);
assertEquals(PurchaseOrderType.class, dataType.getPhysical());
assertEquals(new QName("http://www.example.com/IPO", "PurchaseOrderType"), ((XMLType)dataType.getLogical())
.getTypeName());
- dataType = new DataType(USAddress.class, null);
+ dataType = new DataTypeImpl<Class>(USAddress.class, null);
yes = binding.introspect(dataType, null);
assertTrue(yes);
assertEquals(USAddress.class, dataType.getPhysical());
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java Tue Apr 3 19:53:57 2007
@@ -19,10 +19,11 @@
package org.apache.tuscany.databinding.sdo;
-import junit.framework.TestCase;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import junit.framework.TestCase;
import com.example.stock.sdo.InvalidSymbolFault;
import com.example.stock.sdo.StockFactory;
@@ -48,7 +49,7 @@
}
public void testGetFaultType() {
- DataType execType = new DataType<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
+ DataType execType = new DataTypeImpl<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
DataType<?> dataType = handler.getFaultType(execType);
assertEquals(InvalidSymbolFault.class, dataType.getPhysical());
assertEquals(InvalidSymbolFault_Exception.FAULT_ELEMENT, ((XMLType) dataType.getLogical()).getElementName());
@@ -56,12 +57,12 @@
}
public void testCreate() {
- DataType execType = new DataType<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
+ DataType execType = new DataTypeImpl<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
DataType<?> faultType = handler.getFaultType(execType);
InvalidSymbolFault fault = StockFactory.INSTANCE.createInvalidSymbolFault();
fault.setMessage("ABC");
fault.setSymbol("IBM0");
- DataType<DataType> exType = new DataType<DataType>(InvalidSymbolFault_Exception.class, faultType);
+ DataType<DataType> exType = new DataTypeImpl<DataType>(InvalidSymbolFault_Exception.class, faultType);
Exception ex = handler.createException(exType, "Invalid symbol", fault, null);
assertTrue(ex instanceof InvalidSymbolFault_Exception);
InvalidSymbolFault_Exception exception = (InvalidSymbolFault_Exception)ex;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java Tue Apr 3 19:53:57 2007
@@ -24,8 +24,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.databinding.impl.TransformationContextImpl;
+import org.apache.tuscany.idl.DataType;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.DataType;
import com.example.ipo.sdo.PurchaseOrderType;
import com.example.ipo.sdo.SdoFactory;
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java Tue Apr 3 19:53:57 2007
@@ -19,14 +19,14 @@
package org.apache.tuscany.databinding.sdo;
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import junit.framework.Assert;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.XMLType;
import com.example.ipo.sdo.PurchaseOrderType;
import commonj.sdo.helper.XMLDocument;
@@ -38,12 +38,12 @@
@Override
protected DataType<?> getSourceDataType() {
- return new DataType<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
+ return new DataTypeImpl<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
}
@Override
protected DataType<?> getTargetDataType() {
- return new DataType<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
+ return new DataTypeImpl<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
}
public final void testTransform() throws XMLStreamException {
Added: incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/FaultException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/FaultException.java?view=auto&rev=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/FaultException.java (added)
+++ incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/FaultException.java Tue Apr 3 19:53:57 2007
@@ -0,0 +1,82 @@
+/*
+ * 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.idl.util;
+
+import javax.xml.namespace.QName;
+
+/**
+ * The generic java exception to wrap service faults
+ *
+ * @version $Rev$ $Date$
+ */
+public class FaultException extends Exception {
+ private static final long serialVersionUID = -8002583655240625792L;
+ private Object faultInfo;
+ private QName logical;
+
+ /**
+ * @param message
+ * @param faultInfo
+ */
+ public FaultException(String message, Object faultInfo) {
+ super(message);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ * @param message
+ * @param faultInfo
+ * @param cause
+ */
+ public FaultException(String message, Object faultInfo, Throwable cause) {
+ super(message, cause);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ * @return the faultInfo
+ */
+ public Object getFaultInfo() {
+ return faultInfo;
+ }
+
+ public QName getLogical() {
+ return logical;
+ }
+
+ public void setLogical(QName logical) {
+ this.logical = logical;
+ }
+
+ public boolean isMatchingType(Object type) {
+ if (logical == null) {
+ return false;
+ }
+
+ if ((type instanceof QName) && logical.equals(type)) {
+ return true;
+ }
+ if (type instanceof XMLType && logical.equals(((XMLType)type).getElementName())) {
+ return true;
+ }
+ return false;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/FaultException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/FaultException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?view=diff&rev=525367&r1=525366&r2=525367
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Tue Apr 3 19:53:57 2007
@@ -48,11 +48,13 @@
<module>contribution-impl</module>
<!--
<module>core</module>
+ -->
<module>databinding</module>
<module>databinding-axiom</module>
<module>databinding-jaxb</module>
<module>databinding-sdo</module>
<module>databinding-sdo-axiom</module>
+ <!--
<module>discovery-jms</module>
-->
<module>idl</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org