You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/08/22 09:44:05 UTC
svn commit: r433553 - in /incubator/tuscany/cpp/sca: doc/
projects/tuscany_sca/tuscany_sca_test/
projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
projects/tuscany_sca/tuscany_sca_test/testSCASystem/configuration/
projects/tuscany_sca/tus...
Author: jsdelfino
Date: Tue Aug 22 00:44:03 2006
New Revision: 433553
URL: http://svn.apache.org/viewvc?rev=433553&view=rev
Log:
Renamed subsystems to configuration and composites to packages
Added:
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/configuration/
- copied from r433442, incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/packages/
- copied from r433442, incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/configuration/
- copied from r433442, incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/packages/
- copied from r433442, incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/configuration/
- copied from r433442, incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/subsystems/
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/packages/
- copied from r433442, incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/configuration/
- copied from r433442, incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/subsystems/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/packages/
- copied from r433442, incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/composites/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/configuration/
- copied from r433442, incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/subsystems/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/packages/
- copied from r433442, incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/composites/
Removed:
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/subsystems/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/composites/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/subsystems/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/composites/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/subsystems/
Modified:
incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt
incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
incubator/tuscany/cpp/sca/samples/BigBank/Accounts/Makefile.am
incubator/tuscany/cpp/sca/samples/BigBank/Makefile.am
incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/Makefile.am
incubator/tuscany/cpp/sca/samples/Calculator/Makefile.am
incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
Modified: incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt (original)
+++ incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt Tue Aug 22 00:44:03 2006
@@ -189,21 +189,21 @@
9. Deploy the various files into the SCA directory structure, as follows:
-<deploy_root>/composites/CompositeName/ServiceHeader.h
-<deploy_root>/composites/CompositeName/ImplementationHeader.h
-<deploy_root>/composites/CompositeName/sca.composite
-<deploy_root>/composites/CompositeName/Implementation.componentType
-<deploy_root>/composites/CompositeName/Implementation.dll (or .so on Linux)
-<deploy_root>/subsystems/SubsystemName/sca.subsystem
+<deploy_root>/packages/CompositeName/ServiceHeader.h
+<deploy_root>/packages/CompositeName/ImplementationHeader.h
+<deploy_root>/packages/CompositeName/sca.composite
+<deploy_root>/packages/CompositeName/Implementation.componentType
+<deploy_root>/packages/CompositeName/Implementation.dll (or .so on Linux)
+<deploy_root>/configuration/SubsystemName/sca.subsystem
E.g. for the Calculator sample the structure is:
-samples/Calculator/deploy/composites/CalculatorComposite/Calculator.h
-samples/Calculator/deploy/composites/CalculatorComposite/CalculatorImpl.h
-samples/Calculator/deploy/composites/CalculatorComposite/sca.composite
-samples/Calculator/deploy/composites/CalculatorComposite/CalculatorImpl.componentType
-samples/Calculator/deploy/composites/CalculatorComposite/Calculator.dll
-samples/Calculator/deploy/subsystems/CalculatorSubsystem/sca.subsystem
+samples/Calculator/deploy/packages/CalculatorComposite/Calculator.h
+samples/Calculator/deploy/packages/CalculatorComposite/CalculatorImpl.h
+samples/Calculator/deploy/packages/CalculatorComposite/sca.composite
+samples/Calculator/deploy/packages/CalculatorComposite/CalculatorImpl.componentType
+samples/Calculator/deploy/packages/CalculatorComposite/Calculator.dll
+samples/Calculator/deploy/configuration/CalculatorSubsystem/sca.subsystem
10. Your component, composite and subsystem are now ready to be invoked. Create a
Modified: incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt (original)
+++ incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt Tue Aug 22 00:44:03 2006
@@ -89,8 +89,9 @@
the EntryPoint that will be invoked.
The TuscanySystemRoot parameter requires the full path to your system root
-directory - this is the directory that contains the "composites" and "subsystem"
-directories; which in turn contain your composites and subsystems.
+directory - this is the directory that contains the "packages" and
+"configuration" directories; which in turn contain your packages and
+configuration.
The TuscanyEntryPoint parameter is of the form
"<subsystem-name>/<service-name>/<entrypoint-name>", with the subsystem and
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp Tue Aug 22 00:44:03 2006
@@ -54,7 +54,7 @@
# 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 /subsystem:console /machine:I386 /libpath:"..\..\..\deploy\lib" /libpath:"$(TUSCANY_SDOCPP)\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\composites\MyValueServiceComposite copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\composites\MyValueServiceComposite copy..\tuscany_sca\Release\*.dll Release
+PostBuild_Cmds=copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\packages\MyValueServiceComposite copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\packages\MyValueServiceComposite copy..\tuscany_sca\Release\*.dll Release
# End Special Build Tool
!ELSEIF "$(CFG)" == "tuscany_sca_test - Win32 Debug"
@@ -83,7 +83,7 @@
# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\deploy\lib" /libpath:"$(TUSCANY_SDOCPP)\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\composites\MyValueServiceComposite copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\composites\MyValueServiceComposite copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\composites\MyValueServiceComposite copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\composites\MyValueServiceComposite copy..\tuscany_sca\Debug\*.dll Debug copy..\tuscany_sca\Debug\*.pdb Debug
+PostBuild_Cmds=copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\packages\MyValueServiceComposite copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\packages\MyValueServiceComposite copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\packages\MyValueServiceComposite copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\packages\MyValueServiceComposite copy..\tuscany_sca\Debug\*.dll Debug copy..\tuscany_sca\Debug\*.pdb Debug
# End Special Build Tool
!ENDIF
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak Tue Aug 22 00:44:03 2006
@@ -117,8 +117,8 @@
# End Custom Macros
$(DS_POSTBUILD_DEP) : "tuscany_sca_ws_service - Win32 Release" "tuscany_sca_test_MyValue - Win32 Release" "tuscany_sca_test_CustomerInfo - Win32 Release" "tuscany_sca - Win32 Release" "$(OUTDIR)\tuscany_sca_test.exe"
- copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\composites\MyValueServiceComposite
- copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\composites\MyValueServiceComposite
+ copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\packages\MyValueServiceComposite
+ copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\packages\MyValueServiceComposite
copy..\tuscany_sca\Release\*.dll Release
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
@@ -217,10 +217,10 @@
# End Custom Macros
$(DS_POSTBUILD_DEP) : "tuscany_sca_ws_service - Win32 Debug" "tuscany_sca_test_MyValue - Win32 Debug" "tuscany_sca_test_CustomerInfo - Win32 Debug" "tuscany_sca - Win32 Debug" "$(OUTDIR)\tuscany_sca_test.exe"
- copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\composites\MyValueServiceComposite
- copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\composites\MyValueServiceComposite
- copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\composites\MyValueServiceComposite
- copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\composites\MyValueServiceComposite
+ copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\packages\MyValueServiceComposite
+ copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\packages\MyValueServiceComposite
+ copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\packages\MyValueServiceComposite
+ copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\packages\MyValueServiceComposite
copy..\tuscany_sca\Debug\*.dll Debug
copy..\tuscany_sca\Debug\*.pdb Debug
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj (original)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj Tue Aug 22 00:44:03 2006
@@ -50,8 +50,8 @@
TypeLibraryName=".\Release/tuscany_sca_test.tlb"/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\composites\MyValueServiceComposite
-copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\composites\MyValueServiceComposite
+ CommandLine="copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\packages\MyValueServiceComposite
+copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\packages\MyValueServiceComposite
"/>
<Tool
Name="VCPreBuildEventTool"/>
@@ -107,10 +107,10 @@
TypeLibraryName=".\Debug/tuscany_sca_test.tlb"/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\composites\MyValueServiceComposite
-copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\composites\MyValueServiceComposite
-copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\composites\MyValueServiceComposite
-copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\composites\MyValueServiceComposite
+ CommandLine="copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\packages\MyValueServiceComposite
+copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\packages\MyValueServiceComposite
+copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\packages\MyValueServiceComposite
+copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\packages\MyValueServiceComposite
copy..\tuscany_sca\Debug\*.dll Debug
copy..\tuscany_sca\Debug\*.pdb Debug
"/>
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h Tue Aug 22 00:44:03 2006
@@ -129,7 +129,7 @@
* This will create the runtime model from which the SCA runtime
* will operate.
* @param configurationRoot The path to the configuration of the
- * SCA runtime. Under this root will be the subsystems and composites
+ * SCA runtime. Under this root will be the configuration and packages
* directories.
*/
void load(const string& configurationRoot);
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=433553&r1=433552&r2=433553&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 Tue Aug 22 00:44:03 2006
@@ -65,85 +65,84 @@
void ModelLoader::load(const string& configurationRoot)
{
LOGENTRY(1, "ModelLoader::load");
- LOGINFO_1(2,"configuration root: %s", configurationRoot.c_str());
+ LOGINFO_1(2,"system root: %s", configurationRoot.c_str());
// The configuration root path will point to a directory structure.
- // The composite files representing subsystems can be located anywhere under
- // the subsystems directory.
- loadSubsystems(configurationRoot+"/subsystems");
-
- // composite files representing composite implementations can occur anywhere
- // under the composites directory
- loadComposites(configurationRoot+"/composites");
+ // The composite files representing the configuration of the system can be located
+ // anywhere under the configuration directory.
+ loadConfiguration(configurationRoot+"/configuration");
+
+ // implementations can occur anywhere under the packages directory
+ loadComposites(configurationRoot+"/packages");
system->resolveWires();
LOGEXIT(1, "ModelLoader::load");
}
// ========================================================================
- // loadSubsystems:
- // Load all the subsystems from any directory below the configuration root.
- // Translate the subsystem information to the runtime information
+ // loadConfiguration:
+ // Load all the composite files from any directory below the configuration root.
+ // Translate the configuration information to the runtime information
// ========================================================================
- void ModelLoader::loadSubsystems(const string& configurationRoot)
+ void ModelLoader::loadConfiguration(const string& configurationRoot)
{
// Get all the composite files in the configuration directory
- LOGENTRY(1, "ModelLoader::loadSubsystems");
+ LOGENTRY(1, "ModelLoader::loadConfiguration");
Files files(configurationRoot, "*.composite", true);
for (unsigned int i=0; i < files.size(); i++)
{
- loadSubsystemFile(files[i]);
+ loadConfigurationFile(files[i]);
}
- LOGEXIT(1, "ModelLoader::loadSubsystems");
+ LOGEXIT(1, "ModelLoader::loadConfiguration");
}
// =====================================================================
- // loadSubsystemFile:
- // This method is called for each sca.subsystem file found in the composite
+ // loadConfigurationFile:
+ // This method is called for each composite file found in the configuration
// folder structure
// =====================================================================
- void ModelLoader::loadSubsystemFile(const File& file)
+ void ModelLoader::loadConfigurationFile(const File& file)
{
- LOGENTRY(1, "ModelLoader::loadSubsystemFile");
- LOGINFO_1(2, "subsystem filename: %s", file.getFileName().c_str());
+ LOGENTRY(1, "ModelLoader::loadConfigurationFile");
+ LOGINFO_1(2, "configuration filename: %s", file.getFileName().c_str());
try
{
string filename = file.getDirectory() + "/" + file.getFileName();
- XMLDocumentPtr subsystemFile = getXMLHelper()->loadFile(filename.c_str());
- if (subsystemFile->getRootDataObject() == 0)
+ XMLDocumentPtr configurationFile = getXMLHelper()->loadFile(filename.c_str());
+ if (configurationFile->getRootDataObject() == 0)
{
- LOGERROR_1(0, "ModelLoader::loadSubsystemFile: Unable to load file: %s", filename.c_str());
+ LOGERROR_1(0, "ModelLoader::loadConfigurationFile: Unable to load file: %s", filename.c_str());
}
else
{
- //Utils::printDO(subsystemFile->getRootDataObject());
- mapSubsystem(subsystemFile->getRootDataObject());
+ //Utils::printDO(configurationFile->getRootDataObject());
+ mapConfiguration(configurationFile->getRootDataObject());
}
} catch (SDORuntimeException ex)
{
LOGERROR_1(0, "ModelLoader::loadSubsytemFile: Exception caught: %s", ex.getMessageText());
}
- LOGEXIT(1, "ModelLoader::loadSubsystemFile");
+ LOGEXIT(1, "ModelLoader::loadConfigurationFile");
}
// ===============
- // mapSubsystem:
+ // mapConfiguration:
// ===============
- void ModelLoader::mapSubsystem(DataObjectPtr root)
+ void ModelLoader::mapConfiguration(DataObjectPtr root)
{
- LOGENTRY(1, "ModelLoader::mapSubsystem");
+ LOGENTRY(1, "ModelLoader::mapConfiguration");
- LOGINFO_1(2, "ModelLoader::mapSubsystem: Loaded subsystem: %s", root->getCString("name"));
+ LOGINFO_1(2, "ModelLoader::mapConfiguration: Loaded configuration: %s", root->getCString("name"));
Subsystem* subsystem;
subsystem = system->addSubsystem(root->getCString("name"));
DataObjectList& componentDOs = root->getList("component");
- LOGINFO_1(2, "ModelLoader::mapSubsystem: number of composite components: %d", componentDOs.size());
+ LOGINFO_1(2, "ModelLoader::mapConfiguration: number of composite components: %d", componentDOs.size());
// Iterate over components
for (int i=0; i<componentDOs.size(); i++)
@@ -175,7 +174,7 @@
//TODO Add composite services and references
- LOGEXIT(1, "ModelLoader::mapSubsystem");
+ LOGEXIT(1, "ModelLoader::mapConfiguration");
}
@@ -428,7 +427,6 @@
string src = component->getName() + "/" + refName;
// Get the reference value
- //Utils::printDO(refs[i], 0);
//TODO this works but probably not the correct way to get
// the simple content value of an element...
string refValue = refs[i]->getCString("value");
@@ -517,6 +515,8 @@
DataObjectList& props = componentType->getList("property");
for (int i=0; i<props.size(); i++)
{
+ // cout << "Property " << props[i];
+
string name = props[i]->getCString("name");
string type = props[i]->getCString("type");
bool many=false;
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h Tue Aug 22 00:44:03 2006
@@ -56,7 +56,7 @@
/**
* Load the model from the configuration information.
* @param configurationRoot The location of the deployed SCA
- * composites and subsystems.
+ * packages and configuration.
*/
void load(const string& configurationRoot);
@@ -70,9 +70,9 @@
const commonj::sdo::XSDHelperPtr getXSDHelper(void);
const commonj::sdo::XMLHelperPtr getXMLHelper(void);
- void loadSubsystems(const string& configurationRoot);
- void loadSubsystemFile(const File& file);
- void mapSubsystem(commonj::sdo::DataObjectPtr rootDO);
+ void loadConfiguration(const string& configurationRoot);
+ void loadConfigurationFile(const File& file);
+ void mapConfiguration(commonj::sdo::DataObjectPtr rootDO);
void loadComposites(const string& configurationRoot);
void loadCompositeFile(const File& file);
Modified: incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am Tue Aug 22 00:44:03 2006
@@ -1,11 +1,11 @@
SUBDIRS = CustomerInfo MyValue src
-EXTRA_DIST = testSCASystem/subsystems \
-testSCASystem/composites/MyValueServiceComposite/*.composite \
-testSCASystem/composites/MyValueServiceComposite/*.componentType \
-testSCASystem/composites/MyValueServiceComposite/*.wsdl \
-testSCASystem/composites/MyValueServiceComposite/*.xsd \
-testSCASystem/composites/MyValueServiceComposite/*.config
+EXTRA_DIST = testSCASystem/configuration \
+testSCASystem/packages/MyValueServiceComposite/*.composite \
+testSCASystem/packages/MyValueServiceComposite/*.componentType \
+testSCASystem/packages/MyValueServiceComposite/*.wsdl \
+testSCASystem/packages/MyValueServiceComposite/*.xsd \
+testSCASystem/packages/MyValueServiceComposite/*.config
BUILT_SOURCES = CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.cpp \
CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.h \
@@ -21,18 +21,18 @@
MyValue/MyValueImpl_stockQuote_Proxy.h
-${BUILT_SOURCES}: ./testSCASystem/composites/MyValueServiceComposite/sca.composite
- cp ./MyValue/MyValue.h ./testSCASystem/composites/MyValueServiceComposite
- cp ./MyValue/MyValueImpl.h ./testSCASystem/composites/MyValueServiceComposite
- cp ./MyValue/StockQuoteService.h ./testSCASystem/composites/MyValueServiceComposite
- cp ./CustomerInfo/CustomerInfo.h ./testSCASystem/composites/MyValueServiceComposite
- cp ./CustomerInfo/CustomerInfoImpl.h ./testSCASystem/composites/MyValueServiceComposite
- java -jar $(top_builddir)/tools/scagen/bld/scagen.jar -dir testSCASystem/composites/MyValueServiceComposite -output tmp
+${BUILT_SOURCES}: ./testSCASystem/packages/MyValueServiceComposite/sca.composite
+ cp ./MyValue/MyValue.h ./testSCASystem/packages/MyValueServiceComposite
+ cp ./MyValue/MyValueImpl.h ./testSCASystem/packages/MyValueServiceComposite
+ cp ./MyValue/StockQuoteService.h ./testSCASystem/packages/MyValueServiceComposite
+ cp ./CustomerInfo/CustomerInfo.h ./testSCASystem/packages/MyValueServiceComposite
+ cp ./CustomerInfo/CustomerInfoImpl.h ./testSCASystem/packages/MyValueServiceComposite
+ java -jar $(top_builddir)/tools/scagen/bld/scagen.jar -dir testSCASystem/packages/MyValueServiceComposite -output tmp
cp tmp/CustomerInfoImpl*.* CustomerInfo
cp tmp/MyValueImpl*.* MyValue
install-exec-local:
- cp CustomerInfo/.libs/libCustomerInfo.so testSCASystem/composites/MyValueServiceComposite
- cp MyValue/.libs/libMyValue.so testSCASystem/composites/MyValueServiceComposite
+ cp CustomerInfo/.libs/libCustomerInfo.so testSCASystem/packages/MyValueServiceComposite
+ cp MyValue/.libs/libMyValue.so testSCASystem/packages/MyValueServiceComposite
Modified: incubator/tuscany/cpp/sca/samples/BigBank/Accounts/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/Accounts/Makefile.am?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/Accounts/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/Accounts/Makefile.am Tue Aug 22 00:44:03 2006
@@ -1,5 +1,5 @@
deploydir=$(prefix)/samples/BigBank/deploy
-compositedir=$(deploydir)/composites/Accounts
+compositedir=$(deploydir)/packages/Accounts
BUILT_SOURCES = AccountDataServiceImpl_AccountDataService_Proxy.cpp \
AccountDataServiceImpl_AccountDataService_Wrapper.cpp \
Modified: incubator/tuscany/cpp/sca/samples/BigBank/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/Makefile.am?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/Makefile.am Tue Aug 22 00:44:03 2006
@@ -1,4 +1,4 @@
-deploydir=$(prefix)/samples/BigBank/deploy/subsystems/BigBankSubsystem
+deploydir=$(prefix)/samples/BigBank/deploy/configuration/BigBankSubsystem
SUBDIRS = Accounts AccountClient WSAccountClient
EXTRA_DIST = BigBankSubsystem
deploy_DATA = BigBankSubsystem/BigBankSubsystem.composite
Modified: incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat Tue Aug 22 00:44:03 2006
@@ -1,29 +1,29 @@
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\packages mkdir deploy\packages
+if not exist deploy\packages\Accounts mkdir deploy\packages\Accounts
+if not exist deploy\configuration mkdir deploy\configuration
+if not exist deploy\configuration\Accounts mkdir deploy\configuration\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 Accounts\Debug\Accounts.dll deploy\packages\Accounts
+copy Accounts\Debug\Accounts.pdb deploy\packages\Accounts
+copy Accounts\AccountServiceImpl.h deploy\packages\Accounts
+copy Accounts\AccountService.h deploy\packages\Accounts
+copy Accounts\AccountDataServiceImpl.h deploy\packages\Accounts
+copy Accounts\AccountDataService.h deploy\packages\Accounts
+copy Accounts\StockQuoteService.h deploy\packages\Accounts
+copy Accounts\StockQuoteServiceImpl.h deploy\packages\Accounts
+copy Accounts\StockQuoteWebService.h deploy\packages\Accounts
+copy Accounts\Accounts.composite deploy\packages\Accounts
+copy Accounts\AccountServiceImpl.componentType deploy\packages\Accounts
+copy Accounts\AccountDataServiceImpl.componentType deploy\packages\Accounts
+copy Accounts\StockQuoteServiceImpl.componentType deploy\packages\Accounts
+copy Accounts\AccountService.wsdl deploy\packages\Accounts
+copy Accounts\StockQuoteService.wsdl deploy\packages\Accounts
+copy Accounts\StockQuoteTypes.xsd deploy\packages\Accounts
+copy Accounts\Tuscany-model.config deploy\packages\Accounts
-copy BigBankSubsystem\BigBankSubsystem.composite deploy\subsystems\Accounts
+copy BigBankSubsystem\BigBankSubsystem.composite deploy\configuration\Accounts
copy AccountClient\Debug\AccountClient.exe deploy\bin
copy AccountClient\Debug\AccountClient.pdb deploy\bin
Modified: incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/Makefile.am?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/Makefile.am Tue Aug 22 00:44:03 2006
@@ -1,5 +1,5 @@
deploydir=$(prefix)/samples/Calculator/deploy
-compositedir=$(deploydir)/composites/CalculatorComposite
+compositedir=$(deploydir)/packages/CalculatorComposite
BUILT_SOURCES = CalculatorImpl_CalculatorService_Proxy.cpp \
CalculatorImpl_CalculatorService_Wrapper.cpp \
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/Makefile.am?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/Makefile.am Tue Aug 22 00:44:03 2006
@@ -1,4 +1,4 @@
-deploydir=$(prefix)/samples/Calculator/deploy/subsystems/CalculatorSubsystem
+deploydir=$(prefix)/samples/Calculator/deploy/configuration/CalculatorSubsystem
SUBDIRS = CalculatorComposite Client WSClient
EXTRA_DIST = CalculatorSubsystem
deploy_DATA = CalculatorSubsystem/CalculatorSubsystem.composite
Modified: incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am Tue Aug 22 00:44:03 2006
@@ -1,10 +1,10 @@
SUBDIRS = MyValueComposite Client
deploy_dir = $(top_builddir)/samples/runtime
-deploy_composite = $(deploy_dir)/composites/MyValueComposite
+deploy_composite = $(deploy_dir)/packages/MyValueComposite
install-exec-local:
- cp MyValueSubsystem/sca.subsystem $(deploy_dir)/subsystems/MyValueSubsystem
+ cp MyValueSubsystem/sca.subsystem $(deploy_dir)/configuration/MyValueSubsystem
cp MyValueComposite/sca.composite $(deploy_composite)
cp MyValueComposite/CustomerInfo.fragment $(deploy_composite)
cp MyValueComposite/Tuscany-model.config $(deploy_composite)
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=433553&r1=433552&r2=433553&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 Tue Aug 22 00:44:03 2006
@@ -32,18 +32,18 @@
set destinationPath=%2
)
-if not exist %destinationPath%\composites mkdir %destinationPath%\composites
-if not exist %destinationPath%\composites\CalculatorComposite mkdir %destinationPath%\composites\CalculatorComposite
+if not exist %destinationPath%\packages mkdir %destinationPath%\packages
+if not exist %destinationPath%\packages\CalculatorComposite mkdir %destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\*.componentType %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%\CalculatorComposite.dll %destinationPath%\composites\CalculatorComposite
+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\Tuscany-model.config %destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\Calculator.wsdl %destinationPath%\packages\CalculatorComposite
+copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll %destinationPath%\packages\CalculatorComposite
if not exist %destinationPath%\bin mkdir %destinationPath%\bin
copy %currentPath%\Client\%buildMode%\Client.exe %destinationPath%\bin
@@ -53,9 +53,9 @@
copy %sourcePath%\Client\runclient.cmd %destinationPath%\bin
-if not exist %destinationPath%\subsystems mkdir %destinationPath%\subsystems
-if not exist %destinationPath%\subsystems\CalculatorSubsystem mkdir %destinationPath%\subsystems\CalculatorSubsystem
+if not exist %destinationPath%\configuration mkdir %destinationPath%\configuration
+if not exist %destinationPath%\configuration\CalculatorSubsystem mkdir %destinationPath%\configuration\CalculatorSubsystem
-copy %sourcePath%\CalculatorSubsystem\*.composite %destinationPath%\subsystems\CalculatorSubsystem
+copy %sourcePath%\CalculatorSubsystem\*.composite %destinationPath%\configuration\CalculatorSubsystem
-endlocal
\ No newline at end of file
+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=433553&r1=433552&r2=433553&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 Tue Aug 22 00:44:03 2006
@@ -33,18 +33,18 @@
)
-if not exist %destinationPath%\composites mkdir %destinationPath%\composites
-if not exist %destinationPath%\composites\CalculatorComposite mkdir %destinationPath%\composites\CalculatorComposite
+if not exist %destinationPath%\packages mkdir %destinationPath%\packages
+if not exist %destinationPath%\packages\CalculatorComposite mkdir %destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\*.componentType %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%\CalculatorComposite.dll %destinationPath%\composites\CalculatorComposite
+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\Tuscany-model.config %destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\Calculator.wsdl %destinationPath%\packages\CalculatorComposite
+copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll %destinationPath%\packages\CalculatorComposite
if not exist %destinationPath%\bin mkdir %destinationPath%\bin
copy %currentPath%\WSClient\%buildMode%\WSClient.exe %destinationPath%\bin
@@ -54,10 +54,10 @@
copy %sourcePath%\WSClient\runwsclient.cmd %destinationPath%\bin
-if not exist %destinationPath%\subsystems mkdir %destinationPath%\subsystems
-if not exist %destinationPath%\subsystems\CalculatorSubsystem mkdir %destinationPath%\subsystems\CalculatorSubsystem
+if not exist %destinationPath%\configuration mkdir %destinationPath%\configuration
+if not exist %destinationPath%\configuration\CalculatorSubsystem mkdir %destinationPath%\configuration\CalculatorSubsystem
-copy %sourcePath%\CalculatorSubsystem\*.composite %destinationPath%\subsystems\CalculatorSubsystem
+copy %sourcePath%\CalculatorSubsystem\*.composite %destinationPath%\configuration\CalculatorSubsystem
-endlocal
\ No newline at end of file
+endlocal
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=433553&r1=433552&r2=433553&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 Tue Aug 22 00:44:03 2006
@@ -32,18 +32,18 @@
set destinationPath=%2
)
-if not exist %destinationPath%\composites mkdir %destinationPath%\composites
-if not exist %destinationPath%\composites\CalculatorComposite mkdir %destinationPath%\composites\CalculatorComposite
+if not exist %destinationPath%\packages mkdir %destinationPath%\packages
+if not exist %destinationPath%\packages\CalculatorComposite mkdir %destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\*.componentType %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%\CalculatorComposite.dll %destinationPath%\composites\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\*.componentType %destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\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\Tuscany-model.config %destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\Calculator.wsdl %destinationPath%\packages\CalculatorComposite
+copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll %destinationPath%\packages\CalculatorComposite
if not exist %destinationPath%\bin mkdir %destinationPath%\bin
copy %currentPath%\Client\%buildMode%\Client.exe %destinationPath%\bin
@@ -53,9 +53,9 @@
copy %sourcePath%\Client\runclient.cmd %destinationPath%\bin
-if not exist %destinationPath%\subsystems mkdir %destinationPath%\subsystems
-if not exist %destinationPath%\subsystems\CalculatorSubsystem mkdir %destinationPath%\subsystems\CalculatorSubsystem
+if not exist %destinationPath%\configuration mkdir %destinationPath%\configuration
+if not exist %destinationPath%\configuration\CalculatorSubsystem mkdir %destinationPath%\configuration\CalculatorSubsystem
-copy %sourcePath%\CalculatorSubsystem\CalculatorSubsystem.composite %destinationPath%\subsystems\CalculatorSubsystem
+copy %sourcePath%\CalculatorSubsystem\CalculatorSubsystem.composite %destinationPath%\configuration\CalculatorSubsystem
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=433553&r1=433552&r2=433553&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 Tue Aug 22 00:44:03 2006
@@ -34,18 +34,18 @@
-if not exist %destinationPath%\composites mkdir %destinationPath%\composites
-if not exist %destinationPath%\composites\CalculatorComposite mkdir %destinationPath%\composites\CalculatorComposite
+if not exist %destinationPath%\packages mkdir %destinationPath%\packages
+if not exist %destinationPath%\packages\CalculatorComposite mkdir %destinationPath%\packages\CalculatorComposite
-copy %sourcePath%\CalculatorComposite\*.componentType %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%\CalculatorComposite.dll %destinationPath%\composites\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\*.componentType %destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\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\Tuscany-model.config %destinationPath%\packages\CalculatorComposite
+copy %sourcePath%\CalculatorComposite\Calculator.wsdl %destinationPath%\packages\CalculatorComposite
+copy %currentPath%\Calculator\%buildMode%\CalculatorComposite.dll %destinationPath%\packages\CalculatorComposite
if not exist %destinationPath%\bin mkdir %destinationPath%\bin
copy %currentPath%\WSClient\%buildMode%\WSClient.exe %destinationPath%\bin
@@ -55,10 +55,10 @@
copy %sourcePath%\WSClient\runwsclient.cmd %destinationPath%\bin
-if not exist %destinationPath%\subsystems mkdir %destinationPath%\subsystems
-if not exist %destinationPath%\subsystems\CalculatorSubsystem mkdir %destinationPath%\subsystems\CalculatorSubsystem
+if not exist %destinationPath%\configuration mkdir %destinationPath%\configuration
+if not exist %destinationPath%\configuration\CalculatorSubsystem mkdir %destinationPath%\configuration\CalculatorSubsystem
-copy %sourcePath%\CalculatorSubsystem\CalculatorSubsystem.composite %destinationPath%\subsystems\CalculatorSubsystem
+copy %sourcePath%\CalculatorSubsystem\CalculatorSubsystem.composite %destinationPath%\configuration\CalculatorSubsystem
endlocal
Modified: incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c (original)
+++ incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c Tue Aug 22 00:44:03 2006
@@ -63,7 +63,7 @@
* using the axis2.xml file.
* In this sample client_home points to the Axis2/C default deploy folder. The client_home can
* be different from this folder on your system. For example, you may have a different folder
- * (say, my_client_folder) with its own axis2.xml file. my_client_folder/composites will have the
+ * (say, my_client_folder) with its own axis2.xml file. my_client_folder/packages will have the
* composites that the client uses
*/
client_home = AXIS2_GETENV("AXIS2C_HOME");
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd Tue Aug 22 00:44:03 2006
@@ -1,2 +1,2 @@
rm -rf out
-java -jar scagen.jar -dir c:\workspaces\wid60-no-core\Hydra.sca.core\test\testSCASystem\composites\MyValueServiceComposite -output c:\hydra\out
+java -jar scagen.jar -dir c:\workspaces\wid60-no-core\Hydra.sca.core\test\testSCASystem\packages\MyValueServiceComposite -output c:\hydra\out
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd Tue Aug 22 00:44:03 2006
@@ -1 +1 @@
-java -jar scagen.jar -dirX c:\workspaces\wid60-no-core\Hydra.sca.core\test\testSCASystem\composites\MyValueServiceComposite -output c:\hydra\out
+java -jar scagen.jar -dirX c:\workspaces\wid60-no-core\Hydra.sca.core\test\testSCASystem\packages\MyValueServiceComposite -output c:\hydra\out
Modified: incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd?rev=433553&r1=433552&r2=433553&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd (original)
+++ incubator/tuscany/cpp/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd Tue Aug 22 00:44:03 2006
@@ -1 +1 @@
-java -jar scagen.jar -dir c:\workspaces\wid60-no-core\Hydra.sca.core\test\testSCASystem\composites\MyValueServiceComposite -output r:\hydra\out
+java -jar scagen.jar -dir c:\workspaces\wid60-no-core\Hydra.sca.core\test\testSCASystem\packages\MyValueServiceComposite -output r:\hydra\out
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org