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/21 06:21:56 UTC
svn commit: r489263 [3/4] - in /incubator/tuscany/cpp/sca:
runtime/core/src/tuscany/sca/core/ runtime/core/src/tuscany/sca/extension/
runtime/core/src/tuscany/sca/model/ runtime/core/src/tuscany/sca/util/
runtime/extensions/cpp/src/osoa/sca/ runtime/ex...
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp Wed Dec 20 21:21:32 2006
@@ -27,9 +27,9 @@
extern "C"
{
- #if defined(WIN32) || defined(_WINDOWS)
+#if defined(WIN32) || defined(_WINDOWS)
__declspec(dllexport)
- #endif
+#endif
void tuscany_sca_extension_initialize()
{
tuscany::sca::php::PHPExtension::initialize();
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp Wed Dec 20 21:21:32 2006
@@ -24,6 +24,9 @@
#include "tuscany/sca/util/Logging.h"
#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/php/src/tuscany/sca/php/PHPImplementationExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h Wed Dec 20 21:21:32 2006
@@ -47,19 +47,21 @@
/**
* return the name of the extension
*/
- virtual const string& getExtensionName() {return extensionName;}
+ virtual const std::string& getExtensionName() {return extensionName;}
/**
* return the QName of schema element for this implementation extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#implementation.phpn")
*/
- virtual const string& getExtensionTypeQName() {return typeQName;}
+ virtual const std::string& getExtensionTypeQName() {return typeQName;}
- virtual ComponentType* getImplementation(Composite* composite, DataObjectPtr scdlImplementation);
+ virtual tuscany::sca::model::ComponentType* getImplementation(
+ tuscany::sca::model::Composite* composite,
+ commonj::sdo::DataObjectPtr scdlImplementation);
private:
- static const string extensionName;
- static const string typeQName;
+ static const std::string extensionName;
+ static const std::string typeQName;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp Wed Dec 20 21:21:32 2006
@@ -24,8 +24,9 @@
// WinSock.h and WinSock2.h to be included leading to redefinitions
#define _WINSOCKAPI_
-#include "tuscany/sca/php/PHPServiceWrapper.h"
+#include <php_embed.h>
+#include "tuscany/sca/php/PHPServiceWrapper.h"
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/core/Exceptions.h"
#include "tuscany/sca/util/Utils.h"
@@ -36,7 +37,8 @@
#include "tuscany/sca/core/SCARuntime.h"
#include "tuscany/sca/php/model/PHPImplementation.h"
-#include <php_embed.h>
+using namespace std;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h Wed Dec 20 21:21:32 2006
@@ -23,15 +23,12 @@
#ifndef tuscany_sca_php_phpservicewrapper_h
#define tuscany_sca_php_phpservicewrapper_h
-
#include "tuscany/sca/php/export.h"
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/core/Operation.h"
#include "tuscany/sca/model/Component.h"
#include "tuscany/sca/model/Interface.h"
-using namespace tuscany::sca::model;
-
namespace tuscany
{
@@ -59,13 +56,13 @@
* created.
* @return A wrapper that references the given target.
*/
- static PHPServiceWrapper* getServiceWrapper(Service* service);
+ static PHPServiceWrapper* getServiceWrapper(tuscany::sca::model::Service* service);
/**
* Constructor.
* @param target The component service to which this wrapper refers.
*/
- PHPServiceWrapper(Service* service);
+ PHPServiceWrapper(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -89,7 +86,7 @@
/**
* The component to which this wrapper refers.
*/
- Component* component;
+ tuscany::sca::model::Component* component;
/**
* Set to true if the service is remotable.
@@ -99,7 +96,7 @@
/**
* A pointer to the interface which the service exposes.
*/
- Interface* interf;
+ tuscany::sca::model::Interface* interf;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp Wed Dec 20 21:21:32 2006
@@ -28,6 +28,9 @@
#include "tuscany/sca/model/Reference.h"
#include "tuscany/sca/util/Utils.h"
+using namespace std;
+using namespace tuscany::sca::model;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h Wed Dec 20 21:21:32 2006
@@ -21,14 +21,11 @@
#ifndef tuscany_sca_php_model_phpimplementation_h
#define tuscany_sca_php_model_phpimplementation_h
-#include "tuscany/sca/model/ComponentType.h"
-#include <map>
-using std::map;
#include <string>
-using std::string;
-using namespace tuscany::sca::model;
+#include "tuscany/sca/model/ComponentType.h"
+
namespace tuscany
{
@@ -39,7 +36,7 @@
/**
* Holds information about an SCA implementation written in PHP
*/
- class PHPImplementation : public ComponentType
+ class PHPImplementation : public tuscany::sca::model::ComponentType
{
public:
@@ -52,7 +49,7 @@
* @param className Name of the class in the module (could be a blank string
* if this is not specified).
*/
- PHPImplementation(Composite* composite, const string& module, const string& className);
+ PHPImplementation(tuscany::sca::model::Composite* composite, const std::string& module, const std::string& className);
/**
* Destructor
@@ -63,32 +60,32 @@
* Initialize a component of this type.
* @param component The component to initialize.
*/
- virtual void initializeComponent(Component* component);
+ virtual void initializeComponent(tuscany::sca::model::Component* component);
/**
* Returns the name of the module.
* @return The name of the module.
*/
- const string& getModule() const { return module; }
+ const std::string& getModule() const { return module; }
/**
* Get the name of the class.
* @return The class name if specified.
*/
- const string& getClass() const { return className; }
+ const std::string& getClass() const { return className; }
private:
/**
* Name of the module.
*/
- string module;
+ std::string module;
/**
* Name of the class in the header file declaring the implementation.
* May be an empty string if not set in the SCDL file.
*/
- string className;
+ std::string className;
};
} // End namespace php
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,9 @@
#include "tuscany/sca/php/model/PHPServiceBinding.h"
#include "tuscany/sca/php/PHPServiceWrapper.h"
+using namespace std;
+using namespace tuscany::sca::model;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h Wed Dec 20 21:21:32 2006
@@ -22,10 +22,10 @@
#ifndef tuscany_sca_php_model_phpservicebinding_h
#define tuscany_sca_php_model_phpservicebinding_h
-#include "tuscany/sca/model/ServiceBinding.h"
-using namespace tuscany::sca::model;
#include <string>
-using std::string;
+
+#include "tuscany/sca/model/ServiceBinding.h"
+
namespace tuscany
{
@@ -36,7 +36,7 @@
/**
* Information about a PHP service binding for service or a reference.
*/
- class PHPServiceBinding : public ServiceBinding
+ class PHPServiceBinding : public tuscany::sca::model::ServiceBinding
{
public:
@@ -47,7 +47,7 @@
* or external service is to be bound. This is of the form
* "namespace"#endpoint("service"/"port")
*/
- PHPServiceBinding(Service* service);
+ PHPServiceBinding(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -57,7 +57,7 @@
/**
* Returns the type of binding.
*/
- virtual string getType() { return "http://www.osoa.org/xmlns/sca/1.0#PHPImplementationBinding"; };
+ virtual std::string getType() { return "http://www.osoa.org/xmlns/sca/1.0#PHPImplementationBinding"; };
/**
* Create a wrapper for the service configured by this
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp Wed Dec 20 21:21:32 2006
@@ -26,12 +26,15 @@
#include "tuscany/sca/python/PythonImplementationExtension.h"
#include "tuscany/sca/python/PythonInterfaceExtension.h"
+using namespace std;
+using namespace commonj::sdo;
+using namespace tuscany::sca::model;
extern "C"
{
- #if defined(WIN32) || defined(_WINDOWS)
+#if defined(WIN32) || defined(_WINDOWS)
__declspec(dllexport)
- #endif
+#endif
void tuscany_sca_extension_initialize()
{
tuscany::sca::python::PythonExtension::initialize();
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=489263&r1=489262&r2=489263
==============================================================================
--- 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 Wed Dec 20 21:21:32 2006
@@ -25,6 +25,8 @@
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/util/Utils.h"
+using namespace std;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h Wed Dec 20 21:21:32 2006
@@ -48,19 +48,21 @@
/**
* return the name of the extension
*/
- virtual const string& getExtensionName() {return extensionName;}
+ virtual const std::string& getExtensionName() {return extensionName;}
/**
* return the QName of schema elemant for this implementation extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#implementation.python")
*/
- virtual const string& getExtensionTypeQName() {return typeQName;}
+ virtual const std::string& getExtensionTypeQName() {return typeQName;}
- virtual ComponentType* getImplementation(Composite* composite, DataObjectPtr scdlImplementation);
+ virtual tuscany::sca::model::ComponentType* getImplementation(
+ tuscany::sca::model::Composite* composite,
+ commonj::sdo::DataObjectPtr scdlImplementation);
private:
- static const string extensionName;
- static const string typeQName;
+ static const std::string extensionName;
+ static const std::string typeQName;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp Wed Dec 20 21:21:32 2006
@@ -23,8 +23,9 @@
#include "tuscany/sca/python/model/PythonInterface.h"
#include "tuscany/sca/util/Logging.h"
-//#include "commonj/sdo/SDO.h"
-//using commonj::sdo::DataObjectList;
+using namespace std;
+using namespace commonj::sdo;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h Wed Dec 20 21:21:32 2006
@@ -47,19 +47,21 @@
/**
* return the name of the extension
*/
- virtual const string& getExtensionName() {return extensionName;}
+ virtual const std::string& getExtensionName() {return extensionName;}
/**
* return the QName of schema elemant for this implementation extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#PythonInterface")
*/
- virtual const string& getExtensionTypeQName() {return typeQName;}
+ virtual const std::string& getExtensionTypeQName() {return typeQName;}
- virtual tuscany::sca::model::Interface* getInterface(Composite* composite, DataObjectPtr scdlInterface);
+ virtual tuscany::sca::model::Interface* getInterface(
+ tuscany::sca::model::Composite* composite,
+ commonj::sdo::DataObjectPtr scdlInterface);
private:
- static const string extensionName;
- static const string typeQName;
+ static const std::string extensionName;
+ static const std::string typeQName;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h Wed Dec 20 21:21:32 2006
@@ -22,6 +22,7 @@
#ifndef tuscany_sca_python_pythonserviceproxy_h
#define tuscany_sca_python_pythonserviceproxy_h
+#include "export.h"
#include "tuscany/sca/core/ServiceProxy.h"
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/util/Library.h"
@@ -29,10 +30,6 @@
#include "tuscany/sca/model/Reference.h"
#include "tuscany/sca/model/Service.h"
-#include "export.h"
-
-using namespace tuscany::sca::model;
-
namespace tuscany
{
@@ -52,14 +49,14 @@
* the target ServiceWrapper.
* @param reference The reference on the source component.
*/
- PythonServiceProxy(Reference* reference);
+ PythonServiceProxy(tuscany::sca::model::Reference* reference);
/**
* Create a new service proxy for a service. The proxy will contain a pointer to
* the target ServiceWrapper.
* @param service The service on the target component.
*/
- SCA_PYTHON_API PythonServiceProxy(Service* service);
+ SCA_PYTHON_API PythonServiceProxy(tuscany::sca::model::Service* service);
/**
* Destructor.
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp Wed Dec 20 21:21:32 2006
@@ -19,8 +19,9 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/python/PythonServiceWrapper.h"
+#include "commonj/sdo/SDO.h"
+#include "tuscany/sca/python/PythonServiceWrapper.h"
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/core/Exceptions.h"
#include "tuscany/sca/util/Utils.h"
@@ -31,8 +32,9 @@
#include "tuscany/sca/core/SCARuntime.h"
#include "tuscany/sca/python/model/PythonImplementation.h"
-#include "commonj/sdo/SDO.h"
+using namespace std;
using namespace commonj::sdo;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h Wed Dec 20 21:21:32 2006
@@ -23,14 +23,6 @@
#ifndef tuscany_sca_python_pythonservicewrapper_h
#define tuscany_sca_python_pythonservicewrapper_h
-#include "tuscany/sca/python/export.h"
-#include "tuscany/sca/core/ServiceWrapper.h"
-#include "tuscany/sca/core/Operation.h"
-#include "tuscany/sca/model/Component.h"
-#include "tuscany/sca/model/Interface.h"
-#include "tuscany/sca/python/model/PythonImplementation.h"
-
-using namespace tuscany::sca::model;
// undefine _DEBUG so Python does not need it's deebug dll
#ifdef _DEBUG
@@ -42,6 +34,13 @@
#define _DEBUG
#endif
+#include "tuscany/sca/python/export.h"
+#include "tuscany/sca/core/ServiceWrapper.h"
+#include "tuscany/sca/core/Operation.h"
+#include "tuscany/sca/model/Component.h"
+#include "tuscany/sca/model/Interface.h"
+#include "tuscany/sca/python/model/PythonImplementation.h"
+
namespace tuscany
{
@@ -66,7 +65,7 @@
* Constructor.
* @param target The component service to which this wrapper refers.
*/
- PythonServiceWrapper(Service* service);
+ PythonServiceWrapper(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -127,7 +126,7 @@
/**
* The component to which this wrapper refers.
*/
- Component* component;
+ tuscany::sca::model::Component* component;
/**
* The component implementation
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp Wed Dec 20 21:21:32 2006
@@ -30,6 +30,7 @@
#include "tuscany/sca/model/ReferenceType.h"
#include "tuscany/sca/util/Utils.h"
+using namespace std;
using namespace tuscany::sca::model;
namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h Wed Dec 20 21:21:32 2006
@@ -22,15 +22,13 @@
#ifndef tuscany_sca_python_model_pythonimplementation_h
#define tuscany_sca_python_model_pythonimplementation_h
-#include "tuscany/sca/model/ComponentType.h"
-#include "commonj/sdo/SDO.h"
-#include <map>
-using std::map;
#include <string>
-using std::string;
-using namespace tuscany::sca::model;
+#include "commonj/sdo/SDO.h"
+
+#include "tuscany/sca/model/ComponentType.h"
+
namespace tuscany
{
@@ -41,7 +39,7 @@
/**
* Holds information about an SCA implementation written in Python
*/
- class PythonImplementation : public ComponentType
+ class PythonImplementation : public tuscany::sca::model::ComponentType
{
public:
@@ -63,7 +61,9 @@
* @param className Name of the class in the module (could be a blank string
* if this is not specified).
*/
- PythonImplementation(Composite* composite, const string& module, const string& modulePath, const string& className, Scope scope);
+ PythonImplementation(tuscany::sca::model::Composite* composite,
+ const std::string& module, const std::string& modulePath, const std::string& className,
+ Scope scope);
/**
* Destructor
@@ -74,40 +74,40 @@
* Initialize a component of this type.
* @param component The component to initialize.
*/
- virtual void initializeComponent(Component* component);
+ virtual void initializeComponent(tuscany::sca::model::Component* component);
/**
* Override the ComponentType::findReferenceType method
* to allow Python components to be defined without requiring
* a componentType side-file
*/
- virtual ReferenceType* findReferenceType(const string& referenceName);
+ virtual tuscany::sca::model::ReferenceType* findReferenceType(const std::string& referenceName);
/**
* Override the ComponentType::findPropertyType method
* to allow Python components to be defined without requiring
* a componentType side-file
*/
- virtual const commonj::sdo::Property* findPropertyType(const string& propertyName);
+ virtual const commonj::sdo::Property* findPropertyType(const std::string& propertyName);
/**
* Returns the name of the module.
* @return The name of the module.
*/
- const string& getModule() const { return module; }
+ const std::string& getModule() const { return module; }
/**
* Get the header path.
* @return The pathe element of the header.
*/
- const string& getModulePath() const { return modulePath; }
+ const std::string& getModulePath() const { return modulePath; }
/**
* Get the name of the class.
* @return The class name if specified.
*/
- const string& getClass() const { return className; }
+ const std::string& getClass() const { return className; }
/**
* Returns the implementation scope
@@ -119,18 +119,18 @@
/**
* Name of the module.
*/
- string module;
+ std::string module;
/**
* Path to the module.
*/
- string modulePath;
+ std::string modulePath;
/**
* Name of the class in the header file declaring the implementation.
* May be an empty string if not set in the SCDL file.
*/
- string className;
+ std::string className;
/**
* The implementation scope
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp Wed Dec 20 21:21:32 2006
@@ -24,6 +24,7 @@
#include "tuscany/sca/python/export.h"
#include "tuscany/sca/python/model/PythonInterface.h"
+using namespace std;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h Wed Dec 20 21:21:32 2006
@@ -23,17 +23,10 @@
#ifndef tuscany_sca_python_model_pythoninterface_h
#define tuscany_sca_python_model_pythoninterface_h
-#include "tuscany/sca/python/export.h"
-#include "tuscany/sca/model/Interface.h"
-
-#include <map>
-using std::map;
-#include <vector>
-using std::vector;
#include <string>
-using std::string;
-using namespace tuscany::sca::model;
+#include "tuscany/sca/python/export.h"
+#include "tuscany/sca/model/Interface.h"
namespace tuscany
{
@@ -42,10 +35,10 @@
namespace python
{
/**
- * Holds information about an interface described using a C++
+ * Holds information about an interface described using a Python
* header file.
*/
- class PythonInterface : public Interface
+ class PythonInterface : public tuscany::sca::model::Interface
{
public:
@@ -67,12 +60,12 @@
* return the QName of the schema type for this interface type
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#interface.cpp")
*/
- const string& getInterfaceTypeQName() { return typeQName; };
+ const std::string& getInterfaceTypeQName() { return typeQName; };
/**
* The QName of the schema type for this interface type.
*/
- SCA_PYTHON_API static const string typeQName;
+ SCA_PYTHON_API static const std::string typeQName;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,8 @@
#include "tuscany/sca/python/model/PythonReferenceBinding.h"
#include "tuscany/sca/python/PythonServiceProxy.h"
+using namespace std;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h Wed Dec 20 21:21:32 2006
@@ -22,13 +22,10 @@
#ifndef tuscany_sca_python_model_pythonreferencebinding_h
#define tuscany_sca_python_model_pythonreferencebinding_h
-#include "tuscany/sca/model/ReferenceBinding.h"
-
-
#include <string>
-using std::string;
-using namespace tuscany::sca::model;
+#include "tuscany/sca/model/ReferenceBinding.h"
+
namespace tuscany
{
@@ -39,14 +36,14 @@
/**
* Information about a Python service binding for service or a reference.
*/
- class PythonReferenceBinding : public ReferenceBinding
+ class PythonReferenceBinding : public tuscany::sca::model::ReferenceBinding
{
public:
/**
* Constructor.
*/
- PythonReferenceBinding(Reference* reference);
+ PythonReferenceBinding(tuscany::sca::model::Reference* reference);
/**
* Destructor.
@@ -56,7 +53,7 @@
/**
* Returns the type of binding.
*/
- virtual string getType() { return "http://www.osoa.org/xmlns/sca/1.0#PythonImplementationBinding"; };
+ virtual std::string getType() { return "http://www.osoa.org/xmlns/sca/1.0#PythonImplementationBinding"; };
/**
* Create a proxy representing the reference to the
@@ -67,12 +64,12 @@
/**
* Configure this binding from a service binding.
*/
- virtual void configure(ServiceBinding* serviceBinding);
+ virtual void configure(tuscany::sca::model::ServiceBinding* serviceBinding);
/**
* Returns the target service binding.
*/
- ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
+ tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
private:
@@ -85,7 +82,7 @@
/**
* The service binding of the target
*/
- ServiceBinding* targetServiceBinding;
+ tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace python
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,9 @@
#include "tuscany/sca/python/model/PythonServiceBinding.h"
#include "tuscany/sca/python/PythonServiceWrapper.h"
+using namespace std;
+using namespace tuscany::sca::model;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h Wed Dec 20 21:21:32 2006
@@ -23,10 +23,9 @@
#ifndef tuscany_sca_python_model_pythonservicebinding_h
#define tuscany_sca_python_model_pythonservicebinding_h
-#include "tuscany/sca/model/ServiceBinding.h"
-using namespace tuscany::sca::model;
#include <string>
-using std::string;
+
+#include "tuscany/sca/model/ServiceBinding.h"
namespace tuscany
{
@@ -37,7 +36,7 @@
/**
* Information about a Python service binding for service or a reference.
*/
- class PythonServiceBinding : public ServiceBinding
+ class PythonServiceBinding : public tuscany::sca::model::ServiceBinding
{
public:
@@ -48,7 +47,7 @@
* or external service is to be bound. This is of the form
* "namespace"#endpoint("service"/"port")
*/
- PythonServiceBinding(Service* service);
+ PythonServiceBinding(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -58,7 +57,7 @@
/**
* Returns the type of binding.
*/
- virtual string getType() { return "http://www.osoa.org/xmlns/sca/1.0#PythonImplementationBinding"; };
+ virtual std::string getType() { return "http://www.osoa.org/xmlns/sca/1.0#PythonImplementationBinding"; };
/**
* Create a wrapper for the service configured by this
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp Wed Dec 20 21:21:32 2006
@@ -19,29 +19,9 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/core/SCARuntime.h"
-#include "tuscany/sca/model/Component.h"
-#include "tuscany/sca/model/Reference.h"
-#include "tuscany/sca/model/ReferenceType.h"
-#include "tuscany/sca/model/ServiceBinding.h"
-#include "tuscany/sca/core/Operation.h"
-using namespace tuscany::sca;
-using namespace tuscany::sca::model;
-
-#include "PythonServiceProxy.h"
-using namespace tuscany::sca::python;
-
-#include "tuscany/sca/util/Logging.h"
-#include "tuscany/sca/core/Exceptions.h"
-
-#include "commonj/sdo/SDO.h"
-using namespace commonj::sdo;
-
#include <string>
#include <iostream>
#include <sstream>
-using namespace std;
-
// undefine _DEBUG so Python does not need it's debug dll
#ifdef _DEBUG
@@ -53,6 +33,23 @@
#define _DEBUG
#endif
+#include "commonj/sdo/SDO.h"
+
+#include "PythonServiceProxy.h"
+#include "tuscany/sca/util/Logging.h"
+#include "tuscany/sca/core/Exceptions.h"
+#include "tuscany/sca/core/SCARuntime.h"
+#include "tuscany/sca/model/Component.h"
+#include "tuscany/sca/model/Reference.h"
+#include "tuscany/sca/model/ReferenceType.h"
+#include "tuscany/sca/model/ServiceBinding.h"
+#include "tuscany/sca/core/Operation.h"
+
+using namespace std;
+using namespace commonj::sdo;
+using namespace tuscany::sca;
+using namespace tuscany::sca::model;
+
static PyObject* scaError;
/**
@@ -118,11 +115,11 @@
}
-static PythonServiceProxy* getServiceProxy(PyObject *args)
+static tuscany::sca::python::PythonServiceProxy* getServiceProxy(PyObject *args)
{
logentry();
- PythonServiceProxy* serviceProxy = NULL;
+ tuscany::sca::python::PythonServiceProxy* serviceProxy = NULL;
SCARuntime* runtime = SCARuntime::getInstance();
// The first argument holds the name
@@ -162,7 +159,7 @@
}
ReferenceBinding* refBinding = ref->getBinding();
- serviceProxy = (PythonServiceProxy*) refBinding->getServiceProxy();
+ serviceProxy = (tuscany::sca::python::PythonServiceProxy*) refBinding->getServiceProxy();
}
else
{
@@ -178,7 +175,7 @@
return NULL;
}
- serviceProxy = new PythonServiceProxy(service);
+ serviceProxy = new tuscany::sca::python::PythonServiceProxy(service);
}
return serviceProxy;
@@ -189,7 +186,7 @@
{
logentry();
- PythonServiceProxy* pythonServiceProxy = getServiceProxy(args);
+ tuscany::sca::python::PythonServiceProxy* pythonServiceProxy = getServiceProxy(args);
if(!pythonServiceProxy)
{
return NULL;
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp Wed Dec 20 21:21:32 2006
@@ -24,12 +24,15 @@
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/core/SCARuntime.h"
+using namespace std;
+using namespace commonj::sdo;
+using namespace tuscany::sca::model;
extern "C"
{
- #if defined(WIN32) || defined(_WINDOWS)
+#if defined(WIN32) || defined(_WINDOWS)
__declspec(dllexport)
- #endif
+#endif
void tuscany_sca_extension_initialize()
{
tuscany::sca::rest::RESTInterfaceExtension::initialize();
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h Wed Dec 20 21:21:32 2006
@@ -47,21 +47,23 @@
/**
* return the name of the extension
*/
- virtual const string& getExtensionName() {return extensionName;}
+ virtual const std::string& getExtensionName() {return extensionName;}
/**
* return the QName of schema type for this interface extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#interface.rest")
*/
- virtual const string& getExtensionTypeQName() {return typeQName;}
+ virtual const std::string& getExtensionTypeQName() {return typeQName;}
- virtual tuscany::sca::model::Interface* getInterface(Composite* composite, DataObjectPtr scdlInterface);
+ virtual tuscany::sca::model::Interface* getInterface(
+ tuscany::sca::model::Composite* composite,
+ commonj::sdo::DataObjectPtr scdlInterface);
static void initialize();
private:
- static const string extensionName;
- static const string typeQName;
+ static const std::string extensionName;
+ static const std::string typeQName;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,7 @@
#include "tuscany/sca/util/Utils.h"
#include "tuscany/sca/rest/model/RESTInterface.h"
+using namespace std;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h Wed Dec 20 21:21:32 2006
@@ -22,15 +22,11 @@
#ifndef tuscany_sca_rest_model_restinterface_h
#define tuscany_sca_rest_model_restinterface_h
+#include <string>
+
#include "tuscany/sca/model/Interface.h"
#include "tuscany/sca/rest/exportinterface.h"
-#include <map>
-using std::map;
-#include <string>
-using std::string;
-
-using namespace tuscany::sca::model;
namespace tuscany
{
@@ -41,7 +37,7 @@
/**
* Holds information about a REST interface
*/
- class RESTInterface : public Interface
+ class RESTInterface : public tuscany::sca::model::Interface
{
public:
@@ -65,12 +61,12 @@
* return the QName of the schema type for this interface type
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#interface.rest")
*/
- virtual const string& getInterfaceTypeQName() { return typeQName; };
+ virtual const std::string& getInterfaceTypeQName() { return typeQName; };
/**
* The QName of the schema type for this interface type.
*/
- SCA_REST_INTERFACE_API static const string typeQName;
+ SCA_REST_INTERFACE_API static const std::string typeQName;
private:
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp Wed Dec 20 21:21:32 2006
@@ -23,11 +23,16 @@
#include "tuscany/sca/util/Utils.h"
#include "tuscany/sca/core/SCARuntime.h"
+using namespace std;
+using namespace commonj::sdo;
+using namespace tuscany::sca::model;
+
+
extern "C"
{
- #if defined(WIN32) || defined(_WINDOWS)
+#if defined(WIN32) || defined(_WINDOWS)
__declspec(dllexport)
- #endif
+#endif
void tuscany_sca_extension_initialize()
{
tuscany::sca::rest::RESTServiceBindingExtension::initialize();
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h Wed Dec 20 21:21:32 2006
@@ -45,21 +45,24 @@
/**
* return the name of the extension
*/
- virtual const string& getExtensionName() {return extensionName;}
+ virtual const std::string& getExtensionName() {return extensionName;}
/**
* return the QName of schema elemant for this implementation extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#binding.rest")
*/
- virtual const string& getExtensionTypeQName() {return typeQName;}
+ virtual const std::string& getExtensionTypeQName() {return typeQName;}
- virtual ServiceBinding* getServiceBinding(Composite* composite, Service* service, DataObjectPtr scdlBinding);
+ virtual tuscany::sca::model::ServiceBinding* getServiceBinding(
+ tuscany::sca::model::Composite* composite,
+ tuscany::sca::model::Service* service,
+ commonj::sdo::DataObjectPtr scdlBinding);
static void initialize();
private:
- static const string extensionName;
- static const string typeQName;
+ static const std::string extensionName;
+ static const std::string typeQName;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp Wed Dec 20 21:21:32 2006
@@ -20,6 +20,12 @@
#pragma warning(disable: 4091)
#endif
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+#include "commonj/sdo/SDO.h"
+
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/core/Exceptions.h"
#include "tuscany/sca/util/Utils.h"
@@ -34,15 +40,10 @@
#include "model/RESTServiceBinding.h"
#include "tuscany/sca/rest/model/RESTInterface.h"
-#include "commonj/sdo/SDO.h"
+using namespace std;
using namespace commonj::sdo;
-
-#include <curl/curl.h>
-#include <curl/types.h>
-#include <curl/easy.h>
-
-using namespace tuscany::sca;
using namespace tuscany::sca::model;
+using namespace tuscany::sca::util;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h Wed Dec 20 21:21:32 2006
@@ -20,14 +20,13 @@
#ifndef tuscany_sca_extension_rest_restservicewrapper_h
#define tuscany_sca_extension_rest_restservicewrapper_h
+#include <sstream>
+
+#include "commonj/sdo/SDO.h"
+
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/core/Operation.h"
#include "tuscany/sca/model/Service.h"
-#include "commonj/sdo/SDO.h"
-
-using namespace tuscany::sca::model;
-
-#include <sstream>
namespace tuscany
@@ -46,7 +45,7 @@
* Constructor.
* @param target The service wrapper represents a Web service.
*/
- RESTServiceWrapper(Service* service);
+ RESTServiceWrapper(tuscany::sca::model::Service* service);
/**
* Destructor
@@ -71,7 +70,7 @@
/**
* Get the configured binding URI
*/
- const string getBindingURI();
+ const std::string getBindingURI();
/**
* Write a parameter into a URL
@@ -81,7 +80,7 @@
/**
* Set the return value on the given operation
*/
- void setReturn(commonj::sdo::XMLHelper* xmlHelper, string& payload, Operation& operation);
+ void setReturn(commonj::sdo::XMLHelper* xmlHelper, std::string& payload, Operation& operation);
};
} // End namespace rest
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -22,6 +22,9 @@
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/rest/RESTServiceWrapper.h"
+using namespace std;
+using namespace tuscany::sca::model;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h Wed Dec 20 21:21:32 2006
@@ -20,12 +20,11 @@
#ifndef tuscany_sca_extension_rest_model_restservicebinding_h
#define tuscany_sca_extension_rest_model_restservicebinding_h
+#include <string>
+
#include "tuscany/sca/model/ServiceBinding.h"
#include "tuscany/sca/model/Service.h"
-#include <string>
-using std::string;
-
namespace tuscany
{
namespace sca
@@ -35,7 +34,7 @@
/**
* Information about a REST binding for a service or a reference.
*/
- class RESTServiceBinding : public model::ServiceBinding
+ class RESTServiceBinding : public tuscany::sca::model::ServiceBinding
{
public:
@@ -43,7 +42,7 @@
* Constructor.
* @param uri The uri of the binding.
*/
- RESTServiceBinding(model::Service* service, const string& uri);
+ RESTServiceBinding(tuscany::sca::model::Service* service, const std::string& uri);
/**
* Destructor.
@@ -53,7 +52,7 @@
/**
* Returns the type of binding.
*/
- virtual string getType() { return "http://www.osoa.org/xmlns/sca/1.0#RESTBinding"; };
+ virtual std::string getType() { return "http://www.osoa.org/xmlns/sca/1.0#RESTBinding"; };
/**
* Create a wrapper for the service configured by this
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp Wed Dec 20 21:21:32 2006
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <sstream>
+
#include "apr_strings.h"
#include "apr_fnmatch.h"
#include "apr_lib.h"
@@ -42,6 +44,8 @@
#include "mod_core.h"
+#include "commonj/sdo/SDO.h"
+
#include "tuscany/sca/core/Exceptions.h"
#include "tuscany/sca/util/Logging.h"
#include "RESTServiceProxy.h"
@@ -59,15 +63,11 @@
#include "tuscany/sca/core/SCARuntime.h"
#include "tuscany/sca/util/Utils.h"
-#include "commonj/sdo/SDO.h"
-
-#include <sstream>
-
+using namespace std;
using namespace commonj::sdo;
-
using namespace tuscany::sca;
-using namespace tuscany::sca::rest;
using namespace tuscany::sca::model;
+using namespace tuscany::sca::util;
extern "C"
@@ -1296,13 +1296,13 @@
const command_rec rest_module_cmds[] =
{
- AP_INIT_TAKE1("TuscanyHome", (const char*(*)())rest_set_home, NULL, RSRC_CONF,
+ AP_INIT_TAKE1("TuscanyHome", (const char*(*)())tuscany::sca::rest::rest_set_home, NULL, RSRC_CONF,
"Tuscany home directory"),
- AP_INIT_TAKE1("TuscanyPath", (const char*(*)())rest_set_path, NULL, ACCESS_CONF,
+ AP_INIT_TAKE1("TuscanyPath", (const char*(*)())tuscany::sca::rest::rest_set_path, NULL, ACCESS_CONF,
"Tuscany SCA composite search path"),
- AP_INIT_TAKE1("TuscanyRoot", (const char*(*)())rest_set_root, NULL, ACCESS_CONF,
+ AP_INIT_TAKE1("TuscanyRoot", (const char*(*)())tuscany::sca::rest::rest_set_root, NULL, ACCESS_CONF,
"Tuscany root SCA configuration path"),
- AP_INIT_TAKE1("TuscanyComponent", (const char*(*)())rest_set_component, NULL, ACCESS_CONF,
+ AP_INIT_TAKE1("TuscanyComponent", (const char*(*)())tuscany::sca::rest::rest_set_component, NULL, ACCESS_CONF,
"SCA component name"),
{NULL}
};
@@ -1359,12 +1359,12 @@
module AP_MODULE_DECLARE_DATA sca_rest_module =
{
STANDARD20_MODULE_STUFF,
- rest_create_dir_config, /* dir config */
+ tuscany::sca::rest::rest_create_dir_config, /* dir config */
NULL, /* dir merger --- default is to override */
- rest_create_server_config, /* server config */
+ tuscany::sca::rest::rest_create_server_config, /* server config */
NULL, /* merge server config */
- rest_module_cmds, /* command table */
- register_hooks /* register_hooks */
+ tuscany::sca::rest::rest_module_cmds, /* command table */
+ tuscany::sca::rest::register_hooks /* register_hooks */
};
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp Wed Dec 20 21:21:32 2006
@@ -23,12 +23,15 @@
#include "tuscany/sca/util/Utils.h"
#include "tuscany/sca/core/SCARuntime.h"
+using namespace std;
+using namespace commonj::sdo;
+using namespace tuscany::sca::model;
extern "C"
{
- #if defined(WIN32) || defined(_WINDOWS)
+#if defined(WIN32) || defined(_WINDOWS)
__declspec(dllexport)
- #endif
+#endif
void tuscany_sca_extension_initialize()
{
tuscany::sca::rest::RESTReferenceBindingExtension::initialize();
@@ -70,9 +73,9 @@
{
string uri = scdlBinding->getCString("uri");
- RESTReferenceBinding* serviceBinding = new RESTReferenceBinding(reference, uri);
+ RESTReferenceBinding* referenceBinding = new RESTReferenceBinding(reference, uri);
- return serviceBinding;
+ return referenceBinding;
}
else
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h Wed Dec 20 21:21:32 2006
@@ -45,21 +45,24 @@
/**
* return the name of the extension
*/
- virtual const string& getExtensionName() {return extensionName;}
+ virtual const std::string& getExtensionName() {return extensionName;}
/**
* return the QName of schema elemant for this implementation extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#binding.rest")
*/
- virtual const string& getExtensionTypeQName() {return typeQName;}
+ virtual const std::string& getExtensionTypeQName() {return typeQName;}
- virtual ReferenceBinding* getReferenceBinding(Composite* composite, Reference *reference, DataObjectPtr scdlBinding);
+ virtual tuscany::sca::model::ReferenceBinding* getReferenceBinding(
+ tuscany::sca::model::Composite* composite,
+ tuscany::sca::model::Reference *reference,
+ commonj::sdo::DataObjectPtr scdlBinding);
static void initialize();
private:
- static const string extensionName;
- static const string typeQName;
+ static const std::string extensionName;
+ static const std::string typeQName;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp Wed Dec 20 21:21:32 2006
@@ -19,6 +19,10 @@
/* $Rev$ $Date$ */
+#include <sstream>
+
+#include "commonj/sdo/SDO.h"
+
#include "RESTServiceProxy.h"
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/core/Exceptions.h"
@@ -38,11 +42,8 @@
#include "tuscany/sca/model/WSDLOperation.h"
#include "model/RESTReferenceBinding.h"
-#include <sstream>
-
-#include "commonj/sdo/SDO.h"
+using namespace std;
using namespace commonj::sdo;
-
using namespace tuscany::sca::model;
namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h Wed Dec 20 21:21:32 2006
@@ -20,6 +20,9 @@
#ifndef tuscany_sca_extension_rest_restserviceproxy_h
#define tuscany_sca_extension_rest_restserviceproxy_h
+#include "commonj/sdo/SDO.h"
+
+#include "export.h"
#include "tuscany/sca/core/ServiceProxy.h"
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/model/Component.h"
@@ -27,13 +30,7 @@
#include "tuscany/sca/model/Service.h"
#include "tuscany/sca/model/WSDLOperation.h"
#include "model/RESTReferenceBinding.h"
-#include "commonj/sdo/SDO.h"
-#include "export.h"
-
-using namespace tuscany::sca::model;
-using commonj::sdo::DataObjectPtr;
-using commonj::sdo::DataFactoryPtr;
namespace tuscany
{
@@ -57,7 +54,7 @@
* @param reference The reference on the source component.
* @param target The wrapper of the service which is wired to this reference.
*/
- RESTServiceProxy(Reference* reference);
+ RESTServiceProxy(tuscany::sca::model::Reference* reference);
/**
* Create a new service proxy for a service. The proxy will contain a pointer to
@@ -65,7 +62,7 @@
* @param reference The service on the target component.
* @param target The wrapper of the target service.
*/
- RESTServiceProxy(Service* service);
+ RESTServiceProxy(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -75,11 +72,14 @@
/**
* Invoke the specified operation
*/
- SCA_REST_SERVICE_API DataObjectPtr invoke(const WSDLOperation& wsdlOperation, DataObjectPtr inputDataObject);
+ SCA_REST_SERVICE_API commonj::sdo::DataObjectPtr invoke(
+ const tuscany::sca::model::WSDLOperation& wsdlOperation,
+ commonj::sdo::DataObjectPtr inputDataObject);
private:
- void setOutputData(Operation& operation, DataObjectPtr outputDataObject, DataFactoryPtr dataFactoryPtr);
+ void setOutputData(Operation& operation,
+ commonj::sdo::DataObjectPtr outputDataObject, commonj::sdo::DataFactoryPtr dataFactoryPtr);
/**
* The target service wrapper
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -22,6 +22,9 @@
#include "tuscany/sca/core/ServiceProxy.h"
#include "tuscany/sca/rest/RESTServiceProxy.h"
+using namespace std;
+using namespace tuscany::sca::model;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h Wed Dec 20 21:21:32 2006
@@ -20,12 +20,9 @@
#ifndef tuscany_sca_extension_rest_model_restreferencebinding_h
#define tuscany_sca_extension_rest_model_restreferencebinding_h
-#include "tuscany/sca/model/ReferenceBinding.h"
-
-using namespace tuscany::sca::model;
-
#include <string>
-using std::string;
+
+#include "tuscany/sca/model/ReferenceBinding.h"
namespace tuscany
{
@@ -36,7 +33,7 @@
/**
* Information about a web service binding for service or a reference.
*/
- class RESTReferenceBinding : public ReferenceBinding
+ class RESTReferenceBinding : public tuscany::sca::model::ReferenceBinding
{
public:
@@ -44,7 +41,7 @@
* Constructor.
* @param uri The uri of the binding.
*/
- RESTReferenceBinding(Reference* reference, const string&uri);
+ RESTReferenceBinding(tuscany::sca::model::Reference* reference, const std::string& uri);
/**
* Destructor.
@@ -54,12 +51,12 @@
/**
* Returns the type of binding.
*/
- virtual string getType() { return "http://www.osoa.org/xmlns/sca/1.0#RESTBinding"; };
+ virtual std::string getType() { return "http://www.osoa.org/xmlns/sca/1.0#RESTBinding"; };
/**
* Configure this binding from a service binding.
*/
- virtual void configure(ServiceBinding* serviceBinding);
+ virtual void configure(tuscany::sca::model::ServiceBinding* serviceBinding);
/**
* Create a proxy representing the reference to the
@@ -70,7 +67,7 @@
/**
* Returns the target service binding.
*/
- ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
+ tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
private:
@@ -83,7 +80,7 @@
/**
* The service binding of the target
*/
- ServiceBinding* targetServiceBinding;
+ tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace rest
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp Wed Dec 20 21:21:32 2006
@@ -29,7 +29,8 @@
#include "tuscany/sca/model/Composite.h"
#include "tuscany/sca/ruby/RubyServiceProxy.h"
-using namespace tuscany::sca::ruby;
+using namespace std;
+using namespace tuscany::sca::model;
extern "C"
{
@@ -54,7 +55,7 @@
}
// Get a Proxy for this service
- RubyServiceProxy* serviceProxy = new RubyServiceProxy(service);
+ tuscany::sca::ruby::RubyServiceProxy* serviceProxy = new tuscany::sca::ruby::RubyServiceProxy(service);
// Return the Ruby proxy value object
return serviceProxy->getProxyValue();
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp Wed Dec 20 21:21:32 2006
@@ -24,12 +24,15 @@
#include "tuscany/sca/core/SCARuntime.h"
#include "tuscany/sca/ruby/RubyImplementationExtension.h"
+using namespace std;
+using namespace commonj::sdo;
+using namespace tuscany::sca::model;
extern "C"
{
- #if defined(WIN32) || defined(_WINDOWS)
+#if defined(WIN32) || defined(_WINDOWS)
__declspec(dllexport)
- #endif
+#endif
void tuscany_sca_extension_initialize()
{
tuscany::sca::ruby::RubyExtension::initialize();
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=489263&r1=489262&r2=489263
==============================================================================
--- 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 Wed Dec 20 21:21:32 2006
@@ -24,6 +24,8 @@
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/util/Utils.h"
+using namespace std;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h Wed Dec 20 21:21:32 2006
@@ -47,19 +47,21 @@
/**
* return the name of the extension
*/
- virtual const string& getExtensionName() {return extensionName;}
+ virtual const std::string& getExtensionName() {return extensionName;}
/**
* return the QName of schema elemant for this implementation extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#implementation.ruby")
*/
- virtual const string& getExtensionTypeQName() {return typeQName;}
+ virtual const std::string& getExtensionTypeQName() {return typeQName;}
- virtual ComponentType* getImplementation(Composite* composite, DataObjectPtr scdlImplementation);
+ virtual tuscany::sca::model::ComponentType* getImplementation(
+ tuscany::sca::model::Composite* composite,
+ commonj::sdo::DataObjectPtr scdlImplementation);
private:
- static const string extensionName;
- static const string typeQName;
+ static const std::string extensionName;
+ static const std::string typeQName;
};
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=489263&r1=489262&r2=489263
==============================================================================
--- 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 Wed Dec 20 21:21:32 2006
@@ -20,6 +20,8 @@
/* $Rev$ $Date$ */
+#include <sstream>
+
#include "tuscany/sca/ruby/RubyServiceProxy.h"
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/core/SCARuntime.h"
@@ -36,7 +38,8 @@
#include "tuscany/sca/ruby/model/RubyImplementation.h"
#include "tuscany/sca/ruby/model/RubyReferenceBinding.h"
-#include <sstream>
+using namespace std;
+using namespace tuscany::sca::model;
extern "C"
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h Wed Dec 20 21:21:32 2006
@@ -22,6 +22,7 @@
#ifndef tuscany_sca_ruby_rubyserviceproxy_h
#define tuscany_sca_ruby_rubyserviceproxy_h
+#include "tuscany/sca/ruby/Ruby.h"
#include "tuscany/sca/ruby/export.h"
#include "tuscany/sca/core/ServiceProxy.h"
#include "tuscany/sca/core/ServiceWrapper.h"
@@ -29,10 +30,6 @@
#include "tuscany/sca/model/Reference.h"
#include "tuscany/sca/model/Service.h"
-using namespace tuscany::sca::model;
-
-#include "tuscany/sca/ruby/Ruby.h"
-
namespace tuscany
{
@@ -56,7 +53,7 @@
* @param reference The reference on the source component.
* @param target The wrapper of the service which is wired to this reference.
*/
- RubyServiceProxy(Reference* reference);
+ RubyServiceProxy(tuscany::sca::model::Reference* reference);
/**
* Create a new service proxy for a service. The proxy will contain a pointer to
@@ -64,7 +61,7 @@
* @param reference The service on the target component.
* @param target The wrapper of the target service.
*/
- RubyServiceProxy(Service* service);
+ RubyServiceProxy(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -101,7 +98,7 @@
/**
* The component owning the proxy
*/
- Component* component;
+ tuscany::sca::model::Component* component;
/**
* The Ruby proxy class
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp Wed Dec 20 21:21:32 2006
@@ -20,8 +20,11 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/ruby/RubyServiceWrapper.h"
+#include <sstream>
+
+#include "commonj/sdo/SDO.h"
+#include "tuscany/sca/ruby/RubyServiceWrapper.h"
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/core/Exceptions.h"
#include "tuscany/sca/util/Utils.h"
@@ -36,11 +39,10 @@
#include "tuscany/sca/ruby/model/RubyImplementation.h"
#include "tuscany/sca/ruby/model/RubyServiceBinding.h"
#include "tuscany/sca/ruby/RubyServiceProxy.h"
-#include "commonj/sdo/SDO.h"
-
-#include <sstream>
-using commonj::sdo::PropertyList;
+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/RubyServiceWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h Wed Dec 20 21:21:32 2006
@@ -22,16 +22,14 @@
#ifndef tuscany_sca_ruby_rubyservicewrapper_h
#define tuscany_sca_ruby_rubyservicewrapper_h
+#include "tuscany/sca/ruby/export.h"
+#include "tuscany/sca/ruby/Ruby.h"
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/core/Operation.h"
#include "tuscany/sca/model/Component.h"
#include "tuscany/sca/model/Interface.h"
#include "tuscany/sca/ruby/model/RubyImplementation.h"
-#include "tuscany/sca/ruby/export.h"
-
-#include "tuscany/sca/ruby/Ruby.h"
-using namespace tuscany::sca::model;
namespace tuscany
{
@@ -56,7 +54,7 @@
* Constructor.
* @param target The component service to which this wrapper refers.
*/
- RubyServiceWrapper(Service* service);
+ RubyServiceWrapper(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -75,12 +73,12 @@
/**
* The component to which this wrapper refers.
*/
- Component* component;
+ tuscany::sca::model::Component* component;
/**
* A pointer to the interface which the service exposes.
*/
- Interface* interf;
+ tuscany::sca::model::Interface* interf;
/**
* The Ruby implementation
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp Wed Dec 20 21:21:32 2006
@@ -31,6 +31,9 @@
#include "tuscany/sca/model/ReferenceType.h"
#include "tuscany/sca/util/Utils.h"
+using namespace std;
+using namespace tuscany::sca::model;
+
namespace tuscany
{
namespace sca
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org