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/03/07 02:24:21 UTC
svn commit: r515410 - in
/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo:
DataObjectLoader.java ImportSDOLoader.java SDODataTypeHelper.java
Author: rfeng
Date: Tue Mar 6 17:24:20 2007
New Revision: 515410
URL: http://svn.apache.org/viewvc?view=rev&rev=515410
Log:
[sca-integration-branch] Fix import.sdo association with HelperContext
Modified:
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.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/DataObjectLoader.java?view=diff&rev=515410&r1=515409&r2=515410
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java Tue Mar 6 17:24:20 2007
@@ -66,7 +66,7 @@
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert propertyQName.equals(reader.getName());
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(deploymentContext);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(object);
TypeHelper typeHelper = helperContext.getTypeHelper();
XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
DataObject dataObject = streamHelper.loadObject(reader);
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.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/ImportSDOLoader.java?view=diff&rev=515410&r1=515409&r2=515410
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java Tue Mar 6 17:24:20 2007
@@ -69,7 +69,7 @@
// FIXME: [rfeng] How to associate the TypeHelper with deployment
// context?
- HelperContext helperContext = SDODataTypeHelper.getHelperContext(deploymentContext);
+ HelperContext helperContext = SDODataTypeHelper.getHelperContext(object);
importFactory(reader, deploymentContext, helperContext);
importWSDL(reader, deploymentContext, helperContext);
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=515410&r1=515409&r2=515410
==============================================================================
--- 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 Tue Mar 6 17:24:20 2007
@@ -25,9 +25,9 @@
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 org.apache.tuscany.spi.idl.XMLType;
import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.ModelObject;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.impl.HelperProvider;
@@ -58,15 +58,15 @@
}
}
- public static HelperContext getHelperContext(DeploymentContext deploymentContext) {
+ public static HelperContext getHelperContext(ModelObject composite) {
HelperContext helperContext = null;
- if (deploymentContext != null && deploymentContext.getParent() != null) {
+ if (composite != null) {
// HACK: Retrieve the SDO HelperContext from the CompositeComponent
// extensions
- helperContext = (HelperContext)deploymentContext.getParent().getExtension(HelperContext.class.getName());
+ helperContext = (HelperContext)composite.getExtensions().get(HelperContext.class.getName());
if (helperContext == null) {
helperContext = SDOUtil.createHelperContext();
- deploymentContext.getParent().putExtension(HelperContext.class.getName(), helperContext);
+ composite.getExtensions().put(HelperContext.class.getName(), helperContext);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org