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/08/14 12:51:47 UTC

svn commit: r431322 - in /incubator/tuscany/cpp/sca: projectsvc7/tuscany_sca/tuscany_sca/ projectsvc7/tuscany_sca/tuscany_sca_ws_service/ samples/BigBank/ samples/ides/devstudio7/projects/Calculator/ samples/ides/devstudio7/projects/Calculator/Calculat...

Author: robbinspg
Date: Mon Aug 14 03:51:46 2006
New Revision: 431322

URL: http://svn.apache.org/viewvc?rev=431322&view=rev
Log:
TUSCANY-613 Applying Andy's patch (TUSCANY-613-2.patch)

Modified:
    incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
    incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
    incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat
    incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
    incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
    incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
    incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd

Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj?rev=431322&r1=431321&r2=431322&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj (original)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj Mon Aug 14 03:51:46 2006
@@ -208,9 +208,15 @@
 				RelativePath="..\..\..\runtime\core\src\osoa\sca\CompositeContextImpl.h">
 			</File>
 			<File
+				RelativePath="..\..\..\runtime\core\src\osoa\sca\export.h">
+			</File>
+			<File
 				RelativePath="..\..\..\runtime\core\src\osoa\sca\SCA.cpp">
 			</File>
 			<File
+				RelativePath="..\..\..\runtime\core\src\osoa\sca\sca.h">
+			</File>
+			<File
 				RelativePath="..\..\..\runtime\core\src\osoa\sca\ServiceList.cpp">
 			</File>
 			<File
@@ -222,12 +228,6 @@
 			<File
 				RelativePath="..\..\..\runtime\core\src\osoa\sca\ServiceRuntimeException.h">
 			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\export.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\sca.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="tuscany/sca"
@@ -242,22 +242,22 @@
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ComponentServiceWrapper.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ExternalServiceWrapper.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\CompositeReferenceWrapper.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ExternalServiceWrapper.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\CompositeReferenceWrapper.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\Operation.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\CompositeService.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\Operation.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\CompositeService.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\SCAEntryPoint.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\Operation.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\SCAEntryPoint.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\Operation.h">
 				</File>
 				<File
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\SCARuntime.cpp">
@@ -294,34 +294,40 @@
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Binding.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Component.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Component.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Composite.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Composite.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Component.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CompositeReferenceType.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Component.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CompositeReferenceType.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\EntryPoint.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CompositeServiceType.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\EntryPoint.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CompositeServiceType.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ExternalService.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ExternalService.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.h">
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.cpp">
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.h">
 				</File>
 				<File
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Implementation.cpp">
@@ -342,12 +348,6 @@
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Composite.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Composite.h">
-				</File>
-				<File
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Service.cpp">
 				</File>
 				<File
@@ -372,12 +372,6 @@
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\System.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WSBinding.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WSBinding.h">
-				</File>
-				<File
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Wire.cpp">
 				</File>
 				<File
@@ -390,6 +384,12 @@
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WireTarget.h">
 				</File>
 				<File
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WSBinding.cpp">
+				</File>
+				<File
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WSBinding.h">
+				</File>
+				<File
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Wsdl.cpp">
 				</File>
 				<File
@@ -433,19 +433,19 @@
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Library.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\LogWriter.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logger.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\LogWriter.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logger.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logger.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logging.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logger.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\LogWriter.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logging.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\LogWriter.h">
 				</File>
 				<File
 					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Utils.cpp">
@@ -464,52 +464,18 @@
 					RelativePath="..\..\..\runtime\ws_reference\axis2c\src\Axis2Client.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\EntryPointProxy.cpp">
+					RelativePath="..\..\..\runtime\ws_reference\axis2c\src\WSReferenceWrapper.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\EntryPointProxy.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\WSReferenceWrapper.h">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\ws_reference\axis2c\src\WSServiceWrapper.cpp">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\WSServiceProxy.cpp">
 				</File>
 				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\WSServiceWrapper.h">
+					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\WSServiceProxy.h">
 				</File>
 			</Filter>
-		</Filter>
-		<Filter
-			Name="xsd"
-			Filter="">
-			<File
-				RelativePath="..\..\..\xsd\sca-binding-sca.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-binding-webservice.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-core.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-implementation-cpp.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-implementation-java.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-interface-cpp.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-interface-java.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-interface-wsdl.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\tuscany.xsd">
-			</File>
 		</Filter>
 		<File
 			RelativePath=".\Build Instructions.txt">

Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj?rev=431322&r1=431321&r2=431322&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj (original)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj Mon Aug 14 03:51:46 2006
@@ -138,7 +138,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="..\..\..\runtime\ws_service\axis2c\src\Axis2EntryPointService_skeleton.cpp">
+				RelativePath="..\..\..\runtime\ws_service\axis2c\src\Axis2Service_skeleton.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\runtime\ws_service\axis2c\src\Axis2Utils.cpp">

Modified: incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat?rev=431322&r1=431321&r2=431322&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat Mon Aug 14 03:51:46 2006
@@ -1,16 +1,36 @@
-copy Accounts\Debug\Accounts.dll Deploy\composites\Accounts
-copy Accounts\Debug\Accounts.pdb Deploy\composites\Accounts
-copy Accounts\AccountServiceImpl.h Deploy\composites\Accounts
-copy Accounts\AccountService.h Deploy\composites\Accounts
-copy Accounts\AccountDataServiceImpl.h Deploy\composites\Accounts
-copy Accounts\AccountDataService.h Deploy\composites\Accounts
-copy Accounts\StockQuoteService.h Deploy\composites\Accounts
-copy Accounts\StockQuoteServiceImpl.h Deploy\composites\Accounts
-copy Accounts\StockQuoteExternalService.h Deploy\composites\Accounts
-copy AccountClient\Debug\AccountClient.exe Deploy\composites\Accounts
-copy AccountClient\Debug\AccountClient.pdb Deploy\composites\Accounts
-copy Accounts\sca.composite Deploy\composites\Accounts
-copy Accounts\sca.subsystem Deploy\subsystems\Accounts
-copy Accounts\AccountServiceImpl.componentType Deploy\composites\Accounts
-copy Accounts\AccountDataServiceImpl.componentType Deploy\composites\Accounts
-copy Accounts\StockQuoteServiceImpl.componentType Deploy\composites\Accounts
+if not exist deploy mkdir deploy
+if not exist deploy\composites mkdir deploy\composites
+if not exist deploy\composites\Accounts mkdir deploy\composites\Accounts
+if not exist deploy\subsystems mkdir deploy\subsystems
+if not exist deploy\subsystems\Accounts mkdir deploy\subsystems\Accounts
+if not exist deploy\bin mkdir deploy\bin
+
+copy Accounts\Debug\Accounts.dll deploy\composites\Accounts
+copy Accounts\Debug\Accounts.pdb deploy\composites\Accounts
+copy Accounts\AccountServiceImpl.h deploy\composites\Accounts
+copy Accounts\AccountService.h deploy\composites\Accounts
+copy Accounts\AccountDataServiceImpl.h deploy\composites\Accounts
+copy Accounts\AccountDataService.h deploy\composites\Accounts
+copy Accounts\StockQuoteService.h deploy\composites\Accounts
+copy Accounts\StockQuoteServiceImpl.h deploy\composites\Accounts
+copy Accounts\StockQuoteWebService.h deploy\composites\Accounts
+copy Accounts\Accounts.composite deploy\composites\Accounts
+copy Accounts\AccountServiceImpl.componentType deploy\composites\Accounts
+copy Accounts\AccountDataServiceImpl.componentType deploy\composites\Accounts
+copy Accounts\StockQuoteServiceImpl.componentType deploy\composites\Accounts
+copy Accounts\AccountService.wsdl deploy\composites\Accounts
+copy Accounts\StockQuoteService.wsdl deploy\composites\Accounts
+copy Accounts\StockQuoteTypes.xsd deploy\composites\Accounts
+copy Accounts\Tuscany-model.config deploy\composites\Accounts
+
+copy BigBankSubsystem\BigBankSubsystem.composite deploy\subsystems\Accounts
+
+copy AccountClient\Debug\AccountClient.exe deploy\bin
+copy AccountClient\Debug\AccountClient.pdb deploy\bin
+copy AccountClient\runclient.cmd deploy\bin
+
+copy WSAccountClient\Debug\WSAccountClient.exe deploy\bin
+copy WSAccountClient\Debug\WSAccountClient.pdb deploy\bin
+copy WSAccountClient\runwsclient.cmd deploy\bin
+
+

Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj?rev=431322&r1=431321&r2=431322&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj Mon Aug 14 03:51:46 2006
@@ -40,7 +40,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib"
-				OutputFile=".\Debug/Calculator.dll"
+				OutputFile=".\Debug/CalculatorComposite.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib"
@@ -98,7 +98,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib"
-				OutputFile=".\Release/Calculator.dll"
+				OutputFile=".\Release/CalculatorComposite.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib"
@@ -141,12 +141,6 @@
 				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorDivideService_Proxy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorDivideService_Proxy.h">
-			</File>
-			<File
 				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Proxy.cpp">
 			</File>
 			<File
@@ -159,6 +153,12 @@
 				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Wrapper.h">
 			</File>
 			<File
+				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.h">
+			</File>
+			<File
 				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideService.h">
 			</File>
 			<File
@@ -197,16 +197,22 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\Tuscany-model.config">
+				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorComposite.composite">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.componentType">
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\sca.composite">
+				RelativePath="..\..\..\..\..\Calculator\CalculatorSubsystem\CalculatorSubsystem.composite">
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Calculator\CalculatorSubsystem\sca.subsystem">
+				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.componentType">
 			</File>
 			<File
 				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\services.xml">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\Tuscany-model.config">
 			</File>
 		</Filter>
 		<Filter

Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj?rev=431322&r1=431321&r2=431322&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj Mon Aug 14 03:51:46 2006
@@ -44,7 +44,7 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/Calc.pdb"
+				ProgramDatabaseFile=".\Debug/Client.pdb"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"

Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd?rev=431322&r1=431321&r2=431322&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd Mon Aug 14 03:51:46 2006
@@ -36,14 +36,14 @@
 if not exist %destinationPath%\composites\CalculatorComposite mkdir %destinationPath%\composites\CalculatorComposite
 
 copy %sourcePath%\CalculatorComposite\*.componentType %destinationPath%\composites\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\sca.composite %destinationPath%\composites\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\CalculatorComposite.composite %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\Calculator.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\CalculatorImpl.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\DivideService.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\DivideServiceImpl.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\Tuscany-model.config %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\Calculator.wsdl %destinationPath%\composites\CalculatorComposite
-copy %currentPath%\Calculator\%buildMode%\Calculator.dll %destinationPath%\composites\CalculatorComposite
+copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll %destinationPath%\composites\CalculatorComposite
 
 if not exist %destinationPath%\bin mkdir %destinationPath%\bin
 copy %currentPath%\Client\%buildMode%\Client.exe %destinationPath%\bin
@@ -56,6 +56,6 @@
 if not exist %destinationPath%\subsystems mkdir %destinationPath%\subsystems
 if not exist %destinationPath%\subsystems\CalculatorSubsystem mkdir %destinationPath%\subsystems\CalculatorSubsystem
 
-copy %sourcePath%\CalculatorSubsystem\sca.subsystem %destinationPath%\subsystems\CalculatorSubsystem
+copy %sourcePath%\CalculatorSubsystem\CalculatorSubsystem.composite %destinationPath%\subsystems\CalculatorSubsystem
 
-endlocal
\ No newline at end of file
+endlocal

Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd?rev=431322&r1=431321&r2=431322&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd Mon Aug 14 03:51:46 2006
@@ -33,18 +33,19 @@
 )
 
 
+
 if not exist %destinationPath%\composites mkdir %destinationPath%\composites 
 if not exist %destinationPath%\composites\CalculatorComposite mkdir %destinationPath%\composites\CalculatorComposite
 
 copy %sourcePath%\CalculatorComposite\*.componentType %destinationPath%\composites\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\sca.composite %destinationPath%\composites\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\CalculatorComposite.composite %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\Calculator.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\CalculatorImpl.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\DivideService.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\DivideServiceImpl.h %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\Tuscany-model.config %destinationPath%\composites\CalculatorComposite
 copy %sourcePath%\CalculatorComposite\Calculator.wsdl %destinationPath%\composites\CalculatorComposite
-copy %currentPath%\Calculator\%buildMode%\Calculator.dll %destinationPath%\composites\CalculatorComposite
+copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll %destinationPath%\composites\CalculatorComposite
 
 if not exist %destinationPath%\bin mkdir       %destinationPath%\bin
 copy %currentPath%\WSClient\%buildMode%\WSClient.exe %destinationPath%\bin
@@ -57,7 +58,7 @@
 if not exist %destinationPath%\subsystems mkdir %destinationPath%\subsystems
 if not exist %destinationPath%\subsystems\CalculatorSubsystem mkdir %destinationPath%\subsystems\CalculatorSubsystem
 
-copy %sourcePath%\CalculatorSubsystem\sca.subsystem %destinationPath%\subsystems\CalculatorSubsystem
+copy %sourcePath%\CalculatorSubsystem\CalculatorSubsystem.composite %destinationPath%\subsystems\CalculatorSubsystem
 
 
-endlocal
\ No newline at end of file
+endlocal



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org