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 2006/09/24 00:53:20 UTC

svn commit: r449324 - in /incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom: sdo_axiom.cpp sdo_axiom.h

Author: jsdelfino
Date: Sat Sep 23 15:53:20 2006
New Revision: 449324

URL: http://svn.apache.org/viewvc?view=rev&rev=449324
Log:
Added parameters to allow the caller to pass the element URI and name, instead of always just using the SDO type name.

Modified:
    incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
    incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h

Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp?view=diff&rev=449324&r1=449323&r2=449324
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp Sat Sep 23 15:53:20 2006
@@ -79,10 +79,12 @@
             return the_env;
         }
 
-        axiom_node_t* AxiomHelper::toAxiomNode(DataObjectPtr dob)
+        axiom_node_t* AxiomHelper::toAxiomNode(DataObjectPtr dob,
+            const char* targetNamespaceURI, const char* elementName)
         {
 
-            axiom_document_t* doc = toAxiomDoc(dob);
+            axiom_document_t* doc = toAxiomDoc(dob,
+                targetNamespaceURI, elementName);
 
             if (!doc)
             {
@@ -101,7 +103,8 @@
             return root_node;
         }
 
-        axiom_document_t* AxiomHelper::toAxiomDoc(DataObjectPtr dob)
+        axiom_document_t* AxiomHelper::toAxiomDoc(DataObjectPtr dob,
+            const char* targetNamespaceURI, const char* elementName)
         {
 
             DataFactory* df = dob->getDataFactory();
@@ -112,13 +115,17 @@
                 cout << "No Axis Environment" << endl;
                 return 0;
             }
-           char * str = 
-                xm->save(
+            
+            XMLDocumentPtr doc = xm->createDocument(
                 dob,
-                dob->getType().getURI(),
-                dob->getType().getName());
+                targetNamespaceURI,
+                elementName);
+            
+           char * str = xm->save(doc);
 
-            // if (str) cout << str << endl;
+            //if (str) {
+            //    cout << "toAxiomDoc " << str << endl;
+            //}
 
             axiom_xml_reader_t * reader =  
             axiom_xml_reader_create_for_memory(the_env,

Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h?view=diff&rev=449324&r1=449323&r2=449324
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h Sat Sep 23 15:53:20 2006
@@ -53,8 +53,10 @@
 
             SDO_AXIOM_API static void releaseHelper(AxiomHelper* ax);
 
-            SDO_AXIOM_API axiom_document_t*  toAxiomDoc(DataObjectPtr dob);
-            SDO_AXIOM_API axiom_node_t*      toAxiomNode(DataObjectPtr dob);
+            SDO_AXIOM_API axiom_document_t*  toAxiomDoc(DataObjectPtr dob,
+                const char* targetNamespaceURI = "", const char* elementName = "");
+            SDO_AXIOM_API axiom_node_t*      toAxiomNode(DataObjectPtr dob,
+                const char* targetNamespaceURI = "", const char* elementName = "");
 
             SDO_AXIOM_API DataObjectPtr  toSdo(axiom_document_t* doc, DataFactoryPtr factory, const char* targetNamespaceURI=0);
             SDO_AXIOM_API DataObjectPtr  toSdo(axiom_node_t* root_node, DataFactoryPtr factory, const char* targetNamespaceURI=0);



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