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 [2/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/core/src/tuscany/sca/model/ReferenceType.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h Wed Dec 20 21:21:32 2006
@@ -23,7 +23,6 @@
#define tuscany_sca_model_referencetype_h
#include <string>
-using std::string;
#include "tuscany/sca/model/Contract.h"
@@ -63,7 +62,7 @@
* Constructor.
* @param name The name of the reference.
*/
- SCA_API ReferenceType(ComponentType* componentType, const string& name,
+ SCA_API ReferenceType(ComponentType* componentType, const std::string& name,
Interface* intface, Interface* callbackInterface, Multiplicity multiplicity);
/**
@@ -81,7 +80,7 @@
* Returns the name of the reference.
* @return The name of the reference.
*/
- SCA_API const string& getName() const { return name; }
+ SCA_API const std::string& getName() const { return name; }
/**
* Returns the multiplicity allowed for wires connected to this reference.
@@ -105,7 +104,7 @@
* Get the multiplicity corresponding to the given
* string.
*/
- static Multiplicity getMultiplicityFromString(const string& multip);
+ static Multiplicity getMultiplicityFromString(const std::string& multip);
private:
@@ -117,7 +116,7 @@
/**
* The name of the reference type.
*/
- string name;
+ std::string name;
/**
* The multiplicity allowed for wires connected to this reference.
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Service.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Service.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Service.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Service.h Wed Dec 20 21:21:32 2006
@@ -22,8 +22,6 @@
#ifndef tuscany_sca_model_service_h
#define tuscany_sca_model_service_h
-#include <string>
-using std::string;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -22,6 +22,8 @@
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/model/ServiceBinding.h"
+using namespace std;
+
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.h Wed Dec 20 21:21:32 2006
@@ -21,8 +21,8 @@
#ifndef tuscany_sca_model_servicebinding_h
#define tuscany_sca_model_servicebinding_h
+
#include <string>
-using std::string;
#include "tuscany/sca/model/Binding.h"
@@ -54,7 +54,7 @@
/**
* Constructor to create a new binding.
*/
- SCA_API ServiceBinding(Service* service, const string& uri);
+ SCA_API ServiceBinding(Service* service, const std::string& uri);
/**
* Destructor.
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp Wed Dec 20 21:21:32 2006
@@ -22,6 +22,8 @@
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/model/ServiceType.h"
+using namespace std;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h Wed Dec 20 21:21:32 2006
@@ -23,7 +23,6 @@
#define tuscany_sca_model_servicetype_h
#include <string>
-using std::string;
#include "tuscany/sca/model/Contract.h"
@@ -50,7 +49,7 @@
* @param componentType The component type on which this service is defined.
* @param name The name of the service.
*/
- SCA_API ServiceType(ComponentType* componentType, const string& name,
+ SCA_API ServiceType(ComponentType* componentType, const std::string& name,
Interface* intface, Interface* callbackInterface);
/**
@@ -68,7 +67,7 @@
* Returns the name of the service type.
* @return The name of the service type
*/
- SCA_API const string& getName() const { return name; }
+ SCA_API const std::string& getName() const { return name; }
/**
* Returns the binding supported by this service type.
@@ -92,7 +91,7 @@
/**
* The name of the service type.
*/
- string name;
+ std::string name;
/**
* The binding supported by this service
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp Wed Dec 20 21:21:32 2006
@@ -25,8 +25,9 @@
#include "tuscany/sca/util/Utils.h"
#include "tuscany/sca/core/Exceptions.h"
-using namespace tuscany::sca::util;
+using namespace std;
using namespace commonj::sdo;
+using namespace tuscany::sca::util;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h Wed Dec 20 21:21:32 2006
@@ -22,19 +22,15 @@
#ifndef tuscany_sca_model_wsdldefinition_h
#define tuscany_sca_model_wsdldefinition_h
-#include "tuscany/sca/model/WSDLOperation.h"
-
-#include "tuscany/sca/export.h"
#include <string>
-using std::string;
+#include <map>
+#include <vector>
#include "commonj/sdo/SDO.h"
-using commonj::sdo::DataObjectPtr;
-#include <map>
-using std::map;
-#include <vector>
-using std::vector;
+#include "tuscany/sca/export.h"
+#include "tuscany/sca/model/WSDLOperation.h"
+
namespace tuscany
{
@@ -56,7 +52,7 @@
* @param wsdlModel The data object representing the WSDL document
* defining a web service.
*/
- SCA_API WSDLDefinition(DataObjectPtr wsdlModel);
+ SCA_API WSDLDefinition(commonj::sdo::DataObjectPtr wsdlModel);
/**
* Destructor.
@@ -67,12 +63,12 @@
* Returns the target namespace of the WSDL definitions.
* @return The target namespace.
*/
- SCA_API string getNamespace(void);
+ SCA_API std::string getNamespace(void);
/**
* Add a WSDL model.
*/
- SCA_API void addWSDLModel(DataObjectPtr wsdlModel);
+ SCA_API void addWSDLModel(commonj::sdo::DataObjectPtr wsdlModel);
/**
* Find an operation in the WSDL definitions.
@@ -83,9 +79,9 @@
* @param operationName The name of the operation to find.
* @return The operation if found. Exception thrown if not found.
*/
- SCA_API const WSDLOperation& findOperation(const string& serviceName,
- const string& portName,
- const string& operationName);
+ SCA_API const WSDLOperation& findOperation(const std::string& serviceName,
+ const std::string& portName,
+ const std::string& operationName);
/**
* Find an operation in the WSDL definitions.
@@ -94,8 +90,8 @@
* @param operationName The name of the operation to find.
* @return The operation if found. Exception thrown if not found.
*/
- SCA_API const WSDLOperation& findOperation(const string& portTypeName,
- const string& operationName);
+ SCA_API const WSDLOperation& findOperation(const std::string& portTypeName,
+ const std::string& operationName);
private:
@@ -105,7 +101,7 @@
* @return A data object describing the service if found, otherwise
* a 0 if not found.
*/
- DataObjectPtr findService(const string& serviceName);
+ commonj::sdo::DataObjectPtr findService(const std::string& serviceName);
/**
* Find a binding in the wsdl definition.
@@ -113,7 +109,7 @@
* @return A data object describing the binding if found, otherwise
* a 0 if not found.
*/
- DataObjectPtr findBinding(const string& bindingName);
+ commonj::sdo::DataObjectPtr findBinding(const std::string& bindingName);
/**
* Find a portType in the wsdl definition.
@@ -121,7 +117,7 @@
* @return A data object describing the portType if found, otherwise
* a 0 if not found.
*/
- DataObjectPtr findPortType(const string& portTypeName);
+ commonj::sdo::DataObjectPtr findPortType(const std::string& portTypeName);
/**
* Find a message in the wsdl definition.
@@ -129,16 +125,16 @@
* @return A data object describing the message if found, otherwise
* a 0 if not found.
*/
- DataObjectPtr findMessage(const string& messageName);
+ commonj::sdo::DataObjectPtr findMessage(const std::string& messageName);
/**
* The data object representation of the WSDL document.
*/
- typedef std::vector<DataObjectPtr> MODEL_VECTOR;
+ typedef std::vector<commonj::sdo::DataObjectPtr> MODEL_VECTOR;
MODEL_VECTOR wsdlModels;
- typedef map<string, WSDLOperation> OPERATION_MAP;
+ typedef std::map<std::string, WSDLOperation> OPERATION_MAP;
OPERATION_MAP operationMap;
};
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,7 @@
#include "tuscany/sca/util/Utils.h"
#include "tuscany/sca/model/WSDLInterface.h"
+using namespace std;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.h Wed Dec 20 21:21:32 2006
@@ -22,10 +22,9 @@
#ifndef tuscany_sca_model_wsdlinterface_h
#define tuscany_sca_model_wsdlinterface_h
-#include "tuscany/sca/model/Interface.h"
-
#include <string>
-using std::string;
+
+#include "tuscany/sca/model/Interface.h"
namespace tuscany
{
@@ -45,7 +44,7 @@
* Constuctor.
* @param interfaceName Name of the WSDL interface.
*/
- WSDLInterface(const string& qname, bool remotable, bool conversational);
+ WSDLInterface(const std::string& qname, bool remotable, bool conversational);
/**
* Destructor.
@@ -55,40 +54,40 @@
/**
* Returns the WSDL namespace
*/
- string getNamespaceURI() const { return namespaceURI; }
+ std::string getNamespaceURI() const { return namespaceURI; }
/**
* Returns the interface name
*/
- string getName() const { return name; }
+ std::string getName() const { return name; }
/**
* return the QName of the schema type for this interface type
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#interface.cpp")
*/
- virtual const string& getInterfaceTypeQName() { return typeQName; };
+ virtual const std::string& getInterfaceTypeQName() { return typeQName; };
/**
* The QName of the schema type for this interface type.
*/
- SCA_API static const string typeQName;
+ SCA_API static const std::string typeQName;
private:
/**
* Parse the WSDL qname
*/
- void parse(const string& qname);
+ void parse(const std::string& qname);
/**
* WSDL namespace.
*/
- string namespaceURI;
+ std::string namespaceURI;
/**
* Name of the WSDL interface.
*/
- string name;
+ std::string name;
};
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,7 @@
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/util/Utils.h"
+using namespace std;
using namespace tuscany::sca::util;
namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.h Wed Dec 20 21:21:32 2006
@@ -21,13 +21,13 @@
#ifndef tuscany_sca_model_wsdloperation_h
#define tuscany_sca_model_wsdloperation_h
-#include "tuscany/sca/export.h"
-#include <string>
-using std::string;
+#include <string>
#include "commonj/sdo/SDO.h"
-using commonj::sdo::DataObjectPtr;
+
+#include "tuscany/sca/export.h"
+
namespace tuscany
{
@@ -64,22 +64,22 @@
* outgoing message.
* @return The name of the element in the request message.
*/
- SCA_API const string& getOperationName() const {return operationName;}
- SCA_API void setOperationName(const string& opName) {operationName = opName;}
+ SCA_API const std::string& getOperationName() const {return operationName;}
+ SCA_API void setOperationName(const std::string& opName) {operationName = opName;}
/**
* The soap action string for this operation.
* @return The soap action.
*/
- SCA_API const string& getSoapAction() const {return soapAction;}
- SCA_API void setSoapAction(const string& soapAct) {soapAction = soapAct;}
+ SCA_API const std::string& getSoapAction() const {return soapAction;}
+ SCA_API void setSoapAction(const std::string& soapAct) {soapAction = soapAct;}
/**
* Return the endpoint address for the target web service.
* @return The endpoint address.
*/
- SCA_API const string& getEndpoint() const {return endpoint;}
- SCA_API void setEndpoint(const string& ep) {endpoint = ep;}
+ SCA_API const std::string& getEndpoint() const {return endpoint;}
+ SCA_API void setEndpoint(const std::string& ep) {endpoint = ep;}
enum soapVersion
{
@@ -100,43 +100,43 @@
SCA_API bool isEncoded() const {return encoded;}
- SCA_API void setInputType(const string& inputType);
- SCA_API const string& getInputTypeUri() const {return inputTypeUri;}
- SCA_API const string& getInputTypeName() const {return inputTypeName;}
- SCA_API void setOutputType(const string& outputType);
- SCA_API const string& getOutputTypeUri() const {return outputTypeUri;}
- SCA_API const string& getOutputTypeName() const {return outputTypeName;}
+ SCA_API void setInputType(const std::string& inputType);
+ SCA_API const std::string& getInputTypeUri() const {return inputTypeUri;}
+ SCA_API const std::string& getInputTypeName() const {return inputTypeName;}
+ SCA_API void setOutputType(const std::string& outputType);
+ SCA_API const std::string& getOutputTypeUri() const {return outputTypeUri;}
+ SCA_API const std::string& getOutputTypeName() const {return outputTypeName;}
private:
/**
* The name of the operation for use when serializing an
* outgoing message.
*/
- string operationName;
+ std::string operationName;
/**
* The soap action string for this operation.
*/
- string soapAction;
+ std::string soapAction;
/**
* The endpoint address of the target web service.
*/
- string endpoint;
+ std::string endpoint;
bool documentStyle;
bool wrappedStyle;
bool encoded;
soapVersion soapVer;
- string inputTypeUri;
- string inputTypeName;
+ std::string inputTypeUri;
+ std::string inputTypeName;
- string outputTypeUri;
- string outputTypeName;
+ std::string outputTypeUri;
+ std::string outputTypeName;
- DataObjectPtr inputMessage;
- DataObjectPtr outputMessage;
+ commonj::sdo::DataObjectPtr inputMessage;
+ commonj::sdo::DataObjectPtr outputMessage;
};
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.h Wed Dec 20 21:21:32 2006
@@ -23,7 +23,6 @@
#define tuscany_sca_model_wire_h
#include <string>
-using std::string;
namespace tuscany
{
@@ -45,7 +44,7 @@
* @param target The target of the wire. Either a component and service
* service name (optional) or an external sevice.
*/
- SCA_API Wire(const string& source, const string& target);
+ SCA_API Wire(const std::string& source, const std::string& target);
/**
* Destructor.
@@ -56,35 +55,35 @@
* Get the component name defined by the source of the wire.
* @return The component name which is the source of the wire.
*/
- SCA_API const string& getSourceComponent() const { return sourceComponent; }
+ SCA_API const std::string& getSourceComponent() const { return sourceComponent; }
/**
* Get the reference name defined by the source of the wire.
* @return The reference name which is the source of the wire.
*/
- SCA_API const string& getSourceReference() const { return sourceReference; }
+ SCA_API const std::string& getSourceReference() const { return sourceReference; }
/**
* Get the target uri defined by the target of the wire.
* @return The target uri which is the source of the wire.
*/
- SCA_API const string& getTarget() { return target; }
+ SCA_API const std::string& getTarget() { return target; }
private:
/**
* The source component of the wire.
*/
- string sourceComponent;
+ std::string sourceComponent;
/**
* The source reference of the wire.
*/
- string sourceReference;
+ std::string sourceReference;
/**
* The target uri of the wire.
*/
- string target;
+ std::string target;
};
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp Wed Dec 20 21:21:32 2006
@@ -19,8 +19,10 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/util/DefaultLogWriter.h"
#include <iostream>
+
+#include "tuscany/sca/util/DefaultLogWriter.h"
+
using namespace std;
namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp Wed Dec 20 21:21:32 2006
@@ -23,15 +23,8 @@
#pragma warning(disable: 4786)
#endif
-#include "tuscany/sca/util/File.h"
-#include "tuscany/sca/util/Utils.h"
-#include "tuscany/sca/core/Exceptions.h"
-#include "tuscany/sca/util/Logging.h"
#include <iostream>
-
#include <string>
-#include <iostream>
-using namespace std;
#if defined(WIN32) || defined (_WINDOWS)
#include <windows.h>
@@ -40,6 +33,13 @@
#include <sys/stat.h>
#include <dirent.h>
#endif
+
+#include "tuscany/sca/util/File.h"
+#include "tuscany/sca/util/Utils.h"
+#include "tuscany/sca/core/Exceptions.h"
+#include "tuscany/sca/util/Logging.h"
+
+using namespace std;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.h Wed Dec 20 21:21:32 2006
@@ -23,9 +23,7 @@
#define tuscany_sca_util_file_h
#include <string>
-using std::string;
#include <vector>
-using std::vector;
namespace tuscany
{
@@ -46,7 +44,7 @@
* Either / or \ can be used interchangeably for separating directory elements.
* @param fileName Name of the file in the dirctory.
*/
- File(const string& directory, const string& fileName);
+ File(const std::string& directory, const std::string& fileName);
/**
* Destructor.
@@ -57,23 +55,23 @@
* Return the directory in which this file is located.
* @return Name of the directory.
*/
- const string& getDirectory() const {return directory;}
+ const std::string& getDirectory() const {return directory;}
/**
* Name of the file.
* @return Name of the file.
*/
- const string& getFileName() const {return fileName;}
+ const std::string& getFileName() const {return fileName;}
private:
/**
* Name of the directory.
*/
- string directory;
+ std::string directory;
/**
* Name of the file.
*/
- string fileName;
+ std::string fileName;
};
/**
@@ -90,7 +88,7 @@
* @param pattern A pattern for matching file names. Can include * and ?.
* @param subdirectories Whether subdirectories should be searched too.
*/
- Files(const string& rootDirectory, const string& pattern, bool subdirectories = false);
+ Files(const std::string& rootDirectory, const std::string& pattern, bool subdirectories = false);
/**
* Destructor.
@@ -117,14 +115,14 @@
* @param pattern A pattern for matching file names. Can include * and ?.
* @param subdirectories Whether subdirectories should be searched too.
*/
- void findFiles(const string& rootDirectory, const string& pattern, bool subdirectories);
+ void findFiles(const std::string& rootDirectory, const std::string& pattern, bool subdirectories);
/**
* The top level directory to search.
*/
- string rootDirectory;
+ std::string rootDirectory;
- typedef vector<File> FILES;
+ typedef std::vector<File> FILES;
/**
* Vector of File.
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp Wed Dec 20 21:21:32 2006
@@ -19,8 +19,10 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/util/FileLogWriter.h"
#include <iostream>
+
+#include "tuscany/sca/util/FileLogWriter.h"
+
using namespace std;
namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h Wed Dec 20 21:21:32 2006
@@ -22,10 +22,10 @@
#ifndef tuscany_sca_util_filelogwriter_h
#define tuscany_sca_util_filelogwriter_h
-#include "tuscany/sca/util/LogWriter.h"
#include <iostream>
#include <fstream>
-using std::ofstream;
+
+#include "tuscany/sca/util/LogWriter.h"
namespace tuscany
{
@@ -49,7 +49,7 @@
*/
virtual void log(int level, const char* pid, const char* msg);
private:
- ofstream logFile;
+ std::ofstream logFile;
};
} // End namespace util
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp Wed Dec 20 21:21:32 2006
@@ -30,6 +30,8 @@
#include "tuscany/sca/core/Exceptions.h"
#include "tuscany/sca/util/Logging.h"
+using namespace std;
+
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.h Wed Dec 20 21:21:32 2006
@@ -21,7 +21,6 @@
#ifndef tuscany_sca_util_library_h
#define tuscany_sca_util_library_h
-#include "tuscany/sca/export.h"
#if defined(WIN32) || defined (_WINDOWS)
#include <windows.h>
@@ -31,7 +30,9 @@
#endif
#include <string>
-using std::string;
+
+#include "tuscany/sca/export.h"
+
namespace tuscany
{
@@ -52,7 +53,7 @@
* Constructor. Will load the library.
* @param libraryName Fully qualified name of the library.
*/
- Library(const string& libraryName);
+ Library(const std::string& libraryName);
/**
* Destructor. Will unload the library.
@@ -67,12 +68,12 @@
* @param symbol The name of the symbol to be found.
* @return The pointer to the symbol if found, otherwise 0.
*/
- void* getSymbol(const string& symbol);
+ void* getSymbol(const std::string& symbol);
private:
/**
* Name of the library.
*/
- string name;
+ std::string name;
/**
* Handle to the loaded library.
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h Wed Dec 20 21:21:32 2006
@@ -24,6 +24,7 @@
#include "tuscany/sca/export.h"
#include "tuscany/sca/util/LogWriter.h"
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.cpp Wed Dec 20 21:21:32 2006
@@ -27,6 +27,7 @@
using namespace std;
using namespace commonj::sdo;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/SDOUtils.h Wed Dec 20 21:21:32 2006
@@ -23,9 +23,7 @@
#define tuscany_sca_util_sdovisitor_h
#include <string>
-using std::string;
#include <vector>
-using std::vector;
#include <time.h>
#include "commonj/sdo/SDO.h"
@@ -86,7 +84,7 @@
virtual RESULT visit(commonj::sdo::DataObjectPtr parent, const commonj::sdo::Property& property, float floatData);
virtual RESULT visit(commonj::sdo::DataObjectPtr parent, const commonj::sdo::Property& property, long intData);
virtual RESULT visit(commonj::sdo::DataObjectPtr parent, const commonj::sdo::Property& property, short shortData);
- virtual RESULT visit(commonj::sdo::DataObjectPtr parent, const commonj::sdo::Property& property, const string& stringData);
+ virtual RESULT visit(commonj::sdo::DataObjectPtr parent, const commonj::sdo::Property& property, const std::string& stringData);
virtual RESULT visit(commonj::sdo::DataObjectPtr parent, const commonj::sdo::Property& property, commonj::sdo::DataObjectPtr dataObjectData);
};
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp Wed Dec 20 21:21:32 2006
@@ -27,6 +27,7 @@
using namespace std;
using namespace commonj::sdo;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.h Wed Dec 20 21:21:32 2006
@@ -21,8 +21,9 @@
#ifndef tuscany_sca_util_utils_h
#define tuscany_sca_util_utils_h
+
#include <string>
-using std::string;
+
#include "commonj/sdo/SDO.h"
#include "tuscany/sca/export.h"
@@ -39,19 +40,19 @@
class SCA_API Utils {
public:
- static void tokeniseUri(const string& uri, string& token1, string& token2);
- static void tokeniseQName(const string& sdoname, string& uri, string& name);
+ static void tokeniseUri(const std::string& uri, std::string& token1, std::string& token2);
+ static void tokeniseQName(const std::string& sdoname, std::string& uri, std::string& name);
static void tokeniseString(
- const string& separator,
- const string& str,
- string& token1,
- string& token2);
+ const std::string& separator,
+ const std::string& str,
+ std::string& token1,
+ std::string& token2);
static void rTokeniseString(
- const string& separator,
- const string& str,
- string& token1,
- string& token2);
+ const std::string& separator,
+ const std::string& str,
+ std::string& token1,
+ std::string& token2);
static void breakpoint();
@@ -59,8 +60,8 @@
static void printTypes(commonj::sdo::DataFactoryPtr df);
static void printType(const commonj::sdo::Type& type, int increment=0);
- static const bool compareDataObjects(commonj::sdo::DataObjectPtr dataObject1, commonj::sdo::DataObjectPtr dataObject2, string& diff);
- static const bool compareProperties(commonj::sdo::DataObjectPtr dataObject1, const commonj::sdo::Property& prop1, commonj::sdo::DataObjectPtr dataObject2, const commonj::sdo::Property& prop2, string& diff);
+ static const bool compareDataObjects(commonj::sdo::DataObjectPtr dataObject1, commonj::sdo::DataObjectPtr dataObject2, std::string& diff);
+ static const bool compareProperties(commonj::sdo::DataObjectPtr dataObject1, const commonj::sdo::Property& prop1, commonj::sdo::DataObjectPtr dataObject2, const commonj::sdo::Property& prop2, std::string& diff);
private:
static void tabs(int increment=0);
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp Wed Dec 20 21:21:32 2006
@@ -19,16 +19,19 @@
/* $Rev$ $Date$ */
+#include "commonj/sdo/SDO.h"
+
#include "osoa/sca/ComponentContext.h"
-#include "tuscany/sca/util/Logging.h"
#include "osoa/sca/ServiceRuntimeException.h"
+
+#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/cpp/ComponentContextImpl.h"
#include "tuscany/sca/core/SCARuntime.h"
-#include "commonj/sdo/SDO.h"
-using commonj::sdo::DataFactoryPtr;
+using namespace commonj::sdo;
using namespace tuscany::sca;
using namespace tuscany::sca::cpp;
+using namespace tuscany::sca::model;
namespace osoa
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h Wed Dec 20 21:21:32 2006
@@ -22,10 +22,13 @@
#ifndef osoa_sca_componentcontext_h
#define osoa_sca_componentcontext_h
-#include "osoa/sca/export.h"
-#include "commonj/sdo/SDO.h"
#include <string>
#include <list>
+
+#include "commonj/sdo/SDO.h"
+
+#include "osoa/sca/export.h"
+
namespace osoa
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp Wed Dec 20 21:21:32 2006
@@ -19,14 +19,16 @@
/* $Rev$ $Date$ */
+#include "commonj/sdo/SDO.h"
+
#include "osoa/sca/CompositeContext.h"
#include "osoa/sca/ServiceRuntimeException.h"
+
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/cpp/CompositeContextImpl.h"
#include "tuscany/sca/core/SCARuntime.h"
-#include "commonj/sdo/SDO.h"
-using commonj::sdo::DataFactoryPtr;
+using namespace commonj::sdo;
using namespace tuscany::sca;
using namespace tuscany::sca::cpp;
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h Wed Dec 20 21:21:32 2006
@@ -22,8 +22,9 @@
#ifndef osoa_sca_compositecontext_h
#define osoa_sca_compositecontext_h
-#include "osoa/sca/export.h"
#include "commonj/sdo/SDO.h"
+
+#include "osoa/sca/export.h"
namespace osoa
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h Wed Dec 20 21:21:32 2006
@@ -26,8 +26,6 @@
#include "tuscany/sca/core/Exceptions.h"
-using tuscany::sca::TuscanyRuntimeException;
-
namespace osoa
{
namespace sca
@@ -36,19 +34,19 @@
* Top level exception to represent all the exceptions that may be
* thrown by an SCA runtime implementation.
*/
- class SCA_CPP_API ServiceRuntimeException : public TuscanyRuntimeException
+ class SCA_CPP_API ServiceRuntimeException : public tuscany::sca::TuscanyRuntimeException
{
public:
ServiceRuntimeException(
const char *name="ServiceRuntimeException",
severity_level sev=Severe,
const char* msg_text="")
- : TuscanyRuntimeException(name, sev, msg_text)
+ : tuscany::sca::TuscanyRuntimeException(name, sev, msg_text)
{
}
- ServiceRuntimeException(const TuscanyRuntimeException& e)
- : TuscanyRuntimeException(e)
+ ServiceRuntimeException(const tuscany::sca::TuscanyRuntimeException& e)
+ : tuscany::sca::TuscanyRuntimeException(e)
{
}
}; // End ServiceRuntimeException class definition
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp Wed Dec 20 21:21:32 2006
@@ -28,9 +28,9 @@
extern "C"
{
- #if defined(WIN32) || defined(_WINDOWS)
+#if defined(WIN32) || defined(_WINDOWS)
__declspec(dllexport)
- #endif
+#endif
void tuscany_sca_extension_initialize()
{
tuscany::sca::cpp::CPPExtension::initialize();
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=489263&r1=489262&r2=489263
==============================================================================
--- 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 Wed Dec 20 21:21:32 2006
@@ -24,7 +24,9 @@
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/util/Utils.h"
+using namespace std;
using namespace tuscany::sca::util;
+using namespace tuscany::sca::model;
namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.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 type for this implementation extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#implementation.cpp")
*/
- 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/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=489263&r1=489262&r2=489263
==============================================================================
--- 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 Wed Dec 20 21:21:32 2006
@@ -23,6 +23,8 @@
#include "tuscany/sca/cpp/model/CPPInterface.h"
#include "tuscany/sca/util/Logging.h"
+using namespace std;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.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 type for this interface extension
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#interface.cpp")
*/
- 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/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp Wed Dec 20 21:21:32 2006
@@ -19,9 +19,10 @@
/* $Rev$ $Date$ */
+#include "osoa/sca/ServiceRuntimeException.h"
+
#include "tuscany/sca/cpp/CPPServiceProxy.h"
#include "tuscany/sca/util/Logging.h"
-#include "osoa/sca/ServiceRuntimeException.h"
#include "tuscany/sca/core/SCARuntime.h"
#include "tuscany/sca/model/Reference.h"
#include "tuscany/sca/model/ReferenceType.h"
@@ -35,7 +36,10 @@
#include "tuscany/sca/cpp/model/CPPImplementation.h"
#include "tuscany/sca/cpp/model/CPPReferenceBinding.h"
+using namespace std;
using namespace osoa::sca;
+using namespace tuscany::sca::model;
+using namespace tuscany::sca::util;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h Wed Dec 20 21:21:32 2006
@@ -24,6 +24,7 @@
#define tuscany_sca_cpp_cppserviceproxy_h
#include "osoa/sca/export.h"
+
#include "tuscany/sca/core/ServiceProxy.h"
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/util/Library.h"
@@ -31,9 +32,6 @@
#include "tuscany/sca/model/Reference.h"
#include "tuscany/sca/model/Service.h"
-using namespace tuscany::sca::model;
-using namespace tuscany::sca::util;
-
namespace tuscany
{
@@ -57,7 +55,7 @@
* @param reference The reference on the source component.
* @param target The wrapper of the service which is wired to this reference.
*/
- CPPServiceProxy(Reference* reference);
+ CPPServiceProxy(tuscany::sca::model::Reference* reference);
/**
* Create a new service proxy for a service. The proxy will contain a pointer to
@@ -65,7 +63,7 @@
* @param reference The service on the target component.
* @param target The wrapper of the target service.
*/
- CPPServiceProxy(Service* service);
+ CPPServiceProxy(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -90,7 +88,9 @@
/**
* Create the proxy
*/
- void createProxy(Component* component, const string& name, ServiceWrapper* serviceWrapper);
+ void createProxy(tuscany::sca::model::Component* component,
+ const std::string& name,
+ ServiceWrapper* serviceWrapper);
/**
* Holds the instances of the code generated proxies.
@@ -106,7 +106,7 @@
/**
* The library which contains the code for the proxy.
*/
- Library proxyLibrary;
+ tuscany::sca::util::Library proxyLibrary;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp Wed Dec 20 21:21:32 2006
@@ -19,9 +19,9 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/cpp/CPPServiceWrapper.h"
-
#include "osoa/sca/ServiceRuntimeException.h"
+
+#include "tuscany/sca/cpp/CPPServiceWrapper.h"
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/util/Utils.h"
#include "tuscany/sca/util/Library.h"
@@ -33,8 +33,10 @@
#include "tuscany/sca/cpp/model/CPPImplementation.h"
#include "tuscany/sca/model/Interface.h"
+using namespace std;
using namespace osoa::sca;
-
+using namespace tuscany::sca::model;
+using namespace tuscany::sca::util;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h Wed Dec 20 21:21:32 2006
@@ -23,6 +23,7 @@
#define tuscany_sca_cpp_cppservicewrapper_h
#include "osoa/sca/export.h"
+
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/core/Operation.h"
#include "tuscany/sca/model/Component.h"
@@ -30,9 +31,6 @@
#include "tuscany/sca/cpp/model/CPPImplementation.h"
#include "tuscany/sca/util/Library.h"
-using namespace tuscany::sca::model;
-using namespace tuscany::sca::util;
-
namespace tuscany
{
namespace sca
@@ -58,13 +56,13 @@
* created.
* @return A wrapper that references the given target.
*/
- static CPPServiceWrapper* getServiceWrapper(Service* service);
+ static CPPServiceWrapper* getServiceWrapper(tuscany::sca::model::Service* service);
/**
* Constructor.
* @param target The component service to which this wrapper refers.
*/
- CPPServiceWrapper(Service* service);
+ CPPServiceWrapper(tuscany::sca::model::Service* service);
/**
* Destructor.
@@ -81,7 +79,7 @@
/**
* Return the loaded shared library for the target component.
*/
- Library* getLibrary() const { return wrapperLibrary; }
+ tuscany::sca::util::Library* getLibrary() const { return wrapperLibrary; }
protected:
@@ -129,12 +127,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 component implementation
@@ -145,14 +143,14 @@
* Pointer to the loaded library which contains the component
* implementation.
*/
- Library* wrapperLibrary;
+ tuscany::sca::util::Library* wrapperLibrary;
/**
* Set the loaded library which contains the component
* implementation.
* @param lib The library.
*/
- void setLibrary(Library* lib);
+ void setLibrary(tuscany::sca::util::Library* lib);
};
} // End namespace cpp
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=489263&r1=489262&r2=489263
==============================================================================
--- 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 Wed Dec 20 21:21:32 2006
@@ -19,13 +19,18 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/util/Logging.h"
#include "osoa/sca/ServiceRuntimeException.h"
+
+#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/cpp/ComponentContextImpl.h"
#include "tuscany/sca/model/Composite.h"
#include "tuscany/sca/model/ReferenceBinding.h"
#include "tuscany/sca/model/ReferenceType.h"
#include "tuscany/sca/model/ServiceBinding.h"
+
+using namespace std;
+using namespace tuscany::sca::model;
+using namespace osoa::sca;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h Wed Dec 20 21:21:32 2006
@@ -22,18 +22,14 @@
#ifndef tuscany_sca_cpp_componentcontextimpl_h
#define tuscany_sca_cpp_componentcontextimpl_h
-#include <vector>
-using std::vector;
-
#include "osoa/sca/ComponentContext.h"
+
#include "tuscany/sca/model/Component.h"
#include "tuscany/sca/model/Service.h"
#include "tuscany/sca/model/Reference.h"
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/cpp/CPPServiceProxy.h"
-using namespace osoa::sca;
-
namespace tuscany
{
@@ -45,7 +41,7 @@
/**
* Contains the actual implementation of a ComponentContext interface.
*/
- class ComponentContextImpl : public ComponentContext
+ class ComponentContextImpl : public osoa::sca::ComponentContext
{
public:
@@ -53,7 +49,7 @@
* Constructor that takes a Component which represents the runtime
* model for this context.
*/
- ComponentContextImpl(Component* component);
+ ComponentContextImpl(tuscany::sca::model::Component* component);
/**
* Default constructor.
@@ -73,7 +69,7 @@
/**
* See ComponentContext.
*/
- virtual DataObjectPtr getProperties();
+ virtual commonj::sdo::DataObjectPtr getProperties();
/**
* See ComponentContext.
@@ -84,7 +80,7 @@
* Returns the contained Component.
* @return The Component to which this context refers.
*/
- virtual Component* getComponent() {return component;}
+ virtual tuscany::sca::model::Component* getComponent() {return component;}
private:
ComponentContextImpl(const ComponentContextImpl&);
@@ -94,7 +90,7 @@
* Pointer to the runtime model Component to which this
* context refers.
*/
- Component* component;
+ tuscany::sca::model::Component* component;
/**
* Helper method to return a proxy to a service.
@@ -104,15 +100,15 @@
* class representing the target.
*/
void* getServiceProxy(
- Reference* serviceReference,
- Service* target);
+ tuscany::sca::model::Reference* serviceReference,
+ tuscany::sca::model::Service* target);
/**
* Helper method to return a wrapper for a target service.
* @param target The target for which this wrapper is to be created.
* @return The service wrapper.
*/
- ServiceWrapper* getServiceWrapper(Service* target);
+ ServiceWrapper* getServiceWrapper(tuscany::sca::model::Service* target);
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp Wed Dec 20 21:21:32 2006
@@ -19,8 +19,11 @@
/* $Rev$ $Date$ */
-#include "tuscany/sca/util/Logging.h"
+#include "commonj/sdo/SDO.h"
+
#include "osoa/sca/ServiceRuntimeException.h"
+
+#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/cpp/CompositeContextImpl.h"
#include "tuscany/sca/model/Component.h"
#include "tuscany/sca/model/Composite.h"
@@ -30,11 +33,11 @@
#include "tuscany/sca/core/ServiceProxy.h"
#include "tuscany/sca/core/ServiceWrapper.h"
#include "tuscany/sca/cpp/CPPServiceProxy.h"
-#include "commonj/sdo/SDO.h"
-using namespace tuscany::sca::model;
-using namespace osoa::sca;
+using namespace std;
using namespace commonj::sdo;
+using namespace osoa::sca;
+using namespace tuscany::sca::model;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h Wed Dec 20 21:21:32 2006
@@ -22,16 +22,12 @@
#ifndef tuscany_sca_cpp_compositecontextimpl_h
#define tuscany_sca_cpp_compositecontextimpl_h
-#include <vector>
-using std::vector;
-
#include "osoa/sca/CompositeContext.h"
+
#include "tuscany/sca/model/Composite.h"
#include "tuscany/sca/model/Component.h"
#include "tuscany/sca/cpp/CPPServiceProxy.h"
-using namespace osoa::sca;
-
namespace tuscany
{
namespace sca
@@ -43,7 +39,7 @@
/**
* Contains the actual implementation of a CompositeContext interface.
*/
- class CompositeContextImpl : public CompositeContext
+ class CompositeContextImpl : public osoa::sca::CompositeContext
{
public:
@@ -51,7 +47,7 @@
* Constructor that takes a Composite which represents the runtime
* model for this context.
*/
- CompositeContextImpl(Component* component);
+ CompositeContextImpl(tuscany::sca::model::Component* component);
/**
* See CompositeContext#locateService.
@@ -76,13 +72,13 @@
* Pointer to the runtime model Composite object to which this
* context refers.
*/
- Composite* composite;
+ tuscany::sca::model::Composite* composite;
/**
* Pointer to the runtime model Component object to which this
* context refers.
*/
- Component* component;
+ tuscany::sca::model::Component* component;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp Wed Dec 20 21:21:32 2006
@@ -25,6 +25,8 @@
#include "tuscany/sca/core/Exceptions.h"
#include "tuscany/sca/core/SCARuntime.h"
+using namespace std;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h Wed Dec 20 21:21:32 2006
@@ -22,10 +22,9 @@
#ifndef tuscany_sca_cpp_tuscanyruntime_h
#define tuscany_sca_cpp_tuscanyruntime_h
-#include "osoa/sca/export.h"
-
#include <string>
-using std::string;
+
+#include "osoa/sca/export.h"
namespace tuscany
{
@@ -43,8 +42,8 @@
/**
* Default constructor
*/
- TuscanyRuntime(const string& defaultComponentName = "",
- const string& root = "", const string& path = "");
+ TuscanyRuntime(const std::string& defaultComponentName = "",
+ const std::string& root = "", const std::string& path = "");
/**
* Destructor
@@ -56,19 +55,19 @@
* Set the system root configuration path
* @param root The path to the system configuration.
*/
- void setSystemRoot(const string& root);
+ void setSystemRoot(const std::string& root);
/**
* Set the system composite search path
* @param root The search path for composites.
*/
- void setSystemPath(const string& path);
+ void setSystemPath(const std::string& path);
/**
* Set the default component for the system
* @param componentName The name of the default component.
*/
- void setDefaultComponentName(const string& componentName);
+ void setDefaultComponentName(const std::string& componentName);
/**
* start the runtime
@@ -82,9 +81,9 @@
private:
- string systemRoot;
- string systemPath;
- string defaultComponentName;
+ std::string systemRoot;
+ std::string systemPath;
+ std::string defaultComponentName;
};
} // End namespace cpp
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp Wed Dec 20 21:21:32 2006
@@ -29,6 +29,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/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h Wed Dec 20 21:21:32 2006
@@ -21,14 +21,11 @@
#ifndef tuscany_sca_cpp_model_cppimplementation_h
#define tuscany_sca_cpp_model_cppimplementation_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 C++
*/
- class CPPImplementation : public ComponentType
+ class CPPImplementation : public tuscany::sca::model::ComponentType
{
public:
@@ -60,8 +57,9 @@
* @param className Name of the class in the header file (could be a blank string
* if this is not specified).
*/
- CPPImplementation(Composite* composite, const string& library, const string& header, const string&headerPath,
- const string& headerStub, const string& className, Scope scope);
+ CPPImplementation(tuscany::sca::model::Composite* composite,
+ const std::string& library, const std::string& header, const std::string&headerPath,
+ const std::string& headerStub, const std::string& className, Scope scope);
/**
* Destructor
@@ -72,37 +70,37 @@
* 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 shared library.
* @return The name of the shared library.
*/
- const string& getLibrary() const { return library; }
+ const std::string& getLibrary() const { return library; }
/**
* Get the name of the header file.
* @return Name of the header file.
*/
- const string& getHeader() const { return header; }
+ const std::string& getHeader() const { return header; }
/**
* Get the header file name without the extension.
* @return The name of the header file without any extension.
*/
- const string& getHeaderStub() const { return headerStub; }
+ const std::string& getHeaderStub() const { return headerStub; }
/**
* Get the header path.
* @return The pathe element of the header.
*/
- const string& getHeaderPath() const { return headerPath; }
+ const std::string& getHeaderPath() const { return headerPath; }
/**
* 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
@@ -114,28 +112,28 @@
/**
* Name of the shared library.
*/
- string library;
+ std::string library;
/**
* Name of the header file describing the interface.
*/
- string header;
+ std::string header;
/**
* Name of the header file without the extension.
*/
- string headerStub;
+ std::string headerStub;
/**
* Path element of the header.
*/
- string headerPath;
+ std::string headerPath;
/**
* 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;
/**
* Scope of the implementation
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,7 @@
#include "tuscany/sca/util/Utils.h"
#include "tuscany/sca/cpp/model/CPPInterface.h"
+using namespace std;
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h Wed Dec 20 21:21:32 2006
@@ -22,14 +22,10 @@
#ifndef tuscany_sca_cpp_model_cppinterface_h
#define tuscany_sca_cpp_model_cppinterface_h
-#include "tuscany/sca/model/Interface.h"
-
-#include <map>
-using std::map;
#include <string>
-using std::string;
-using namespace tuscany::sca::model;
+#include "tuscany/sca/model/Interface.h"
+
namespace tuscany
{
@@ -41,7 +37,7 @@
* Holds information about an interface described using a C++
* header file.
*/
- class CPPInterface : public Interface
+ class CPPInterface : public tuscany::sca::model::Interface
{
public:
@@ -55,8 +51,8 @@
* @param remotable True if the interface is remotable.
*/
CPPInterface(
- const string& header,
- const string& className,
+ const std::string& header,
+ const std::string& className,
bool remotable,
bool conversational);
@@ -70,47 +66,47 @@
* @return The name of the header file containing the definition of the
* interface.
*/
- const string& getHeader() { return header; }
+ const std::string& getHeader() { return header; }
/**
* Return the name of the header file without the extension.
* @return Header file name without any extension.
*/
- const string& getHeaderStub() { return headerStub; }
+ const std::string& getHeaderStub() { return headerStub; }
/**
* Get the name of the class.
* @return The name of the class defining the interface.
*/
- const string& getClass() { return className; }
+ const std::string& getClass() { return className; }
/**
* return the QName of the schema type for this interface type
* (e.g. "http://www.osoa.org/xmlns/sca/1.0#interface.cpp")
*/
- virtual const string& getInterfaceTypeQName() { return typeQName; };
+ virtual const std::string& getInterfaceTypeQName() { return typeQName; };
private:
/**
* Name of the header file containing the definition of the interface.
*/
- string header;
+ std::string header;
/**
* Name of the header file without the extension.
*/
- string headerStub;
+ std::string headerStub;
/**
* Name of the class in the header file.
*/
- string className;
+ std::string className;
/**
* The QName of the schema type for this interface type.
*/
- static const string typeQName;
+ static const std::string typeQName;
};
} // End namespace cpp
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,8 @@
#include "tuscany/sca/cpp/model/CPPReferenceBinding.h"
#include "tuscany/sca/cpp/CPPServiceProxy.h"
+using namespace tuscany::sca::model;
+
namespace tuscany
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h Wed Dec 20 21:21:32 2006
@@ -22,13 +22,10 @@
#ifndef tuscany_sca_cpp_model_cppreferencebinding_h
#define tuscany_sca_cpp_model_cppreferencebinding_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,7 +36,7 @@
/**
* Information about a CPP service binding for service or a reference.
*/
- class CPPReferenceBinding : public ReferenceBinding
+ class CPPReferenceBinding : public tuscany::sca::model::ReferenceBinding
{
public:
@@ -50,7 +47,7 @@
* or external service is to be bound. This is of the form
* "namespace"#endpoint("service"/"port")
*/
- CPPReferenceBinding(Reference* reference);
+ CPPReferenceBinding(tuscany::sca::model::Reference* reference);
/**
* Destructor.
@@ -60,7 +57,7 @@
/**
* Returns the type of binding.
*/
- virtual string getType() { return "http://www.osoa.org/xmlns/sca/1.0#CPPImplementationBinding"; };
+ virtual std::string getType() { return "http://www.osoa.org/xmlns/sca/1.0#CPPImplementationBinding"; };
/**
* Create a proxy representing the reference to the
@@ -71,12 +68,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:
@@ -89,7 +86,7 @@
/**
* The service binding of the target
*/
- ServiceBinding* targetServiceBinding;
+ tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace cpp
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp Wed Dec 20 21:21:32 2006
@@ -23,6 +23,8 @@
#include "tuscany/sca/cpp/model/CPPServiceBinding.h"
#include "tuscany/sca/cpp/CPPServiceWrapper.h"
+using namespace tuscany::sca::model;
+
namespace tuscany
{
namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h?view=diff&rev=489263&r1=489262&r2=489263
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h Wed Dec 20 21:21:32 2006
@@ -22,10 +22,10 @@
#ifndef tuscany_sca_cpp_model_cppservicebinding_h
#define tuscany_sca_cpp_model_cppservicebinding_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 CPP service binding for service or a reference.
*/
- class CPPServiceBinding : public ServiceBinding
+ class CPPServiceBinding : 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")
*/
- CPPServiceBinding(Service* service);
+ CPPServiceBinding(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#CPPImplementationBinding"; };
+ virtual std::string getType() { return "http://www.osoa.org/xmlns/sca/1.0#CPPImplementationBinding"; };
/**
* Create a wrapper for the service configured by this
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org