You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/01/16 18:18:29 UTC
svn commit: r496777 - in /incubator/tuscany/java/sca/services/databinding:
databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/
databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/
databinding-test/src/test/java/org/apache/tus...
Author: rfeng
Date: Tue Jan 16 09:18:27 2007
New Revision: 496777
URL: http://svn.apache.org/viewvc?view=rev&rev=496777
Log:
Move to SDO 2.1
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
incubator/tuscany/java/sca/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java Tue Jan 16 09:18:27 2007
@@ -20,7 +20,6 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
@@ -29,7 +28,7 @@
import org.osoa.sca.annotations.Service;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
@Service(Transformer.class)
@@ -40,8 +39,8 @@
public String transform(DataObject source, TransformationContext context) {
try {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(typeHelper);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ XMLHelper xmlHelper = helperContext.getXMLHelper();
Object logicalType = context.getSourceDataType().getLogical();
if (logicalType instanceof QName) {
QName elementName = (QName) logicalType;
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java Tue Jan 16 09:18:27 2007
@@ -32,7 +32,7 @@
import org.osoa.sca.annotations.Service;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
@@ -42,12 +42,12 @@
public XMLStreamReader transform(DataObject source, TransformationContext context) {
try {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
Object logicalType = context.getSourceDataType().getLogical();
QName elementName =
(logicalType instanceof QName) ? (QName) logicalType : new QName("commonj.sdo", "dataObject");
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(typeHelper);
+ XMLHelper xmlHelper = helperContext.getXMLHelper();
XMLDocument document =
xmlHelper.createDocument(source, elementName.getNamespaceURI(), elementName.getLocalPart());
return streamHelper.createXMLStreamReader(document);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java Tue Jan 16 09:18:27 2007
@@ -38,7 +38,7 @@
import org.apache.tuscany.spi.model.ModelObject;
import org.osoa.sca.annotations.Constructor;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XSDHelper;
/**
@@ -48,10 +48,11 @@
*/
public class ImportSDOLoader extends LoaderExtension {
public static final QName IMPORT_SDO =
- new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo");
+ new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo");
- @Constructor( { "registry" })
- public ImportSDOLoader(@Autowire LoaderRegistry registry) {
+ @Constructor( {"registry"})
+ public ImportSDOLoader(@Autowire
+ LoaderRegistry registry) {
super(registry);
}
@@ -59,24 +60,31 @@
return IMPORT_SDO;
}
- public ModelObject load(CompositeComponent parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
- throws XMLStreamException, LoaderException {
+ public ModelObject load(CompositeComponent parent,
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert IMPORT_SDO.equals(reader.getName());
- // FIXME: [rfeng] How to associate the TypeHelper with deployment context?
- TypeHelper typeHelper = TypeHelper.INSTANCE;
+ // FIXME: [rfeng] How to associate the TypeHelper with deployment
+ // context?
+ HelperContext helperContext = null;
if (deploymentContext != null && deploymentContext.getParent() != null) {
- typeHelper = (TypeHelper) deploymentContext.getParent().getExtension(TypeHelper.class.getName());
- if (typeHelper == null) {
- typeHelper = SDOUtil.createTypeHelper();
- deploymentContext.getParent().putExtension(TypeHelper.class.getName(), typeHelper);
+ helperContext = (HelperContext)deploymentContext.getParent().getExtension(HelperContext.class.getName());
+ if (helperContext == null) {
+ helperContext = SDOUtil.createHelperContext();
+ deploymentContext.getParent().putExtension(HelperContext.class.getName(), helperContext);
}
}
+ if (helperContext == null) {
+ helperContext = SDOUtil.createHelperContext();
+ }
+
importFactory(reader, deploymentContext);
- importWSDL(reader, deploymentContext, typeHelper);
+ importWSDL(reader, deploymentContext, helperContext);
LoaderUtil.skipToEndElement(reader);
- return new SDOType(typeHelper);
+ return new SDOType(helperContext);
}
private void importFactory(XMLStreamReader reader, DeploymentContext deploymentContext) throws LoaderException {
@@ -88,7 +96,8 @@
ClassLoader cl = deploymentContext.getClassLoader();
Thread.currentThread().setContextClassLoader(cl);
Class<?> factoryClass = cl.loadClass(factoryName);
- // FIXME: We require the SDO to provide an API to register static types in a given TypeHelper
+ // FIXME: We require the SDO to provide an API to register
+ // static types in a given TypeHelper
SDOUtil.registerStaticTypes(factoryClass);
} catch (ClassNotFoundException e) {
throw new LoaderException(e.getMessage(), e);
@@ -98,7 +107,7 @@
}
}
- private void importWSDL(XMLStreamReader reader, DeploymentContext deploymentContext, TypeHelper typeHelper)
+ private void importWSDL(XMLStreamReader reader, DeploymentContext deploymentContext, HelperContext helperContext)
throws LoaderException {
String location = reader.getAttributeValue(null, "location");
if (location == null)
@@ -118,7 +127,7 @@
}
InputStream xsdInputStream = wsdlURL.openStream();
try {
- XSDHelper xsdHelper = SDOUtil.createXSDHelper(typeHelper);
+ XSDHelper xsdHelper = helperContext.getXSDHelper();
xsdHelper.define(xsdInputStream, wsdlURL.toExternalForm());
} finally {
xsdInputStream.close();
@@ -132,15 +141,15 @@
}
public static class SDOType extends ModelObject {
- private TypeHelper typeHelper;
+ private HelperContext helperContext;
- public SDOType(TypeHelper typeHelper) {
+ public SDOType(HelperContext typeHelper) {
super();
- this.typeHelper = typeHelper;
+ this.helperContext = typeHelper;
}
- public TypeHelper getTypeHelper() {
- return typeHelper;
+ public HelperContext getHelperContext() {
+ return helperContext;
}
}
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java Tue Jan 16 09:18:27 2007
@@ -20,10 +20,11 @@
package org.apache.tuscany.databinding.sdo;
import org.apache.tuscany.databinding.sdo.ImportSDOLoader.SDOType;
+import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
/**
* Helper class to get TypeHelper from the transformation context
@@ -32,21 +33,22 @@
private SDODataTypeHelper() {
}
- public static TypeHelper getTypeHelper(TransformationContext context) {
- TypeHelper typeHelper = null;
+ public static HelperContext getHelperContext(TransformationContext context) {
if (context == null || context.getMetadata() == null) {
- return TypeHelper.INSTANCE;
+ return SDOUtil.createHelperContext();
}
- CompositeComponent composite = (CompositeComponent) context.getMetadata().get(CompositeComponent.class);
+ HelperContext helperContext = null;
+ CompositeComponent composite = (CompositeComponent)context.getMetadata().get(CompositeComponent.class);
if (composite != null) {
- SDOType sdoType = (SDOType) composite.getExtensions().get(SDOType.class);
+ SDOType sdoType = (SDOType)composite.getExtensions().get(SDOType.class);
if (sdoType != null) {
- typeHelper = sdoType.getTypeHelper();
+ helperContext = sdoType.getHelperContext();
}
}
- if (typeHelper == null) {
- return TypeHelper.INSTANCE;
+ if (helperContext == null) {
+ return SDOUtil.createHelperContext();
+ } else {
+ return helperContext;
}
- return typeHelper;
}
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java Tue Jan 16 09:18:27 2007
@@ -27,6 +27,7 @@
import org.apache.tuscany.spi.idl.TypeInfo;
import commonj.sdo.Type;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
/**
@@ -45,7 +46,8 @@
if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
} else {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ TypeHelper typeHelper = helperContext.getTypeHelper();
type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
}
return SDOUtil.createFromString(type, value);
@@ -57,10 +59,8 @@
if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
} else {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- if (typeHelper == null) {
- typeHelper = TypeHelper.INSTANCE;
- }
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ TypeHelper typeHelper = helperContext.getTypeHelper();
type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
}
return SDOUtil.convertToString(type, obj);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java Tue Jan 16 09:18:27 2007
@@ -21,15 +21,13 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.WrapperHandler;
import org.apache.tuscany.spi.idl.ElementInfo;
-import org.apache.tuscany.spi.model.DataType;
import commonj.sdo.DataObject;
import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
@@ -43,40 +41,31 @@
* TransformationContext)
*/
public Object create(ElementInfo element, TransformationContext context) {
- TypeHelper typeHelper = TypeHelper.INSTANCE;
- if (context != null) {
- DataType targetType = context.getTargetDataType();
- if (targetType != null) {
- typeHelper = (TypeHelper) targetType.getMetadata(TypeHelper.class.getName());
- if (typeHelper == null) {
- typeHelper = TypeHelper.INSTANCE;
- }
- }
- }
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
QName typeName = element.getType().getQName();
- DataFactory dataFactory = SDOUtil.createDataFactory(typeHelper);
+ DataFactory dataFactory = helperContext.getDataFactory();
DataObject root = dataFactory.create(typeName.getNamespaceURI(), typeName.getLocalPart());
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(typeHelper);
+ XMLHelper xmlHelper = helperContext.getXMLHelper();
return xmlHelper.createDocument(root, element.getQName().getNamespaceURI(), element.getQName().getLocalPart());
}
/**
- * @see org.apache.tuscany.spi.databinding.WrapperHandler#getChild(java.lang.Object, int,
- * ElementInfo)
+ * @see org.apache.tuscany.spi.databinding.WrapperHandler#getChild(java.lang.Object,
+ * int, ElementInfo)
*/
public Object getChild(Object wrapper, int i, ElementInfo element) {
DataObject wrapperDO =
- (wrapper instanceof XMLDocument) ? ((XMLDocument) wrapper).getRootObject() : (DataObject) wrapper;
+ (wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
return wrapperDO.get(element.getQName().getLocalPart());
}
/**
- * @see org.apache.tuscany.spi.databinding.WrapperHandler#setChild(java.lang.Object, int,
- * ElementInfo, java.lang.Object)
+ * @see org.apache.tuscany.spi.databinding.WrapperHandler#setChild(java.lang.Object,
+ * int, ElementInfo, java.lang.Object)
*/
public void setChild(Object wrapper, int i, ElementInfo childElement, Object value) {
DataObject wrapperDO =
- (wrapper instanceof XMLDocument) ? ((XMLDocument) wrapper).getRootObject() : (DataObject) wrapper;
+ (wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
wrapperDO.set(childElement.getQName().getLocalPart(), value);
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java Tue Jan 16 09:18:27 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.databinding.sdo;
-import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
@@ -27,16 +26,17 @@
import org.osoa.sca.annotations.Service;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLHelper;
@Service(Transformer.class)
-public class String2DataObject extends TransformerExtension<String, DataObject> implements PullTransformer<String, DataObject> {
+public class String2DataObject extends TransformerExtension<String, DataObject> implements
+ PullTransformer<String, DataObject> {
public DataObject transform(String source, TransformationContext context) {
try {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(typeHelper);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ XMLHelper xmlHelper = helperContext.getXMLHelper();
return xmlHelper.load(source).getRootObject();
} catch (Exception e) {
throw new TransformationException(e);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java Tue Jan 16 09:18:27 2007
@@ -20,7 +20,6 @@
import java.io.StringWriter;
-import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
@@ -28,18 +27,18 @@
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
-import commonj.sdo.helper.TypeHelper;
+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> {
+ PullTransformer<XMLDocument, String> {
public String transform(XMLDocument source, TransformationContext context) {
try {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(typeHelper);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ XMLHelper xmlHelper = helperContext.getXMLHelper();
StringWriter writer = new StringWriter();
xmlHelper.save(source, writer, null);
return writer.toString();
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java Tue Jan 16 09:18:27 2007
@@ -30,11 +30,12 @@
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
@Service(Transformer.class)
-public class XMLDocument2XMLStreamReader extends TransformerExtension<XMLDocument, XMLStreamReader> implements PullTransformer<XMLDocument, XMLStreamReader> {
+public class XMLDocument2XMLStreamReader extends TransformerExtension<XMLDocument, XMLStreamReader> implements
+ PullTransformer<XMLDocument, XMLStreamReader> {
/**
* @param source
* @param context
@@ -42,8 +43,8 @@
*/
public XMLStreamReader transform(XMLDocument source, TransformationContext context) {
try {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
return streamHelper.createXMLStreamReader(source);
} catch (XMLStreamException e) {
throw new TransformationException(e);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java Tue Jan 16 09:18:27 2007
@@ -31,17 +31,18 @@
import org.osoa.sca.annotations.Service;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
@Service(Transformer.class)
public class XMLStreamReader2DataObject extends TransformerExtension<XMLStreamReader, DataObject> implements
- PullTransformer<XMLStreamReader, DataObject> {
+ PullTransformer<XMLStreamReader, DataObject> {
public DataObject transform(XMLStreamReader source, TransformationContext context) {
try {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
- // The XMLStreamHelper requires that the reader is posistioned at START_ELEMENT
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
+ // The XMLStreamHelper requires that the reader is posistioned at
+ // START_ELEMENT
while (source.getEventType() != XMLStreamConstants.START_ELEMENT && source.hasNext()) {
source.next();
}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java Tue Jan 16 09:18:27 2007
@@ -29,17 +29,17 @@
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
@Service(Transformer.class)
public class XMLStreamReader2XMLDocument extends TransformerExtension<XMLStreamReader, XMLDocument> implements
- PullTransformer<XMLStreamReader, XMLDocument> {
+ PullTransformer<XMLStreamReader, XMLDocument> {
public XMLDocument transform(XMLStreamReader source, TransformationContext context) {
try {
- TypeHelper typeHelper = SDODataTypeHelper.getTypeHelper(context);
- XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(context);
+ XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
return streamHelper.load(source);
} catch (Exception e) {
throw new TransformationException(e);
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java Tue Jan 16 09:18:27 2007
@@ -20,7 +20,8 @@
package org.apache.tuscany.databinding.sdo;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
import org.apache.tuscany.core.databinding.impl.TransformationContextImpl;
import org.apache.tuscany.sdo.util.SDOUtil;
@@ -30,13 +31,7 @@
import com.example.ipo.sdo.PurchaseOrderType;
import com.example.ipo.sdo.SdoFactory;
import com.example.ipo.sdo.USAddress;
-
import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
/**
* The base class for SDO-related test cases
Modified: incubator/tuscany/java/sca/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java?view=diff&rev=496777&r1=496776&r2=496777
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java Tue Jan 16 09:18:27 2007
@@ -66,7 +66,7 @@
import org.w3c.dom.Node;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
@@ -155,8 +155,8 @@
// XMLBeans --> SDO
public void testTransformation1() throws Exception {
URL xsdFile = getClass().getClassLoader().getResource("ipo.xsd");
- TypeHelper typeHelper = SDOUtil.createTypeHelper();
- XSDHelper xsdHelper = SDOUtil.createXSDHelper(typeHelper);
+ HelperContext helperContext = SDOUtil.createHelperContext();
+ XSDHelper xsdHelper = helperContext.getXSDHelper();
xsdHelper.define(xsdFile.openStream(), xsdFile.toExternalForm());
// URL/Stream/Reader to XmlObject
@@ -167,7 +167,7 @@
System.out.println("Path: " + path);
TransformationContext tContext = createTransformationContext();
- tContext.getMetadata().put(SDOType.class, new SDOType(typeHelper));
+ tContext.getMetadata().put(SDOType.class, new SDOType(helperContext));
Object result = object;
for (Transformer transformer : path) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org