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/12/22 06:37:22 UTC

svn commit: r489558 - in /incubator/tuscany/cpp: sca/runtime/core/src/tuscany/sca/core/ sca/runtime/core/src/tuscany/sca/model/ sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ sca/runtime/extensions/python/src/tuscany/sca/python/ sca/runtime/extensions...

Author: jsdelfino
Date: Thu Dec 21 21:37:20 2006
New Revision: 489558

URL: http://svn.apache.org/viewvc?view=rev&rev=489558
Log:
Removed 'using' statements from SDO headers, and added 'using' statements where necessary after that.

Modified:
    incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
    incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h
    incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
    incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
    incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h
    incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h

Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp Thu Dec 21 21:37:20 2006
@@ -28,6 +28,7 @@
 #include "tuscany/sca/core/SCARuntime.h"
 
 using namespace std;
+using namespace commonj::sdo;
 
 
 namespace tuscany

Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h Thu Dec 21 21:37:20 2006
@@ -140,7 +140,7 @@
                  * and their values can be accessed.
                  * @return A data object holding the property values.
                  */
-                SCA_API DataObjectPtr getProperties();
+                SCA_API commonj::sdo::DataObjectPtr getProperties();
 
             private:
                 

Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h Thu Dec 21 21:37:20 2006
@@ -108,7 +108,7 @@
                 typedef std::map<std::string, Composite*> COMPOSITE_MODELS;
                 COMPOSITE_MODELS compositeModels;
                 
-                typedef std::map<std::string, DataObjectPtr> COMPOSITE_DATAOBJECTS;
+                typedef std::map<std::string, commonj::sdo::DataObjectPtr> COMPOSITE_DATAOBJECTS;
                 COMPOSITE_DATAOBJECTS compositeDataObjects;
 
                 typedef std::map<std::string, Composite*> COMPOSITE_FILES;

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp Thu Dec 21 21:37:20 2006
@@ -25,6 +25,7 @@
 #include "tuscany/sca/util/Utils.h"
 
 using namespace std;
+using namespace commonj::sdo;
 using namespace tuscany::sca::util;
 using namespace tuscany::sca::model;
 

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp Thu Dec 21 21:37:20 2006
@@ -24,6 +24,7 @@
 #include "tuscany/sca/util/Logging.h"
 
 using namespace std;
+using namespace commonj::sdo;
 using namespace tuscany::sca::model;
 
 namespace tuscany

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp Thu Dec 21 21:37:20 2006
@@ -29,8 +29,9 @@
 #include "tuscany/sca/model/ServiceBinding.h"
 
 using namespace std;
-using namespace tuscany::sca::model;
 using namespace osoa::sca;
+using namespace commonj::sdo;
+using namespace tuscany::sca::model;
 
 namespace tuscany
 {

Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp Thu Dec 21 21:37:20 2006
@@ -26,6 +26,7 @@
 #include "tuscany/sca/util/Utils.h"
 
 using namespace std;
+using namespace commonj::sdo;
 using namespace tuscany::sca::model;
 
 namespace tuscany

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp Thu Dec 21 21:37:20 2006
@@ -25,6 +25,7 @@
 #include "tuscany/sca/util/Utils.h"
 
 using namespace std;
+using namespace commonj::sdo;
 using namespace tuscany::sca::model;
 
 namespace tuscany

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp Thu Dec 21 21:37:20 2006
@@ -39,6 +39,7 @@
 #include "tuscany/sca/ruby/model/RubyReferenceBinding.h"
 
 using namespace std;
+using namespace commonj::sdo;
 using namespace tuscany::sca::model;
 
 extern "C"

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp Thu Dec 21 21:37:20 2006
@@ -26,6 +26,7 @@
 #include "tuscany/sca/core/SCARuntime.h"
 
 using namespace std;
+using namespace commonj::sdo;
 using namespace tuscany::sca::model;
 
 extern "C"

Modified: incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp (original)
+++ incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.account/AccountServiceImpl.cpp Thu Dec 21 21:37:20 2006
@@ -30,6 +30,7 @@
 #include "AccountDataService.h"
 
 using namespace std;
+using namespace commonj::sdo;
 using namespace osoa::sca;
 using namespace services::accountdata;
 using namespace services::stockquote;

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=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h Thu Dec 21 21:37:20 2006
@@ -35,7 +35,6 @@
 
 namespace commonj
 {
-    using namespace sdo;
     namespace sdo_axiom
     {
             
@@ -55,13 +54,13 @@
 
             SDO_AXIOM_API static void releaseHelper(AxiomHelper* ax);
 
-            SDO_AXIOM_API axiom_document_t*  toAxiomDoc(DataObjectPtr dob,
+            SDO_AXIOM_API axiom_document_t*  toAxiomDoc(commonj::sdo::DataObjectPtr dob,
                 const char* targetNamespaceURI = "", const char* elementName = "");
-            SDO_AXIOM_API axiom_node_t*      toAxiomNode(DataObjectPtr dob,
+            SDO_AXIOM_API axiom_node_t*      toAxiomNode(commonj::sdo::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);
+            SDO_AXIOM_API commonj::sdo::DataObjectPtr  toSdo(axiom_document_t* doc, commonj::sdo::DataFactoryPtr factory, const char* targetNamespaceURI=0);
+            SDO_AXIOM_API commonj::sdo::DataObjectPtr  toSdo(axiom_node_t* root_node, commonj::sdo::DataFactoryPtr factory, const char* targetNamespaceURI=0);
 
             SDO_AXIOM_API axis2_env_t* getEnv();
 

Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h?view=diff&rev=489558&r1=489557&r2=489558
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h Thu Dec 21 21:37:20 2006
@@ -25,8 +25,6 @@
 
 #include "commonj/sdo/export.h"
 #include "commonj/sdo/SDO.h"
-using commonj::sdo::DataObjectPtr;
-using commonj::sdo::DataObject;
 
 
 namespace commonj



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