You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2006/06/24 03:07:58 UTC
svn commit: r416851 [3/3] - in /incubator/tuscany/cpp/sca/tools/scagen:
junit/org/apache/tuscany/sca/cpp/tools/junit/
junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/
junit/testoutput/CalculatorModuleAndComponent/exp...
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -20,6 +20,8 @@
using namespace osoa::sca;
using namespace tuscany::sca;
+using Other::MyValueImpl;
+
extern "C"
{
@@ -58,27 +60,27 @@
if (operationName == "getMyValue")
{
- const char* p0 = (const char*)operation.getParameter(0);
+ const char* p0 = *(const char**)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValue(p0);
return;
}
if (operationName == "getMyValueS")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValueS(p0);
return;
}
if (operationName == "getCustname")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(string*)operation.getReturnValue() = impl->getCustname(p0);
return;
}
if (operationName == "getCustnamecs")
{
- string& p0 = *( string*)operation.getParameter(0);
+ string& p0 = *( string*)operation.getParameterValue(0);
const string& ret = impl->getCustnamecs(p0);
- operation.setReturnValue((void*)&ret);
+ operation.setReturnValue(&ret);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_MyValueService_Wrapper_h
#define MyValueImpl_MyValueService_Wrapper_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "MyValueImpl.hpp"
#include "tuscany/sca/core/ComponentServiceWrapper.h"
@@ -29,7 +33,7 @@
virtual void* newImplementation();
virtual void deleteImplementation();
private:
- MyValueImpl* impl;
+ Other::MyValueImpl* impl;
};
#endif // MyValueImpl_MyValueService_Wrapper_h
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,13 +52,12 @@
const char* MyValueImpl_customerInfo_Proxy::getCustomerInformation(const char* arg0)
{
- Operation operation("getCustomerInformation", 1);
- operation.setParameter(0, (void*)arg0);
-
-
+ Operation operation("getCustomerInformation");
+ operation.addParameter(&arg0);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_customerInfo_Proxy_h
#define MyValueImpl_customerInfo_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "CustomerInfo.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,15 +52,12 @@
commonj::sdo::DataObjectPtr MyValueImpl_stockQuote_Proxy::GetStockQuotes( commonj::sdo::DataObjectPtr arg0)
{
- Operation operation("GetStockQuotes", 1);
- operation.setParameter(0, (void*)&arg0);
-
- commonj::sdo::DataObjectPtr ret = 0;
- operation.setReturnValue((void*)&ret);
-
+ Operation operation("GetStockQuotes");
+ operation.addParameter(&arg0);
+ commonj::sdo::DataObjectPtr ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return ret;
-
+ return ret;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_stockQuote_Proxy_h
#define MyValueImpl_stockQuote_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "StockQuoteService.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -0,0 +1,182 @@
+/*
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "MyValueImpl_MyValueService_Proxy.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+extern "C"
+{
+
+ #if defined(WIN32) || defined(_WINDOWS)
+ __declspec(dllexport)
+ #endif
+ MyValueImpl_MyValueService_Proxy* MyValueImpl_MyValueService_Proxy_Factory(ServiceWrapper* target)
+ {
+ return new MyValueImpl_MyValueService_Proxy(target);
+ }
+
+ #if defined(WIN32) || defined(_WINDOWS)
+ __declspec(dllexport)
+ #endif
+ void MyValueImpl_MyValueService_Proxy_Destructor(void* proxy)
+ {
+ delete (MyValueImpl_MyValueService_Proxy*)proxy;
+ }
+}
+
+MyValueImpl_MyValueService_Proxy::MyValueImpl_MyValueService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_MyValueService_Proxy::~MyValueImpl_MyValueService_Proxy()
+{
+ if (target)
+ delete target;
+}
+
+float MyValueImpl_MyValueService_Proxy::getMyValueOther(const char* arg0)
+{
+ Operation operation("getMyValueOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
+ target->invoke(operation);
+ return ret;
+}
+
+float MyValueImpl_MyValueService_Proxy::getMyValueSOther(const string& arg0)
+{
+ Operation operation("getMyValueSOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
+ target->invoke(operation);
+ return ret;
+}
+
+string MyValueImpl_MyValueService_Proxy::getCustnameOther( string& arg0)
+{
+ Operation operation("getCustnameOther");
+ operation.addParameter(&arg0);
+ string ret;
+ operation.setReturnValue(&ret);
+ target->invoke(operation);
+ return ret;
+}
+
+const string& MyValueImpl_MyValueService_Proxy::getCustnamecsOther( string arg0)
+{
+ Operation operation("getCustnamecsOther");
+ operation.addParameter(&arg0);
+ target->invoke(operation);
+ return *(const string*)operation.getReturnValue();
+}
+
+
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "MyValueImpl_MyValueService_Proxy.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+extern "C"
+{
+
+ #if defined(WIN32) || defined(_WINDOWS)
+ __declspec(dllexport)
+ #endif
+ MyValueImpl_MyValueService_Proxy* MyValueImpl_MyValueService_Proxy_Factory(ServiceWrapper* target)
+ {
+ return new MyValueImpl_MyValueService_Proxy(target);
+ }
+
+ #if defined(WIN32) || defined(_WINDOWS)
+ __declspec(dllexport)
+ #endif
+ void MyValueImpl_MyValueService_Proxy_Destructor(void* proxy)
+ {
+ delete (MyValueImpl_MyValueService_Proxy*)proxy;
+ }
+}
+
+MyValueImpl_MyValueService_Proxy::MyValueImpl_MyValueService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_MyValueService_Proxy::~MyValueImpl_MyValueService_Proxy()
+{
+ if (target)
+ delete target;
+}
+
+float MyValueImpl_MyValueService_Proxy::getMyValueOther(const char* arg0)
+{
+ Operation operation("getMyValueOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
+ target->invoke(operation);
+ return ret;
+}
+
+float MyValueImpl_MyValueService_Proxy::getMyValueSOther(const string& arg0)
+{
+ Operation operation("getMyValueSOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
+ target->invoke(operation);
+ return ret;
+}
+
+string MyValueImpl_MyValueService_Proxy::getCustnameOther( string& arg0)
+{
+ Operation operation("getCustnameOther");
+ operation.addParameter(&arg0);
+ string ret;
+ operation.setReturnValue(&ret);
+ target->invoke(operation);
+ return ret;
+}
+
+const string& MyValueImpl_MyValueService_Proxy::getCustnamecsOther( string arg0)
+{
+ Operation operation("getCustnamecsOther");
+ operation.addParameter(&arg0);
+ target->invoke(operation);
+ return *(const string*)operation.getReturnValue();
+}
+
+
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -0,0 +1,82 @@
+/*
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MyValueImpl_MyValueService_Proxy_h
+#define MyValueImpl_MyValueService_Proxy_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
+#include "MyValue.h"
+#include "tuscany/sca/core/ServiceWrapper.h"
+
+class MyValueImpl_MyValueService_Proxy : public MyValue
+{
+public:
+ MyValueImpl_MyValueService_Proxy(tuscany::sca::ServiceWrapper*);
+ virtual ~MyValueImpl_MyValueService_Proxy();
+ virtual float getMyValueOther(const char* customerID);
+ virtual float getMyValueSOther(const string& customerID);
+ virtual string getCustnameOther( string& customerID);
+ virtual const string& getCustnamecsOther( string customerID);
+private:
+ tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_MyValueService_Proxy_h
+
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MyValueImpl_MyValueService_Proxy_h
+#define MyValueImpl_MyValueService_Proxy_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
+#include "MyValue.h"
+#include "tuscany/sca/core/ServiceWrapper.h"
+
+class MyValueImpl_MyValueService_Proxy : public MyValue
+{
+public:
+ MyValueImpl_MyValueService_Proxy(tuscany::sca::ServiceWrapper*);
+ virtual ~MyValueImpl_MyValueService_Proxy();
+ virtual float getMyValueOther(const char* customerID);
+ virtual float getMyValueSOther(const string& customerID);
+ virtual string getCustnameOther( string& customerID);
+ virtual const string& getCustnamecsOther( string customerID);
+private:
+ tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_MyValueService_Proxy_h
+
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -0,0 +1,182 @@
+/*
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "MyValueImpl_MyValueService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+using myvaluecorp::implns::MyValueImpl;
+
+extern "C"
+{
+
+ #if defined(WIN32) || defined(_WINDOWS)
+ __declspec(dllexport)
+ #endif
+ MyValueImpl_MyValueService_Wrapper* MyValueImpl_MyValueService_Wrapper_Factory(tuscany::sca::model::Service* target)
+ {
+ return new MyValueImpl_MyValueService_Wrapper(target);
+ }
+}
+
+MyValueImpl_MyValueService_Wrapper::MyValueImpl_MyValueService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+ impl = (MyValueImpl*)getImplementation();
+}
+
+MyValueImpl_MyValueService_Wrapper::~MyValueImpl_MyValueService_Wrapper()
+{
+ releaseImplementation();
+}
+
+void* MyValueImpl_MyValueService_Wrapper::newImplementation()
+{
+ return new MyValueImpl;
+}
+
+void MyValueImpl_MyValueService_Wrapper::deleteImplementation()
+{
+ delete impl;
+}
+
+void MyValueImpl_MyValueService_Wrapper::invokeService(Operation& operation)
+{
+ const string& operationName = operation.getName();
+
+ if (operationName == "getMyValueOther")
+ {
+ const char* p0 = *(const char**)operation.getParameterValue(0);
+ *(float*)operation.getReturnValue() = impl->getMyValueOther(p0);
+ return;
+ }
+ if (operationName == "getMyValueSOther")
+ {
+ string& p0 = *(string*)operation.getParameterValue(0);
+ *(float*)operation.getReturnValue() = impl->getMyValueSOther(p0);
+ return;
+ }
+ if (operationName == "getCustnameOther")
+ {
+ string& p0 = *(string*)operation.getParameterValue(0);
+ *(string*)operation.getReturnValue() = impl->getCustnameOther(p0);
+ return;
+ }
+ if (operationName == "getCustnamecsOther")
+ {
+ string& p0 = *( string*)operation.getParameterValue(0);
+ const string& ret = impl->getCustnamecsOther(p0);
+ operation.setReturnValue(&ret);
+ return;
+ }
+
+
+ throw ServiceRuntimeException("Invalid operation");
+
+}
+
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "MyValueImpl_MyValueService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+using myvaluecorp::implns::MyValueImpl;
+
+extern "C"
+{
+
+ #if defined(WIN32) || defined(_WINDOWS)
+ __declspec(dllexport)
+ #endif
+ MyValueImpl_MyValueService_Wrapper* MyValueImpl_MyValueService_Wrapper_Factory(tuscany::sca::model::Service* target)
+ {
+ return new MyValueImpl_MyValueService_Wrapper(target);
+ }
+}
+
+MyValueImpl_MyValueService_Wrapper::MyValueImpl_MyValueService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+ impl = (MyValueImpl*)getImplementation();
+}
+
+MyValueImpl_MyValueService_Wrapper::~MyValueImpl_MyValueService_Wrapper()
+{
+ releaseImplementation();
+}
+
+void* MyValueImpl_MyValueService_Wrapper::newImplementation()
+{
+ return new MyValueImpl;
+}
+
+void MyValueImpl_MyValueService_Wrapper::deleteImplementation()
+{
+ delete impl;
+}
+
+void MyValueImpl_MyValueService_Wrapper::invokeService(Operation& operation)
+{
+ const string& operationName = operation.getName();
+
+ if (operationName == "getMyValueOther")
+ {
+ const char* p0 = *(const char**)operation.getParameterValue(0);
+ *(float*)operation.getReturnValue() = impl->getMyValueOther(p0);
+ return;
+ }
+ if (operationName == "getMyValueSOther")
+ {
+ string& p0 = *(string*)operation.getParameterValue(0);
+ *(float*)operation.getReturnValue() = impl->getMyValueSOther(p0);
+ return;
+ }
+ if (operationName == "getCustnameOther")
+ {
+ string& p0 = *(string*)operation.getParameterValue(0);
+ *(string*)operation.getReturnValue() = impl->getCustnameOther(p0);
+ return;
+ }
+ if (operationName == "getCustnamecsOther")
+ {
+ string& p0 = *( string*)operation.getParameterValue(0);
+ const string& ret = impl->getCustnamecsOther(p0);
+ operation.setReturnValue(&ret);
+ return;
+ }
+
+
+ throw ServiceRuntimeException("Invalid operation");
+
+}
+
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -0,0 +1,80 @@
+/*
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MyValueImpl_MyValueService_Wrapper_h
+#define MyValueImpl_MyValueService_Wrapper_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
+#include "MyValueImpl.hpp"
+#include "tuscany/sca/core/ComponentServiceWrapper.h"
+
+class MyValueImpl_MyValueService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+ MyValueImpl_MyValueService_Wrapper(tuscany::sca::model::Service* target);
+ virtual ~MyValueImpl_MyValueService_Wrapper();
+ virtual void invokeService(tuscany::sca::Operation& operation);
+ virtual void* newImplementation();
+ virtual void deleteImplementation();
+private:
+ myvaluecorp::implns::MyValueImpl* impl;
+};
+
+#endif // MyValueImpl_MyValueService_Wrapper_h
+
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MyValueImpl_MyValueService_Wrapper_h
+#define MyValueImpl_MyValueService_Wrapper_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
+#include "MyValueImpl.hpp"
+#include "tuscany/sca/core/ComponentServiceWrapper.h"
+
+class MyValueImpl_MyValueService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+ MyValueImpl_MyValueService_Wrapper(tuscany::sca::model::Service* target);
+ virtual ~MyValueImpl_MyValueService_Wrapper();
+ virtual void invokeService(tuscany::sca::Operation& operation);
+ virtual void* newImplementation();
+ virtual void deleteImplementation();
+private:
+ myvaluecorp::implns::MyValueImpl* impl;
+};
+
+#endif // MyValueImpl_MyValueService_Wrapper_h
+
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,49 +52,40 @@
float MyValueImpl_MyValueService_Proxy::getMyValueOther(const char* arg0)
{
- Operation operation("getMyValueOther", 1);
- operation.setParameter(0, (void*)arg0);
-
- float ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getMyValueOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
float MyValueImpl_MyValueService_Proxy::getMyValueSOther(const string& arg0)
{
- Operation operation("getMyValueSOther", 1);
- operation.setParameter(0, (void*)&arg0);
-
- float ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getMyValueSOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
string MyValueImpl_MyValueService_Proxy::getCustnameOther( string& arg0)
{
- Operation operation("getCustnameOther", 1);
- operation.setParameter(0, (void*)&arg0);
-
- string ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getCustnameOther");
+ operation.addParameter(&arg0);
+ string ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
const string& MyValueImpl_MyValueService_Proxy::getCustnamecsOther( string arg0)
{
- Operation operation("getCustnamecsOther", 1);
- operation.setParameter(0, (void*)&arg0);
-
-
+ Operation operation("getCustnamecsOther");
+ operation.addParameter(&arg0);
target->invoke(operation);
return *(const string*)operation.getReturnValue();
-
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_MyValueService_Proxy_h
#define MyValueImpl_MyValueService_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "MyValue.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -20,6 +20,8 @@
using namespace osoa::sca;
using namespace tuscany::sca;
+
+
extern "C"
{
@@ -58,27 +60,27 @@
if (operationName == "getMyValueOther")
{
- const char* p0 = (const char*)operation.getParameter(0);
+ const char* p0 = *(const char**)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValueOther(p0);
return;
}
if (operationName == "getMyValueSOther")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValueSOther(p0);
return;
}
if (operationName == "getCustnameOther")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(string*)operation.getReturnValue() = impl->getCustnameOther(p0);
return;
}
if (operationName == "getCustnamecsOther")
{
- string& p0 = *( string*)operation.getParameter(0);
+ string& p0 = *( string*)operation.getParameterValue(0);
const string& ret = impl->getCustnamecsOther(p0);
- operation.setReturnValue((void*)&ret);
+ operation.setReturnValue(&ret);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_MyValueService_Wrapper_h
#define MyValueImpl_MyValueService_Wrapper_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "MyValueImpl.hpp"
#include "tuscany/sca/core/ComponentServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,49 +52,40 @@
float MyValueImpl_MyValueService_Proxy::getMyValueOther(const char* arg0)
{
- Operation operation("getMyValueOther", 1);
- operation.setParameter(0, (void*)arg0);
-
- float ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getMyValueOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
float MyValueImpl_MyValueService_Proxy::getMyValueSOther(const string& arg0)
{
- Operation operation("getMyValueSOther", 1);
- operation.setParameter(0, (void*)&arg0);
-
- float ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getMyValueSOther");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
string MyValueImpl_MyValueService_Proxy::getCustnameOther( string& arg0)
{
- Operation operation("getCustnameOther", 1);
- operation.setParameter(0, (void*)&arg0);
-
- string ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getCustnameOther");
+ operation.addParameter(&arg0);
+ string ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
const string& MyValueImpl_MyValueService_Proxy::getCustnamecsOther( string arg0)
{
- Operation operation("getCustnamecsOther", 1);
- operation.setParameter(0, (void*)&arg0);
-
-
+ Operation operation("getCustnamecsOther");
+ operation.addParameter(&arg0);
target->invoke(operation);
return *(const string*)operation.getReturnValue();
-
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_MyValueService_Proxy_h
#define MyValueImpl_MyValueService_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "MyValue.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -20,6 +20,8 @@
using namespace osoa::sca;
using namespace tuscany::sca;
+
+
extern "C"
{
@@ -58,27 +60,27 @@
if (operationName == "getMyValueOther")
{
- const char* p0 = (const char*)operation.getParameter(0);
+ const char* p0 = *(const char**)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValueOther(p0);
return;
}
if (operationName == "getMyValueSOther")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValueSOther(p0);
return;
}
if (operationName == "getCustnameOther")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(string*)operation.getReturnValue() = impl->getCustnameOther(p0);
return;
}
if (operationName == "getCustnamecsOther")
{
- string& p0 = *( string*)operation.getParameter(0);
+ string& p0 = *( string*)operation.getParameterValue(0);
const string& ret = impl->getCustnamecsOther(p0);
- operation.setReturnValue((void*)&ret);
+ operation.setReturnValue(&ret);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_MyValueService_Wrapper_h
#define MyValueImpl_MyValueService_Wrapper_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "MyValueImpl.hpp"
#include "tuscany/sca/core/ComponentServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,13 +52,12 @@
const char* CustomerInfoImpl2_CustomerInfoService_Proxy::getCustomerInformation(const char* arg0)
{
- Operation operation("getCustomerInformation", 1);
- operation.setParameter(0, (void*)arg0);
-
-
+ Operation operation("getCustomerInformation");
+ operation.addParameter(&arg0);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef CustomerInfoImpl2_CustomerInfoService_Proxy_h
#define CustomerInfoImpl2_CustomerInfoService_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "/CustomerInfo.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -58,9 +58,8 @@
if (operationName == "getCustomerInformation")
{
- const char* p0 = (const char*)operation.getParameter(0);
-
- operation.setReturnValue((void*) impl->getCustomerInformation(p0));
+ const char* p0 = *(const char**)operation.getParameterValue(0);
+ *(const char**)operation.getReturnValue() = impl->getCustomerInformation(p0);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef CustomerInfoImpl2_CustomerInfoService_Wrapper_h
#define CustomerInfoImpl2_CustomerInfoService_Wrapper_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "CustomerInfoImpl.h"
#include "tuscany/sca/core/ComponentServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,49 +52,40 @@
float MyValueImpl_MyValueService_Proxy::getMyValue(const char* arg0)
{
- Operation operation("getMyValue", 1);
- operation.setParameter(0, (void*)arg0);
-
- float ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getMyValue");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
float MyValueImpl_MyValueService_Proxy::getMyValueS(const string& arg0)
{
- Operation operation("getMyValueS", 1);
- operation.setParameter(0, (void*)&arg0);
-
- float ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getMyValueS");
+ operation.addParameter(&arg0);
+ float ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
string MyValueImpl_MyValueService_Proxy::getCustname( string& arg0)
{
- Operation operation("getCustname", 1);
- operation.setParameter(0, (void*)&arg0);
-
- string ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getCustname");
+ operation.addParameter(&arg0);
+ string ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
const string& MyValueImpl_MyValueService_Proxy::getCustnamecs( string arg0)
{
- Operation operation("getCustnamecs", 1);
- operation.setParameter(0, (void*)&arg0);
-
-
+ Operation operation("getCustnamecs");
+ operation.addParameter(&arg0);
target->invoke(operation);
return *(const string*)operation.getReturnValue();
-
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_MyValueService_Proxy_h
#define MyValueImpl_MyValueService_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "MyValue.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -58,27 +58,27 @@
if (operationName == "getMyValue")
{
- const char* p0 = (const char*)operation.getParameter(0);
+ const char* p0 = *(const char**)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValue(p0);
return;
}
if (operationName == "getMyValueS")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(float*)operation.getReturnValue() = impl->getMyValueS(p0);
return;
}
if (operationName == "getCustname")
{
- string& p0 = *(string*)operation.getParameter(0);
+ string& p0 = *(string*)operation.getParameterValue(0);
*(string*)operation.getReturnValue() = impl->getCustname(p0);
return;
}
if (operationName == "getCustnamecs")
{
- string& p0 = *( string*)operation.getParameter(0);
+ string& p0 = *( string*)operation.getParameterValue(0);
const string& ret = impl->getCustnamecs(p0);
- operation.setReturnValue((void*)&ret);
+ operation.setReturnValue(&ret);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_MyValueService_Wrapper_h
#define MyValueImpl_MyValueService_Wrapper_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "MyValueImpl.hpp"
#include "tuscany/sca/core/ComponentServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,13 +52,12 @@
const char* MyValueImpl_customerInfo_Proxy::getCustomerInformation(const char* arg0)
{
- Operation operation("getCustomerInformation", 1);
- operation.setParameter(0, (void*)arg0);
-
-
+ Operation operation("getCustomerInformation");
+ operation.addParameter(&arg0);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_customerInfo_Proxy_h
#define MyValueImpl_customerInfo_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "CustomerInfo.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,15 +52,12 @@
commonj::sdo::DataObjectPtr MyValueImpl_stockQuote_Proxy::GetStockQuotes( commonj::sdo::DataObjectPtr arg0)
{
- Operation operation("GetStockQuotes", 1);
- operation.setParameter(0, (void*)&arg0);
-
- commonj::sdo::DataObjectPtr ret = 0;
- operation.setReturnValue((void*)&ret);
-
+ Operation operation("GetStockQuotes");
+ operation.addParameter(&arg0);
+ commonj::sdo::DataObjectPtr ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return ret;
-
+ return ret;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef MyValueImpl_stockQuote_Proxy_h
#define MyValueImpl_stockQuote_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "StockQuoteService.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,41 +52,35 @@
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationCharPublic( char* arg0, const char* arg1)
{
- Operation operation("getCustomerInformationCharPublic", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInformationCharPublic");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoACharPublic( char* arg0, const char* arg1)
{
- Operation operation("getCustomerInfoACharPublic", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoACharPublic");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBCharPublic( char* arg0, char* arg1)
{
- Operation operation("getCustomerInfoBCharPublic", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoBCharPublic");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef CustomerInfoImpl_CustomerInfoService_Proxy_h
#define CustomerInfoImpl_CustomerInfoService_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "/CustomerInfo.h"
#include "tuscany/sca/core/ServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -20,6 +20,8 @@
using namespace osoa::sca;
using namespace tuscany::sca;
+
+
extern "C"
{
@@ -58,26 +60,23 @@
if (operationName == "getCustomerInformationCharPublic")
{
- char* p0 = ( char*)operation.getParameter(0);
- const char* p1 = (const char*)operation.getParameter(1);
-
- operation.setReturnValue((void*) impl->getCustomerInformationCharPublic(p0, p1));
+ char* p0 = *( char**)operation.getParameterValue(0);
+ const char* p1 = *(const char**)operation.getParameterValue(1);
+ *(const char**)operation.getReturnValue() = impl->getCustomerInformationCharPublic(p0, p1);
return;
}
if (operationName == "getCustomerInfoACharPublic")
{
- char* p0 = ( char*)operation.getParameter(0);
- const char* p1 = (const char*)operation.getParameter(1);
-
- operation.setReturnValue((void*) impl->getCustomerInfoACharPublic(p0, p1));
+ char* p0 = *( char**)operation.getParameterValue(0);
+ const char* p1 = *(const char**)operation.getParameterValue(1);
+ *(const char**)operation.getReturnValue() = impl->getCustomerInfoACharPublic(p0, p1);
return;
}
if (operationName == "getCustomerInfoBCharPublic")
{
- char* p0 = ( char*)operation.getParameter(0);
- char* p1 = ( char*)operation.getParameter(1);
-
- operation.setReturnValue((void*) impl->getCustomerInfoBCharPublic(p0, p1));
+ char* p0 = *( char**)operation.getParameterValue(0);
+ char* p1 = *( char**)operation.getParameterValue(1);
+ *(const char**)operation.getReturnValue() = impl->getCustomerInfoBCharPublic(p0, p1);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef CustomerInfoImpl_CustomerInfoService_Wrapper_h
#define CustomerInfoImpl_CustomerInfoService_Wrapper_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "CustomerInfoImpl.h"
#include "tuscany/sca/core/ComponentServiceWrapper.h"
Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java Fri Jun 23 18:07:54 2006
@@ -166,7 +166,15 @@
}
}
- currentNamespace = word;
+
+ if(currentNamespace == null)
+ {
+ currentNamespace = word;
+ }
+ else
+ {
+ currentNamespace += "::" + word;
+ }
//We have not got to the class yet
//so will need ot deal with the namespace
//when we do
Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java Fri Jun 23 18:07:54 2006
@@ -182,7 +182,7 @@
if (-1 != namespaceEnd) {
namespace = implClass.substring(0, namespaceEnd);
- ctParser.setParameter("namespace", namespace);
+ ctParser.setParameter("implNamespace", namespace);
implClass = implClass.substring(namespaceEnd + 2);
}
@@ -279,9 +279,17 @@
return implementationCppClass;
}
} else {
- // Implementation class is null so we return the classname of the
+ // Implementation class is null so we return the fully qualified classname of the
// first service method
- return ((Signature) methods.get(0)).getTrimClassName();
+ Signature s = (Signature) methods.get(0);
+ String className = s.getTrimClassName();
+ String namespace = s.getNamespace();
+ if( namespace != null && namespace.length() > 0)
+ {
+ className = namespace + "::" + className;
+ }
+
+ return className;
}
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java Fri Jun 23 18:07:54 2006
@@ -231,8 +231,19 @@
}
String implClassNameAttrFromModuleFile = (String) parameters
- .get("implClass");
-
+ .get("implClass");
+ String implClassNamespaceAttrFromModuleFile = (String) parameters
+ .get("implNamespace");
+
+ if(implClassNamespaceAttrFromModuleFile == null || implClassNamespaceAttrFromModuleFile.length() == 0)
+ {
+ implClassNamespaceAttrFromModuleFile = "";
+ }
+ else
+ {
+ implClassNamespaceAttrFromModuleFile += "::";
+ }
+
String interfaceClassNameAttrFromComponentTypeFile;
if (forReference) {
interfaceClassNameAttrFromComponentTypeFile = (String) parameters
@@ -243,7 +254,7 @@
}
List methods = headers.getAllMethods();
-
+
// Pull out one of the methods' namespace attributes.
String intfNamespace = null;
if (methods.size() > 0) {
@@ -271,8 +282,16 @@
componentTypeFileHeaderName, moduleXmlFileHeader,
moduleXmlFileHeaderNoExt, intfNamespace,
interfaceClassNameAttrFromComponentTypeFile,
- implClassNameAttrFromModuleFile);
-
+ implClassNameAttrFromModuleFile, implClassNamespaceAttrFromModuleFile);
+
+// // Print out the generated DOM
+// StringWriter sw = new StringWriter();
+// OutputFormat outputFormat = new OutputFormat("xml", "UTF-8", true);
+// XMLSerializer serializer = new XMLSerializer(sw, outputFormat);
+// serializer.serialize(dom);
+// System.out.println("DOM:\n"+sw.toString());
+
+
createProxyCPPFromDom(outputDir, dom);
createProxyHeaderFromDom(outputDir, dom);
@@ -648,7 +667,7 @@
String componentTypeXmlFileIntfHeaderNameWithPathAndExt,
String moduleXmlFileImplHeaderNameWithPathAndExt,
String moduleXmlFileHeaderNoExtorPath, String intfNamespace,
- String intfClass, String implClass) {
+ String intfClass, String implClass, String implNamespace) {
if (methods == null) {
return null;
@@ -750,6 +769,10 @@
root.setAttribute("implClass", implClass);
} else {
root.setAttribute("implClass", moduleXmlFileHeaderNoExtorPath);
+ }
+
+ if (implClass != null) {
+ root.setAttribute("implNamespace", implNamespace);
}
// default class name to the name of the header...
Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl Fri Jun 23 18:07:54 2006
@@ -99,6 +99,13 @@
<xsl:text>
</xsl:text>
+ <xsl:text>#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif </xsl:text>
+<!-- newline -->
+<xsl:text>
+
+</xsl:text>
</xsl:template>
<xsl:template name="include_headers">
Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl Fri Jun 23 18:07:54 2006
@@ -58,6 +58,11 @@
#include "osoa/sca/sca.h"
using namespace osoa::sca;
using namespace tuscany::sca;
+
+<xsl:if test="not(@implNamespace = '')">using <xsl:value-of select="@implNamespace"/><xsl:value-of select="@implClass"/>;</xsl:if>
+<xsl:text><!-- newline -->
+
+</xsl:text>
<!-- thats the prologue over and done with
now continue with the scaServiceElement -->
<xsl:apply-templates/> <!-- will be applied to scaService -->
Modified: incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl Fri Jun 23 18:07:54 2006
@@ -98,6 +98,13 @@
<xsl:text>
</xsl:text>
+ <xsl:text>#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif </xsl:text>
+<!-- newline -->
+<xsl:text>
+
+</xsl:text>
</xsl:template>
<xsl:template name="include_headers">
@@ -155,7 +162,7 @@
</xsl:text>
<xsl:text>private:
</xsl:text>
- <xsl:value-of select="../@implClass"/><xsl:text>* impl;
+ <xsl:value-of select="../@implNamespace"/><xsl:value-of select="../@implClass"/><xsl:text>* impl;
};
</xsl:text>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org