Cleaning up SVN structure, moving branch under sca-cpp/branches.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@880612 13f79535-47bb-0310-9956-ffa450edef68

72 files changed, 6114 insertions, 0 deletions

diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
new file mode 100644
index 0000000000..3b04e26b05
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
@@ -0,0 +1,64 @@
+/*
+ *  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 "CalculatorImpl_CalculatorService_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
+    CalculatorImpl_CalculatorService_Proxy* CalculatorImpl_CalculatorService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CalculatorImpl_CalculatorService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CalculatorImpl_CalculatorService_Proxy_Destructor(void* proxy)
+    {
+        delete (CalculatorImpl_CalculatorService_Proxy*)proxy;
+    }
+}
+
+CalculatorImpl_CalculatorService_Proxy::CalculatorImpl_CalculatorService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CalculatorImpl_CalculatorService_Proxy::~CalculatorImpl_CalculatorService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+long CalculatorImpl_CalculatorService_Proxy::subtract( long arg0,  long arg1)
+{
+    Operation operation("subtract");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    long ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
new file mode 100644
index 0000000000..ad8f588ede
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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 CalculatorImpl_CalculatorService_Proxy_h
+#define CalculatorImpl_CalculatorService_Proxy_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif 
+
+#include "Calculator.h"
+#include "tuscany/sca/core/ServiceWrapper.h"
+
+class CalculatorImpl_CalculatorService_Proxy : public Calculator
+{
+public:
+    CalculatorImpl_CalculatorService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CalculatorImpl_CalculatorService_Proxy();
+    virtual long subtract( long a,  long b);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CalculatorImpl_CalculatorService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
new file mode 100644
index 0000000000..787314f817
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
@@ -0,0 +1,73 @@
+/* 
+ *  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 "CalculatorImpl_CalculatorService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CalculatorImpl_CalculatorService_Wrapper* CalculatorImpl_CalculatorService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CalculatorImpl_CalculatorService_Wrapper(target);
+    }
+}
+
+CalculatorImpl_CalculatorService_Wrapper::CalculatorImpl_CalculatorService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CalculatorImpl*)getImplementation();
+}
+
+CalculatorImpl_CalculatorService_Wrapper::~CalculatorImpl_CalculatorService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CalculatorImpl_CalculatorService_Wrapper::newImplementation()
+{
+    return new CalculatorImpl;
+}
+
+void CalculatorImpl_CalculatorService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CalculatorImpl_CalculatorService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "subtract")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        long& p1 = *( long*)operation.getParameterValue(1);
+        *(long*)operation.getReturnValue() = impl->subtract(p0, p1);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
new file mode 100644
index 0000000000..c881576ca2
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 CalculatorImpl_CalculatorService_Wrapper_h
+#define CalculatorImpl_CalculatorService_Wrapper_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif 
+
+#include "CalculatorImpl.h"
+#include "tuscany/sca/core/ComponentServiceWrapper.h"
+
+class CalculatorImpl_CalculatorService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CalculatorImpl_CalculatorService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CalculatorImpl_CalculatorService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CalculatorImpl* impl;
+};
+
+#endif // CalculatorImpl_CalculatorService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
new file mode 100644
index 0000000000..aeb9642130
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
@@ -0,0 +1,75 @@
+/*
+ *  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 "CalculatorBackImpl_CalculatorService_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
+    CalculatorBackImpl_CalculatorService_Proxy* CalculatorBackImpl_CalculatorService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CalculatorBackImpl_CalculatorService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CalculatorBackImpl_CalculatorService_Proxy_Destructor(void* proxy)
+    {
+        delete (CalculatorBackImpl_CalculatorService_Proxy*)proxy;
+    }
+}
+
+CalculatorBackImpl_CalculatorService_Proxy::CalculatorBackImpl_CalculatorService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CalculatorBackImpl_CalculatorService_Proxy::~CalculatorBackImpl_CalculatorService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+long CalculatorBackImpl_CalculatorService_Proxy::subtractBack( long arg0,  long arg1)
+{
+    Operation operation("subtractBack");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    long ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+long CalculatorBackImpl_CalculatorService_Proxy::addBack( long arg0,  long arg1)
+{
+    Operation operation("addBack");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    long ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
new file mode 100644
index 0000000000..4a263154e0
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
@@ -0,0 +1,39 @@
+/* 
+ *  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 CalculatorBackImpl_CalculatorService_Proxy_h
+#define CalculatorBackImpl_CalculatorService_Proxy_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif 
+
+#include "otherSubFolder/CalculatorBack.h"
+#include "tuscany/sca/core/ServiceWrapper.h"
+
+class CalculatorBackImpl_CalculatorService_Proxy : public CalculatorBack
+{
+public:
+    CalculatorBackImpl_CalculatorService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CalculatorBackImpl_CalculatorService_Proxy();
+    virtual long subtractBack( long a,  long b);
+    virtual long addBack( long a,  long b);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CalculatorBackImpl_CalculatorService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
new file mode 100644
index 0000000000..6f71734763
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
@@ -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.
+ */
+
+#include "CalculatorBackImpl_CalculatorService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CalculatorBackImpl_CalculatorService_Wrapper* CalculatorBackImpl_CalculatorService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CalculatorBackImpl_CalculatorService_Wrapper(target);
+    }
+}
+
+CalculatorBackImpl_CalculatorService_Wrapper::CalculatorBackImpl_CalculatorService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CalculatorBackImpl*)getImplementation();
+}
+
+CalculatorBackImpl_CalculatorService_Wrapper::~CalculatorBackImpl_CalculatorService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CalculatorBackImpl_CalculatorService_Wrapper::newImplementation()
+{
+    return new CalculatorBackImpl;
+}
+
+void CalculatorBackImpl_CalculatorService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CalculatorBackImpl_CalculatorService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "subtractBack")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        long& p1 = *( long*)operation.getParameterValue(1);
+        *(long*)operation.getReturnValue() = impl->subtractBack(p0, p1);
+        return;
+    }
+    if (operationName == "addBack")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        long& p1 = *( long*)operation.getParameterValue(1);
+        *(long*)operation.getReturnValue() = impl->addBack(p0, p1);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
new file mode 100644
index 0000000000..1dbfdd58c1
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 CalculatorBackImpl_CalculatorService_Wrapper_h
+#define CalculatorBackImpl_CalculatorService_Wrapper_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif 
+
+#include "subFolder/CalculatorBackImpl.h"
+#include "tuscany/sca/core/ComponentServiceWrapper.h"
+
+class CalculatorBackImpl_CalculatorService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CalculatorBackImpl_CalculatorService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CalculatorBackImpl_CalculatorService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CalculatorBackImpl* impl;
+};
+
+#endif // CalculatorBackImpl_CalculatorService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
new file mode 100644
index 0000000000..33b66fbc28
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
@@ -0,0 +1,75 @@
+/*
+ *  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 "CalculatorForwardImpl_CalculatorService_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
+    CalculatorForwardImpl_CalculatorService_Proxy* CalculatorForwardImpl_CalculatorService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CalculatorForwardImpl_CalculatorService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CalculatorForwardImpl_CalculatorService_Proxy_Destructor(void* proxy)
+    {
+        delete (CalculatorForwardImpl_CalculatorService_Proxy*)proxy;
+    }
+}
+
+CalculatorForwardImpl_CalculatorService_Proxy::CalculatorForwardImpl_CalculatorService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CalculatorForwardImpl_CalculatorService_Proxy::~CalculatorForwardImpl_CalculatorService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+long CalculatorForwardImpl_CalculatorService_Proxy::subtractForward( long arg0,  long arg1)
+{
+    Operation operation("subtractForward");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    long ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+long CalculatorForwardImpl_CalculatorService_Proxy::addForward( long arg0,  long arg1)
+{
+    Operation operation("addForward");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    long ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
new file mode 100644
index 0000000000..9b87ee9d7e
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
@@ -0,0 +1,39 @@
+/* 
+ *  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 CalculatorForwardImpl_CalculatorService_Proxy_h
+#define CalculatorForwardImpl_CalculatorService_Proxy_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif 
+
+#include "otherSubFolder/CalculatorForward.h"
+#include "tuscany/sca/core/ServiceWrapper.h"
+
+class CalculatorForwardImpl_CalculatorService_Proxy : public CalculatorForward
+{
+public:
+    CalculatorForwardImpl_CalculatorService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CalculatorForwardImpl_CalculatorService_Proxy();
+    virtual long subtractForward( long a,  long b);
+    virtual long addForward( long a,  long b);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CalculatorForwardImpl_CalculatorService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
new file mode 100644
index 0000000000..ce20b11941
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
@@ -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.
+ */
+
+#include "CalculatorForwardImpl_CalculatorService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CalculatorForwardImpl_CalculatorService_Wrapper* CalculatorForwardImpl_CalculatorService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CalculatorForwardImpl_CalculatorService_Wrapper(target);
+    }
+}
+
+CalculatorForwardImpl_CalculatorService_Wrapper::CalculatorForwardImpl_CalculatorService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CalculatorForwardImpl*)getImplementation();
+}
+
+CalculatorForwardImpl_CalculatorService_Wrapper::~CalculatorForwardImpl_CalculatorService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CalculatorForwardImpl_CalculatorService_Wrapper::newImplementation()
+{
+    return new CalculatorForwardImpl;
+}
+
+void CalculatorForwardImpl_CalculatorService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CalculatorForwardImpl_CalculatorService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "subtractForward")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        long& p1 = *( long*)operation.getParameterValue(1);
+        *(long*)operation.getReturnValue() = impl->subtractForward(p0, p1);
+        return;
+    }
+    if (operationName == "addForward")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        long& p1 = *( long*)operation.getParameterValue(1);
+        *(long*)operation.getReturnValue() = impl->addForward(p0, p1);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
new file mode 100644
index 0000000000..bb035ccb2b
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 CalculatorForwardImpl_CalculatorService_Wrapper_h
+#define CalculatorForwardImpl_CalculatorService_Wrapper_h
+
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif 
+
+#include "subFolder/CalculatorForwardImpl.h"
+#include "tuscany/sca/core/ComponentServiceWrapper.h"
+
+class CalculatorForwardImpl_CalculatorService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CalculatorForwardImpl_CalculatorService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CalculatorForwardImpl_CalculatorService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CalculatorForwardImpl* impl;
+};
+
+#endif // CalculatorForwardImpl_CalculatorService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
new file mode 100644
index 0000000000..9f09ba8d6f
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
@@ -0,0 +1,593 @@
+/*
+ *  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 "CustomerInfoImpl_CustomerInfoService_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
+    CustomerInfoImpl_CustomerInfoService_Proxy* CustomerInfoImpl_CustomerInfoService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CustomerInfoImpl_CustomerInfoService_Proxy_Destructor(void* proxy)
+    {
+        delete (CustomerInfoImpl_CustomerInfoService_Proxy*)proxy;
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::CustomerInfoImpl_CustomerInfoService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::~CustomerInfoImpl_CustomerInfoService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationChar( char* arg0, const char* arg1)
+{
+    Operation operation("getCustomerInformationChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAChar( char* arg0, const char* arg1)
+{
+    Operation operation("getCustomerInfoAChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBChar( char* arg0,  char* arg1)
+{
+    Operation operation("getCustomerInfoBChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCChar( char* arg0,  char arg1)
+{
+    Operation operation("getCustomerInfoCChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDChar( char* arg0,  char arg1)
+{
+    Operation operation("getCustomerInfoDChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEChar( char* arg0,  char* arg1)
+{
+    Operation operation("getCustomerInfoEChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFChar( char* arg0,  char* arg1,  char* arg2)
+{
+    Operation operation("getCustomerInfoFChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    operation.addParameter(&arg2);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGChar( char* arg0,  char* arg1,  char* arg2,  signed char* arg3)
+{
+    Operation operation("getCustomerInfoGChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    operation.addParameter(&arg2);
+    operation.addParameter(&arg3);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHChar( unsigned char* arg0, const char arg1)
+{
+    Operation operation("getCustomerInfoHChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHChar( unsigned char* arg0, const char* arg1)
+{
+    Operation operation("getCustomerInfoHChar");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationLong(const long* arg0, const long* arg1)
+{
+    Operation operation("getCustomerInformationLong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoALong(const long* arg0, const long* arg1)
+{
+    Operation operation("getCustomerInfoALong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBLong( long* arg0,  long* arg1)
+{
+    Operation operation("getCustomerInfoBLong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCLong( long arg0,  long arg1)
+{
+    Operation operation("getCustomerInfoCLong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDLong( long arg0,  long arg1)
+{
+    Operation operation("getCustomerInfoDLong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoELong( long* arg0,  long* arg1)
+{
+    Operation operation("getCustomerInfoELong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFLong( long* arg0,  long* arg1)
+{
+    Operation operation("getCustomerInfoFLong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGLong( signed long* arg0,  signed long* arg1)
+{
+    Operation operation("getCustomerInfoGLong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHLong( signed long* arg0,  signed long* arg1)
+{
+    Operation operation("getCustomerInfoHLong");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationInt( char* arg0, const int* arg1)
+{
+    Operation operation("getCustomerInformationInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAInt( char* arg0, const int* arg1)
+{
+    Operation operation("getCustomerInfoAInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBInt( char* arg0,  int* arg1)
+{
+    Operation operation("getCustomerInfoBInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCInt( char* arg0,  int arg1)
+{
+    Operation operation("getCustomerInfoCInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDInt( char* arg0,  int arg1)
+{
+    Operation operation("getCustomerInfoDInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEInt( char* arg0,  int* arg1)
+{
+    Operation operation("getCustomerInfoEInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFInt( char* arg0,  int* arg1)
+{
+    Operation operation("getCustomerInfoFInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGInt( char* arg0,  signed int* arg1)
+{
+    Operation operation("getCustomerInfoGInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHInt( char* arg0,  unsigned int* arg1)
+{
+    Operation operation("getCustomerInfoHInt");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationint64( Diamond& arg0, const __int64* arg1)
+{
+    Operation operation("getCustomerInformationint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAint64( Diamond& arg0, const __int64* arg1)
+{
+    Operation operation("getCustomerInfoAint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBint64( Diamond& arg0,  __int64* arg1)
+{
+    Operation operation("getCustomerInfoBint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCint64( Diamond& arg0,  __int64 arg1)
+{
+    Operation operation("getCustomerInfoCint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDint64( Diamond& arg0,  __int64 arg1)
+{
+    Operation operation("getCustomerInfoDint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEint64( Diamond& arg0,  __int64* arg1)
+{
+    Operation operation("getCustomerInfoEint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFint64( Diamond& arg0,  __int64* arg1)
+{
+    Operation operation("getCustomerInfoFint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGint64( Diamond& arg0,  signed __int64* arg1)
+{
+    Operation operation("getCustomerInfoGint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHint64(const Diamond& arg0,  unsigned int64* arg1)
+{
+    Operation operation("getCustomerInfoHint64");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const void* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationVoid( float& arg0, const __int64* arg1)
+{
+    Operation operation("getCustomerInformationVoid");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const void* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAVoid(const float& arg0, const __int64* arg1)
+{
+    Operation operation("getCustomerInfoAVoid");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    target->invoke(operation);
+    return;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBVoid()
+{
+    Operation operation("getCustomerInfoBVoid");
+    target->invoke(operation);
+    return;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCVoid()
+{
+    Operation operation("getCustomerInfoCVoid");
+    target->invoke(operation);
+    return;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDVoid()
+{
+    Operation operation("getCustomerInfoDVoid");
+    operation.addParameter(&arg0);
+    target->invoke(operation);
+    return;
+}
+
+char CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEVoid()
+{
+    Operation operation("getCustomerInfoEVoid");
+    operation.addParameter(&arg0);
+    char ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+char CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFVoid()
+{
+    Operation operation("getCustomerInfoFVoid");
+    char ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+char CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGVoid()
+{
+    Operation operation("getCustomerInfoGVoid");
+    operation.addParameter(&arg0);
+    char ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAInline( int arg0,  int arg1,  int arg2,  int arg3,  char* customer arg4)
+{
+    Operation operation("getCustomerInfoAInline");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    operation.addParameter(&arg2);
+    operation.addParameter(&arg3);
+    operation.addParameter(&arg4);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBInline( int* arg0,  int* arg1,  int* arg2,  char* customer arg3)
+{
+    Operation operation("getCustomerInfoBInline");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    operation.addParameter(&arg2);
+    operation.addParameter(&arg3);
+    int ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+friend const unsigned int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCInline( char* customer arg0)
+{
+    Operation operation("getCustomerInfoCInline");
+    operation.addParameter(&arg0);
+    friend const unsigned int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoTrickyA(const char arg0, const char arg1)
+{
+    Operation operation("getCustomerInfoTrickyA");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    int ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoTrickyB( int arg0,  int arg1)
+{
+    Operation operation("getCustomerInfoTrickyB");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    int ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
new file mode 100644
index 0000000000..baa55ac5b8
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
@@ -0,0 +1,87 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Proxy : public CustomerInfo
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Proxy();
+    virtual const char* getCustomerInformationChar( char* p1, const char* customerID);
+    virtual const char* getCustomerInfoAChar( char* p1, const char* );
+    virtual const char* getCustomerInfoBChar( char* p1,  char* customerID);
+    virtual const char* getCustomerInfoCChar( char* p1,  char customerID);
+    virtual const char* getCustomerInfoDChar( char* p1,  char );
+    virtual const char* getCustomerInfoEChar( char* p1,  char* );
+    virtual const char* getCustomerInfoFChar( char* p1,  char* p1,  char* customerID);
+    virtual const char* getCustomerInfoGChar( char* p1,  char* ,  char* p1,  signed char* customerID);
+    virtual const char* getCustomerInfoHChar( unsigned char* customerID, const char );
+    virtual const char* getCustomerInfoHChar( unsigned char* customerID, const char* );
+    virtual const long* getCustomerInformationLong(const long* customerID, const long* customerID);
+    virtual const long* getCustomerInfoALong(const long* , const long* );
+    virtual const long* getCustomerInfoBLong( long* customerID,  long* customerID2);
+    virtual const long* getCustomerInfoCLong( long customerID,  long customerID2);
+    virtual const long* getCustomerInfoDLong( long ,  long );
+    virtual const long* getCustomerInfoELong( long* ,  long* );
+    virtual const long* getCustomerInfoFLong( long* customerID,  long* customerID2);
+    virtual const long* getCustomerInfoGLong( signed long* customerID,  signed long* customerID2);
+    virtual const long* getCustomerInfoHLong( signed long* customerID,  signed long* customerID2);
+    virtual const int* getCustomerInformationInt( char* , const int* customerID);
+    virtual const int* getCustomerInfoAInt( char* , const int* );
+    virtual const int* getCustomerInfoBInt( char* ,  int* customerID);
+    virtual const int* getCustomerInfoCInt( char* ,  int customerID);
+    virtual const int* getCustomerInfoDInt( char* ,  int );
+    virtual const int* getCustomerInfoEInt( char* ,  int* );
+    virtual const int* getCustomerInfoFInt( char* ,  int* customerID);
+    virtual const int* getCustomerInfoGInt( char* ,  signed int* customerID);
+    virtual const int* getCustomerInfoHInt( char* ,  unsigned int* customerID);
+    virtual const __int64* getCustomerInformationint64( Diamond& , const __int64* customerID);
+    virtual const __int64* getCustomerInfoAint64( Diamond& , const __int64* );
+    virtual const __int64* getCustomerInfoBint64( Diamond& ,  __int64* customerID);
+    virtual const __int64* getCustomerInfoCint64( Diamond& ,  __int64 customerID);
+    virtual const __int64* getCustomerInfoDint64( Diamond& myDiamond,  __int64 );
+    virtual const __int64* getCustomerInfoEint64( Diamond& myDiamond,  __int64* );
+    virtual const __int64* getCustomerInfoFint64( Diamond& myDiamond,  __int64* customerID);
+    virtual const __int64* getCustomerInfoGint64( Diamond& myDiamond,  signed __int64* customerID);
+    virtual const __int64* getCustomerInfoHint64(const Diamond& myDiamond,  unsigned int64* customerID);
+    virtual const void* getCustomerInformationVoid( float& f, const __int64* customerID);
+    virtual void getCustomerInfoAVoid(const float& f, const __int64* );
+    virtual void getCustomerInfoBVoid();
+    virtual void getCustomerInfoCVoid();
+    virtual void getCustomerInfoDVoid( void );
+    virtual char getCustomerInfoEVoid( void );
+    virtual char getCustomerInfoFVoid();
+    virtual char getCustomerInfoGVoid( void );
+    virtual const char* getCustomerInfoAInline( int ,  int ,  int ,  int ,  char* customer id);
+    virtual int getCustomerInfoBInline( int* ,  int* f,  int* g,  char* customer id);
+    virtual friend const unsigned int* getCustomerInfoCInline( char* customer id);
+    virtual int getCustomerInfoTrickyA(const char , const char );
+    virtual int getCustomerInfoTrickyB( int myInt,  int myInt);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
new file mode 100644
index 0000000000..25d73c326c
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
@@ -0,0 +1,411 @@
+/* 
+ *  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 "CustomerInfoImpl_CustomerInfoService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CustomerInfoImpl_CustomerInfoService_Wrapper* CustomerInfoImpl_CustomerInfoService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Wrapper(target);
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::CustomerInfoImpl_CustomerInfoService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CustomerInfoImpl*)getImplementation();
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::~CustomerInfoImpl_CustomerInfoService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CustomerInfoImpl_CustomerInfoService_Wrapper::newImplementation()
+{
+    return new CustomerInfoImpl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "getCustomerInformationChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        const char* p1 = *(const char**)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInformationChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoAChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        const char* p1 = *(const char**)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoAChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoBChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        char* p1 = *( char**)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoBChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoCChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        char& p1 = *( char*)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoCChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoDChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        char& p1 = *( char*)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoDChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoEChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        char* p1 = *( char**)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoEChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoFChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        char* p1 = *( char**)operation.getParameterValue(1);
+        char* p2 = *( char**)operation.getParameterValue(2);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoFChar(p0, p1, p2);
+        return;
+    }
+    if (operationName == "getCustomerInfoGChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        char* p1 = *( char**)operation.getParameterValue(1);
+        char* p2 = *( char**)operation.getParameterValue(2);
+        signed char* p3 = *( signed char**)operation.getParameterValue(3);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoGChar(p0, p1, p2, p3);
+        return;
+    }
+    if (operationName == "getCustomerInfoHChar")
+    {
+        unsigned char* p0 = *( unsigned char**)operation.getParameterValue(0);
+        const char& p1 = *(const char*)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoHChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoHChar")
+    {
+        unsigned char* p0 = *( unsigned char**)operation.getParameterValue(0);
+        const char* p1 = *(const char**)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoHChar(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInformationLong")
+    {
+        const long* p0 = *(const long**)operation.getParameterValue(0);
+        const long* p1 = *(const long**)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInformationLong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoALong")
+    {
+        const long* p0 = *(const long**)operation.getParameterValue(0);
+        const long* p1 = *(const long**)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoALong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoBLong")
+    {
+        long* p0 = *( long**)operation.getParameterValue(0);
+        long* p1 = *( long**)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoBLong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoCLong")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        long& p1 = *( long*)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoCLong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoDLong")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        long& p1 = *( long*)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoDLong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoELong")
+    {
+        long* p0 = *( long**)operation.getParameterValue(0);
+        long* p1 = *( long**)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoELong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoFLong")
+    {
+        long* p0 = *( long**)operation.getParameterValue(0);
+        long* p1 = *( long**)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoFLong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoGLong")
+    {
+        signed long* p0 = *( signed long**)operation.getParameterValue(0);
+        signed long* p1 = *( signed long**)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoGLong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoHLong")
+    {
+        signed long* p0 = *( signed long**)operation.getParameterValue(0);
+        signed long* p1 = *( signed long**)operation.getParameterValue(1);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoHLong(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInformationInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        const int* p1 = *(const int**)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInformationInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoAInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        const int* p1 = *(const int**)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoAInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoBInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        int* p1 = *( int**)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoBInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoCInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        int& p1 = *( int*)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoCInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoDInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        int& p1 = *( int*)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoDInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoEInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        int* p1 = *( int**)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoEInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoFInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        int* p1 = *( int**)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoFInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoGInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        signed int* p1 = *( signed int**)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoGInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoHInt")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        unsigned int* p1 = *( unsigned int**)operation.getParameterValue(1);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoHInt(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInformationint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        const __int64* p1 = *(const __int64**)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInformationint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoAint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        const __int64* p1 = *(const __int64**)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoAint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoBint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        __int64* p1 = *( __int64**)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoBint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoCint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        __int64& p1 = *( __int64*)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoCint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoDint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        __int64& p1 = *( __int64*)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoDint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoEint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        __int64* p1 = *( __int64**)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoEint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoFint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        __int64* p1 = *( __int64**)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoFint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoGint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        signed __int64* p1 = *( signed __int64**)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoGint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoHint64")
+    {
+        Diamond& p0 = *(Diamond*)operation.getParameterValue(0);
+        unsigned int64* p1 = *( unsigned int64**)operation.getParameterValue(1);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoHint64(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInformationVoid")
+    {
+        float& p0 = *(float*)operation.getParameterValue(0);
+        const __int64* p1 = *(const __int64**)operation.getParameterValue(1);
+        *(const void**)operation.getReturnValue() = impl->getCustomerInformationVoid(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoAVoid")
+    {
+        float& p0 = *(float*)operation.getParameterValue(0);
+        const __int64* p1 = *(const __int64**)operation.getParameterValue(1);
+            impl->getCustomerInfoAVoid(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoBVoid")
+    {
+            impl->getCustomerInfoBVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoCVoid")
+    {
+            impl->getCustomerInfoCVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoDVoid")
+    {
+            impl->getCustomerInfoDVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoEVoid")
+    {
+        *(char*)operation.getReturnValue() = impl->getCustomerInfoEVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoFVoid")
+    {
+        *(char*)operation.getReturnValue() = impl->getCustomerInfoFVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoGVoid")
+    {
+        *(char*)operation.getReturnValue() = impl->getCustomerInfoGVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoAInline")
+    {
+        int& p0 = *( int*)operation.getParameterValue(0);
+        int& p1 = *( int*)operation.getParameterValue(1);
+        int& p2 = *( int*)operation.getParameterValue(2);
+        int& p3 = *( int*)operation.getParameterValue(3);
+        char* customer p4 = *( char* customer*)operation.getParameterValue(4);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoAInline(p0, p1, p2, p3, p4);
+        return;
+    }
+    if (operationName == "getCustomerInfoBInline")
+    {
+        int* p0 = *( int**)operation.getParameterValue(0);
+        int* p1 = *( int**)operation.getParameterValue(1);
+        int* p2 = *( int**)operation.getParameterValue(2);
+        char* customer p3 = *( char* customer*)operation.getParameterValue(3);
+        *(int*)operation.getReturnValue() = impl->getCustomerInfoBInline(p0, p1, p2, p3);
+        return;
+    }
+    if (operationName == "getCustomerInfoCInline")
+    {
+        char* customer p0 = *( char* customer*)operation.getParameterValue(0);
+        *(friend const unsigned int**)operation.getReturnValue() = impl->getCustomerInfoCInline(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoTrickyA")
+    {
+        const char& p0 = *(const char*)operation.getParameterValue(0);
+        const char& p1 = *(const char*)operation.getParameterValue(1);
+        *(int*)operation.getReturnValue() = impl->getCustomerInfoTrickyA(p0, p1);
+        return;
+    }
+    if (operationName == "getCustomerInfoTrickyB")
+    {
+        int& p0 = *( int*)operation.getParameterValue(0);
+        int& p1 = *( int*)operation.getParameterValue(1);
+        *(int*)operation.getReturnValue() = impl->getCustomerInfoTrickyB(p0, p1);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
new file mode 100644
index 0000000000..5fb82c4295
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CustomerInfoImpl* impl;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
new file mode 100644
index 0000000000..531ca6c010
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
@@ -0,0 +1,503 @@
+/*
+ *  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 "CustomerInfoImpl_CustomerInfoService_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
+    CustomerInfoImpl_CustomerInfoService_Proxy* CustomerInfoImpl_CustomerInfoService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CustomerInfoImpl_CustomerInfoService_Proxy_Destructor(void* proxy)
+    {
+        delete (CustomerInfoImpl_CustomerInfoService_Proxy*)proxy;
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::CustomerInfoImpl_CustomerInfoService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::~CustomerInfoImpl_CustomerInfoService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationChar(const char* arg0)
+{
+    Operation operation("getCustomerInformationChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAChar(const char* arg0)
+{
+    Operation operation("getCustomerInfoAChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBChar( char* arg0)
+{
+    Operation operation("getCustomerInfoBChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCChar( char arg0)
+{
+    Operation operation("getCustomerInfoCChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDChar( char arg0)
+{
+    Operation operation("getCustomerInfoDChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEChar( char* arg0)
+{
+    Operation operation("getCustomerInfoEChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFChar( char* arg0)
+{
+    Operation operation("getCustomerInfoFChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGChar( signed char* arg0)
+{
+    Operation operation("getCustomerInfoGChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHChar( unsigned char* arg0)
+{
+    Operation operation("getCustomerInfoHChar");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationLong(const long* arg0)
+{
+    Operation operation("getCustomerInformationLong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoALong(const long* arg0)
+{
+    Operation operation("getCustomerInfoALong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBLong( long* arg0)
+{
+    Operation operation("getCustomerInfoBLong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCLong( long arg0)
+{
+    Operation operation("getCustomerInfoCLong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDLong( long arg0)
+{
+    Operation operation("getCustomerInfoDLong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoELong( long* arg0)
+{
+    Operation operation("getCustomerInfoELong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFLong( long* arg0)
+{
+    Operation operation("getCustomerInfoFLong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGLong( signed long* arg0)
+{
+    Operation operation("getCustomerInfoGLong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHLong( unsigned long* arg0)
+{
+    Operation operation("getCustomerInfoHLong");
+    operation.addParameter(&arg0);
+    const long* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationInt(const int* arg0)
+{
+    Operation operation("getCustomerInformationInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAInt(const int* arg0)
+{
+    Operation operation("getCustomerInfoAInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBInt( int* arg0)
+{
+    Operation operation("getCustomerInfoBInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCInt( int arg0)
+{
+    Operation operation("getCustomerInfoCInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDInt( int arg0)
+{
+    Operation operation("getCustomerInfoDInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEInt( int* arg0)
+{
+    Operation operation("getCustomerInfoEInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFInt( int* arg0)
+{
+    Operation operation("getCustomerInfoFInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGInt( signed int* arg0)
+{
+    Operation operation("getCustomerInfoGInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHInt( unsigned int* arg0)
+{
+    Operation operation("getCustomerInfoHInt");
+    operation.addParameter(&arg0);
+    const int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationint64(const __int64* arg0)
+{
+    Operation operation("getCustomerInformationint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAint64(const __int64* arg0)
+{
+    Operation operation("getCustomerInfoAint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBint64( __int64* arg0)
+{
+    Operation operation("getCustomerInfoBint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCint64( __int64 arg0)
+{
+    Operation operation("getCustomerInfoCint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDint64( __int64 arg0)
+{
+    Operation operation("getCustomerInfoDint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEint64( __int64* arg0)
+{
+    Operation operation("getCustomerInfoEint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFint64( __int64* arg0)
+{
+    Operation operation("getCustomerInfoFint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGint64( signed __int64* arg0)
+{
+    Operation operation("getCustomerInfoGint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHint64( unsigned int64* arg0)
+{
+    Operation operation("getCustomerInfoHint64");
+    operation.addParameter(&arg0);
+    const __int64* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const void* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationVoid(const __int64* arg0)
+{
+    Operation operation("getCustomerInformationVoid");
+    operation.addParameter(&arg0);
+    const void* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAVoid(const __int64* arg0)
+{
+    Operation operation("getCustomerInfoAVoid");
+    operation.addParameter(&arg0);
+    target->invoke(operation);
+    return;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBVoid()
+{
+    Operation operation("getCustomerInfoBVoid");
+    target->invoke(operation);
+    return;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCVoid()
+{
+    Operation operation("getCustomerInfoCVoid");
+    target->invoke(operation);
+    return;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDVoid()
+{
+    Operation operation("getCustomerInfoDVoid");
+    operation.addParameter(&arg0);
+    target->invoke(operation);
+    return;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAInline( char* customer arg0)
+{
+    Operation operation("getCustomerInfoAInline");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBInline( char* customer arg0)
+{
+    Operation operation("getCustomerInfoBInline");
+    operation.addParameter(&arg0);
+    int ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+friend const unsigned int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCInline( char* customer arg0)
+{
+    Operation operation("getCustomerInfoCInline");
+    operation.addParameter(&arg0);
+    friend const unsigned int* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoTrickyA(const char arg0)
+{
+    Operation operation("getCustomerInfoTrickyA");
+    operation.addParameter(&arg0);
+    int ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoTrickyB( int arg0)
+{
+    Operation operation("getCustomerInfoTrickyB");
+    operation.addParameter(&arg0);
+    int ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
new file mode 100644
index 0000000000..f35d841b12
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
@@ -0,0 +1,83 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Proxy : public CustomerInfo
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Proxy();
+    virtual const char* getCustomerInformationChar(const char* customerID);
+    virtual const char* getCustomerInfoAChar(const char* );
+    virtual const char* getCustomerInfoBChar( char* customerID);
+    virtual const char* getCustomerInfoCChar( char customerID);
+    virtual const char* getCustomerInfoDChar( char );
+    virtual const char* getCustomerInfoEChar( char* );
+    virtual const char* getCustomerInfoFChar( char* customerID);
+    virtual const char* getCustomerInfoGChar( signed char* customerID);
+    virtual const char* getCustomerInfoHChar( unsigned char* customerID);
+    virtual const long* getCustomerInformationLong(const long* customerID);
+    virtual const long* getCustomerInfoALong(const long* );
+    virtual const long* getCustomerInfoBLong( long* customerID);
+    virtual const long* getCustomerInfoCLong( long customerID);
+    virtual const long* getCustomerInfoDLong( long );
+    virtual const long* getCustomerInfoELong( long* );
+    virtual const long* getCustomerInfoFLong( long* customerID);
+    virtual const long* getCustomerInfoGLong( signed long* customerID);
+    virtual const long* getCustomerInfoHLong( unsigned long* customerID);
+    virtual const int* getCustomerInformationInt(const int* customerID);
+    virtual const int* getCustomerInfoAInt(const int* );
+    virtual const int* getCustomerInfoBInt( int* customerID);
+    virtual const int* getCustomerInfoCInt( int customerID);
+    virtual const int* getCustomerInfoDInt( int );
+    virtual const int* getCustomerInfoEInt( int* );
+    virtual const int* getCustomerInfoFInt( int* customerID);
+    virtual const int* getCustomerInfoGInt( signed int* customerID);
+    virtual const int* getCustomerInfoHInt( unsigned int* customerID);
+    virtual const __int64* getCustomerInformationint64(const __int64* customerID);
+    virtual const __int64* getCustomerInfoAint64(const __int64* );
+    virtual const __int64* getCustomerInfoBint64( __int64* customerID);
+    virtual const __int64* getCustomerInfoCint64( __int64 customerID);
+    virtual const __int64* getCustomerInfoDint64( __int64 );
+    virtual const __int64* getCustomerInfoEint64( __int64* );
+    virtual const __int64* getCustomerInfoFint64( __int64* customerID);
+    virtual const __int64* getCustomerInfoGint64( signed __int64* customerID);
+    virtual const __int64* getCustomerInfoHint64( unsigned int64* customerID);
+    virtual const void* getCustomerInformationVoid(const __int64* customerID);
+    virtual void getCustomerInfoAVoid(const __int64* );
+    virtual void getCustomerInfoBVoid();
+    virtual void getCustomerInfoCVoid();
+    virtual void getCustomerInfoDVoid( void );
+    virtual const char* getCustomerInfoAInline( char* customer id);
+    virtual int getCustomerInfoBInline( char* customer id);
+    virtual friend const unsigned int* getCustomerInfoCInline( char* customer id);
+    virtual int getCustomerInfoTrickyA(const char );
+    virtual int getCustomerInfoTrickyB( int myInt);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
new file mode 100644
index 0000000000..892b92c524
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
@@ -0,0 +1,339 @@
+/* 
+ *  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 "CustomerInfoImpl_CustomerInfoService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CustomerInfoImpl_CustomerInfoService_Wrapper* CustomerInfoImpl_CustomerInfoService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Wrapper(target);
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::CustomerInfoImpl_CustomerInfoService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CustomerInfoImpl*)getImplementation();
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::~CustomerInfoImpl_CustomerInfoService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CustomerInfoImpl_CustomerInfoService_Wrapper::newImplementation()
+{
+    return new CustomerInfoImpl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "getCustomerInformationChar")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInformationChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoAChar")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoAChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoBChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoBChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoCChar")
+    {
+        char& p0 = *( char*)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoCChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoDChar")
+    {
+        char& p0 = *( char*)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoDChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoEChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoEChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoFChar")
+    {
+        char* p0 = *( char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoFChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoGChar")
+    {
+        signed char* p0 = *( signed char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoGChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoHChar")
+    {
+        unsigned char* p0 = *( unsigned char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoHChar(p0);
+        return;
+    }
+    if (operationName == "getCustomerInformationLong")
+    {
+        const long* p0 = *(const long**)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInformationLong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoALong")
+    {
+        const long* p0 = *(const long**)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoALong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoBLong")
+    {
+        long* p0 = *( long**)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoBLong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoCLong")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoCLong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoDLong")
+    {
+        long& p0 = *( long*)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoDLong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoELong")
+    {
+        long* p0 = *( long**)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoELong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoFLong")
+    {
+        long* p0 = *( long**)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoFLong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoGLong")
+    {
+        signed long* p0 = *( signed long**)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoGLong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoHLong")
+    {
+        unsigned long* p0 = *( unsigned long**)operation.getParameterValue(0);
+        *(const long**)operation.getReturnValue() = impl->getCustomerInfoHLong(p0);
+        return;
+    }
+    if (operationName == "getCustomerInformationInt")
+    {
+        const int* p0 = *(const int**)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInformationInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoAInt")
+    {
+        const int* p0 = *(const int**)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoAInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoBInt")
+    {
+        int* p0 = *( int**)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoBInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoCInt")
+    {
+        int& p0 = *( int*)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoCInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoDInt")
+    {
+        int& p0 = *( int*)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoDInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoEInt")
+    {
+        int* p0 = *( int**)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoEInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoFInt")
+    {
+        int* p0 = *( int**)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoFInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoGInt")
+    {
+        signed int* p0 = *( signed int**)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoGInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoHInt")
+    {
+        unsigned int* p0 = *( unsigned int**)operation.getParameterValue(0);
+        *(const int**)operation.getReturnValue() = impl->getCustomerInfoHInt(p0);
+        return;
+    }
+    if (operationName == "getCustomerInformationint64")
+    {
+        const __int64* p0 = *(const __int64**)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInformationint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoAint64")
+    {
+        const __int64* p0 = *(const __int64**)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoAint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoBint64")
+    {
+        __int64* p0 = *( __int64**)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoBint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoCint64")
+    {
+        __int64& p0 = *( __int64*)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoCint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoDint64")
+    {
+        __int64& p0 = *( __int64*)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoDint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoEint64")
+    {
+        __int64* p0 = *( __int64**)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoEint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoFint64")
+    {
+        __int64* p0 = *( __int64**)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoFint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoGint64")
+    {
+        signed __int64* p0 = *( signed __int64**)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoGint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoHint64")
+    {
+        unsigned int64* p0 = *( unsigned int64**)operation.getParameterValue(0);
+        *(const __int64**)operation.getReturnValue() = impl->getCustomerInfoHint64(p0);
+        return;
+    }
+    if (operationName == "getCustomerInformationVoid")
+    {
+        const __int64* p0 = *(const __int64**)operation.getParameterValue(0);
+        *(const void**)operation.getReturnValue() = impl->getCustomerInformationVoid(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoAVoid")
+    {
+        const __int64* p0 = *(const __int64**)operation.getParameterValue(0);
+            impl->getCustomerInfoAVoid(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoBVoid")
+    {
+            impl->getCustomerInfoBVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoCVoid")
+    {
+            impl->getCustomerInfoCVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoDVoid")
+    {
+            impl->getCustomerInfoDVoid();
+        return;
+    }
+    if (operationName == "getCustomerInfoAInline")
+    {
+        char* customer p0 = *( char* customer*)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoAInline(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoBInline")
+    {
+        char* customer p0 = *( char* customer*)operation.getParameterValue(0);
+        *(int*)operation.getReturnValue() = impl->getCustomerInfoBInline(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoCInline")
+    {
+        char* customer p0 = *( char* customer*)operation.getParameterValue(0);
+        *(friend const unsigned int**)operation.getReturnValue() = impl->getCustomerInfoCInline(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoTrickyA")
+    {
+        const char& p0 = *(const char*)operation.getParameterValue(0);
+        *(int*)operation.getReturnValue() = impl->getCustomerInfoTrickyA(p0);
+        return;
+    }
+    if (operationName == "getCustomerInfoTrickyB")
+    {
+        int& p0 = *( int*)operation.getParameterValue(0);
+        *(int*)operation.getReturnValue() = impl->getCustomerInfoTrickyB(p0);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
new file mode 100644
index 0000000000..5fb82c4295
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CustomerInfoImpl* impl;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
new file mode 100644
index 0000000000..b875e97a95
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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 "CustomerInfoImpl2_CustomerInfoService_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
+    CustomerInfoImpl2_CustomerInfoService_Proxy* CustomerInfoImpl2_CustomerInfoService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CustomerInfoImpl2_CustomerInfoService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CustomerInfoImpl2_CustomerInfoService_Proxy_Destructor(void* proxy)
+    {
+        delete (CustomerInfoImpl2_CustomerInfoService_Proxy*)proxy;
+    }
+}
+
+CustomerInfoImpl2_CustomerInfoService_Proxy::CustomerInfoImpl2_CustomerInfoService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CustomerInfoImpl2_CustomerInfoService_Proxy::~CustomerInfoImpl2_CustomerInfoService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* CustomerInfoImpl2_CustomerInfoService_Proxy::getCustomerInformation(const char* arg0)
+{
+    Operation operation("getCustomerInformation");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
new file mode 100644
index 0000000000..90cf63c66a
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl2_CustomerInfoService_Proxy : public CustomerInfo
+{
+public:
+    CustomerInfoImpl2_CustomerInfoService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CustomerInfoImpl2_CustomerInfoService_Proxy();
+    virtual const char* getCustomerInformation(const char* customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CustomerInfoImpl2_CustomerInfoService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
new file mode 100644
index 0000000000..03c4b2af44
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
@@ -0,0 +1,72 @@
+/* 
+ *  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 "CustomerInfoImpl2_CustomerInfoService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CustomerInfoImpl2_CustomerInfoService_Wrapper* CustomerInfoImpl2_CustomerInfoService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CustomerInfoImpl2_CustomerInfoService_Wrapper(target);
+    }
+}
+
+CustomerInfoImpl2_CustomerInfoService_Wrapper::CustomerInfoImpl2_CustomerInfoService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CustomerInfoImpl2*)getImplementation();
+}
+
+CustomerInfoImpl2_CustomerInfoService_Wrapper::~CustomerInfoImpl2_CustomerInfoService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CustomerInfoImpl2_CustomerInfoService_Wrapper::newImplementation()
+{
+    return new CustomerInfoImpl2;
+}
+
+void CustomerInfoImpl2_CustomerInfoService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CustomerInfoImpl2_CustomerInfoService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "getCustomerInformation")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInformation(p0);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
new file mode 100644
index 0000000000..2a73893241
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl2_CustomerInfoService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CustomerInfoImpl2_CustomerInfoService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CustomerInfoImpl2_CustomerInfoService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CustomerInfoImpl2* impl;
+};
+
+#endif // CustomerInfoImpl2_CustomerInfoService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
new file mode 100644
index 0000000000..d34b63ea14
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
@@ -0,0 +1,91 @@
+/*
+ *  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::getMyValue(const char* arg0)
+{
+    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");
+    operation.addParameter(&arg0);
+    float ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+string MyValueImpl_MyValueService_Proxy::getCustname( string& arg0)
+{
+    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");
+    operation.addParameter(&arg0);
+    target->invoke(operation);
+    return *(const string*)operation.getReturnValue();
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
new file mode 100644
index 0000000000..742947ca69
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
@@ -0,0 +1,41 @@
+/* 
+ *  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 getMyValue(const char* customerID);
+    virtual float getMyValueS(const string& customerID);
+    virtual string getCustname( string& customerID);
+    virtual const string& getCustnamecs( string customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_MyValueService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
new file mode 100644
index 0000000000..da60e4c1e3
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
@@ -0,0 +1,91 @@
+/* 
+ *  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;
+
+
+
+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 == "getMyValue")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(float*)operation.getReturnValue() = impl->getMyValue(p0);
+        return;
+    }
+    if (operationName == "getMyValueS")
+    {
+        string& p0 = *(string*)operation.getParameterValue(0);
+        *(float*)operation.getReturnValue() = impl->getMyValueS(p0);
+        return;
+    }
+    if (operationName == "getCustname")
+    {
+        string& p0 = *(string*)operation.getParameterValue(0);
+        *(string*)operation.getReturnValue() = impl->getCustname(p0);
+        return;
+    }
+    if (operationName == "getCustnamecs")
+    {
+        string& p0 = *( string*)operation.getParameterValue(0);
+        const string& ret = impl->getCustnamecs(p0);
+        operation.setReturnValue(&ret);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
new file mode 100644
index 0000000000..f8b8b11724
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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:
+    MyValueImpl* impl;
+};
+
+#endif // MyValueImpl_MyValueService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
new file mode 100644
index 0000000000..cda55a99c8
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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_customerInfo_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_customerInfo_Proxy* MyValueImpl_customerInfo_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new MyValueImpl_customerInfo_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void MyValueImpl_customerInfo_Proxy_Destructor(void* proxy)
+    {
+        delete (MyValueImpl_customerInfo_Proxy*)proxy;
+    }
+}
+
+MyValueImpl_customerInfo_Proxy::MyValueImpl_customerInfo_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_customerInfo_Proxy::~MyValueImpl_customerInfo_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* MyValueImpl_customerInfo_Proxy::getCustomerInformation(const char* arg0)
+{
+    Operation operation("getCustomerInformation");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
new file mode 100644
index 0000000000..6ac33b4ef6
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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_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"
+
+class MyValueImpl_customerInfo_Proxy : public CustomerInfo
+{
+public:
+    MyValueImpl_customerInfo_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~MyValueImpl_customerInfo_Proxy();
+    virtual const char* getCustomerInformation(const char* customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_customerInfo_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
new file mode 100644
index 0000000000..3656acbaad
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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_stockQuote_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_stockQuote_Proxy* MyValueImpl_stockQuote_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new MyValueImpl_stockQuote_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void MyValueImpl_stockQuote_Proxy_Destructor(void* proxy)
+    {
+        delete (MyValueImpl_stockQuote_Proxy*)proxy;
+    }
+}
+
+MyValueImpl_stockQuote_Proxy::MyValueImpl_stockQuote_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_stockQuote_Proxy::~MyValueImpl_stockQuote_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+commonj::sdo::DataObjectPtr MyValueImpl_stockQuote_Proxy::GetStockQuotes( commonj::sdo::DataObjectPtr arg0)
+{
+    Operation operation("GetStockQuotes");
+    operation.addParameter(&arg0);
+    commonj::sdo::DataObjectPtr ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
new file mode 100644
index 0000000000..7619b6c9cd
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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_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"
+
+class MyValueImpl_stockQuote_Proxy : public StockQuoteService
+{
+public:
+    MyValueImpl_stockQuote_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~MyValueImpl_stockQuote_Proxy();
+    virtual commonj::sdo::DataObjectPtr GetStockQuotes( commonj::sdo::DataObjectPtr request);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_stockQuote_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
new file mode 100644
index 0000000000..e6cb3b3426
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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 "CustomerInfoImpl_CustomerInfoService_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
+    CustomerInfoImpl_CustomerInfoService_Proxy* CustomerInfoImpl_CustomerInfoService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CustomerInfoImpl_CustomerInfoService_Proxy_Destructor(void* proxy)
+    {
+        delete (CustomerInfoImpl_CustomerInfoService_Proxy*)proxy;
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::CustomerInfoImpl_CustomerInfoService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::~CustomerInfoImpl_CustomerInfoService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformation(const char* arg0)
+{
+    Operation operation("getCustomerInformation");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
new file mode 100644
index 0000000000..1e2c47225e
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Proxy : public CustomerInfo
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Proxy();
+    virtual const char* getCustomerInformation(const char* customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
new file mode 100644
index 0000000000..57404925d2
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
@@ -0,0 +1,72 @@
+/* 
+ *  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 "CustomerInfoImpl_CustomerInfoService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+using Other::CustomerInfoImpl;
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CustomerInfoImpl_CustomerInfoService_Wrapper* CustomerInfoImpl_CustomerInfoService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Wrapper(target);
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::CustomerInfoImpl_CustomerInfoService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CustomerInfoImpl*)getImplementation();
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::~CustomerInfoImpl_CustomerInfoService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CustomerInfoImpl_CustomerInfoService_Wrapper::newImplementation()
+{
+    return new CustomerInfoImpl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "getCustomerInformation")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInformation(p0);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
new file mode 100644
index 0000000000..cbb77ab41e
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    Other::CustomerInfoImpl* impl;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
new file mode 100644
index 0000000000..d34b63ea14
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
@@ -0,0 +1,91 @@
+/*
+ *  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::getMyValue(const char* arg0)
+{
+    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");
+    operation.addParameter(&arg0);
+    float ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+string MyValueImpl_MyValueService_Proxy::getCustname( string& arg0)
+{
+    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");
+    operation.addParameter(&arg0);
+    target->invoke(operation);
+    return *(const string*)operation.getReturnValue();
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
new file mode 100644
index 0000000000..742947ca69
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
@@ -0,0 +1,41 @@
+/* 
+ *  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 getMyValue(const char* customerID);
+    virtual float getMyValueS(const string& customerID);
+    virtual string getCustname( string& customerID);
+    virtual const string& getCustnamecs( string customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_MyValueService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
new file mode 100644
index 0000000000..d5eaade5b1
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
@@ -0,0 +1,91 @@
+/* 
+ *  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 Other::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 == "getMyValue")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(float*)operation.getReturnValue() = impl->getMyValue(p0);
+        return;
+    }
+    if (operationName == "getMyValueS")
+    {
+        string& p0 = *(string*)operation.getParameterValue(0);
+        *(float*)operation.getReturnValue() = impl->getMyValueS(p0);
+        return;
+    }
+    if (operationName == "getCustname")
+    {
+        string& p0 = *(string*)operation.getParameterValue(0);
+        *(string*)operation.getReturnValue() = impl->getCustname(p0);
+        return;
+    }
+    if (operationName == "getCustnamecs")
+    {
+        string& p0 = *( string*)operation.getParameterValue(0);
+        const string& ret = impl->getCustnamecs(p0);
+        operation.setReturnValue(&ret);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
new file mode 100644
index 0000000000..bcaff5b880
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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:
+    Other::MyValueImpl* impl;
+};
+
+#endif // MyValueImpl_MyValueService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
new file mode 100644
index 0000000000..cda55a99c8
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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_customerInfo_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_customerInfo_Proxy* MyValueImpl_customerInfo_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new MyValueImpl_customerInfo_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void MyValueImpl_customerInfo_Proxy_Destructor(void* proxy)
+    {
+        delete (MyValueImpl_customerInfo_Proxy*)proxy;
+    }
+}
+
+MyValueImpl_customerInfo_Proxy::MyValueImpl_customerInfo_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_customerInfo_Proxy::~MyValueImpl_customerInfo_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* MyValueImpl_customerInfo_Proxy::getCustomerInformation(const char* arg0)
+{
+    Operation operation("getCustomerInformation");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
new file mode 100644
index 0000000000..6ac33b4ef6
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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_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"
+
+class MyValueImpl_customerInfo_Proxy : public CustomerInfo
+{
+public:
+    MyValueImpl_customerInfo_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~MyValueImpl_customerInfo_Proxy();
+    virtual const char* getCustomerInformation(const char* customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_customerInfo_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
new file mode 100644
index 0000000000..3656acbaad
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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_stockQuote_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_stockQuote_Proxy* MyValueImpl_stockQuote_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new MyValueImpl_stockQuote_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void MyValueImpl_stockQuote_Proxy_Destructor(void* proxy)
+    {
+        delete (MyValueImpl_stockQuote_Proxy*)proxy;
+    }
+}
+
+MyValueImpl_stockQuote_Proxy::MyValueImpl_stockQuote_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_stockQuote_Proxy::~MyValueImpl_stockQuote_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+commonj::sdo::DataObjectPtr MyValueImpl_stockQuote_Proxy::GetStockQuotes( commonj::sdo::DataObjectPtr arg0)
+{
+    Operation operation("GetStockQuotes");
+    operation.addParameter(&arg0);
+    commonj::sdo::DataObjectPtr ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
new file mode 100644
index 0000000000..7619b6c9cd
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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_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"
+
+class MyValueImpl_stockQuote_Proxy : public StockQuoteService
+{
+public:
+    MyValueImpl_stockQuote_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~MyValueImpl_stockQuote_Proxy();
+    virtual commonj::sdo::DataObjectPtr GetStockQuotes( commonj::sdo::DataObjectPtr request);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_stockQuote_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
new file mode 100644
index 0000000000..b1f76af778
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
@@ -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();
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
new file mode 100644
index 0000000000..d9459ece24
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
@@ -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
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
new file mode 100644
index 0000000000..d77b4a302d
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
@@ -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");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
new file mode 100644
index 0000000000..3992f0445f
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
@@ -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
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
new file mode 100644
index 0000000000..4cdd4899b0
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
@@ -0,0 +1,91 @@
+/*
+ *  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();
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
new file mode 100644
index 0000000000..5bb75abd5b
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
@@ -0,0 +1,41 @@
+/* 
+ *  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 Other::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
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
new file mode 100644
index 0000000000..34125fa6a3
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
@@ -0,0 +1,91 @@
+/* 
+ *  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;
+
+
+
+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");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
new file mode 100644
index 0000000000..f8b8b11724
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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:
+    MyValueImpl* impl;
+};
+
+#endif // MyValueImpl_MyValueService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
new file mode 100644
index 0000000000..4cdd4899b0
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
@@ -0,0 +1,91 @@
+/*
+ *  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();
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
new file mode 100644
index 0000000000..5bb75abd5b
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
@@ -0,0 +1,41 @@
+/* 
+ *  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 Other::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
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
new file mode 100644
index 0000000000..34125fa6a3
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
@@ -0,0 +1,91 @@
+/* 
+ *  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;
+
+
+
+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");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
new file mode 100644
index 0000000000..f8b8b11724
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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:
+    MyValueImpl* impl;
+};
+
+#endif // MyValueImpl_MyValueService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
new file mode 100644
index 0000000000..b875e97a95
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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 "CustomerInfoImpl2_CustomerInfoService_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
+    CustomerInfoImpl2_CustomerInfoService_Proxy* CustomerInfoImpl2_CustomerInfoService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CustomerInfoImpl2_CustomerInfoService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CustomerInfoImpl2_CustomerInfoService_Proxy_Destructor(void* proxy)
+    {
+        delete (CustomerInfoImpl2_CustomerInfoService_Proxy*)proxy;
+    }
+}
+
+CustomerInfoImpl2_CustomerInfoService_Proxy::CustomerInfoImpl2_CustomerInfoService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CustomerInfoImpl2_CustomerInfoService_Proxy::~CustomerInfoImpl2_CustomerInfoService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* CustomerInfoImpl2_CustomerInfoService_Proxy::getCustomerInformation(const char* arg0)
+{
+    Operation operation("getCustomerInformation");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
new file mode 100644
index 0000000000..90cf63c66a
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl2_CustomerInfoService_Proxy : public CustomerInfo
+{
+public:
+    CustomerInfoImpl2_CustomerInfoService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CustomerInfoImpl2_CustomerInfoService_Proxy();
+    virtual const char* getCustomerInformation(const char* customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CustomerInfoImpl2_CustomerInfoService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
new file mode 100644
index 0000000000..12d3a1a3d1
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
@@ -0,0 +1,70 @@
+/* 
+ *  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 "CustomerInfoImpl2_CustomerInfoService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CustomerInfoImpl2_CustomerInfoService_Wrapper* CustomerInfoImpl2_CustomerInfoService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CustomerInfoImpl2_CustomerInfoService_Wrapper(target);
+    }
+}
+
+CustomerInfoImpl2_CustomerInfoService_Wrapper::CustomerInfoImpl2_CustomerInfoService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CustomerInfoImpl2*)getImplementation();
+}
+
+CustomerInfoImpl2_CustomerInfoService_Wrapper::~CustomerInfoImpl2_CustomerInfoService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CustomerInfoImpl2_CustomerInfoService_Wrapper::newImplementation()
+{
+    return new CustomerInfoImpl2;
+}
+
+void CustomerInfoImpl2_CustomerInfoService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CustomerInfoImpl2_CustomerInfoService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "getCustomerInformation")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInformation(p0);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
new file mode 100644
index 0000000000..2a73893241
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl2_CustomerInfoService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CustomerInfoImpl2_CustomerInfoService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CustomerInfoImpl2_CustomerInfoService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CustomerInfoImpl2* impl;
+};
+
+#endif // CustomerInfoImpl2_CustomerInfoService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
new file mode 100644
index 0000000000..d34b63ea14
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
@@ -0,0 +1,91 @@
+/*
+ *  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::getMyValue(const char* arg0)
+{
+    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");
+    operation.addParameter(&arg0);
+    float ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+string MyValueImpl_MyValueService_Proxy::getCustname( string& arg0)
+{
+    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");
+    operation.addParameter(&arg0);
+    target->invoke(operation);
+    return *(const string*)operation.getReturnValue();
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
new file mode 100644
index 0000000000..742947ca69
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
@@ -0,0 +1,41 @@
+/* 
+ *  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 getMyValue(const char* customerID);
+    virtual float getMyValueS(const string& customerID);
+    virtual string getCustname( string& customerID);
+    virtual const string& getCustnamecs( string customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_MyValueService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
new file mode 100644
index 0000000000..83857169e5
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
@@ -0,0 +1,89 @@
+/* 
+ *  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;
+
+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 == "getMyValue")
+    {
+        const char* p0 = *(const char**)operation.getParameterValue(0);
+        *(float*)operation.getReturnValue() = impl->getMyValue(p0);
+        return;
+    }
+    if (operationName == "getMyValueS")
+    {
+        string& p0 = *(string*)operation.getParameterValue(0);
+        *(float*)operation.getReturnValue() = impl->getMyValueS(p0);
+        return;
+    }
+    if (operationName == "getCustname")
+    {
+        string& p0 = *(string*)operation.getParameterValue(0);
+        *(string*)operation.getReturnValue() = impl->getCustname(p0);
+        return;
+    }
+    if (operationName == "getCustnamecs")
+    {
+        string& p0 = *( string*)operation.getParameterValue(0);
+        const string& ret = impl->getCustnamecs(p0);
+        operation.setReturnValue(&ret);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
new file mode 100644
index 0000000000..f8b8b11724
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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:
+    MyValueImpl* impl;
+};
+
+#endif // MyValueImpl_MyValueService_Wrapper_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
new file mode 100644
index 0000000000..cda55a99c8
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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_customerInfo_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_customerInfo_Proxy* MyValueImpl_customerInfo_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new MyValueImpl_customerInfo_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void MyValueImpl_customerInfo_Proxy_Destructor(void* proxy)
+    {
+        delete (MyValueImpl_customerInfo_Proxy*)proxy;
+    }
+}
+
+MyValueImpl_customerInfo_Proxy::MyValueImpl_customerInfo_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_customerInfo_Proxy::~MyValueImpl_customerInfo_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* MyValueImpl_customerInfo_Proxy::getCustomerInformation(const char* arg0)
+{
+    Operation operation("getCustomerInformation");
+    operation.addParameter(&arg0);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
new file mode 100644
index 0000000000..6ac33b4ef6
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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_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"
+
+class MyValueImpl_customerInfo_Proxy : public CustomerInfo
+{
+public:
+    MyValueImpl_customerInfo_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~MyValueImpl_customerInfo_Proxy();
+    virtual const char* getCustomerInformation(const char* customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_customerInfo_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
new file mode 100644
index 0000000000..3656acbaad
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
@@ -0,0 +1,63 @@
+/*
+ *  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_stockQuote_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_stockQuote_Proxy* MyValueImpl_stockQuote_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new MyValueImpl_stockQuote_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void MyValueImpl_stockQuote_Proxy_Destructor(void* proxy)
+    {
+        delete (MyValueImpl_stockQuote_Proxy*)proxy;
+    }
+}
+
+MyValueImpl_stockQuote_Proxy::MyValueImpl_stockQuote_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+MyValueImpl_stockQuote_Proxy::~MyValueImpl_stockQuote_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+commonj::sdo::DataObjectPtr MyValueImpl_stockQuote_Proxy::GetStockQuotes( commonj::sdo::DataObjectPtr arg0)
+{
+    Operation operation("GetStockQuotes");
+    operation.addParameter(&arg0);
+    commonj::sdo::DataObjectPtr ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
new file mode 100644
index 0000000000..7619b6c9cd
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
@@ -0,0 +1,38 @@
+/* 
+ *  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_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"
+
+class MyValueImpl_stockQuote_Proxy : public StockQuoteService
+{
+public:
+    MyValueImpl_stockQuote_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~MyValueImpl_stockQuote_Proxy();
+    virtual commonj::sdo::DataObjectPtr GetStockQuotes( commonj::sdo::DataObjectPtr request);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // MyValueImpl_stockQuote_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
new file mode 100644
index 0000000000..074406c606
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
@@ -0,0 +1,86 @@
+/*
+ *  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 "CustomerInfoImpl_CustomerInfoService_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
+    CustomerInfoImpl_CustomerInfoService_Proxy* CustomerInfoImpl_CustomerInfoService_Proxy_Factory(ServiceWrapper* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Proxy(target);
+    }
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    void CustomerInfoImpl_CustomerInfoService_Proxy_Destructor(void* proxy)
+    {
+        delete (CustomerInfoImpl_CustomerInfoService_Proxy*)proxy;
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::CustomerInfoImpl_CustomerInfoService_Proxy(ServiceWrapper* targ) : target(targ)
+{
+}
+
+CustomerInfoImpl_CustomerInfoService_Proxy::~CustomerInfoImpl_CustomerInfoService_Proxy()
+{
+    if (target)
+        delete target;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationCharPublic( char* arg0, const char* arg1)
+{
+    Operation operation("getCustomerInformationCharPublic");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoACharPublic( char* arg0, const char* arg1)
+{
+    Operation operation("getCustomerInfoACharPublic");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBCharPublic( char* arg0,  char* arg1)
+{
+    Operation operation("getCustomerInfoBCharPublic");
+    operation.addParameter(&arg0);
+    operation.addParameter(&arg1);
+    const char* ret;
+    operation.setReturnValue(&ret);
+    target->invoke(operation);
+    return ret;
+}
+
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
new file mode 100644
index 0000000000..ddb678c094
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Proxy : public CustomerInfo
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Proxy(tuscany::sca::ServiceWrapper*);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Proxy();
+    virtual const char* getCustomerInformationCharPublic( char* p1, const char* customerID);
+    virtual const char* getCustomerInfoACharPublic( char* p1, const char* );
+    virtual const char* getCustomerInfoBCharPublic( char* p1,  char* customerID);
+private:
+    tuscany::sca::ServiceWrapper* target;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Proxy_h
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
new file mode 100644
index 0000000000..09000f9040
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
@@ -0,0 +1,87 @@
+/* 
+ *  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 "CustomerInfoImpl_CustomerInfoService_Wrapper.h"
+
+#include "osoa/sca/sca.h"
+using namespace osoa::sca;
+using namespace tuscany::sca;
+
+
+
+extern "C"
+{
+
+    #if defined(WIN32) || defined(_WINDOWS)
+    __declspec(dllexport) 
+    #endif
+    CustomerInfoImpl_CustomerInfoService_Wrapper* CustomerInfoImpl_CustomerInfoService_Wrapper_Factory(tuscany::sca::model::Service* target)
+    {
+        return new CustomerInfoImpl_CustomerInfoService_Wrapper(target);
+    }
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::CustomerInfoImpl_CustomerInfoService_Wrapper(Service* target) : ComponentServiceWrapper(target)
+{
+    impl = (CustomerInfoImpl*)getImplementation();
+}
+
+CustomerInfoImpl_CustomerInfoService_Wrapper::~CustomerInfoImpl_CustomerInfoService_Wrapper()
+{
+    releaseImplementation();
+}
+
+void* CustomerInfoImpl_CustomerInfoService_Wrapper::newImplementation()
+{
+    return new CustomerInfoImpl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::deleteImplementation()
+{
+    delete impl;
+}
+
+void CustomerInfoImpl_CustomerInfoService_Wrapper::invokeService(Operation& operation)
+{
+    const string& operationName = operation.getName();
+
+    if (operationName == "getCustomerInformationCharPublic")
+    {
+        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.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.getParameterValue(0);
+        char* p1 = *( char**)operation.getParameterValue(1);
+        *(const char**)operation.getReturnValue() = impl->getCustomerInfoBCharPublic(p0, p1);
+        return;
+    }
+        
+
+    throw ServiceRuntimeException("Invalid operation");
+    
+}
+
diff --git a/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
new file mode 100644
index 0000000000..5fb82c4295
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
@@ -0,0 +1,40 @@
+/* 
+ *  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 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"
+
+class CustomerInfoImpl_CustomerInfoService_Wrapper : public tuscany::sca::ComponentServiceWrapper
+{
+public:
+    CustomerInfoImpl_CustomerInfoService_Wrapper(tuscany::sca::model::Service* target);
+    virtual ~CustomerInfoImpl_CustomerInfoService_Wrapper();
+    virtual void invokeService(tuscany::sca::Operation& operation);
+    virtual void* newImplementation();
+    virtual void deleteImplementation();
+private:
+    CustomerInfoImpl* impl;
+};
+
+#endif // CustomerInfoImpl_CustomerInfoService_Wrapper_h
+