Author: ajborley
Date: Thu Sep 7 03:04:54 2006
New Revision: 441041
URL: http://svn.apache.org/viewvc?view=rev&rev=441041
Log:
Updated to new Calculator sample layout & naming
Modified:
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/WSClient/WSClient.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/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?view=diff&rev=441041&r1=441040&r2=441041
==============================================================================
---
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
Thu Sep 7 03:04:54 2006
@@ -40,7 +40,7 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib
tuscany_sca.lib tuscany_sdo.lib tuscany_sca_cpp.lib"
- OutputFile=".\Debug/CalculatorComposite.dll"
+ OutputFile=".\Debug/Calculator.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"
@@ -57,7 +57,8 @@
<Tool
Name="VCPostBuildEventTool"/>
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ CommandLine="$(TUSCANY_SCACPP)/bin/scagen.cmd
-dir ../../../../../Calculator/sample.calculator -output
../../../../../Calculator/sample.calculator -verbose"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
@@ -140,90 +141,68 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\Calculator.h">
- </File>
- <File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\Calculator.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Proxy.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Proxy.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Proxy.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Wrapper.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Proxy.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Wrapper.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_divideService_Proxy.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideService.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_divideService_Proxy.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\Divide.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\DivideImpl.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.py">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\DivideImpl.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Proxy.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Proxy.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Proxy.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Proxy.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Wrapper.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Wrapper.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Wrapper.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Wrapper.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\Calculator.wsdl">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"/>
- </FileConfiguration>
- </File>
- <File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorComposite.composite">
- </File>
- <File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.componentType">
- </File>
- <File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorSubsystem\CalculatorSubsystem.composite">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\Calculator.wsdl">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.componentType">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl.componentType">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\services.xml">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\DivideImpl.componentType">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\CalculatorComposite\Tuscany-model.config">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator\sample.calculator.composite">
</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?view=diff&rev=441041&r1=441040&r2=441041
==============================================================================
---
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
Thu Sep 7 03:04:54 2006
@@ -39,12 +39,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib
tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib"
- OutputFile="./Debug/Client.exe"
+ OutputFile="./Debug/calculator_client.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/Client.pdb"
+
ProgramDatabaseFile=".\Debug/calculator_client.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
@@ -126,10 +126,10 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
-
RelativePath="..\..\..\..\..\Calculator\Client\Calc.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator.client\Calculator.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\Client\Calculator.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator.client\CalculatorClient.cpp">
</File>
</Filter>
<Filter
Modified:
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj?view=diff&rev=441041&r1=441040&r2=441041
==============================================================================
---
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
(original)
+++
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
Thu Sep 7 03:04:54 2006
@@ -40,12 +40,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib
axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib"
- OutputFile=".\Debug/WSClient.exe"
+ OutputFile=".\Debug/calculator_wsclient.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(AXIS2C_HOME)\lib"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/WSClient.pdb"
+
ProgramDatabaseFile=".\Debug/calculator_wsclient.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
@@ -126,13 +126,13 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
-
RelativePath="..\..\..\..\..\Calculator\WSClient\axis2_Calculator_stub.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator.wsclient\axis2_Calculator_stub.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\WSClient\axis2_Calculator_stub.h">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator.wsclient\axis2_Calculator_stub.h">
</File>
<File
-
RelativePath="..\..\..\..\..\Calculator\WSClient\Calculator_Client.cpp">
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator.wsclient\CalculatorWSClient.cpp">
</File>
</Filter>
<Filter
@@ -142,6 +142,9 @@
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ <File
+
RelativePath="..\..\..\..\..\Calculator\sample.calculator.wsclient\services.xml">
+ </File>
</Filter>
<File
RelativePath=".\BuildInstructions.txt">
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?view=diff&rev=441041&r1=441040&r2=441041
==============================================================================
---
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
(original)
+++
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
Thu Sep 7 03:04:54 2006
@@ -33,29 +33,28 @@
)
if not exist %destinationPath%\packages mkdir %destinationPath%\packages
-if not exist %destinationPath%\packages\CalculatorComposite mkdir
%destinationPath%\packages\CalculatorComposite
+if not exist %destinationPath%\packages\sample.calculator mkdir
%destinationPath%\packages\sample.calculator
-copy %sourcePath%\CalculatorComposite\*.componentType
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\*.composite
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\Calculator.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\CalculatorImpl.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\DivideService.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\DivideServiceImpl.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\DivideServiceImpl.py
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\Calculator.wsdl
%destinationPath%\packages\CalculatorComposite
-copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll
%destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\sample.calculator\*.componentType
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\*.composite
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\Calculator.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\CalculatorImpl.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\Divide.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\DivideImpl.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\Calculator.wsdl
%destinationPath%\packages\sample.calculator
+copy %currentPath%\Calculator\%buildMode%\Calculator.dll
%destinationPath%\packages\sample.calculator
if not exist %destinationPath%\bin mkdir %destinationPath%\bin
-copy %currentPath%\Client\%buildMode%\Client.exe %destinationPath%\bin
+copy %currentPath%\Client\%buildMode%\calculator_client.exe
%destinationPath%\bin
if %buildMode% == Debug (
-copy %currentPath%\Client\%buildMode%\Client.pdb %destinationPath%\bin
+copy %currentPath%\Client\%buildMode%\calculator_client.pdb
%destinationPath%\bin
)
-copy %sourcePath%\Client\runclient.cmd %destinationPath%\bin
+copy %sourcePath%\sample.calculator.client\runclient.bat
%destinationPath%\bin
if not exist %destinationPath%\configuration mkdir
%destinationPath%\configuration
-if not exist %destinationPath%\configuration\CalculatorSubsystem mkdir
%destinationPath%\configuration\CalculatorSubsystem
+if not exist %destinationPath%\configuration\sample.calculator.solution mkdir
%destinationPath%\configuration\sample.calculator.solution
-copy %sourcePath%\CalculatorSubsystem\*.composite
%destinationPath%\configuration\CalculatorSubsystem
+copy %sourcePath%\sample.calculator.solution\*.composite
%destinationPath%\configuration\sample.calculator.solution
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?view=diff&rev=441041&r1=441040&r2=441041
==============================================================================
---
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd
(original)
+++
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd
Thu Sep 7 03:04:54 2006
@@ -32,32 +32,30 @@
set destinationPath=%2
)
-
if not exist %destinationPath%\packages mkdir %destinationPath%\packages
-if not exist %destinationPath%\packages\CalculatorComposite mkdir
%destinationPath%\packages\CalculatorComposite
+if not exist %destinationPath%\packages\sample.calculator mkdir
%destinationPath%\packages\sample.calculator
-copy %sourcePath%\CalculatorComposite\*.componentType
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\*.composite
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\Calculator.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\CalculatorImpl.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\DivideService.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\DivideServiceImpl.h
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\DivideServiceImpl.py
%destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\Calculator.wsdl
%destinationPath%\packages\CalculatorComposite
-copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll
%destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\sample.calculator\*.componentType
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\*.composite
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\Calculator.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\CalculatorImpl.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\Divide.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\DivideImpl.h
%destinationPath%\packages\sample.calculator
+copy %sourcePath%\sample.calculator\Calculator.wsdl
%destinationPath%\packages\sample.calculator
+copy %currentPath%\Calculator\%buildMode%\Calculator.dll
%destinationPath%\packages\sample.calculator
if not exist %destinationPath%\bin mkdir %destinationPath%\bin
-copy %currentPath%\WSClient\%buildMode%\WSClient.exe %destinationPath%\bin
+copy %currentPath%\WSClient\%buildMode%\calculator_wsclient.exe
%destinationPath%\bin
if %buildMode% == Debug (
-copy %currentPath%\WSClient\%buildMode%\WSClient.pdb %destinationPath%\bin
+copy %currentPath%\WSClient\%buildMode%\calculator_wsclient.pdb
%destinationPath%\bin
)
-copy %sourcePath%\WSClient\runwsclient.cmd %destinationPath%\bin
+copy %sourcePath%\sample.calculator.wsclient\runwsclient.bat
%destinationPath%\bin
if not exist %destinationPath%\configuration mkdir
%destinationPath%\configuration
-if not exist %destinationPath%\configuration\CalculatorSubsystem mkdir
%destinationPath%\configuration\CalculatorSubsystem
+if not exist %destinationPath%\configuration\sample.calculator.solution mkdir
%destinationPath%\configuration\sample.calculator.solution
-copy %sourcePath%\CalculatorSubsystem\*.composite
%destinationPath%\configuration\CalculatorSubsystem
+copy %sourcePath%\sample.calculator.solution\*.composite
%destinationPath%\configuration\sample.calculator.solution
endlocal
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
