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/02/15 23:45:50 UTC
svn commit: r508218 - in
/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src:
main/java/org/apache/tuscany/databinding/sdo/
test/java/org/apache/tuscany/databinding/sdo/
Author: rfeng
Date: Thu Feb 15 14:45:49 2007
New Revision: 508218
URL: http://svn.apache.org/viewvc?view=rev&rev=508218
Log:
[sca-integration-branch] Use HelperContext to register static types
Modified:
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java?view=diff&rev=508218&r1=508217&r2=508218
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java Thu Feb 15 14:45:49 2007
@@ -20,12 +20,12 @@
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 org.apache.tuscany.spi.deployer.DeploymentContext;
import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
/**
* Helper class to get TypeHelper from the context
@@ -36,7 +36,7 @@
public static HelperContext getHelperContext(TransformationContext context) {
if (context == null || context.getMetadata() == null) {
- return SDOUtil.createHelperContext();
+ return getDefaultHelperContext();
}
HelperContext helperContext = null;
CompositeComponent composite = (CompositeComponent)context.getMetadata().get(CompositeComponent.class);
@@ -47,7 +47,7 @@
}
}
if (helperContext == null) {
- return SDOUtil.createHelperContext();
+ return getDefaultHelperContext();
} else {
return helperContext;
}
@@ -58,15 +58,20 @@
if (deploymentContext != null && deploymentContext.getParent() != null) {
helperContext = (HelperContext)deploymentContext.getParent().getExtension(HelperContext.class.getName());
if (helperContext == null) {
- helperContext = SDOUtil.createHelperContext();
+ helperContext = getDefaultHelperContext();
deploymentContext.getParent().putExtension(HelperContext.class.getName(), helperContext);
}
}
if (helperContext == null) {
- helperContext = SDOUtil.createHelperContext();
+ helperContext = getDefaultHelperContext();
}
return helperContext;
+ }
+
+ protected static HelperContext getDefaultHelperContext() {
+ // SDOUtil.createHelperContext();
+ return HelperProvider.getDefaultContext();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java?view=diff&rev=508218&r1=508217&r2=508218
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java Thu Feb 15 14:45:49 2007
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.model.DataType;
@@ -32,6 +31,8 @@
import com.example.ipo.sdo.SdoFactory;
import com.example.ipo.sdo.USAddress;
import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
/**
* The base class for SDO-related test cases
@@ -39,6 +40,7 @@
public abstract class SDOTransformerTestCaseBase extends TestCase {
protected static final QName ORDER_QNAME = new QName("http://www.example.com/IPO", "purchaseOrder");
+ protected HelperContext helperContext;
protected String binding = DataObject.class.getName();
protected TransformationContext context;
protected TransformationContext reversedContext;
@@ -49,7 +51,9 @@
*/
protected void setUp() throws Exception {
super.setUp();
- SDOUtil.registerStaticTypes(SdoFactory.class);
+ helperContext = HelperProvider.getDefaultContext();
+ SdoFactory.INSTANCE.register(helperContext);
+
context = new TransformationContextImpl();
context.setSourceDataType(getSourceDataType());
context.setTargetDataType(getTargetDataType());
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java?view=diff&rev=508218&r1=508217&r2=508218
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java Thu Feb 15 14:45:49 2007
@@ -28,9 +28,7 @@
import org.apache.tuscany.spi.model.DataType;
import com.example.ipo.sdo.PurchaseOrderType;
-
import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
/**
*
@@ -49,7 +47,9 @@
public final void testTransform() throws XMLStreamException {
XMLDocument document =
- XMLHelper.INSTANCE.createDocument(dataObject, ORDER_QNAME.getNamespaceURI(), ORDER_QNAME.getLocalPart());
+ helperContext.getXMLHelper().createDocument(dataObject,
+ ORDER_QNAME.getNamespaceURI(),
+ ORDER_QNAME.getLocalPart());
XMLStreamReader reader = new XMLDocument2XMLStreamReader().transform(document, context);
XMLDocument document2 = new XMLStreamReader2XMLDocument().transform(reader, reversedContext);
Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), document2.getRootElementURI());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org