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/11/12 05:39:45 UTC
svn commit: r473873 [1/5] - 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...
Author: jsdelfino
Date: Sat Nov 11 20:39:42 2006
New Revision: 473873
URL: http://svn.apache.org/viewvc?view=rev&rev=473873
Log:
Merged changes described in http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/200611.mbox/%3c45561531.2040805@apache.org%3e
Added:
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/export.h (with props)
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/AccountService.wsdl (with props)
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/AccountWSClient.rb (with props)
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/Makefile.am (with props)
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/bigbank.wsclient.composite (with props)
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.bat (with props)
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.sh (with props)
Removed:
incubator/tuscany/cpp/sca/runtime/extensions/php/src/osoa/
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceRuntimeException.h
incubator/tuscany/cpp/sca/samples/MyValue/
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Reference.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Service.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Exceptions.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/sca/reference/axis2c/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/sca/service/axis2c/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/AccountDataServiceImpl.cpp
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/StockQuoteServiceImpl.cpp
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/AccountClient.cpp
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/CalculatorClient.cpp
incubator/tuscany/cpp/sca/samples/RubyBank/Makefile.am
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/AccountServiceImpl.rb
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/StockQuoteServiceImpl.rb
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/bigbank.account.composite
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.accountmanagement.composite
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/AccountClient.rb
incubator/tuscany/cpp/sca/samples/configure.ac
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp Sat Nov 11 20:39:42 2006
@@ -23,6 +23,7 @@
#include <stdarg.h>
#include "tuscany/sca/util/Logging.h"
+#include "tuscany/sca/util/Exceptions.h"
#include "tuscany/sca/core/SCARuntime.h"
@@ -35,14 +36,11 @@
// ===========
Operation::Operation(const char* operationName)
{
- LOGENTRY(1,"Operation::constructor");
-
+ logentry();
if (operationName != 0)
{
name = operationName;
}
-
- LOGEXIT(1,"Operation::constructor");
}
// ==========
@@ -50,9 +48,8 @@
// ==========
Operation::~Operation()
{
- LOGENTRY(1,"Operation::destructor");
+ logentry();
clean();
- LOGEXIT(1,"Operation::destructor");
}
// ==========
@@ -60,9 +57,8 @@
// ==========
Operation::Operation(const Operation& op)
{
- LOGENTRY(1,"Operation::copy contructor");
+ logentry();
copy(op);
- LOGEXIT(1,"Operation::copy contructor");
}
// ==========
@@ -70,12 +66,11 @@
// ==========
Operation& Operation::operator=(const Operation& op)
{
- LOGENTRY(1,"Operation::operator=");
+ logentry();
if (&op != this)
{
copy(op);
}
- LOGEXIT(1,"Operation::operator=");
return *this;
}
@@ -84,7 +79,7 @@
// ==========
void Operation::clean()
{
- LOGENTRY(1,"Operation::clean");
+ logentry();
for (unsigned int i = 0; i < getNParms(); i++)
{
const Parameter& parm = getParameter(i);
@@ -100,8 +95,6 @@
{
delete (DataObjectPtr*)getReturnValue();
}
-
- LOGEXIT(1,"Operation::clean");
}
// ==========
@@ -109,7 +102,7 @@
// ==========
void Operation::copy(const Operation& op)
{
- LOGENTRY(1,"Operation::copy");
+ logentry();
clean();
for (unsigned int i = 0; i < op.getNParms(); i++)
{
@@ -132,8 +125,6 @@
{
returnValue = op.returnValue;
}
-
- LOGEXIT(1,"Operation::copy");
}
// ==============================================
@@ -141,6 +132,7 @@
// ==============================================
void* Operation::getParameterValue(unsigned int pos) const
{
+ logentry();
if (pos < parameters.size())
{
return parameters[pos].getValue();
@@ -154,12 +146,13 @@
// ==============================================
const Operation::Parameter& Operation::getParameter(unsigned int pos) const
{
+ logentry();
if (pos < parameters.size())
{
return parameters[pos];
}
- throw "index out of range";
+ throwException(ServiceInvocationException, "Index out of range");
}
@@ -168,6 +161,7 @@
// ==============================================
Operation::ParameterType Operation::getParameterType(unsigned int pos) const
{
+ logentry();
if (pos < parameters.size())
{
return parameters[pos].getType();
@@ -181,91 +175,91 @@
// ===========================================
void Operation::addParameter(const void *parm)
{
- LOGINFO(4, "Operation::addParameter(void*)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, VOID_TYPE));
}
void Operation::addParameter(const bool *parm)
{
- LOGINFO(4, "Operation::addParameter(bool)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, BOOL));
}
void Operation::addParameter(const short *parm)
{
- LOGINFO(4, "Operation::addParameter(short)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, SHORT));
}
void Operation::addParameter(const int *parm)
{
- LOGINFO(4, "Operation::addParameter(int)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, INT));
}
void Operation::addParameter(const long *parm)
{
- LOGINFO(4, "Operation::addParameter(long)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, LONG));
}
void Operation::addParameter(const unsigned short *parm)
{
- LOGINFO(4, "Operation::addParameter(unsigned short)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, USHORT));
}
void Operation::addParameter(const unsigned int *parm)
{
- LOGINFO(4, "Operation::addParameter(unsigned int)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, UINT));
}
void Operation::addParameter(const unsigned long *parm)
{
- LOGINFO(4, "Operation::addParameter(unsigned long)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, ULONG));
}
void Operation::addParameter(const float *parm)
{
- LOGINFO(4, "Operation::addParameter(float)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, FLOAT));
}
void Operation::addParameter(const double *parm)
{
- LOGINFO(4, "Operation::addParameter(double)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, DOUBLE));
}
void Operation::addParameter(const long double *parm)
{
- LOGINFO(4, "Operation::addParameter(long double)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, LONGDOUBLE));
}
void Operation::addParameter(const char* *parm)
{
- LOGINFO(4, "Operation::addParameter(char*)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, CHARS));
}
void Operation::addParameter(const char *parm)
{
- LOGINFO(4, "Operation::addParameter(char)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, CHAR));
}
void Operation::addParameter(const string *parm)
{
- LOGINFO(4, "Operation::addParameter(string)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)parm, STRING));
}
void Operation::addParameter(const DataObjectPtr *parm)
{
- LOGINFO(4, "Operation::addParameter(DataObjectPtr)");
+ logentry();
parameters.insert(parameters.end(), Parameter((void*)new DataObjectPtr(*parm), DATAOBJECT));
}
@@ -279,91 +273,91 @@
// ===========================================
void Operation::setReturnValue(const void *parm)
{
- LOGINFO(4, "Operation::setReturnValue(void*)");
+ logentry();
returnValue = Parameter((void*)parm, VOID_TYPE);
}
void Operation::setReturnValue(const bool *parm)
{
- LOGINFO(4, "Operation::setReturnValue(bool*)");
+ logentry();
returnValue = Parameter((void*)parm, BOOL);
}
void Operation::setReturnValue(const short *parm)
{
- LOGINFO(4, "Operation::setReturnValue(short*)");
+ logentry();
returnValue = Parameter((void*)parm, SHORT);
}
void Operation::setReturnValue(const int *parm)
{
- LOGINFO(4, "Operation::setReturnValue(int)");
+ logentry();
returnValue = Parameter((void*)parm, INT);
}
void Operation::setReturnValue(const long *parm)
{
- LOGINFO(4, "Operation::setReturnValue(long*)");
+ logentry();
returnValue = Parameter((void*)parm, LONG);
}
void Operation::setReturnValue(const unsigned short *parm)
{
- LOGINFO(4, "Operation::setReturnValue(unsigned short*)");
+ logentry();
returnValue = Parameter((void*)parm, USHORT);
}
void Operation::setReturnValue(const unsigned int *parm)
{
- LOGINFO(4, "Operation::setReturnValue(unsigned int)");
+ logentry();
returnValue = Parameter((void*)parm, UINT);
}
void Operation::setReturnValue(const unsigned long *parm)
{
- LOGINFO(4, "Operation::setReturnValue(unsigned long*)");
+ logentry();
returnValue = Parameter((void*)parm, ULONG);
}
void Operation::setReturnValue(const float *parm)
{
- LOGINFO(4, "Operation::setReturnValue(float*)");
+ logentry();
returnValue = Parameter((void*)parm, FLOAT);
}
void Operation::setReturnValue(const double *parm)
{
- LOGINFO(4, "Operation::setReturnValue(double*)");
+ logentry();
returnValue = Parameter((void*)parm, DOUBLE);
}
void Operation::setReturnValue(const long double *parm)
{
- LOGINFO(4, "Operation::setReturnValue(long double*)");
+ logentry();
returnValue = Parameter((void*)parm, LONGDOUBLE);
}
void Operation::setReturnValue(const char *parm)
{
- LOGINFO(4, "Operation::setReturnValue(char)");
+ logentry();
returnValue = Parameter((void*)parm, CHAR);
}
void Operation::setReturnValue(const char* *parm)
{
- LOGINFO(4, "Operation::setReturnValue(char*)");
+ logentry();
returnValue = Parameter((void*)parm, CHARS);
}
void Operation::setReturnValue(const string *parm)
{
- LOGINFO(4, "Operation::setReturnValue(string*)");
+ logentry();
returnValue = Parameter((void*)parm, STRING);
}
void Operation::setReturnValue(const DataObjectPtr *parm)
{
- LOGINFO(4, "Operation::setReturnValue(DataObjectPtr*)");
+ logentry();
returnValue = Parameter((void*)new DataObjectPtr(*parm), DATAOBJECT);
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp Sat Nov 11 20:39:42 2006
@@ -61,10 +61,9 @@
// ==========================================================
void SCARuntime::setSystemRoot(const string& root)
{
- LOGENTRY(1, "SCARuntime::setSystemRoot");
+ logentry();
systemRoot = root;
- LOGINFO_1(3, "SCARuntime::setSystemRoot - set to %s", root.c_str());
- LOGEXIT(1, "SCARuntime::setSystemRoot");
+ loginfo("System root: %s", root.c_str());
}
// ==========================================================
@@ -72,10 +71,9 @@
// ==========================================================
void SCARuntime::setSystemPath(const string& path)
{
- LOGENTRY(1, "SCARuntime::setSystemPath");
+ logentry();
systemPath = path;
- LOGINFO_1(3, "SCARuntime::setSystemPath - set to %s", path.c_str());
- LOGEXIT(1, "SCARuntime::setSystemPath");
+ loginfo("System path: %s", path.c_str());
}
// ==========================================================
@@ -83,10 +81,9 @@
// ==========================================================
void SCARuntime::setDefaultComponentName(const string& componentName)
{
- LOGENTRY(1, "SCARuntime::setDefaultComponentName");
+ logentry();
defaultComponentName = componentName;
- LOGINFO_1(3, "SCARuntime::setDefaultComponentName - set to %s", componentName.c_str());
- LOGEXIT(1, "SCARuntime::setDefaultComponentName");
+ loginfo("Default component name: %s", componentName.c_str());
}
// ===================================================================
@@ -95,7 +92,7 @@
// ===================================================================
SCARuntime::SCARuntime() : system(0), defaultComponent(0)
{
- LOGENTRY(1, "SCARuntime::constructor");
+ logentry();
// Locate the SCA install root
char* root = 0;
@@ -104,14 +101,13 @@
{
string msg = TUSCANY_SCACPP;
msg += " environment variable not set";
- throw SystemConfigurationException(msg.c_str());
+ throwException(SystemConfigurationException, msg.c_str());
}
else
{
SCARoot = root;
}
- LOGEXIT(1, "SCARuntime::constructor");
}
// ===================================================================
@@ -119,14 +115,13 @@
// ===================================================================
SCARuntime::~SCARuntime()
{
- LOGENTRY(1, "SCARuntime::destructor");
+ logentry();
if (system)
{
delete system;
}
- LOGEXIT(1, "SCARuntime::destructor");
}
// =============================================================
@@ -135,7 +130,7 @@
// =============================================================
SCARuntime* SCARuntime::getInstance()
{
- LOGENTRY(1, "SCARuntime::getInstance");
+ logentry();
if (instance == NULL)
{
@@ -157,7 +152,7 @@
{
string msg = TUSCANY_SCACPP_ROOT;
msg += " environment variable not set";
- throw SystemConfigurationException(msg.c_str());
+ throwException(SystemConfigurationException, msg.c_str());
}
systemRoot = systemRootEnv;
@@ -167,22 +162,13 @@
// Get system path from environment variable TUSCANY_SCACPP_PATH
char* systemPathEnv = getenv(TUSCANY_SCACPP_PATH);
- if (systemPathEnv == 0)
- {
- // Make the path optional for now
-// string msg = TUSCANY_SCACPP_PATH;
-// msg += " environment variable not set";
-// throw SystemConfigurationException(msg.c_str());
- }
- else
+ if (systemPathEnv != 0)
{
systemPath = systemPathEnv;
}
}
}
- LOGEXIT(1, "SCARuntime::getInstance");
-
return instance;
}
@@ -193,7 +179,7 @@
// =============================================================
void SCARuntime::releaseInstance()
{
- LOGENTRY(1, "SCARuntime::releaseInstance");
+ logentry();
if (instance)
{
@@ -203,8 +189,6 @@
systemPath = "";
defaultComponentName = "";
}
-
- LOGEXIT(1, "SCARuntime::releaseInstance");
}
// ======================================
@@ -212,16 +196,14 @@
// ======================================
void SCARuntime::load()
{
- LOGENTRY(1, "SCARuntime::load");
+ logentry();
- LOGINFO_1(2,"configuration root: %s", systemRoot.c_str());
- LOGINFO_1(2,"configuration path: %s", systemPath.c_str());
+ loginfo("Configuration root: %s", systemRoot.c_str());
+ loginfo("Configuration path: %s", systemPath.c_str());
// Load the system composite
ModelLoader loader(system);
loader.load(systemRoot, systemPath);
-
- LOGEXIT(1, "SCARuntime::load");
}
@@ -230,7 +212,7 @@
// ======================================
void SCARuntime::loadExtensions()
{
- LOGENTRY(1, "SCARuntime::loadExtensions");
+ logentry();
string extensionsRoot = SCARoot + "/extensions";
@@ -256,12 +238,10 @@
}
catch (TuscanyRuntimeException& ex)
{
- LOGERROR_3(0, "SCARuntime::loadExtensions failed to load extension library: %s: %s: %s",
+ logerror("Failed to load extension library: %s: %s: %s",
files[i].getFileName().c_str(), ex.getEClassName(), ex.getMessageText());
}
}
-
- LOGEXIT(1, "SCARuntime::loadExtensions");
}
@@ -270,12 +250,11 @@
// ======================================
void SCARuntime::registerInterfaceExtension(InterfaceExtension* extension)
{
- LOGENTRY(1, "SCARuntime::registerInterfaceExtension");
+ logentry();
if (extension)
{
interfaceExtensions[extension->getExtensionTypeQName()] = extension;
}
- LOGEXIT(1, "SCARuntime::registerInterfaceExtension");
}
// ======================================
@@ -291,12 +270,11 @@
// ======================================
void SCARuntime::registerImplementationExtension(ImplementationExtension* extension)
{
- LOGENTRY(1, "SCARuntime::registerImplementationExtension");
+ logentry();
if (extension)
{
implementationExtensions[extension->getExtensionTypeQName()] = extension;
}
- LOGEXIT(1, "SCARuntime::registerImplementationExtension");
}
// ======================================
@@ -312,12 +290,11 @@
// ======================================
void SCARuntime::registerReferenceBindingExtension(ReferenceBindingExtension* extension)
{
- LOGENTRY(1, "SCARuntime::registerReferenceBindingExtension");
+ logentry();
if (extension)
{
referenceBindingExtensions[extension->getExtensionTypeQName()] = extension;
}
- LOGEXIT(1, "SCARuntime::registerReferenceBindingExtension");
}
// ======================================
@@ -333,12 +310,11 @@
// ======================================
void SCARuntime::registerServiceBindingExtension(ServiceBindingExtension* extension)
{
- LOGENTRY(1, "SCARuntime::registerServiceBindingExtension");
+ logentry();
if (extension)
{
serviceBindingExtensions[extension->getExtensionTypeQName()] = extension;
}
- LOGEXIT(1, "SCARuntime::registerServiceBindingExtension");
}
// ======================================
@@ -355,6 +331,7 @@
// ===================================
Composite* SCARuntime::getSystem()
{
+ logentry();
if (!system)
{
system = new Composite("tuscany/sca/system", "");
@@ -369,6 +346,7 @@
// ===================================================
void SCARuntime::setCurrentComponent(Component* component)
{
+ logentry();
#if defined(WIN32) || defined (_WINDOWS)
DWORD currentThreadId = GetCurrentThreadId();
@@ -392,6 +370,8 @@
// ====================================================
Component* SCARuntime::unsetCurrentComponent()
{
+ logentry();
+
#if defined(WIN32) || defined (_WINDOWS)
DWORD currentThreadId = GetCurrentThreadId();
#else
@@ -418,6 +398,8 @@
// =============================================================
Component* SCARuntime::getCurrentComponent()
{
+ logentry();
+
#if defined(WIN32) || defined (_WINDOWS)
DWORD currentThreadId = GetCurrentThreadId();
#else
@@ -448,36 +430,42 @@
// ===========================================
Component* SCARuntime::getDefaultComponent()
{
+ logentry();
- // ----------------------
- // Get the default Component
- // ----------------------
- if (!defaultComponent)
+ // -------------------------------------------
+ // Get the default component name from the environment
+ // -------------------------------------------
+ if (defaultComponentName == "")
{
- // -------------------------------------------
- // Get the default component name from the environment
- // -------------------------------------------
- if (defaultComponentName == "")
+ const char* defComp = getenv(TUSCANY_SCACPP_COMPONENT);
+ if (!defComp)
{
- const char* defComp = getenv(TUSCANY_SCACPP_COMPONENT);
- if (!defComp)
- {
- defComp = getenv(TUSCANY_SCACPP_DEFAULT_COMPONENT);
- }
- if (!defComp)
- {
- string message = TUSCANY_SCACPP_COMPONENT;
- message += " environment variable not set";
- throw SystemConfigurationException(message.c_str());
- }
- defaultComponentName = defComp;
+ defComp = getenv(TUSCANY_SCACPP_DEFAULT_COMPONENT);
}
+ if (!defComp)
+ {
+ string message = TUSCANY_SCACPP_COMPONENT;
+ message += " environment variable not set";
+ throwException(SystemConfigurationException, message.c_str());
+ }
+ defaultComponentName = defComp;
+ }
+
+ // -------------------------------------------
+ // Get the default component
+ // -------------------------------------------
+ if (defaultComponent && defaultComponentName != defaultComponent->getName())
+ {
+ defaultComponent = NULL;
+ }
+ if (!defaultComponent)
+ {
defaultComponent = getSystem()->findComponent(defaultComponentName);
if (!defaultComponent)
{
string message = "Component \'" + defaultComponentName + "\' not found";
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
}
return defaultComponent;
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp Sat Nov 11 20:39:42 2006
@@ -33,9 +33,7 @@
ServiceProxy::ServiceProxy(Reference* reference)
: reference(reference)
{
- LOGENTRY(1,"ServiceProxy::constructor");
- LOGEXIT(1,"ServiceProxy::constructor");
-
+ logentry();
}
// ==========
@@ -43,8 +41,7 @@
// ==========
ServiceProxy::~ServiceProxy()
{
- LOGENTRY(1,"ServiceProxy::destructor");
- LOGEXIT(1,"ServiceProxy::destructor");
+ logentry();
}
} // End namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp Sat Nov 11 20:39:42 2006
@@ -33,10 +33,7 @@
ServiceWrapper::ServiceWrapper(Service* service)
: service(service)
{
- LOGENTRY(1,"ServiceWrapper::constructor");
-
- LOGEXIT(1,"ServiceWrapper::constructor");
-
+ logentry();
}
// ==========
@@ -44,8 +41,7 @@
// ==========
ServiceWrapper::~ServiceWrapper()
{
- LOGENTRY(1,"ServiceWrapper::destructor");
- LOGEXIT(1,"ServiceWrapper::destructor");
+ logentry();
}
} // End namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp Sat Nov 11 20:39:42 2006
@@ -35,10 +35,9 @@
// ==========================================================
void TuscanyRuntime::setSystemRoot(const string& root)
{
- LOGENTRY(1, "TuscanyRuntime::setSystemRoot");
+ logentry();
systemRoot = root;
- LOGINFO_1(3, "TuscanyRuntime::setSystemRoot - set to %s", root.c_str());
- LOGEXIT(1, "TuscanyRuntime::setSystemRoot");
+ loginfo("System root: %s", root.c_str());
}
// ==========================================================
@@ -46,10 +45,9 @@
// ==========================================================
void TuscanyRuntime::setSystemPath(const string& path)
{
- LOGENTRY(1, "TuscanyRuntime::setSystemPath");
+ logentry();
systemPath = path;
- LOGINFO_1(3, "TuscanyRuntime::setSystemPath - set to %s", path.c_str());
- LOGEXIT(1, "TuscanyRuntime::setSystemPath");
+ loginfo("System path: %s", path.c_str());
}
// ==========================================================
@@ -57,10 +55,9 @@
// ==========================================================
void TuscanyRuntime::setDefaultComponentName(const string& componentName)
{
- LOGENTRY(1, "TuscanyRuntime::setDefaultComponentName");
+ logentry();
defaultComponentName = componentName;
- LOGINFO_1(3, "TuscanyRuntime::setDefaultComponentName - set to %s", componentName.c_str());
- LOGEXIT(1, "TuscanyRuntime::setDefaultComponentName");
+ loginfo("Default component name: %s", componentName.c_str());
}
// ===================================================================
@@ -68,11 +65,10 @@
// ===================================================================
TuscanyRuntime::TuscanyRuntime(const string& componentName, const string& root, const string& path)
{
- LOGENTRY(1, "TuscanyRuntime::constructor");
+ logentry();
setSystemRoot(root);
setSystemPath(path);
setDefaultComponentName(componentName);
- LOGEXIT(1, "TuscanyRuntime::constructor");
}
// ===================================================================
@@ -80,21 +76,19 @@
// ===================================================================
TuscanyRuntime::~TuscanyRuntime()
{
- LOGENTRY(1, "TuscanyRuntime::destructor");;
- LOGEXIT(1, "TuscanyRuntime::destructor");
+ logentry();
}
// ===================================================================
// Start the runtime.
// ===================================================================
void TuscanyRuntime::start()
- {
- LOGENTRY(1, "TuscanyRuntime::start");
+ {
+ logentry();
SCARuntime::setSystemRoot(systemRoot);
SCARuntime::setSystemPath(systemPath);
SCARuntime::setDefaultComponentName(defaultComponentName);
SCARuntime::getInstance();
- LOGEXIT(1, "TuscanyRuntime::start");
}
// ===================================================================
@@ -102,9 +96,8 @@
// ===================================================================
void TuscanyRuntime::stop()
{
- LOGENTRY(1, "TuscanyRuntime::stop");
+ logentry();
SCARuntime::releaseInstance();
- LOGEXIT(1, "TuscanyRuntime::stop");
}
} // End namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp Sat Nov 11 20:39:42 2006
@@ -29,9 +29,8 @@
// Constructor for the ImplementationExtension class.
// ===================================================================
ImplementationExtension::ImplementationExtension()
- {
- LOGENTRY(1, "ImplementationExtension::constructor");
- LOGEXIT(1, "ImplementationExtension::constructor");
+ {
+ logentry();
}
// ===================================================================
@@ -39,10 +38,8 @@
// ===================================================================
ImplementationExtension::~ImplementationExtension()
{
- LOGENTRY(1, "ImplementationExtension::destructor");;
- LOGEXIT(1, "ImplementationExtension::destructor");
+ logentry();
}
-
} // End namespace sca
} // End namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp Sat Nov 11 20:39:42 2006
@@ -29,18 +29,16 @@
// Constructor for the InterfaceExtension class.
// ===================================================================
InterfaceExtension::InterfaceExtension()
- {
- LOGENTRY(1, "InterfaceExtension::constructor");
- LOGEXIT(1, "InterfaceExtension::constructor");
+ {
+ logentry();
}
// ===================================================================
// Destructor for the InterfaceExtension class.
// ===================================================================
InterfaceExtension::~InterfaceExtension()
- {
- LOGENTRY(1, "InterfaceExtension::destructor");;
- LOGEXIT(1, "InterfaceExtension::destructor");
+ {
+ logentry();
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp Sat Nov 11 20:39:42 2006
@@ -29,18 +29,16 @@
// Constructor for the ReferenceBindingExtension class.
// ===================================================================
ReferenceBindingExtension::ReferenceBindingExtension()
- {
- LOGENTRY(1, "ReferenceBindingExtension::constructor");
- LOGEXIT(1, "ReferenceBindingExtension::constructor");
+ {
+ logentry();
}
// ===================================================================
// Destructor for the ReferenceBindingExtension class.
// ===================================================================
ReferenceBindingExtension::~ReferenceBindingExtension()
- {
- LOGENTRY(1, "ReferenceBindingExtension::destructor");;
- LOGEXIT(1, "ReferenceBindingExtension::destructor");
+ {
+ logentry();
}
} // End namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp Sat Nov 11 20:39:42 2006
@@ -29,18 +29,16 @@
// Constructor for the ServiceBindingExtension class.
// ===================================================================
ServiceBindingExtension::ServiceBindingExtension()
- {
- LOGENTRY(1, "ServiceBindingExtension::constructor");
- LOGEXIT(1, "ServiceBindingExtension::constructor");
+ {
+ logentry();
}
// ===================================================================
// Destructor for the ServiceBindingExtension class.
// ===================================================================
ServiceBindingExtension::~ServiceBindingExtension()
- {
- LOGENTRY(1, "ServiceBindingExtension::destructor");;
- LOGEXIT(1, "ServiceBindingExtension::destructor");
+ {
+ logentry();
}
} // End namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Binding.cpp Sat Nov 11 20:39:42 2006
@@ -34,11 +34,13 @@
// Constructor
Binding::Binding(const string& uri) : uri(uri)
{
+ logentry();
}
// Destructor
Binding::~Binding()
{
+ logentry();
}
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp Sat Nov 11 20:39:42 2006
@@ -42,26 +42,29 @@
Component::Component(Composite* composite, const std::string& componentName, ComponentType *componentType)
: name(componentName), composite(composite), type(componentType)
{
- LOGENTRY(1, "Component::constructor");
- LOGINFO_1(3, "Component::constructor: Component name: %s", name.c_str());
+ logentry();
+ loginfo("Component name: %s", name.c_str());
// Initialize the component from its component type
componentType->initializeComponent(this);
- LOGEXIT(1, "Component::constructor");
}
Component::~Component()
{
+ logentry();
}
void Component::addService(Service* service)
{
+ logentry();
services[service->getType()->getName()] = service;
}
Service* Component::findService(const string& serviceName)
{
+ logentry();
+
// If serviceName is empty then return the ONLY service
if (serviceName == ""
&& services.size() == 1)
@@ -82,16 +85,20 @@
void Component::addReference(Reference* reference)
{
+ logentry();
references[reference->getType()->getName()] = reference;
}
Reference* Component::findReference(const std::string& referenceName)
{
+ logentry();
return references[referenceName];
}
DataObjectPtr Component::getProperties()
{
+ logentry();
+
if (!properties)
{
properties = type->getPropertyDataFactory()->create("org/osoa/sca", "Properties");
@@ -101,7 +108,8 @@
void Component::setProperty(const string& name, DataObjectPtr value)
{
- //cout << "setting property: " << name.c_str() << " to: " << value <<endl;
+ logentry();
+
DataObjectPtr props = getProperties();
// Get the property's type
@@ -130,14 +138,11 @@
props->setDataObject(propProperty, value);
}
}
- catch (SDOPropertyNotFoundException&)
+ catch (SDORuntimeException& ex)
{
// Configuration error: property is not defined
- string message = "Undefined property: " + name;
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, ex);
}
-
- //cout << "properties set: " << props << endl;
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp Sat Nov 11 20:39:42 2006
@@ -46,22 +46,25 @@
ComponentType::ComponentType(Composite* composite, const string& name)
: composite(composite), name(name)
{
- LOGENTRY(1, "ComponentType::constructor");
- LOGEXIT(1, "ComponentType::constructor");
+ logentry();
}
// Destructor
ComponentType::~ComponentType()
{
+ logentry();
}
void ComponentType::addServiceType(ServiceType* serviceType)
{
+ logentry();
serviceTypes[serviceType->getName()] = serviceType;
}
ServiceType* ComponentType::findServiceType(const string& serviceName)
{
+ logentry();
+
// If serviceName is empty then return the ONLY service
if (serviceName == ""
&& serviceTypes.size() == 1)
@@ -76,11 +79,15 @@
void ComponentType::addReferenceType(ReferenceType* referenceType)
{
+ logentry();
+
referenceTypes[referenceType->getName()] = referenceType;
}
ReferenceType* ComponentType::findReferenceType(const string& referenceName)
{
+ logentry();
+
return referenceTypes[referenceName];
}
@@ -89,6 +96,8 @@
bool many,
DataObjectPtr* defaultValue)
{
+ logentry();
+
// Create a Type in the Properties dataFactory
DataFactoryPtr factory = getPropertyDataFactory();
@@ -222,7 +231,6 @@
}
catch (SDOTypeNotFoundException&)
{
- // cout << "setting default failed" <<endl;
}
}
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp Sat Nov 11 20:39:42 2006
@@ -42,33 +42,31 @@
Composite::Composite(const string& name, const string& root)
: ComponentType(0, name), root(root)
{
- LOGENTRY(1, "Composite::constructor");
- LOGEXIT(1, "Composite::constructor");
+ logentry();
}
// Destructor
Composite::~Composite()
{
+ logentry();
}
void Composite::addComponent(Component* component)
{
- LOGENTRY(1, "Composite::addComponent");
+ logentry();
components[component->getName()] = component;
- LOGEXIT(1, "Composite::addComponent");
}
Component* Composite::findComponent(const std::string& name)
{
- LOGENTRY(1, "Composite::findComponent");
+ logentry();
Component* component = components[name];
- LOGEXIT(1, "Composite::findComponent");
return component;
}
Service* Composite::findComponentService(const std::string& name)
{
- LOGENTRY(1, "Composite::findComponentService");
+ logentry();
Service* service = 0;
@@ -83,21 +81,19 @@
// Locate the service
service = component->findService(serviceName);
}
- LOGEXIT(1, "Composite::findComponentService");
return service;
}
void Composite::addWire(const std::string& source, const std::string& target)
{
- LOGENTRY(1, "Composite::addWire");
+ logentry();
Wire* wire=new Wire(source, target);
wires.push_back(wire);
- LOGEXIT(1, "Composite::addWire");
}
void Composite::addInclude(Composite* composite)
{
- LOGENTRY(1, "Composite::addInclude");
+ logentry();
includes.push_back(composite);
for (COMPONENT_MAP::iterator iter = composite->components.begin();
@@ -106,12 +102,11 @@
{
components[iter->first] = iter->second;
}
- LOGEXIT(1, "Composite::addInclude");
}
void Composite::resolveWires()
{
- LOGENTRY(1, "Composite::resolveWires");
+ logentry();
for (WIRES::iterator iter = wires.begin();
iter != wires.end();
@@ -123,7 +118,7 @@
Service* service = findComponentService(wire->getTarget());
if (!service)
{
- LOGERROR_1(0, "Composite::resolveWires: Wire target %s not found", wire->getTarget().c_str());
+ logerror("Wire target %s not found", wire->getTarget().c_str());
}
else
{
@@ -140,36 +135,42 @@
}
else
{
- LOGERROR_1(0, "Composite::resolveWires: Wire source reference %s not found", wire->getSourceReference().c_str());
+ logerror("Wire source reference %s not found", wire->getSourceReference().c_str());
}
}
else
{
- LOGERROR_1(0, "Composite::resolveWires: Wire source %s not found", wire->getSourceComponent().c_str());
+ logerror("Wire source %s not found", wire->getSourceComponent().c_str());
}
}
}
-
- LOGEXIT(1, "Composite::resolveWires");
}
void Composite::addWSDLDefinition(commonj::sdo::DataObjectPtr wsdlModel)
{
- LOGENTRY(1, "Composite::addWSDLDefinition");
+ logentry();
WSDLDefinition* wsdlDefinition = new WSDLDefinition(wsdlModel);
- wsdlDefinitions[wsdlDefinition->getNamespace()] = wsdlDefinition;
- LOGEXIT(1, "Composite::addWSDLDefinition");
-
+
+ WSDLDefinition* existingDefinition = wsdlDefinitions[wsdlDefinition->getNamespace()];
+ if (existingDefinition == NULL)
+ {
+ wsdlDefinitions[wsdlDefinition->getNamespace()] = wsdlDefinition;
+ }
+ else{
+ existingDefinition->addWSDLModel(wsdlModel);
+ }
}
WSDLDefinition* Composite::findWSDLDefinition(const std::string& wsdlNamespace )
{
+ logentry();
return wsdlDefinitions[wsdlNamespace];
}
commonj::sdo::XSDHelperPtr Composite::getXSDHelper()
{
+ logentry();
if (xsdHelper == 0)
{
xsdHelper = commonj::sdo::HelperProvider::getXSDHelper();
@@ -180,6 +181,7 @@
commonj::sdo::XMLHelperPtr Composite::getXMLHelper()
{
+ logentry();
if (xmlHelper == 0)
{
xmlHelper = commonj::sdo::HelperProvider::getXMLHelper(getXSDHelper()->getDataFactory());
@@ -190,6 +192,7 @@
commonj::sdo::DataFactoryPtr Composite::getDataFactory()
{
+ logentry();
return getXSDHelper()->getDataFactory();
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp Sat Nov 11 20:39:42 2006
@@ -41,8 +41,8 @@
Interface* intface, Interface* callbackInterface, bool conversational, ReferenceType::Multiplicity multiplicity) :
Component(composite, name, new ComponentType(composite, name))
{
- LOGENTRY(1, "CompositeReference::constructor");
- LOGINFO_1(2, "CompositeReference::constructor: CompositeReference name: %s", name.c_str());
+ logentry();
+ loginfo("Composite reference name: %s", name.c_str());
// Initialize the component type, service type and service
ComponentType* componentType = getType();
@@ -52,13 +52,12 @@
service = new Service(this, serviceType);
addService(service);
-
- LOGEXIT(1, "CompositeReference::constructor");
}
// Destructor
CompositeReference::~CompositeReference()
{
+ logentry();
}
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp Sat Nov 11 20:39:42 2006
@@ -44,8 +44,8 @@
ReferenceType::Multiplicity multiplicity) :
Component(composite, name, new ComponentType(composite, name))
{
- LOGENTRY(1, "CompositeService::constructor");
- LOGINFO_1(2, "CompositeService::constructor: CompositeService name: %s", name.c_str());
+ logentry();
+ loginfo("Composite service name: %s", name.c_str());
// Initialize the component type, reference type and reference
ComponentType* componentType = getType();
@@ -55,13 +55,12 @@
reference = new Reference(this, referenceType);
addReference(reference);
-
- LOGEXIT(1, "CompositeService::constructor");
}
// Destructor
CompositeService::~CompositeService()
{
+ logentry();
}
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp Sat Nov 11 20:39:42 2006
@@ -35,11 +35,13 @@
Contract::Contract(Interface *intface, Interface* callbackInterface) :
iface(intface), callbackInterface(callbackInterface)
{
+ logentry();
}
// Destructor
Contract::~Contract()
{
+ logentry();
}
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Interface.cpp Sat Nov 11 20:39:42 2006
@@ -35,10 +35,12 @@
Interface::Interface(bool remotable, bool conversational)
: remotable(remotable), conversational(conversational)
{
+ logentry();
}
Interface::~Interface()
{
+ logentry();
}
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp?view=diff&rev=473873&r1=473872&r2=473873
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp Sat Nov 11 20:39:42 2006
@@ -59,11 +59,9 @@
// ===========
ModelLoader::ModelLoader(Composite* system) : system(system)
{
- LOGENTRY(1, "ModelLoader::constructor");
+ logentry();
runtime = SCARuntime::getInstance();
-
- LOGEXIT(1, "ModelLoader::constructor");
}
// ==========
@@ -71,6 +69,7 @@
// ==========
ModelLoader::~ModelLoader()
{
+ logentry();
}
// =========================================================
@@ -80,9 +79,9 @@
// =========================================================
void ModelLoader::load(const string& systemRoot, const string& systemPath)
{
- LOGENTRY(1, "ModelLoader::load");
- LOGINFO_1(2,"system root: %s", systemRoot.c_str());
- LOGINFO_1(2,"system path: %s", systemPath.c_str());
+ logentry();
+ loginfo("System root: %s", systemRoot.c_str());
+ loginfo("System path: %s", systemPath.c_str());
// Load composite implementations
// Composite implementations can occur anywhere on the given search path
@@ -102,8 +101,6 @@
// Resolve the wires in the system composite
system->resolveWires();
-
- LOGEXIT(1, "ModelLoader::load");
}
// ========================================================================
@@ -113,16 +110,17 @@
// ========================================================================
void ModelLoader::loadSystem(const string& systemRoot)
{
+ logentry();
+
// Get all the composite files on the system root path
// These composites are included in the system composite
- LOGENTRY(1, "ModelLoader::loadSystem");
for (string path = systemRoot; path != ""; )
{
string dir;
Utils::tokeniseString(PATH_SEPARATOR, path, dir, path);
if (dir != "")
{
- LOGINFO_1(2, "system root directory: %s", dir.c_str());
+ loginfo("System root directory: %s", dir.c_str());
Files files(dir, "*.composite", false);
for (unsigned int i=0; i < files.size(); i++)
{
@@ -141,7 +139,6 @@
}
}
}
- LOGEXIT(1, "ModelLoader::loadSystem");
}
// =====================================================================
@@ -151,15 +148,16 @@
// =====================================================================
void ModelLoader::loadComposites(const string& searchPath)
{
+ logentry();
+
// Get all the composite files on the composite search path
- LOGENTRY(1, "ModelLoader::loadComposites");
for (string path = searchPath; path != ""; )
{
string dir;
Utils::tokeniseString(PATH_SEPARATOR, path, dir, path);
if (dir != "")
{
- LOGINFO_1(2, "composite path directory: %s", dir.c_str());
+ loginfo("Composite path directory: %s", dir.c_str());
Files files(dir, "*.composite", true);
for (unsigned int i=0; i < files.size(); i++)
{
@@ -175,8 +173,6 @@
{
mapCompositePass2(iter->first, iter->second);
}
-
- LOGEXIT(1, "ModelLoader::loadComposites");
}
// ====================================================================
@@ -186,8 +182,9 @@
// ====================================================================
Composite* ModelLoader::loadCompositeFile(const File& file)
{
- LOGENTRY(1, "ModelLoader::loadCompositeFile");
- LOGINFO_1(2, "composite filename: %s", file.getFileName().c_str());
+ logentry();
+
+ loginfo("Composite file name: %s", file.getFileName().c_str());
Composite* composite = NULL;
try
@@ -198,7 +195,7 @@
XMLDocumentPtr compositeFile = getXMLHelper()->loadFile(fileName.c_str());
if (compositeFile->getRootDataObject() == NULL)
{
- LOGERROR_1(0, "ModelLoader::loadCompositeFile: Unable to load file: %s", fileName.c_str());
+ logerror("Unable to load file: %s", fileName.c_str());
}
else
{
@@ -210,12 +207,10 @@
}
}
- } catch (SDORuntimeException ex)
+ } catch (SDORuntimeException& ex)
{
- LOGERROR_1(0, "ModelLoader::loadCompositeFile: Exception caught: %s", ex.getMessageText());
+ logerror("Unable to load composite: %s", ex.getMessageText());
}
-
- LOGEXIT(1, "ModelLoader::loadCompositeFile");
return composite;
}
@@ -224,11 +219,11 @@
// ===========
Composite* ModelLoader::mapCompositePass1(const File& file, DataObjectPtr root)
{
- LOGENTRY(1, "ModelLoader::mapCompositePass1");
+ logentry();
const string& compositeRootDir = file.getDirectory();
const string compositeName = root->getCString("name");
- LOGINFO_2(2, "ModelLoader::mapCompositePass1: Loading composite: %s, root Dir: %s", compositeName.c_str(), compositeRootDir.c_str());
+ loginfo("Composite: %s, root directory: %s", compositeName.c_str(), compositeRootDir.c_str());
Composite* composite = new Composite(compositeName, compositeRootDir);
compositeModels[compositeName] = composite;
@@ -264,7 +259,6 @@
composite->addWire(source, target);
}
- LOGEXIT(1, "ModelLoader::mapCompositePass1");
return composite;
}
@@ -273,9 +267,8 @@
// ===========
Composite* ModelLoader::mapCompositePass2(const string& compositeName, DataObjectPtr root)
{
- LOGENTRY(1, "ModelLoader::mapCompositePass2");
-
- LOGINFO_1(2, "ModelLoader::mapCompositePass2: Loading composite: %s", compositeName.c_str());
+ logentry();
+ loginfo("Composite: %s", compositeName.c_str());
Composite* composite = compositeModels[compositeName];
@@ -292,7 +285,6 @@
// Resolve all the wires inside the composite
composite->resolveWires();
- LOGEXIT(1, "ModelLoader::mapCompositePass2");
return composite;
}
@@ -301,6 +293,8 @@
// =================================
void ModelLoader::addComponent(Composite* composite, DataObjectPtr componentDO)
{
+ logentry();
+
// -------------------
// Get the component implementation
// -------------------
@@ -309,7 +303,7 @@
{
string message = "No implementation for component: ";
message = message + componentDO->getCString("name");
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
// Create the component type
@@ -329,7 +323,7 @@
{
string message = "Composite not found: ";
message = message + impl->getCString("name");
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
componentType = composite;
}
@@ -361,7 +355,7 @@
if (!componentTypeFile || componentTypeFile->getRootDataObject() == 0)
{
// Component type files are optional
- LOGINFO_1(0, "ModelLoader::addComponent: Unable to load file: %s", typeFileName.c_str());
+ logerror("Unable to load file: %s", typeFileName.c_str());
}
else
{
@@ -373,19 +367,18 @@
}
} catch (SDORuntimeException& ex)
{
- LOGERROR_2(0, "ModelLoader::addComponent (%s): Exception caught: %s",
- typeFileName.c_str(), ex.getMessageText());
- throw SystemConfigurationException(ex.getMessageText());
+ logerror(0, "Unable to load file:%s", typeFileName.c_str());
+ throwException(SystemConfigurationException, ex);
}
}
}
else
{
- LOGERROR_1(0, "ModelLoader::addComponent: Unsupported implementation type: %s", implTypeQname.c_str());
+ logerror("Unsupported implementation type: %s", implTypeQname.c_str());
string message = "Implementation type not supported: ";
message = message + implTypeQname;
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
}
@@ -399,7 +392,7 @@
{
// Configuration error: reference is not defined
string message = "Undefined reference: " + refName;
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
}
@@ -432,7 +425,7 @@
{
// Configuration error: reference is not defined
string message = "Undefined reference: " + refName;
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
string src = component->getName() + "/" + refName;
@@ -449,6 +442,8 @@
// =====================================================================
void ModelLoader::addServiceTypes(Composite* composite, ComponentType* componentType, DataObjectPtr componentTypeDO)
{
+ logentry();
+
DataObjectList& serviceTypes = componentTypeDO->getList("service");
for (int i=0; i<serviceTypes.size(); i++)
{
@@ -464,6 +459,8 @@
// ===================================================
void ModelLoader::addReferenceTypes(Composite* composite, ComponentType* componentType, DataObjectPtr componentTypeDO)
{
+ logentry();
+
DataObjectList& refs = componentTypeDO->getList("reference");
for (int i=0; i<refs.size(); i++)
{
@@ -493,6 +490,8 @@
// ==============
Interface* ModelLoader::getInterface(Composite* composite, DataObjectPtr obj)
{
+ logentry();
+
// -----------------
// get the interface
// -----------------
@@ -501,7 +500,7 @@
{
string message = "No interface for: ";
message = message + obj->getCString("name");
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
string typeQname = iface->getType().getURI();
@@ -526,7 +525,7 @@
else
{
// log this for now.
- LOGERROR_1(1, "ModelLoader::getInterface: Unsupported interface type: %s", typeQname.c_str());
+ logerror("Unsupported interface type: %s", typeQname.c_str());
return 0;
}
}
@@ -538,6 +537,8 @@
// ==============================================
void ModelLoader::addPropertyTypes(ComponentType* componentType, DataObjectPtr componentTypeDO)
{
+ logentry();
+
DataObjectList& props = componentTypeDO->getList("property");
for (int i=0; i<props.size(); i++)
{
@@ -564,8 +565,8 @@
// ===============================================
void ModelLoader::addCompositeService(Composite* composite, DataObjectPtr compositeServiceDO)
{
+ logentry();
- //Utils::printDO(compositeServiceDO);
string compositeServiceName = compositeServiceDO->getCString("name");
Interface* iface;
@@ -610,12 +611,10 @@
{
string message = "No binding for compositeService: ";
message = message + compositeServiceDO->getCString("name");
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
DataObjectPtr binding = bindings[0];
- // Utils::printDO(binding);
-
// Determine the binding type
string bindingType = binding->getType().getName();
string bindingTypeQname = binding->getType().getURI();
@@ -632,11 +631,11 @@
}
else
{
- LOGERROR_1(0, "ModelLoader::addCompositeService: Unsupported binding type: %s", bindingTypeQname.c_str());
+ logerror("Unsupported binding type: %s", bindingTypeQname.c_str());
string message = "Binding type not supported: ";
message = message + bindingTypeQname;
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
}
@@ -646,6 +645,8 @@
// =========================================================
void ModelLoader::addCompositeReference(Composite* composite, DataObjectPtr compositeReferenceDO)
{
+ logentry();
+
string compositeReferenceName = compositeReferenceDO->getCString("name");
Interface* iface;
@@ -669,12 +670,10 @@
{
string message = "No binding for compositeReference: ";
message = message + compositeReferenceDO->getCString("name");
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
DataObjectPtr binding = bindings[0];
- //Utils::printDO(binding);
-
// Determine the binding type
string bindingType = binding->getType().getName();
string bindingTypeQname = binding->getType().getURI();
@@ -691,11 +690,11 @@
}
else
{
- LOGERROR_1(0, "ModelLoader::addCompositeReference: Unsupported binding type: %s", bindingTypeQname.c_str());
+ logerror("Unsupported binding type: %s", bindingTypeQname.c_str());
string message = "Binding type not supported: ";
message = message + bindingTypeQname;
- throw SystemConfigurationException(message.c_str());
+ throwException(SystemConfigurationException, message.c_str());
}
}
@@ -706,7 +705,7 @@
///
void ModelLoader::loadTypeMetadata(const string &compositeRootDir, Composite* composite)
{
- LOGENTRY(1, "ModelLoader::loadTypeMetadata");
+ logentry();
// Load the "Tuscany.config" file, if it exists
Files files(compositeRootDir, "Tuscany.config", false);
@@ -718,11 +717,11 @@
XMLDocumentPtr compositeConfigFile = getXMLHelper()->loadFile(filename.c_str());
if (compositeConfigFile->getRootDataObject() == 0)
{
- LOGERROR_1(0, "ModelLoader::loadTypeMetadata: Unable to load file: %s", filename.c_str());
+ logerror("Unable to load file: %s", filename.c_str());
}
else
{
- LOGINFO_2(2, "ModelLoader::loadTypeMetadata: Loading composite config for: %s, root Dir: %s", composite->getName().c_str(), compositeRootDir.c_str());
+ loginfo("Composite config for: %s, root directory: %s", composite->getName().c_str(), compositeRootDir.c_str());
if(compositeConfigFile->getRootDataObject()->isSet("xsd"))
{
@@ -784,8 +783,6 @@
loadWSDLDefinition(composite, wsdlName.c_str());
}
}
-
- LOGEXIT(1, "ModelLoader::loadTypeMetadata");
}
@@ -794,7 +791,7 @@
///
void ModelLoader::loadXMLSchema(Composite* composite, const char *fileName)
{
- LOGENTRY(1, "ModelLoader::loadXMLSchema");
+ logentry();
// Load a xsd file -> set the types in the data factory associated with
// the composite
@@ -802,12 +799,11 @@
composite->getXSDHelper()->defineFile(fileName);
//Utils::printTypes((*compositeIter)->getXSDHelper()->getDataFactory());
- } catch (SDOTypeNotFoundException ex)
+ } catch (SDORuntimeException& ex)
{
- LOGERROR_1(0, "ModelLoader: Exception caught: %s", ex.getMessageText());
- throw ex;
+ logerror("Unable to load schema: %s", fileName);
+ throwException(SystemConfigurationException, ex);
}
- LOGEXIT(1, "ModelLoader::loadXMLSchema");
}
///
@@ -815,7 +811,7 @@
///
void ModelLoader::loadWSDLDefinition(Composite* composite, const char *fileName)
{
- LOGENTRY(1, "ModelLoader::loadWSDLDefinition");
+ logentry();
try {
// Load the wsdl file
@@ -831,21 +827,14 @@
}
else
{
- LOGERROR_1(0, "ModelLoader: Unable to load or parse WSDL %s", fileName);
+ logerror("Unable to load or parse WSDL: %s", fileName);
}
- } catch (SDOTypeNotFoundException ex)
- {
- LOGERROR_1(0, "ModelLoader: SDOTypeNotFoundException caught: %s", ex.getMessageText());
- throw ex;
- }
- catch (SDONullPointerException ex)
+ } catch (SDORuntimeException& ex)
{
- LOGERROR_1(0, "ModelLoader: SDONullPointerException caught: %s", ex.getMessageText());
- throw ex;
+ logerror("Unable to load or parse WSDL: %s", fileName);
+ throwException(SystemConfigurationException, ex);
}
- LOGEXIT(1, "ModelLoader::loadWSDLDefinition");
-
}
//////////////////////////////////////////////////////////////////////////////
@@ -857,6 +846,8 @@
///
const XSDHelperPtr ModelLoader::getXSDHelper()
{
+ logentry();
+
if (myXSDHelper == 0)
{
@@ -888,15 +879,12 @@
}
- } catch (SDOTypeNotFoundException ex)
+ } catch (SDORuntimeException& ex)
{
- LOGERROR_1(0, "ModelLoader: Exception caught: %s", ex.getMessageText());
- throw ex;
+ throwException(SystemConfigurationException, ex);
}
}
- //cout << myXSDHelper->getDataFactory();
-
return myXSDHelper;
}
@@ -906,6 +894,8 @@
///
const XMLHelperPtr ModelLoader::getXMLHelper()
{
+ logentry();
+
if (myXMLHelper == 0) {
// Create an xml helper
@@ -918,6 +908,8 @@
void ModelLoader::initializeWSDLModel(XSDHelperPtr xsdHelper)
{
+ logentry();
+
DataFactoryPtr dataFactory = xsdHelper->getDataFactory();
dataFactory->addType(
@@ -1808,7 +1800,6 @@
"http://schemas.xmlsoap.org/wsdl/soap12/", "useChoice",
"commonj.sdo", "String");
}
-
} // End namespace model
} // End namespace sca
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org