You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2006/06/24 03:07:58 UTC
svn commit: r416851 [1/3] - in /incubator/tuscany/cpp/sca/tools/scagen:
junit/org/apache/tuscany/sca/cpp/tools/junit/
junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/
junit/testoutput/CalculatorModuleAndComponent/exp...
Author: robbinspg
Date: Fri Jun 23 18:07:54 2006
New Revision: 416851
URL: http://svn.apache.org/viewvc?rev=416851&view=rev
Log:
TUSCANY-461 TUSCANY-462 Applying Andrew Borley's patch
Added:
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java (with props)
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h (with props)
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp (with props)
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h (with props)
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp (with props)
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h (with props)
Modified:
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java Fri Jun 23 18:07:54 2006
@@ -16,8 +16,6 @@
*/
package org.apache.tuscany.sca.cpp.tools.junit;
-import org.apache.tuscany.sca.cpp.tools.services.Scagen;
-
/**
* This is a "run this first" testcase that just tests some simple operations of
* the scagen tools it uses the
@@ -43,4 +41,4 @@
testModule("MyValueServiceModule", check_results);
}
-}
\ No newline at end of file
+}
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java Fri Jun 23 18:07:54 2006
@@ -0,0 +1,88 @@
+/*
+/*
+*
+* 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.
+*/
+package org.apache.tuscany.sca.cpp.tools.junit;
+
+/**
+ * This is a "run this first" testcase that just tests some simple operations of
+ * the scagen tools it uses the
+ * Hydra.sca.core\test\testSCASystem\modules\MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr SCA module as
+ * input data.
+ */
+public class ImplClassWithNameSpaceButNotInClassAttrTest extends TuscanyTestCase {
+
+ /**
+ * Constructor for CustomerInfoTestOLD.
+ *
+ * @param arg0
+ */
+ public ImplClassWithNameSpaceButNotInClassAttrTest(String arg0) {
+ super(arg0);
+ }
+
+ /**
+ * Test the Hydra.sca.core\test\testSCASystem\modules\MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr
+ * proxy and wrapper generation.
+ */
+ public void testEnvHandler() {
+ testModule("MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr", check_results);
+ }
+
+}
+*
+* 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.
+*/
+package org.apache.tuscany.sca.cpp.tools.junit;
+
+/**
+ * This is a "run this first" testcase that just tests some simple operations of
+ * the scagen tools it uses the
+ * Hydra.sca.core\test\testSCASystem\modules\MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr SCA module as
+ * input data.
+ */
+public class ImplClassWithNameSpaceButNotInClassAttrTest extends TuscanyTestCase {
+
+ /**
+ * Constructor for CustomerInfoTestOLD.
+ *
+ * @param arg0
+ */
+ public ImplClassWithNameSpaceButNotInClassAttrTest(String arg0) {
+ super(arg0);
+ }
+
+ /**
+ * Test the Hydra.sca.core\test\testSCASystem\modules\MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr
+ * proxy and wrapper generation.
+ */
+ public void testEnvHandler() {
+ testModule("MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr", check_results);
+ }
+
+}
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java Fri Jun 23 18:07:54 2006
@@ -16,8 +16,6 @@
*/
package org.apache.tuscany.sca.cpp.tools.junit;
-import org.apache.tuscany.sca.cpp.tools.services.Scagen;
-
/**
* This is a "run this first" testcase that just tests some simple operations of
* the scagen tools it uses the
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java Fri Jun 23 18:07:54 2006
@@ -16,8 +16,6 @@
*/
package org.apache.tuscany.sca.cpp.tools.junit;
-import org.apache.tuscany.sca.cpp.tools.services.Scagen;
-
/**
* This is a "run this first" testcase that just tests some simple operations of
* the scagen tools it uses the
@@ -43,4 +41,4 @@
testModule("MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr", check_results);
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java Fri Jun 23 18:07:54 2006
@@ -16,8 +16,6 @@
*/
package org.apache.tuscany.sca.cpp.tools.junit;
-import org.apache.tuscany.sca.cpp.tools.services.Scagen;
-
/**
* This is a "run this first" testcase that just tests some simple operations of
* the scagen tools it uses the
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java Fri Jun 23 18:07:54 2006
@@ -16,8 +16,6 @@
*/
package org.apache.tuscany.sca.cpp.tools.junit;
-import org.apache.tuscany.sca.cpp.tools.services.Scagen;
-
/**
* This is a "run this first" testcase that just tests some simple operations of
* the scagen tools it uses the
@@ -43,4 +41,4 @@
testModule("MyValueServiceModuleMissingScaModule",check_results);
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java Fri Jun 23 18:07:54 2006
@@ -16,8 +16,6 @@
*/
package org.apache.tuscany.sca.cpp.tools.junit;
-import org.apache.tuscany.sca.cpp.tools.services.Scagen;
-
/**
* This is a "run this first" testcase that just tests some simple operations of
* the scagen tools it uses the
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java Fri Jun 23 18:07:54 2006
@@ -34,6 +34,7 @@
super(arg0);
excludes.add("MyValueServiceModuleMissingScaModule");
excludes.add("CVS");
+ excludes.add(".svn");
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java Fri Jun 23 18:07:54 2006
@@ -18,9 +18,6 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.tuscany.sca.cpp.tools.common.Utils;
-import org.apache.tuscany.sca.cpp.tools.junit.TuscanyTestCase;
-
/**
* This test case will test all the modules placed in the "modules" directory
* against the results in their repectice "expected_results" folders.
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java Fri Jun 23 18:07:54 2006
@@ -33,7 +33,7 @@
*/
public class TuscanyTestCase extends TestCase {
- public static String root = "cpp\\sca\\tools\\scagen\\junit\\";
+ public static String root = "d:\\tuscany\\cpp\\sca\\tools\\scagen\\junit\\";
public static String junit_modules = root + "testinput\\modules\\";
@@ -162,15 +162,20 @@
for (int i = 0; i < files.length; i++) {
File child = new File(dir, files[i]);
if (child.isDirectory()) {
- if (!child.getName().equals("expected_output")) {
+ if (!(child.getName().equals("expected_output") || child.getName().equals(".svn"))) {
clearDirButNotExpectedOutputSubDir(dir
.getAbsolutePath()
+ File.separator + files[i]);
}
}
- child.delete();
+ else
+ {
+ if( !child.delete() )
+ {
+ System.out.println("File "+outputDir+"/"+child.getName()+" could not be deleted");
+ }
+ }
}
-
}
}
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h Fri Jun 23 18:07:54 2006
@@ -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.
+ */
+
+// MyValue.h: interface for the MyValueImpl class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef MyValue_h
+#define MyValue_h
+#include <string>
+using std::string;
+
+class MyValue
+{
+ public:
+ virtual float getMyValueOther(const char* customerID) = 0;
+ virtual float getMyValueSOther(const string& customerID) = 0;
+ virtual string getCustnameOther(string& customerID) = 0;
+ virtual const string& getCustnamecsOther(string customerID) = 0;
+}
+
+#endif
+ *
+ * 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.
+ */
+
+// MyValue.h: interface for the MyValueImpl class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#ifndef MyValue_h
+#define MyValue_h
+#include <string>
+using std::string;
+
+class MyValue
+{
+ public:
+ virtual float getMyValueOther(const char* customerID) = 0;
+ virtual float getMyValueSOther(const string& customerID) = 0;
+ virtual string getCustnameOther(string& customerID) = 0;
+ virtual const string& getCustnamecsOther(string customerID) = 0;
+}
+
+#endif
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType Fri Jun 23 18:07:54 2006
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+/*
+ *
+ * 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.
+ */
+ -->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/0.9">
+
+ <service name="MyValueService">
+ <interface.cpp header="MyValue.h">
+ </interface.cpp>
+ </service>
+
+</componentType>
+
+<!--
+/*
+ *
+ * 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.
+ */
+ -->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/0.9">
+
+ <service name="MyValueService">
+ <interface.cpp header="MyValue.h">
+ </interface.cpp>
+ </service>
+
+</componentType>
+
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp Fri Jun 23 18:07:54 2006
@@ -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.
+ */
+// Class definition for the implementation
+
+#ifndef MyValueImpl_h
+#define MyValueImpl_h
+
+#include "MyValue.h"
+
+
+namespace myvaluecorp
+{
+ namespace implns
+ {
+
+ class MyValueImpl : public MyValue
+ {
+ public:
+ MyValueImpl();
+ virtual ~MyValueImpl();
+ virtual float getMyValue(const char* customerID);
+ virtual float getMyValueS(const string& customerID);
+ virtual string getCustname(string& customerID);
+ virtual const string& getCustnamecs(string customerID);
+
+ };
+ }
+}
+#endif
+ *
+ * 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.
+ */
+// Class definition for the implementation
+
+#ifndef MyValueImpl_h
+#define MyValueImpl_h
+
+#include "MyValue.h"
+
+
+namespace myvaluecorp
+{
+ namespace implns
+ {
+
+ class MyValueImpl : public MyValue
+ {
+ public:
+ MyValueImpl();
+ virtual ~MyValueImpl();
+ virtual float getMyValue(const char* customerID);
+ virtual float getMyValueS(const string& customerID);
+ virtual string getCustname(string& customerID);
+ virtual const string& getCustnamecs(string customerID);
+
+ };
+ }
+}
+#endif
Added: incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module?rev=416851&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module (added)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module Fri Jun 23 18:07:54 2006
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+/*
+ *
+ * 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.
+ */
+ -->
+<module xmlns="http://www.osoa.org/xmlns/sca/0.9"
+ xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
+ xmlns:mvs="http://www.myvalue.org/MyValueService/"
+ name="MyValueServiceModule">
+
+ <!-- Expose as a web service -->
+ <entryPoint name="MyValueServiceExport" multiplicity="1..1">
+ <interface.wsdl interface="" callbackInterface=""></interface.wsdl>
+ <binding.ws port="mvs:MyValueServiceSOAP"></binding.ws>
+ <reference>MyValueServiceComponent</reference>
+ </entryPoint>
+
+ <component name="MyValueServiceComponent">
+ <implementation.cpp dll="MyValue" header="MyValueImpl.hpp"></implementation.cpp>
+ <properties>
+ </properties>
+ <references>
+ <customerInfo>CustomerInfoComponent</customerInfo>
+ <stockQuote>StockQuoteService</stockQuote>
+ </references>
+ </component>
+
+ <!--wire>
+ <source.uri>MyValueServiceComponent/customerInfo</source.uri>
+ <target.uri>CustomerInfoComponent</target.uri>
+ </wire-->
+
+</module>
+
+<!--
+/*
+ *
+ * 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.
+ */
+ -->
+<module xmlns="http://www.osoa.org/xmlns/sca/0.9"
+ xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
+ xmlns:mvs="http://www.myvalue.org/MyValueService/"
+ name="MyValueServiceModule">
+
+ <!-- Expose as a web service -->
+ <entryPoint name="MyValueServiceExport" multiplicity="1..1">
+ <interface.wsdl interface="" callbackInterface=""></interface.wsdl>
+ <binding.ws port="mvs:MyValueServiceSOAP"></binding.ws>
+ <reference>MyValueServiceComponent</reference>
+ </entryPoint>
+
+ <component name="MyValueServiceComponent">
+ <implementation.cpp dll="MyValue" header="MyValueImpl.hpp"></implementation.cpp>
+ <properties>
+ </properties>
+ <references>
+ <customerInfo>CustomerInfoComponent</customerInfo>
+ <stockQuote>StockQuoteService</stockQuote>
+ </references>
+ </component>
+
+ <!--wire>
+ <source.uri>MyValueServiceComponent/customerInfo</source.uri>
+ <target.uri>CustomerInfoComponent</target.uri>
+ </wire-->
+
+</module>
+
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,16 +52,13 @@
long CalculatorImpl_CalculatorService_Proxy::subtract( long arg0, long arg1)
{
- Operation operation("subtract", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- long ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("subtract");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ long ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#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"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -20,6 +20,8 @@
using namespace osoa::sca;
using namespace tuscany::sca;
+
+
extern "C"
{
@@ -58,8 +60,8 @@
if (operationName == "subtract")
{
- long& p0 = *( long*)operation.getParameter(0);
- long& p1 = *( long*)operation.getParameter(1);
+ long& p0 = *( long*)operation.getParameterValue(0);
+ long& p1 = *( long*)operation.getParameterValue(1);
*(long*)operation.getReturnValue() = impl->subtract(p0, p1);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#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"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,30 +52,24 @@
long CalculatorBackImpl_CalculatorService_Proxy::subtractBack( long arg0, long arg1)
{
- Operation operation("subtractBack", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- long ret;
- operation.setReturnValue((void*)&ret);
+ 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", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- long ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("addBack");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ long ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#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"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -20,6 +20,8 @@
using namespace osoa::sca;
using namespace tuscany::sca;
+
+
extern "C"
{
@@ -58,15 +60,15 @@
if (operationName == "subtractBack")
{
- long& p0 = *( long*)operation.getParameter(0);
- long& p1 = *( long*)operation.getParameter(1);
+ 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.getParameter(0);
- long& p1 = *( long*)operation.getParameter(1);
+ long& p0 = *( long*)operation.getParameterValue(0);
+ long& p1 = *( long*)operation.getParameterValue(1);
*(long*)operation.getReturnValue() = impl->addBack(p0, p1);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#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"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,30 +52,24 @@
long CalculatorForwardImpl_CalculatorService_Proxy::subtractForward( long arg0, long arg1)
{
- Operation operation("subtractForward", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- long ret;
- operation.setReturnValue((void*)&ret);
+ 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", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- long ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("addForward");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ long ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#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"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp Fri Jun 23 18:07:54 2006
@@ -20,6 +20,8 @@
using namespace osoa::sca;
using namespace tuscany::sca;
+
+
extern "C"
{
@@ -58,15 +60,15 @@
if (operationName == "subtractForward")
{
- long& p0 = *( long*)operation.getParameter(0);
- long& p1 = *( long*)operation.getParameter(1);
+ 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.getParameter(0);
- long& p1 = *( long*)operation.getParameter(1);
+ long& p0 = *( long*)operation.getParameterValue(0);
+ long& p1 = *( long*)operation.getParameterValue(1);
*(long*)operation.getReturnValue() = impl->addForward(p0, p1);
return;
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#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"
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp Fri Jun 23 18:07:54 2006
@@ -52,648 +52,542 @@
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationChar( char* arg0, const char* arg1)
{
- Operation operation("getCustomerInformationChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInformationChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAChar( char* arg0, const char* arg1)
{
- Operation operation("getCustomerInfoAChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoAChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBChar( char* arg0, char* arg1)
{
- Operation operation("getCustomerInfoBChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoBChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCChar( char* arg0, char arg1)
{
- Operation operation("getCustomerInfoCChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoCChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDChar( char* arg0, char arg1)
{
- Operation operation("getCustomerInfoDChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoDChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEChar( char* arg0, char* arg1)
{
- Operation operation("getCustomerInfoEChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoEChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFChar( char* arg0, char* arg1, char* arg2)
{
- Operation operation("getCustomerInfoFChar", 3);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
- operation.setParameter(2, (void*)arg2);
-
-
+ Operation operation("getCustomerInfoFChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ operation.addParameter(&arg2);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGChar( char* arg0, char* arg1, char* arg2, signed char* arg3)
{
- Operation operation("getCustomerInfoGChar", 4);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
- operation.setParameter(2, (void*)arg2);
-
- operation.setParameter(3, (void*)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 (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHChar( unsigned char* arg0, const char arg1)
{
- Operation operation("getCustomerInfoHChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoHChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const char* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHChar( unsigned char* arg0, const char* arg1)
{
- Operation operation("getCustomerInfoHChar", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoHChar");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const char* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const char*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationLong(const long* arg0, const long* arg1)
{
- Operation operation("getCustomerInformationLong", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInformationLong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoALong(const long* arg0, const long* arg1)
{
- Operation operation("getCustomerInfoALong", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoALong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBLong( long* arg0, long* arg1)
{
- Operation operation("getCustomerInfoBLong", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoBLong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCLong( long arg0, long arg1)
{
- Operation operation("getCustomerInfoCLong", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoCLong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDLong( long arg0, long arg1)
{
- Operation operation("getCustomerInfoDLong", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoDLong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoELong( long* arg0, long* arg1)
{
- Operation operation("getCustomerInfoELong", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoELong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFLong( long* arg0, long* arg1)
{
- Operation operation("getCustomerInfoFLong", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoFLong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGLong( signed long* arg0, signed long* arg1)
{
- Operation operation("getCustomerInfoGLong", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoGLong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const long* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHLong( signed long* arg0, signed long* arg1)
{
- Operation operation("getCustomerInfoHLong", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoHLong");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const long* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const long*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationInt( char* arg0, const int* arg1)
{
- Operation operation("getCustomerInformationInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInformationInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAInt( char* arg0, const int* arg1)
{
- Operation operation("getCustomerInfoAInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoAInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBInt( char* arg0, int* arg1)
{
- Operation operation("getCustomerInfoBInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoBInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCInt( char* arg0, int arg1)
{
- Operation operation("getCustomerInfoCInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoCInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDInt( char* arg0, int arg1)
{
- Operation operation("getCustomerInfoDInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoDInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEInt( char* arg0, int* arg1)
{
- Operation operation("getCustomerInfoEInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoEInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFInt( char* arg0, int* arg1)
{
- Operation operation("getCustomerInfoFInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoFInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGInt( char* arg0, signed int* arg1)
{
- Operation operation("getCustomerInfoGInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoGInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const int* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHInt( char* arg0, unsigned int* arg1)
{
- Operation operation("getCustomerInfoHInt", 2);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoHInt");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const int*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationint64( Diamond& arg0, const __int64* arg1)
{
- Operation operation("getCustomerInformationint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInformationint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAint64( Diamond& arg0, const __int64* arg1)
{
- Operation operation("getCustomerInfoAint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoAint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBint64( Diamond& arg0, __int64* arg1)
{
- Operation operation("getCustomerInfoBint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoBint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCint64( Diamond& arg0, __int64 arg1)
{
- Operation operation("getCustomerInfoCint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoCint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDint64( Diamond& arg0, __int64 arg1)
{
- Operation operation("getCustomerInfoDint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
-
+ Operation operation("getCustomerInfoDint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEint64( Diamond& arg0, __int64* arg1)
{
- Operation operation("getCustomerInfoEint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoEint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFint64( Diamond& arg0, __int64* arg1)
{
- Operation operation("getCustomerInfoFint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoFint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGint64( Diamond& arg0, signed __int64* arg1)
{
- Operation operation("getCustomerInfoGint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoGint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const __int64* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoHint64(const Diamond& arg0, unsigned int64* arg1)
{
- Operation operation("getCustomerInfoHint64", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoHint64");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const __int64* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const __int64*)operation.getReturnValue();
-
+ return ret;
}
const void* CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInformationVoid( float& arg0, const __int64* arg1)
{
- Operation operation("getCustomerInformationVoid", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInformationVoid");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ const void* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (const void*)operation.getReturnValue();
-
+ return ret;
}
void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoAVoid(const float& arg0, const __int64* arg1)
{
- Operation operation("getCustomerInfoAVoid", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)arg1);
-
-
+ Operation operation("getCustomerInfoAVoid");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
target->invoke(operation);
return;
-
}
void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBVoid()
{
- Operation operation("getCustomerInfoBVoid", 0);
-
+ Operation operation("getCustomerInfoBVoid");
target->invoke(operation);
return;
-
}
void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoCVoid()
{
- Operation operation("getCustomerInfoCVoid", 0);
-
+ Operation operation("getCustomerInfoCVoid");
target->invoke(operation);
return;
-
}
void CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoDVoid()
{
- Operation operation("getCustomerInfoDVoid", 0);
-
+ Operation operation("getCustomerInfoDVoid");
+ operation.addParameter(&arg0);
target->invoke(operation);
return;
-
}
char CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoEVoid()
{
- Operation operation("getCustomerInfoEVoid", 0);
- char ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getCustomerInfoEVoid");
+ operation.addParameter(&arg0);
+ char ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
char CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoFVoid()
{
- Operation operation("getCustomerInfoFVoid", 0);
- char ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getCustomerInfoFVoid");
+ char ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
char CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoGVoid()
{
- Operation operation("getCustomerInfoGVoid", 0);
- char ret;
- operation.setReturnValue((void*)&ret);
+ 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", 5);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- operation.setParameter(2, (void*)&arg2);
-
- operation.setParameter(3, (void*)&arg3);
-
- operation.setParameter(4, (void*)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 (const char*)operation.getReturnValue();
-
+ return ret;
}
int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoBInline( int* arg0, int* arg1, int* arg2, char* customer arg3)
{
- Operation operation("getCustomerInfoBInline", 4);
- operation.setParameter(0, (void*)arg0);
-
- operation.setParameter(1, (void*)arg1);
-
- operation.setParameter(2, (void*)arg2);
-
- operation.setParameter(3, (void*)arg3);
-
- int ret;
- operation.setReturnValue((void*)&ret);
+ 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", 1);
- operation.setParameter(0, (void*)arg0);
-
-
+ Operation operation("getCustomerInfoCInline");
+ operation.addParameter(&arg0);
+ friend const unsigned int* ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
- return (friend const unsigned int*)operation.getReturnValue();
-
+ return ret;
}
int CustomerInfoImpl_CustomerInfoService_Proxy::getCustomerInfoTrickyA(const char arg0, const char arg1)
{
- Operation operation("getCustomerInfoTrickyA", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- int ret;
- operation.setReturnValue((void*)&ret);
+ 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", 2);
- operation.setParameter(0, (void*)&arg0);
-
- operation.setParameter(1, (void*)&arg1);
-
- int ret;
- operation.setReturnValue((void*)&ret);
+ Operation operation("getCustomerInfoTrickyB");
+ operation.addParameter(&arg0);
+ operation.addParameter(&arg1);
+ int ret;
+ operation.setReturnValue(&ret);
target->invoke(operation);
return ret;
-
}
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h?rev=416851&r1=416850&r2=416851&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h Fri Jun 23 18:07:54 2006
@@ -17,6 +17,10 @@
#ifndef CustomerInfoImpl_CustomerInfoService_Proxy_h
#define CustomerInfoImpl_CustomerInfoService_Proxy_h
+#if defined(WIN32) || defined (_WINDOWS)
+#pragma warning(disable: 4786)
+#endif
+
#include "/CustomerInfo.h"
#include "tuscany/sca/core/ServiceWrapper.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org