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:58:03 UTC
svn commit: r525351 - in
/incubator/tuscany/java/sca/modules/databinding-axiom: ./
src/main/java/org/apache/tuscany/databinding/axiom/
src/test/java/org/apache/tuscany/databinding/axiom/
Author: jsdelfino
Date: Tue Apr 3 18:58:00 2007
New Revision: 525351
URL: http://svn.apache.org/viewvc?view=rev&rev=525351
Log:
Adjusted databinding-axiom to get it building again.
Modified:
incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandler.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomHelper.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandlerTestCase.java
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml Tue Apr 3 18:58:00 2007
@@ -18,25 +18,27 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.sca.axis2</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-axiom</artifactId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
<name>Apache Tuscany Data Binding for Axiom</name>
- <description>Tuscany Axiom Data Binding</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>1.0-alpha1-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-framework</artifactId>
- <version>2.0-alpha2-incubating-SNAPSHOT</version>
- <scope>compile</scope>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
@@ -48,42 +50,30 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
+ <version>1.2.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </dependency>
- <!-- java.xml.stream API -->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
+ <version>1.1</version>
+ <scope>runtime</scope>
</dependency>
- <!-- StAX implementation -->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
@@ -91,21 +81,6 @@
<scope>runtime</scope>
</dependency>
- <!-- junit version -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- <!-- EasyMock version -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java Tue Apr 3 18:58:00 2007
@@ -20,16 +20,13 @@
package org.apache.tuscany.databinding.axiom;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
import org.apache.tuscany.spi.databinding.WrapperHandler;
import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
-import org.osoa.sca.annotations.Service;
/**
* DataBinding for AXIOM
*/
-@Service(DataBinding.class)
public class AxiomDataBinding extends DataBindingExtension {
public static final String NAME = OMElement.class.getName();
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandler.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandler.java Tue Apr 3 18:58:00 2007
@@ -20,10 +20,11 @@
package org.apache.tuscany.databinding.axiom;
import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.FaultException;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.ExceptionHandler;
-import org.apache.tuscany.spi.idl.ServiceFaultException;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.XMLType;
/**
* AXIOM implementation of ExceptionHandler
@@ -33,25 +34,25 @@
public class AxiomExceptionHandler implements ExceptionHandler {
public Exception createException(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause) {
- return new ServiceFaultException(message, (OMElement)faultInfo, cause);
+ return new FaultException(message, (OMElement)faultInfo, cause);
}
public Object getFaultInfo(Exception exception) {
if (exception == null) {
return null;
}
- ServiceFaultException faultException = (ServiceFaultException)exception;
+ FaultException faultException = (FaultException)exception;
return faultException.getFaultInfo();
}
public DataType<?> getFaultType(DataType exceptionType) {
- if (ServiceFaultException.class == exceptionType.getPhysical()) {
+ if (FaultException.class == exceptionType.getPhysical()) {
XMLType type = XMLType.UNKNOWN;
if(exceptionType.getLogical() instanceof XMLType) {
type = (XMLType) exceptionType.getLogical();
}
- DataType<XMLType> faultType = new DataType<XMLType>(AxiomDataBinding.NAME, OMElement.class, type);
+ DataType<XMLType> faultType = new DataTypeImpl<XMLType>(AxiomDataBinding.NAME, OMElement.class, type);
return faultType;
} else {
return null;
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomHelper.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomHelper.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomHelper.java Tue Apr 3 18:58:00 2007
@@ -25,9 +25,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+import org.apache.tuscany.idl.DataType;
+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;
/**
* Helper for AXIOM
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java Tue Apr 3 18:58:00 2007
@@ -19,14 +19,11 @@
package org.apache.tuscany.databinding.axiom;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.SimpleType2JavaTransformer;
-import org.osoa.sca.annotations.Service;
/**
* Transformer to convert data from a simple java bject to OMElement
*/
-@Service(Transformer.class)
public class OMElement2Object extends SimpleType2JavaTransformer<OMElement> {
@Override
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java Tue Apr 3 18:58:00 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;
/**
* Transformer to convert data from an OMElement to XML String
*/
-@Service(Transformer.class)
public class OMElement2String extends TransformerExtension<OMElement, String> implements PullTransformer<OMElement, String> {
// private XmlOptions options;
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java Tue Apr 3 18:58:00 2007
@@ -23,11 +23,8 @@
import org.apache.axiom.om.OMElement;
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;
-@Service(Transformer.class)
public class OMElement2XMLStreamReader extends TransformerExtension<OMElement, XMLStreamReader> implements PullTransformer<OMElement, XMLStreamReader> {
// private XmlOptions options;
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java Tue Apr 3 18:58:00 2007
@@ -29,9 +29,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+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;
/**
* OMElement wrapper handler implementation
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java Tue Apr 3 18:58:00 2007
@@ -24,14 +24,11 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.Java2SimpleTypeTransformer;
-import org.osoa.sca.annotations.Service;
/**
* Transformer to convert data from an simple OMElement to Java Object
*/
-@Service(Transformer.class)
public class Object2OMElement extends Java2SimpleTypeTransformer<OMElement> {
private OMFactory factory;
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java Tue Apr 3 18:58:00 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 String2OMElement extends TransformerExtension<String, OMElement> implements
PullTransformer<String, OMElement> {
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java Tue Apr 3 18:58:00 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 XMLStreamReader2OMElement extends TransformerExtension<XMLStreamReader, OMElement> implements
PullTransformer<XMLStreamReader, OMElement> {
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandlerTestCase.java?view=diff&rev=525351&r1=525350&r2=525351
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/AxiomExceptionHandlerTestCase.java Tue Apr 3 18:58:00 2007
@@ -28,9 +28,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.tuscany.spi.idl.ServiceFaultException;
-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.FaultException;
+import org.apache.tuscany.idl.util.XMLType;
/**
* Test case for SDOExceptionHandler
@@ -81,25 +82,25 @@
}
public void testGetFaultType() {
- DataType<?> dataType = handler.getFaultType(new DataType<XMLType>(ServiceFaultException.class, null));
+ DataType<?> dataType = handler.getFaultType(new DataTypeImpl<XMLType>(FaultException.class, null));
assertEquals(OMElement.class, dataType.getPhysical());
assertEquals(XMLType.UNKNOWN, dataType.getLogical());
assertEquals(AxiomDataBinding.NAME, dataType.getDataBinding());
- dataType = handler.getFaultType(new DataType<XMLType>(Exception.class, null));
+ dataType = handler.getFaultType(new DataTypeImpl<XMLType>(Exception.class, null));
assertNull(dataType);
}
public void testCreate() {
Exception ex = handler.createException(null, "Order", faultElement, null);
- assertTrue(ex instanceof ServiceFaultException);
- ServiceFaultException exception = (ServiceFaultException)ex;
+ assertTrue(ex instanceof FaultException);
+ FaultException exception = (FaultException)ex;
assertEquals("Order", exception.getMessage());
assertSame(faultElement, exception.getFaultInfo());
}
public void testGetFaultInfo() {
- ServiceFaultException exception = new ServiceFaultException("Order", faultElement, null);
+ FaultException exception = new FaultException("Order", faultElement, null);
Object faultInfo = handler.getFaultInfo(exception);
assertSame(faultElement, faultInfo);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org