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/10 18:03:52 UTC
svn commit: r430416 - in /incubator/tuscany/cpp/sca: projects/tuscany_sca/
projects/tuscany_sca/tuscany_sca/
projects/tuscany_sca/tuscany_sca_ws_service/
runtime/core/src/tuscany/sca/model/
samples/ides/devstudio6/projects/Calculator/ samples/ides/devs...
Author: robbinspg
Date: Thu Aug 10 09:03:49 2006
New Revision: 430416
URL: http://svn.apache.org/viewvc?rev=430416&view=rev
Log:
TUSCANY-613 Windows build for SCA with new model
Minor change to ModelLoader to load All .composites in directory
Modified:
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.ncb
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.opt
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.ncb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.ncb?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.opt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.opt?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp Thu Aug 10 09:03:49 2006
@@ -118,10 +118,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\osoa\sca\export.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\runtime\core\src\osoa\sca\CompositeContext.cpp
# End Source File
# Begin Source File
@@ -138,6 +134,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\runtime\core\src\osoa\sca\export.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\runtime\core\src\osoa\sca\SCA.cpp
# End Source File
# Begin Source File
@@ -177,27 +177,27 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\ExternalServiceWrapper.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\CompositeReferenceWrapper.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\ExternalServiceWrapper.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\CompositeReferenceWrapper.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\Operation.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\CompositeService.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\Operation.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\CompositeService.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\SCAEntryPoint.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\Operation.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\SCAEntryPoint.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\core\Operation.h
# End Source File
# Begin Source File
@@ -253,67 +253,67 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Composite.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Composite.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CompositeReferenceType.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CompositeReferenceType.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\EntryPoint.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CompositeServiceType.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\EntryPoint.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CompositeServiceType.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\ExternalService.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\ExternalService.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Implementation.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Implementation.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Interface.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Implementation.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Interface.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Implementation.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Interface.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Interface.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Composite.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Composite.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.h
# End Source File
# Begin Source File
@@ -469,19 +469,19 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\ws\EntryPointProxy.cpp
+SOURCE=..\..\..\runtime\ws_reference\axis2c\src\WSReferenceWrapper.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\ws\EntryPointProxy.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\ws\WSReferenceWrapper.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\ws_reference\axis2c\src\WSServiceWrapper.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\ws\WSServiceProxy.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\ws\WSServiceWrapper.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\ws\WSServiceProxy.h
# End Source File
# End Group
# End Group
@@ -498,7 +498,15 @@
# End Source File
# Begin Source File
+SOURCE="..\..\..\xsd\sca-composite.xsd"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\..\xsd\sca-core.xsd"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\xsd\sca-implementation-composite.xsd"
# End Source File
# Begin Source File
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp Thu Aug 10 09:03:49 2006
@@ -102,7 +102,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\runtime\ws_service\axis2c\src\Axis2EntryPointService_skeleton.cpp
+SOURCE=..\..\..\runtime\ws_service\axis2c\src\Axis2Service_skeleton.cpp
# End Source File
# Begin Source File
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp Thu Aug 10 09:03:49 2006
@@ -191,16 +191,16 @@
Files files(configurationRoot, "*.composite", true);
for (unsigned int i=0; i < files.size(); i++)
{
- string directoryName = files[i].getDirectory();
+ /*string directoryName = files[i].getDirectory();
string fileName = files[i].getFileName();
int fl = fileName.length()-10;
string compositeName = "/" + fileName.substr(0, fl);
fl++;
int dl = directoryName.length();
if (dl>fl && directoryName.substr(dl-fl, fl) == compositeName)
- {
+ {*/
loadCompositeFile(files[i]);
- }
+ //}
}
LOGEXIT(1, "ModelLoader::loadComposites");
}
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp Thu Aug 10 09:03:49 2006
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /machine:I386 /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /machine:I386 /out:"Release/CalculatorComposite.dll" /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
!ELSEIF "$(CFG)" == "Calculator - Win32 Debug"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /debug /machine:I386 /out:"Debug/CalculatorComposite.dll" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
!ENDIF
@@ -106,10 +106,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorDivideService_Proxy.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Proxy.cpp
# End Source File
# Begin Source File
@@ -126,6 +122,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideService.h
# End Source File
# Begin Source File
@@ -158,7 +158,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorDivideService_Proxy.h
+SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.h
# End Source File
# End Group
# Begin Group "Resource Files"
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd Thu Aug 10 09:03:49 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\*.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\*.composite %destinationPath%\subsystems\CalculatorSubsystem
endlocal
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd?rev=430416&r1=430415&r2=430416&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd Thu Aug 10 09:03:49 2006
@@ -37,14 +37,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\*.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 +57,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\*.composite %destinationPath%\subsystems\CalculatorSubsystem
endlocal
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org