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/05/08 02:09:04 UTC

svn commit: r536028 - /incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java

Author: rfeng
Date: Mon May  7 17:09:04 2007
New Revision: 536028

URL: http://svn.apache.org/viewvc?view=rev&rev=536028
Log:
Make sure the root element for the SDODataSource is the same as the target

Modified:
    incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/DataObject2OMElement.java

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=536028&r1=536027&r2=536028
==============================================================================
--- 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 Mon May  7 17:09:04 2007
@@ -33,6 +33,7 @@
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
 
 /**
  * SDO DataObject --> AXIOM OMElement transformer
@@ -44,7 +45,6 @@
 
     public OMElement transform(DataObject source, TransformationContext context) {
         HelperContext helperContext = SDOContextHelper.getHelperContext(context);
-        SDODataSource dataSource = new SDODataSource(source, helperContext);
         OMFactory factory = OMAbstractFactory.getOMFactory();
 
         OMNamespace namespace = null;
@@ -55,18 +55,20 @@
             if (logical instanceof XMLType) {
                 XMLType xmlType = (XMLType)logical;
                 if (xmlType.isElement()) {
-                    namespace =
-                        factory.createOMNamespace(xmlType.getElementName().getNamespaceURI(), xmlType.getElementName()
-                            .getPrefix());
+                    namespace = factory.createOMNamespace(xmlType.getElementName().getNamespaceURI(), xmlType
+                        .getElementName().getPrefix());
                     localName = xmlType.getElementName().getLocalPart();
                 }
             }
         }
         if (namespace == null) {
-            namespace =
-                factory.createOMNamespace(ROOT_ELEMENT.getNamespaceURI(), ROOT_ELEMENT.getPrefix());
+            namespace = factory.createOMNamespace(ROOT_ELEMENT.getNamespaceURI(), ROOT_ELEMENT.getPrefix());
         }
 
+        XMLDocument document = helperContext.getXMLHelper().createDocument(source,
+                                                                           namespace.getNamespaceURI(),
+                                                                           localName);
+        SDODataSource dataSource = new SDODataSource(document, helperContext);
         OMElement element = factory.createOMElement(dataSource, localName, namespace);
         return element;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org