You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2006/05/09 13:59:32 UTC
svn commit: r405401 - in /incubator/tuscany/cpp/sdo/runtime/core:
sdo_axiom/sdo_axiom.cpp sdo_axiom/sdo_axiom.h
sdo_axiom_test/sdo_axiom_test.cpp
Author: edslattery
Date: Tue May 9 04:59:27 2006
New Revision: 405401
URL: http://svn.apache.org/viewcvs?rev=405401&view=rev
Log:
modify toAxiom to toAxiomDoc and toAxiomNode
Modified:
incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h
incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp?rev=405401&r1=405400&r2=405401&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp Tue May 9 04:59:27 2006
@@ -68,7 +68,35 @@
deleteEnv();
}
- axis2_om_document_t* AxiomHelper::toAxiom(DataObjectPtr dob)
+
+ axis2_env_t** AxiomHelper::getEnv()
+ {
+ return &the_env;
+ }
+
+ axis2_om_node_t* AxiomHelper::toAxiomNode(DataObjectPtr dob)
+ {
+
+ axis2_om_document_t* doc = toAxiomDoc(dob);
+
+ if (!doc)
+ {
+ return 0;
+ }
+
+ axis2_om_node_t* root_node =
+ AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(doc, &the_env);
+ if (!root_node)
+ {
+ cout << "No Root Element in the document" << endl;
+ return 0;
+ }
+
+
+ return root_node;
+ }
+
+ axis2_om_document_t* AxiomHelper::toAxiomDoc(DataObjectPtr dob)
{
DataFactory* df = dob->getDataFactory();
@@ -133,7 +161,6 @@
return document;
}
-
DataObjectPtr AxiomHelper::toSdo(axis2_om_document_t* document,
DataFactoryPtr factory)
Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h?rev=405401&r1=405400&r2=405401&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h Tue May 9 04:59:27 2006
@@ -52,10 +52,13 @@
SDO_AXIOM_API static void releaseHelper(AxiomHelper* ax);
- SDO_AXIOM_API axis2_om_document_t* toAxiom(DataObjectPtr dob);
+ SDO_AXIOM_API axis2_om_document_t* toAxiomDoc(DataObjectPtr dob);
+ SDO_AXIOM_API axis2_om_node_t* toAxiomNode(DataObjectPtr dob);
SDO_AXIOM_API DataObjectPtr toSdo(axis2_om_document_t* doc,DataFactoryPtr factory);
SDO_AXIOM_API DataObjectPtr toSdo(axis2_om_node* root_node,DataFactoryPtr factory);
+
+ SDO_AXIOM_API axis2_env_t** getEnv();
SDO_AXIOM_API void output(axis2_om_document_t* document);
Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp?rev=405401&r1=405400&r2=405401&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp Tue May 9 04:59:27 2006
@@ -84,8 +84,37 @@
if (ax)
{
- axis2_om_document_t* doc = ax->toAxiom(company);
- ax->output(doc);
+ axis2_om_document_t* doc = ax->toAxiomDoc(company);
+
+ if (doc)
+ {
+ ax->output(doc);
+
+ DataObjectPtr newdob = ax->toSdo(doc,mdg);
+
+ if (newdob)
+ {
+ cout << "Printing first data object..." << endl;
+ SDOUtils::printDataObject(cout,newdob);
+ cout << "Finished" << endl;
+ }
+
+ axis2_om_node_t* node =
+ AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(doc, ax->getEnv());
+
+
+ DataObjectPtr newdob2 = ax->toSdo(node,mdg);
+
+ if (newdob2)
+ {
+ cout << "Printing second data object..." << endl;
+ SDOUtils::printDataObject(cout,newdob2);
+ cout << "Finished" << endl;
+ }
+
+
+ }
+
}
return;