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/08 23:47:11 UTC
svn commit: r429833 [1/5] - in /incubator/tuscany/cpp/sca: ./ doc/
projects/tuscany_sca/ projects/tuscany_sca/tuscany_sca/
projects/tuscany_sca/tuscany_sca_test/
projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
projects/tuscany_sca/tusca...
Author: jsdelfino
Date: Tue Aug 8 14:47:01 2006
New Revision: 429833
URL: http://svn.apache.org/viewvc?rev=429833&view=rev
Log:
Refactoring SCA C++ runtime to use the composite assembly model. First stage, rename Module to Composite in all file names and file contents.
Added:
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
- copied from r429532, incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/
- copied from r429532, incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/
- copied from r429532, incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/
- copied from r429532, incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.cpp (with props)
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.h (with props)
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.cpp (with props)
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.h (with props)
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp (with props)
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.h (with props)
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/
- copied from r429532, incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/modules/
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/MyValueServiceComposite/
- copied from r429532, incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/MyValueServiceComposite/sca.composite
incubator/tuscany/cpp/sca/samples/BigBank/Accounts/sca.composite
incubator/tuscany/cpp/sca/samples/BigBank/Accounts/sca.composite.lin
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/
- copied from r429532, incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/sca.composite
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/sca.composite.lin
incubator/tuscany/cpp/sca/samples/MyValue/MyValueComposite/
- copied from r429532, incubator/tuscany/cpp/sca/samples/MyValue/MyValueModule/
incubator/tuscany/cpp/sca/samples/MyValue/MyValueComposite/sca.composite (with props)
incubator/tuscany/cpp/sca/test/WSEntryPointTest/WSEntryPointTestComposite/
- copied from r429532, incubator/tuscany/cpp/sca/test/WSEntryPointTest/WSEntryPointTestModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/WSEntryPointTestComposite/sca.composite
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/composites/
- copied from r429532, incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/modules/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/composites/WSEntryPointTestComposite/
- copied from r429532, incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/composites/WSEntryPointTestComposite/sca.composite
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/
- copied from r429532, incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.composite
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/composites/
- copied from r429532, incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/modules/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/composites/WSEntryPointTestRPCComposite/
- copied from r429532, incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/composites/WSEntryPointTestRPCComposite/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CalculatorModuleAndComponent/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModule/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleImplClassWithNamespace/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleIntfClassWithNamespace/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleTwoClasses/sca.composite
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorCompositeAndComponent/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceComposite/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespace/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeImplClassWithNamespaceButNotInClassAttr/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeIntfClassWithNamespace/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceCompositeTwoClasses/
- copied from r429532, incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/CompositeOrFragmentFileHandler.java (with props)
Removed:
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.module
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceModule/
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.module
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceModule/
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ModuleContext.cpp
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ModuleContext.h
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ModuleContextImpl.cpp
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ModuleContextImpl.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Module.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Module.h
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/MyValueServiceComposite/sca.module
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/MyValueServiceModule/
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/modules/
incubator/tuscany/cpp/sca/samples/BigBank/Accounts/sca.module
incubator/tuscany/cpp/sca/samples/BigBank/Accounts/sca.module.lin
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/sca.module
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/sca.module.lin
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/
incubator/tuscany/cpp/sca/samples/MyValue/MyValueComposite/sca.module
incubator/tuscany/cpp/sca/samples/MyValue/MyValueModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/WSEntryPointTestComposite/sca.module
incubator/tuscany/cpp/sca/test/WSEntryPointTest/WSEntryPointTestModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/composites/WSEntryPointTestComposite/sca.module
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/composites/WSEntryPointTestModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/modules/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/sca.module
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/composites/WSEntryPointTestRPCComposite/sca.module
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/composites/WSEntryPointTestRPCModule/
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/modules/
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CalculatorModuleAndComponent/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceCompositeIntfClassWithNamespaceButNotInClassAttr/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModule/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleImplClassWithNamespace/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleIntfClassWithNamespace/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleTwoClasses/sca.module
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModule/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/
incubator/tuscany/cpp/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java
Modified:
incubator/tuscany/cpp/sca/Developers Guide.txt
incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt
incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.ncb
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
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/tuscany_sca.vcproj
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.pdb
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/MyValue.pdb
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h
incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/sca.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CPPInterface.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CPPInterface.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Component.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ExternalService.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ExternalService.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/src/tuscany/sca/model/Subsystem.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Subsystem.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/System.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/System.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.h
incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
incubator/tuscany/cpp/sca/runtime/core/test/src/TestSCA.cpp
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment
incubator/tuscany/cpp/sca/runtime/core/test/testSCASystem/subsystems/SubSystem1/sca.subsystem
incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp
incubator/tuscany/cpp/sca/samples/BigBank/AccountClient/AccountClient.cpp
incubator/tuscany/cpp/sca/samples/BigBank/AccountClient/runclient.cmd
incubator/tuscany/cpp/sca/samples/BigBank/AccountClient/runclient.sh
incubator/tuscany/cpp/sca/samples/BigBank/Accounts/Accounts.dsp
incubator/tuscany/cpp/sca/samples/BigBank/Accounts/Makefile.am
incubator/tuscany/cpp/sca/samples/BigBank/BigBank.ncb
incubator/tuscany/cpp/sca/samples/BigBank/BigBankSubsystem/sca.subsystem
incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorComposite/Makefile.am
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorSubsystem/sca.subsystem
incubator/tuscany/cpp/sca/samples/Calculator/Client/Calc.cpp
incubator/tuscany/cpp/sca/samples/Calculator/Client/Makefile.am
incubator/tuscany/cpp/sca/samples/Calculator/Client/readme.txt
incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd
incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.sh
incubator/tuscany/cpp/sca/samples/Calculator/Makefile.am
incubator/tuscany/cpp/sca/samples/GettingStarted.html
incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am
incubator/tuscany/cpp/sca/samples/MyValue/MyValueComposite/CustomerInfo.fragment
incubator/tuscany/cpp/sca/samples/MyValue/MyValueComposite/Makefile.am
incubator/tuscany/cpp/sca/samples/MyValue/MyValueSubsystem/sca.subsystem
incubator/tuscany/cpp/sca/samples/MyValue/runMyValueClient.sh
incubator/tuscany/cpp/sca/samples/configure.ac
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/BuildInstructions.txt
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/Calculator/Calculator.vcproj
incubator/tuscany/cpp/sca/samples/ides/devstudio7/projects/Calculator/WSClient/BuildInstructions.txt
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/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.c
incubator/tuscany/cpp/sca/test/WSEntryPointTest/WSEntryPointTestComposite/WSEntryPointTestModule.vcproj
incubator/tuscany/cpp/sca/test/WSEntryPointTest/WSEntryPointTestSubsystem/sca.subsystem
incubator/tuscany/cpp/sca/test/WSEntryPointTest/runtime/subsystems/WSEntryPointTestSubsystem/sca.subsystem
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCComposite/WSEntryPointTestRPCModule.vcproj
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
incubator/tuscany/cpp/sca/test/WSEntryPointTestRPC/runtime/subsystems/WSEntryPointTestRPCSubsystem/sca.subsystem
incubator/tuscany/cpp/sca/tools/scagen/ (props changed)
incubator/tuscany/cpp/sca/tools/scagen/build.xml
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
incubator/tuscany/cpp/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
incubator/tuscany/cpp/sca/tools/scagen/junit/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
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CalculatorModuleAndComponent/CalculatorImpl.componentType
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModule/CustomerInfo.fragment
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleMissingScaModule/sca.moduleX
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/MyValueServiceModuleTwoClasses/CustomerInfo.fragment
incubator/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
incubator/tuscany/cpp/sca/xsd/sca-core.xsd
incubator/tuscany/cpp/sca/xsd/sca-interface-cpp.xsd
Modified: incubator/tuscany/cpp/sca/Developers Guide.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/Developers%20Guide.txt?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/Developers Guide.txt (original)
+++ incubator/tuscany/cpp/sca/Developers Guide.txt Tue Aug 8 14:47:01 2006
@@ -37,18 +37,18 @@
It can be run from the scagen.jar file using "java -jar scagen.jar"
or from small scripts - scagen.cmd for Windows and scagen.sh for Unix.
The parameters are:
- -dir <the path to the sca module root directory>
+ -dir <the path to the sca composite root directory>
-output <the path to an output directory where the generated file will be placed>
e.g.
- scagen -dir c:\mymodules\module1 -output c:\mymodules\bld\module1
+ scagen -dir c:\mycomposites\composite1 -output c:\mycomposites\bld\composite1
What scagen does
----------------
The input directory passed to the scagen tools as
the -dir parameter method is taken to be the SCA
-module root directory. All the sca.module and .fragment
+composite root directory. All the sca.composite and .fragment
files in that directory are inspected to resolve all
the <component/> elements within them.
@@ -100,7 +100,7 @@
o (Overall structure of the code)
o Walking the input directory
- o Scanning the .module and .fragment files
+ o Scanning the .composite and .fragment files
o finding the C++ implementation headers
o finding/checking the classname in the C++ implementation headers
o find the matching .componentTemplate files
@@ -134,28 +134,28 @@
and process files that fit a particular filter (e.g. "*.hpp") by passing them to
implementer of the FileActor Interface (see the classes "Headers" for the
actor that processes C++ headers and "XMLFileActor" for the file actor that
-processes the .componentType and sca.module/fragment files.)
+processes the .componentType and sca.composite/fragment files.)
The ...services package contains the majority of code written afresh for the
scagen tool including the subclasses of XMLFileActor (see ComponentTypeFileHandler.java
-and ModuleOrFragmentFileHandler.java) that are the classes that tie this
+and CompositeOrFragmentFileHandler.java) that are the classes that tie this
package to the ...common package and which are called by the
DirectoryTree walker.
-Walking the module root input directory
+Walking the composite root input directory
---------------------------------------
The main method of the scagen class creates an instance of
"DirectoryScanner" and registers with it a file handler of
-type "ModuleOrFragmentFileHandler" for all files that end
-in ".module" or ".fragment". On calling the "walkTree" method
+type "CompositeOrFragmentFileHandler" for all files that end
+in ".composite" or ".fragment". On calling the "walkTree" method
on the scanner it will in turn call the actOnFile method on the
-ModuleOrFragmentFileHandler for appropriate files.
+CompositeOrFragmentFileHandler for appropriate files.
-Scanning the .module and .fragment files
+Scanning the .composite and .fragment files
----------------------------------------
-The scanning of these files by the respective "ModuleOrFragmentFileHandler"
+The scanning of these files by the respective "CompositeOrFragmentFileHandler"
and "ComponentTypeFileHandler" is mostly handled by the superclass
"XMLFileActor". This class will recursively goes through the whole
XML file and considers the name of the XML element it finds.
@@ -196,12 +196,12 @@
Finding the C++ implementation headers
--------------------------------------
-The "/module/component/implementation.cpp/@header" and
+The "/composite/component/implementation.cpp/@header" and
is used to key into the name of the implementation header
and this is opened directly and passed to the
actOnFileMethod of a Headers object from the ...common package
bypassing the DirectoryScanner code. The path is relative to
-the given (-dir option) module root directory.
+the given (-dir option) composite root directory.
Finding/checking the classname in the C++ implementation headers
-----------------------------------------------------------------
@@ -232,7 +232,7 @@
-----------------------------------------------------------------------------
We open up the .componentTemplateFiles with exactly the same
-mechanism as we read the sca.module/fragment file (by creating
+mechanism as we read the sca.composite/fragment file (by creating
a DOM and descending through it this time using a ComponentTypeFileHandler that it
has had various data values ( e.g. the implementation class and namespace used later)
poked into it. The ComponentTypeFileHandler itself has individual
@@ -324,11 +324,11 @@
The junit unit test
/tuscany/cpp/sca/tools/scagen/
- junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
+ junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllCompositesTest.java
will dynamically look for all the subdirectores of the directory
-path given by TuscanyTestCase.junit_modules and run the scagen
-tool on them as if they were modules roots.
+path given by TuscanyTestCase.junit_composites and run the scagen
+tool on them as if they were composites roots.
By convention an "expected_output" directory is located
(see the CVS tree or the test program) and the actual
@@ -336,11 +336,11 @@
good first/basic regression test for any changes.
New test cases can thus be added without having to write
-any new junit java code by by creating new SCA modules and
+any new junit java code by by creating new SCA composites and
the associated expected Scagen output - perhaps by using the tool
initially and checking the output is satisfactory before copying
it to the expected output directory at:
-/tuscany/cpp/sca/tools/scagen/junit/testoutput/<module>/expected_output
+/tuscany/cpp/sca/tools/scagen/junit/testoutput/<composite>/expected_output
where input data is taken from
-/tuscany/cpp/sca/tools/scagen/junit/testinput/modules/<module>
+/tuscany/cpp/sca/tools/scagen/junit/testinput/composites/<composite>
Modified: incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt (original)
+++ incubator/tuscany/cpp/sca/doc/CreatingSCACPPComponents.txt Tue Aug 8 14:47:01 2006
@@ -17,9 +17,9 @@
in the service header file
o Proxy and wrapper header and implementation files generated by the Tuscany
C++ SCAGEN tool
- o A component definition in the module sca.module file
+ o A component definition in the composite sca.composite file
o A service definition in a .componentType file
- o A module component definition in a sca.subsystem file
+ o A composite component definition in a sca.subsystem file
In this section we will use the Calculator sample as a worked example.
@@ -130,17 +130,17 @@
</componentType>
-5. Create the sca.module file for your module and define your component within
+5. Create the sca.composite file for your composite and define your component within
it. The component definition specifies the implementation library to use (a
.dll file on Windows and a .so file on Linux) and the implementation header
file (which describes the implementation class). Component properties and
references to other services can also be specified here. E.g. the
- Calculator sca.module file contains the following XML:
+ Calculator sca.composite file contains the following XML:
<?xml version="1.0" encoding="ASCII"?>
-<module xmlns="http://www.osoa.org/xmlns/sca/0.9"
+<composite xmlns="http://www.osoa.org/xmlns/sca/0.9"
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
- name="CalculatorModule">
+ name="CalculatorComposite">
<!-- The Calculator component -->
<component name="CalculatorServiceComponent">
@@ -148,18 +148,18 @@
<properties></properties>
<references></references>
</component>
-</module>
+</composite>
6. Generate the proxy and wrapper classes and header files using the SCAGEN
tool. These classes are used by the Tuscany SCA C++ runtime to enable
service implementations to be invoked from a client or another component.
Run the SCAGEN tool, specifying the directory where your header files,
- sca.module and componentType file are and the directory where you
+ sca.composite and componentType file are and the directory where you
want the generated files to be placed. E.g. on Windows, the
following command is run from the directory where Tuscany SCA is deployed:
-bin/scagen.cmd -dir samples/Calculator/CalculatorModule -output samples/Calculator/CalculatorModule
+bin/scagen.cmd -dir samples/Calculator/CalculatorComposite -output samples/Calculator/CalculatorComposite
which produces the following files:
@@ -171,42 +171,42 @@
7. Compile and link the code that has been written and generated. This will
produce a .dll or .so library file. The name should match the library name
- specified in the sca.module file.
+ specified in the sca.composite file.
-8. Create the sca.subsystem file and define your module component within it.
- The module component definition should specify the service name used in the
- componentType file and the module name used in the sca.module file. E.g.
+8. Create the sca.subsystem file and define your composite component within it.
+ The composite component definition should specify the service name used in the
+ componentType file and the composite name used in the sca.composite file. E.g.
the Calculator sca.subsystem file contains the following XML:
<?xml version="1.0" encoding="ASCII"?>
<subsystem xmlns="http://www.osoa.org/xmlns/sca/0.9"
name="CalculatorSubsystem">
- <moduleComponent name="CalculatorService" module="CalculatorModule"/>
+ <compositeComponent name="CalculatorService" composite="CalculatorComposite"/>
</subsystem>
9. Deploy the various files into the SCA directory structure, as follows:
-<deploy_root>/modules/ModuleName/ServiceHeader.h
-<deploy_root>/modules/ModuleName/ImplementationHeader.h
-<deploy_root>/modules/ModuleName/sca.module
-<deploy_root>/modules/ModuleName/Implementation.componentType
-<deploy_root>/modules/ModuleName/Implementation.dll (or .so on Linux)
+<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
E.g. for the Calculator sample the structure is:
-samples/Calculator/deploy/modules/CalculatorModule/Calculator.h
-samples/Calculator/deploy/modules/CalculatorModule/CalculatorImpl.h
-samples/Calculator/deploy/modules/CalculatorModule/sca.module
-samples/Calculator/deploy/modules/CalculatorModule/CalculatorImpl.componentType
-samples/Calculator/deploy/modules/CalculatorModule/Calculator.dll
+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
-10. Your component, module and subsystem are now ready to be invoked. Create a
+10. Your component, composite and subsystem are now ready to be invoked. Create a
client that will call the service. E.g. the Calculator client (in the
Calc.cpp file) contains code similar to the following:
@@ -214,16 +214,16 @@
{
// Define and start the Tuscany runtime:
// Set the system root path that contains the SCA directory structure, set
- // the default module component that will be used based on the format
- // <SubsystemName>/<ModuleComponentName> and then start the runtime
+ // the default composite component that will be used based on the format
+ // <SubsystemName>/<CompositeComponentName> and then start the runtime
TuscanyRuntime rt;
rt.setSystemRoot("C:/tuscany_sca/samples/Calculator/deploy");
- rt.setDefaultModuleComponent("CalculatorSubsystem/CalculatorService");
+ rt.setDefaultCompositeComponent("CalculatorSubsystem/CalculatorService");
rt.start();
// Locate the service
- ModuleContext myContext = ModuleContext::getCurrent();
+ CompositeContext myContext = CompositeContext::getCurrent();
Calculator *calcService = (Calculator*) myContext.locateService("CalculatorServiceComponent");
if (calcService == 0)
{
Modified: incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt (original)
+++ incubator/tuscany/cpp/sca/doc/WSEntrypoint.txt Tue Aug 8 14:47:01 2006
@@ -14,7 +14,7 @@
for more details.
-Defining and deploying an SCA Module with a WS EntryPoint
+Defining and deploying an SCA Composite with a WS EntryPoint
=========================================================
In this section we will use the Calculator sample as a worked example.
@@ -22,9 +22,9 @@
Pre-requisites:
- o A working component within a module and subsystem, with SCAGEN generated
+ o A working component within a composite and subsystem, with SCAGEN generated
Proxy and Wrapper classes and a DLL or SO library compiled from these and
- the component class files. The sca.module, *.componentType, *.fragment and
+ the component class files. The sca.composite, *.componentType, *.fragment and
sca.subsystem files must also be available and working
1. Create the WSDL that defines the interface of your SCA component. See the
@@ -33,11 +33,11 @@
schema types in the WSDL. This file needs to be accessible from the component,
so place it in the same directory as the component or in a subdirectory.
-See the sca/samples/Calculator/CalculatorModule/Calculator.wsdl file as an
+See the sca/samples/Calculator/CalculatorComposite/Calculator.wsdl file as an
example.
-2. Add an EntryPoint definition to the sca.module file, setting the
+2. Add an EntryPoint definition to the sca.composite file, setting the
interface.wsdl interface attribute to the WSDL file defined above, the
reference element to the name of the component to be invoked and the binding.ws
port attribute to the namespace, service and port name specified in the
@@ -56,7 +56,7 @@
3. Create a file named Tuscany-model.config in the same directory as your
component. This file defines which WSDL and XML Schema files to include in the
-Tuscany runtime environment for this module. Set the contents of the file
+Tuscany runtime environment for this composite. Set the contents of the file
using the example below and use the path and name of the WSDL file created
above.
@@ -89,13 +89,13 @@
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 "modules" and "subsystem"
-directories; which in turn contain your modules and subsystems.
+directory - this is the directory that contains the "composites" and "subsystem"
+directories; which in turn contain your composites and subsystems.
The TuscanyEntryPoint parameter is of the form
"<subsystem-name>/<service-name>/<entrypoint-name>", with the subsystem and
service names defined in your sca.subsystem file and the EntryPoint name
-defined in the EntryPoint definition you added to your sca.module file above.
+defined in the EntryPoint definition you added to your sca.composite file above.
Set the ServiceClass parameter to "tuscany_sca_ws_service" as this library
(tuscany_sca_ws_service.dll on Windows and libtuscany_sca_ws_service.so on
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=429833&r1=429832&r2=429833&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=429833&r1=429832&r2=429833&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 Tue Aug 8 14:47:01 2006
@@ -122,19 +122,19 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\osoa\sca\ModuleContext.cpp
+SOURCE=..\..\..\runtime\core\src\osoa\sca\CompositeContext.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\osoa\sca\ModuleContext.h
+SOURCE=..\..\..\runtime\core\src\osoa\sca\CompositeContext.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\osoa\sca\ModuleContextImpl.cpp
+SOURCE=..\..\..\runtime\core\src\osoa\sca\CompositeContextImpl.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\osoa\sca\ModuleContextImpl.h
+SOURCE=..\..\..\runtime\core\src\osoa\sca\CompositeContextImpl.h
# End Source File
# Begin Source File
@@ -309,11 +309,11 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Module.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Composite.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Module.h
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Composite.h
# End Source File
# Begin Source File
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak Tue Aug 8 14:47:01 2006
@@ -58,9 +58,9 @@
-@erase "$(INTDIR)\Logger.obj"
-@erase "$(INTDIR)\LogWriter.obj"
-@erase "$(INTDIR)\ModelLoader.obj"
- -@erase "$(INTDIR)\Module.obj"
- -@erase "$(INTDIR)\ModuleContext.obj"
- -@erase "$(INTDIR)\ModuleContextImpl.obj"
+ -@erase "$(INTDIR)\Composite.obj"
+ -@erase "$(INTDIR)\CompositeContext.obj"
+ -@erase "$(INTDIR)\CompositeContextImpl.obj"
-@erase "$(INTDIR)\Operation.obj"
-@erase "$(INTDIR)\SCA.obj"
-@erase "$(INTDIR)\SCAEntryPoint.obj"
@@ -134,8 +134,8 @@
LINK32_OBJS= \
"$(INTDIR)\ComponentContext.obj" \
"$(INTDIR)\ComponentContextImpl.obj" \
- "$(INTDIR)\ModuleContext.obj" \
- "$(INTDIR)\ModuleContextImpl.obj" \
+ "$(INTDIR)\CompositeContext.obj" \
+ "$(INTDIR)\CompositeContextImpl.obj" \
"$(INTDIR)\SCA.obj" \
"$(INTDIR)\ServiceList.obj" \
"$(INTDIR)\ServiceRuntimeException.obj" \
@@ -156,7 +156,7 @@
"$(INTDIR)\Implementation.obj" \
"$(INTDIR)\Interface.obj" \
"$(INTDIR)\ModelLoader.obj" \
- "$(INTDIR)\Module.obj" \
+ "$(INTDIR)\Composite.obj" \
"$(INTDIR)\Service.obj" \
"$(INTDIR)\ServiceReference.obj" \
"$(INTDIR)\Subsystem.obj" \
@@ -237,9 +237,9 @@
-@erase "$(INTDIR)\Logger.obj"
-@erase "$(INTDIR)\LogWriter.obj"
-@erase "$(INTDIR)\ModelLoader.obj"
- -@erase "$(INTDIR)\Module.obj"
- -@erase "$(INTDIR)\ModuleContext.obj"
- -@erase "$(INTDIR)\ModuleContextImpl.obj"
+ -@erase "$(INTDIR)\Composite.obj"
+ -@erase "$(INTDIR)\CompositeContext.obj"
+ -@erase "$(INTDIR)\CompositeContextImpl.obj"
-@erase "$(INTDIR)\Operation.obj"
-@erase "$(INTDIR)\SCA.obj"
-@erase "$(INTDIR)\SCAEntryPoint.obj"
@@ -316,8 +316,8 @@
LINK32_OBJS= \
"$(INTDIR)\ComponentContext.obj" \
"$(INTDIR)\ComponentContextImpl.obj" \
- "$(INTDIR)\ModuleContext.obj" \
- "$(INTDIR)\ModuleContextImpl.obj" \
+ "$(INTDIR)\CompositeContext.obj" \
+ "$(INTDIR)\CompositeContextImpl.obj" \
"$(INTDIR)\SCA.obj" \
"$(INTDIR)\ServiceList.obj" \
"$(INTDIR)\ServiceRuntimeException.obj" \
@@ -338,7 +338,7 @@
"$(INTDIR)\Implementation.obj" \
"$(INTDIR)\Interface.obj" \
"$(INTDIR)\ModelLoader.obj" \
- "$(INTDIR)\Module.obj" \
+ "$(INTDIR)\Composite.obj" \
"$(INTDIR)\Service.obj" \
"$(INTDIR)\ServiceReference.obj" \
"$(INTDIR)\Subsystem.obj" \
@@ -412,15 +412,15 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\runtime\core\src\osoa\sca\ModuleContext.cpp
+SOURCE=..\..\..\runtime\core\src\osoa\sca\CompositeContext.cpp
-"$(INTDIR)\ModuleContext.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\CompositeContext.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\runtime\core\src\osoa\sca\ModuleContextImpl.cpp
+SOURCE=..\..\..\runtime\core\src\osoa\sca\CompositeContextImpl.cpp
-"$(INTDIR)\ModuleContextImpl.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\CompositeContextImpl.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -544,9 +544,9 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Module.cpp
+SOURCE=..\..\..\runtime\core\src\tuscany\sca\model\Composite.cpp
-"$(INTDIR)\Module.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\Composite.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment?rev=429833&r1=429532&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment Tue Aug 8 14:47:01 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<moduleFragment xmlns="http://www.osoa.org/xmlns/sca/0.9"
+<compositeFragment xmlns="http://www.osoa.org/xmlns/sca/0.9"
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
xmlns:mvs="http://www.myvalue.org/MyValueService/"
name="CustomerInfoComponent">
@@ -32,5 +32,5 @@
</references>
</component>
-</moduleFragment>
+</compositeFragment>
Added: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite?rev=429833&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite (added)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite Tue Aug 8 14:47:01 2006
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/0.9"
+ xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
+ xmlns:mvs="http://www.myvalue.org/MyValueService/"
+ name="MyValueServiceComposite">
+
+ <!-- Expose as a web service -->
+ <entryPoint name="MyValueServiceExport" multiplicity="1..1">
+ <interface.wsdl interface="MyValueService.wsdl" callbackInterface=""></interface.wsdl>
+ <binding.ws port="http://www.myvalue.org/MyValueService/#wsdl.endpoint(MyValueService/MyValueServicePort)"></binding.ws>
+ <reference>MyValueServiceComponent</reference>
+ </entryPoint>
+
+ <component name="MyValueServiceComponent">
+ <implementation.cpp dll="MyValue.dll" header="MyValueImpl.h"></implementation.cpp>
+ <properties>
+ </properties>
+ <references>
+ <stockQuote>StockQuoteService</stockQuote>
+ </references>
+ </component>
+
+ <externalService name="StockQuoteService">
+ <interface.cpp header="StockQuoteService.h"/>
+ <binding.ws port="http://www.webserviceX.NET/#wsdl.endpoint(StockQuote/StockQuoteSoap)"/>
+ </externalService>
+
+ <wire>
+ <source.uri>MyValueServiceComponent/customerInfo</source.uri>
+ <target.uri>CustomerInfoComponent</target.uri>
+ </wire>
+
+</composite>
+
\ No newline at end of file
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem Tue Aug 8 14:47:01 2006
@@ -19,9 +19,9 @@
name="SubSystem1">
- <moduleComponent name="MyValue" module="MyValueServiceModule">
+ <compositeComponent name="MyValue" composite="MyValueServiceComposite">
- </moduleComponent>
+ </compositeComponent>
</subsystem>
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=429833&r1=429832&r2=429833&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 8 14:47:01 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\modules\MyValueServiceModule copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule copy..\tuscany_sca\Release\*.dll Release
+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
# 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\modules\MyValueServiceModule copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\modules\MyValueServiceModule copy..\tuscany_sca\Debug\*.dll Debug copy..\tuscany_sca\Debug\*.pdb Debug
+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
# 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=429833&r1=429832&r2=429833&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 8 14:47:01 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\modules\MyValueServiceModule
- copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule
+ 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
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\modules\MyValueServiceModule
- copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\modules\MyValueServiceModule
- copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule
- copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\modules\MyValueServiceModule
+ 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
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
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=429833&r1=429832&r2=429833&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 Tue Aug 8 14:47:01 2006
@@ -196,16 +196,16 @@
RelativePath="..\..\..\runtime\core\src\osoa\sca\ComponentContextImpl.h">
</File>
<File
- RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContext.cpp">
+ RelativePath="..\..\..\runtime\core\src\osoa\sca\CompositeContext.cpp">
</File>
<File
- RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContext.h">
+ RelativePath="..\..\..\runtime\core\src\osoa\sca\CompositeContext.h">
</File>
<File
- RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContextImpl.cpp">
+ RelativePath="..\..\..\runtime\core\src\osoa\sca\CompositeContextImpl.cpp">
</File>
<File
- RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContextImpl.h">
+ RelativePath="..\..\..\runtime\core\src\osoa\sca\CompositeContextImpl.h">
</File>
<File
RelativePath="..\..\..\runtime\core\src\osoa\sca\SCA.cpp">
@@ -342,10 +342,10 @@
RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.h">
</File>
<File
- RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Module.cpp">
+ RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Composite.cpp">
</File>
<File
- RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Module.h">
+ RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Composite.h">
</File>
<File
RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Service.cpp">
Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment?rev=429833&r1=429532&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment (original)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.fragment Tue Aug 8 14:47:01 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<moduleFragment xmlns="http://www.osoa.org/xmlns/sca/0.9"
+<compositeFragment xmlns="http://www.osoa.org/xmlns/sca/0.9"
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
xmlns:mvs="http://www.myvalue.org/MyValueService/"
name="CustomerInfoComponent">
@@ -32,5 +32,5 @@
</references>
</component>
-</moduleFragment>
+</compositeFragment>
Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.pdb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/CustomerInfo.pdb?rev=429833&r1=429532&r2=429833&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/MyValue.pdb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/MyValue.pdb?rev=429833&r1=429532&r2=429833&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite?rev=429833&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite (added)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/composites/MyValueServiceComposite/sca.composite Tue Aug 8 14:47:01 2006
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/0.9"
+ xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
+ xmlns:mvs="http://www.myvalue.org/MyValueService/"
+ name="MyValueServiceComposite">
+
+ <!-- Expose as a web service -->
+ <entryPoint name="MyValueServiceExport" multiplicity="1..1">
+ <interface.wsdl interface="MyValueService.wsdl" callbackInterface=""></interface.wsdl>
+ <binding.ws port="http://www.myvalue.org/MyValueService/#wsdl.endpoint(MyValueService/MyValueServicePort)"></binding.ws>
+ <reference>MyValueServiceComponent</reference>
+ </entryPoint>
+
+ <component name="MyValueServiceComponent">
+ <implementation.cpp dll="MyValue.dll" header="MyValueImpl.h"></implementation.cpp>
+ <properties>
+ </properties>
+ <references>
+ <stockQuote>StockQuoteService</stockQuote>
+ </references>
+ </component>
+
+ <externalService name="StockQuoteService">
+ <interface.cpp header="StockQuoteService.h"/>
+ <binding.ws port="http://www.webserviceX.NET/#wsdl.endpoint(StockQuote/StockQuoteSoap)"/>
+ </externalService>
+
+ <wire>
+ <source.uri>MyValueServiceComponent/customerInfo</source.uri>
+ <target.uri>CustomerInfoComponent</target.uri>
+ </wire>
+
+</composite>
+
\ No newline at end of file
Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem (original)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem Tue Aug 8 14:47:01 2006
@@ -19,9 +19,9 @@
name="SubSystem1">
- <moduleComponent name="MyValue" module="MyValueServiceModule">
+ <compositeComponent name="MyValue" composite="MyValueServiceComposite">
- </moduleComponent>
+ </compositeComponent>
</subsystem>
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=429833&r1=429832&r2=429833&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 8 14:47:01 2006
@@ -50,8 +50,8 @@
TypeLibraryName=".\Release/tuscany_sca_test.tlb"/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule
+ CommandLine="copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\composites\MyValueServiceComposite
+copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\composites\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\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\modules\MyValueServiceModule
+ 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
copy..\tuscany_sca\Debug\*.dll Debug
copy..\tuscany_sca\Debug\*.pdb Debug
"/>
Modified: incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am Tue Aug 8 14:47:01 2006
@@ -4,8 +4,8 @@
osoa/sca/ComponentContext.h \
osoa/sca/ComponentContextImpl.h \
osoa/sca/export.h \
-osoa/sca/ModuleContext.h \
-osoa/sca/ModuleContextImpl.h \
+osoa/sca/CompositeContext.h \
+osoa/sca/CompositeContextImpl.h \
osoa/sca/sca.h \
osoa/sca/ServiceList.h \
osoa/sca/ServiceRuntimeException.h \
@@ -26,7 +26,7 @@
tuscany/sca/model/Implementation.h \
tuscany/sca/model/Interface.h \
tuscany/sca/model/ModelLoader.h \
-tuscany/sca/model/Module.h \
+tuscany/sca/model/Composite.h \
tuscany/sca/model/Service.h \
tuscany/sca/model/ServiceReference.h \
tuscany/sca/model/Subsystem.h \
@@ -52,8 +52,8 @@
libtuscany_sca_la_SOURCES = \
osoa/sca/ComponentContext.cpp \
osoa/sca/ComponentContextImpl.cpp \
-osoa/sca/ModuleContext.cpp \
-osoa/sca/ModuleContextImpl.cpp \
+osoa/sca/CompositeContext.cpp \
+osoa/sca/CompositeContextImpl.cpp \
osoa/sca/SCA.cpp \
osoa/sca/ServiceList.cpp \
osoa/sca/ServiceRuntimeException.cpp \
@@ -73,7 +73,7 @@
tuscany/sca/model/Implementation.cpp \
tuscany/sca/model/Interface.cpp \
tuscany/sca/model/ModelLoader.cpp \
-tuscany/sca/model/Module.cpp \
+tuscany/sca/model/Composite.cpp \
tuscany/sca/model/Service.cpp \
tuscany/sca/model/ServiceReference.cpp \
tuscany/sca/model/Subsystem.cpp \
Modified: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp Tue Aug 8 14:47:01 2006
@@ -24,7 +24,7 @@
#include "tuscany/sca/core/ComponentServiceWrapper.h"
#include "tuscany/sca/core/ExternalServiceWrapper.h"
#include "tuscany/sca/model/CPPImplementation.h"
-#include "tuscany/sca/model/Module.h"
+#include "tuscany/sca/model/Composite.h"
using namespace tuscany::sca;
using namespace tuscany::sca::model;
@@ -253,13 +253,13 @@
}
// ==============================================
- // getDataFactory: return the data factory for the module in which
+ // getDataFactory: return the data factory for the composite in which
// this component resides
// ==============================================
DataFactoryPtr ComponentContextImpl::getDataFactory()
{
LOGENTRY(1, "ComponentContextImpl::getProperties");
- DataFactoryPtr dataFactory = component->getModule()->getDataFactory();
+ DataFactoryPtr dataFactory = component->getComposite()->getDataFactory();
LOGEXIT(1, "ComponentContextImpl::getDataFactory");
return dataFactory;
Added: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.cpp?rev=429833&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.cpp (added)
+++ incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.cpp Tue Aug 8 14:47:01 2006
@@ -0,0 +1,104 @@
+/*
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Rev$ $Date: 2005/12/22 11:33:21 $ */
+
+#include "osoa/sca/CompositeContext.h"
+#include "tuscany/sca/util/Logging.h"
+#include "osoa/sca/CompositeContextImpl.h"
+#include "tuscany/sca/core/SCARuntime.h"
+
+using namespace tuscany::sca;
+
+namespace osoa
+{
+ namespace sca
+ {
+ // ===========
+ // Constructor
+ // ===========
+ CompositeContext::CompositeContext(CompositeContextImpl* implementation)
+ : impl(implementation)
+ {
+ }
+
+ // ===================================
+ // Copy constructor: create a new impl
+ // ===================================
+ CompositeContext::CompositeContext(const CompositeContext& ctx)
+ {
+ impl = new CompositeContextImpl(SCARuntime::getInstance()->getCurrentComposite());
+ }
+
+ // =============================
+ // operator= : create a new impl
+ // =============================
+ CompositeContext& CompositeContext::operator=(const CompositeContext& ctx)
+ {
+ if (this != &ctx)
+ {
+ impl = new CompositeContextImpl(SCARuntime::getInstance()->getCurrentComposite());
+ }
+ return *this;
+ }
+
+ // ==========
+ // Destructor
+ // ==========
+ CompositeContext::~CompositeContext()
+ {
+ LOGENTRY(1, "CompositeContext::destructor");
+ delete impl;
+ LOGEXIT(1, "CompositeContext::destructor");
+ }
+
+ // ====================================================
+ // getCurrent: create a context from the current composite
+ // ====================================================
+ CompositeContext CompositeContext::getCurrent()
+ {
+ LOGENTRY(1, "CompositeContext::getCurrent");
+ CompositeContextImpl* mci = new CompositeContextImpl(SCARuntime::getInstance()->getCurrentComposite());
+ LOGEXIT(1, "CompositeContext::getCurrent");
+ return CompositeContext(mci);
+ }
+
+ // =============
+ // locateService
+ // =============
+ void* CompositeContext::locateService(const char* serviceName)
+ {
+ LOGENTRY(1, "CompositeContext::locateService");
+ void* sp = impl->locateService(serviceName);
+ LOGEXIT(1, "CompositeContext::locateService");
+ return sp;
+ }
+
+ // =============
+ // getDataFactory
+ // =============
+ DataFactoryPtr CompositeContext::getDataFactory()
+ {
+ LOGENTRY(1, "CompositeContext::getDataFactory");
+ DataFactoryPtr df = impl->getDataFactory();
+ LOGEXIT(1, "CompositeContext::getDataFactory");
+ return df;
+ }
+
+
+ } // End namespace sca
+} // End namespace osoa
Propchange: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.h?rev=429833&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.h (added)
+++ incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.h Tue Aug 8 14:47:01 2006
@@ -0,0 +1,90 @@
+/*
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Rev$ $Date: 2005/12/22 11:33:21 $ */
+
+#ifndef osoa_sca_compositecontext_h
+#define osoa_sca_compositecontext_h
+
+#include "osoa/sca/export.h"
+#include "commonj/sdo/SDO.h"
+
+namespace osoa
+{
+ namespace sca
+ {
+ class CompositeContextImpl;
+
+ /**
+ * An SCA component implementation, or a non-SCA client, uses the
+ * CompositeContext class to retrieve information about the configured
+ * SCA composite.
+ */
+ class SCA_API CompositeContext
+ {
+
+ public:
+ /**
+ * Return a new CompositeContext for the current Component.
+ */
+ static CompositeContext getCurrent();
+
+ /**
+ * Resolve a service name into a single component service.
+ * @param serviceName The name of the service in the form
+ * "component name"/"service name". The service name is
+ * optional in the component has one service.
+ * @return A pointer to an object which can be cast to the
+ * business interface of the target service.
+ */
+ void* locateService(const char* serviceName);
+
+ /**
+ * Get an SDO data factory which will allow the component to
+ * create data objects for all the types configured for this
+ * component.
+ * @return A data factory to be used by the component to create
+ * new data objects.
+ */
+ commonj::sdo::DataFactoryPtr getDataFactory();
+
+ /**
+ * Destructor.
+ */
+ virtual ~CompositeContext();
+
+ CompositeContext(const CompositeContext&);
+ CompositeContext& operator=(const CompositeContext&);
+
+ private:
+ /**
+ * Constructor to create an interface class from the contained
+ * implementation.
+ * @param implementation The actual implementation class.
+ */
+ CompositeContext(CompositeContextImpl* implementation);
+
+ /**
+ * Pointer to the class which provides the actual implementation.
+ */
+ CompositeContextImpl* impl;
+
+ };
+ } // End namespace sca
+} // End namespace osoa
+
+#endif // osoa_sca_compositecontext_h
Propchange: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContext.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.cpp?rev=429833&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.cpp (added)
+++ incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.cpp Tue Aug 8 14:47:01 2006
@@ -0,0 +1,114 @@
+/*
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Rev$ $Date: 2005/12/22 11:33:21 $ */
+
+#include "tuscany/sca/util/Logging.h"
+#include "tuscany/sca/util/Exceptions.h"
+#include "tuscany/sca/model/Component.h"
+#include "tuscany/sca/model/CPPImplementation.h"
+#include "osoa/sca/CompositeContextImpl.h"
+#include "tuscany/sca/core/ComponentServiceWrapper.h"
+
+using namespace tuscany::sca;
+using namespace tuscany::sca::model;
+
+namespace osoa
+{
+ namespace sca
+ {
+ // ===========
+ // Constructor
+ // ===========
+ CompositeContextImpl::CompositeContextImpl(Composite* mod)
+ : composite(mod)
+ {
+ }
+
+ // ==========
+ // Destructor
+ // ==========
+ CompositeContextImpl::~CompositeContextImpl()
+ {
+ // --------------------------------------------
+ // Delete the proxies served up by this context
+ // --------------------------------------------
+ for (PROXIES::iterator iter = proxies.begin(); iter != proxies.end(); iter++)
+ {
+ delete (ServiceProxy*)*iter;
+ }
+ }
+
+ // ===========================================================================
+ // locateService: return a proxy connected to a wrapper for the target service
+ // ===========================================================================
+ void* CompositeContextImpl::locateService(const char* serviceName)
+ {
+ LOGENTRY(1, "CompositeContextImpl::locateService");
+
+
+ // ----------------------------
+ // Locate the component service
+ // ----------------------------
+ Service* service = composite->findComponentService(serviceName);
+ string msg;
+ if (!service)
+ {
+ msg = "Service not found: ";
+ msg = msg + serviceName;
+ throw ServiceNotFoundException(msg.c_str());
+ }
+
+ // -------------------------
+ // Create the ServiceWrapper
+ // -------------------------
+ ComponentServiceWrapper* serviceWrapper = ComponentServiceWrapper::createServiceWrapper(service);
+
+ // ----------------------------
+ // Get a Proxy for this service
+ // ----------------------------
+ try
+ {
+ ServiceProxy* serviceProxy = new ServiceProxy(service->getComponent(), service->getName(), serviceWrapper);
+ proxies.push_back(serviceProxy);
+ LOGEXIT(1, "CompositeContextImpl::locateService");
+ return serviceProxy->getProxy();
+ }
+ catch (ServiceRuntimeException&)
+ {
+ delete serviceWrapper;
+ throw ;
+ }
+
+ }
+
+ // ==============================================
+ // getDataFactory: return the data factory for the current composite
+ // ==============================================
+ DataFactoryPtr CompositeContextImpl::getDataFactory()
+ {
+ LOGENTRY(1, "CompositeContextImpl::getDataFactory");
+ DataFactoryPtr dataFactory = composite->getDataFactory();
+
+ LOGEXIT(1, "CompositeContextImpl::getDataFactory");
+ return dataFactory;
+ }
+
+
+
+ } // End namespace sca
+} // End namespace osoa
Propchange: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.h?rev=429833&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.h (added)
+++ incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.h Tue Aug 8 14:47:01 2006
@@ -0,0 +1,76 @@
+/*
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Rev$ $Date: 2005/12/22 11:33:21 $ */
+
+#ifndef osoa_sca_compositecontextimpl_h
+#define osoa_sca_compositecontextimpl_h
+#include "tuscany/sca/model/Composite.h"
+#include "tuscany/sca/core/ServiceProxy.h"
+
+namespace osoa
+{
+ namespace sca
+ {
+ /**
+ * Contains the actual implementation of a CompositeContext interface.
+ */
+ class CompositeContextImpl
+ {
+
+ public:
+ /**
+ * Constructor that takes a Composite which represents the runtime
+ * model for this context.
+ */
+ CompositeContextImpl(tuscany::sca::model::Composite* composite);
+
+ /**
+ * See CompositeContext#locateService.
+ */
+ void* locateService(const char* serviceName);
+
+ /**
+ * See CompositeContext.
+ */
+ commonj::sdo::DataFactoryPtr getDataFactory();
+
+ /**
+ * Destructor.
+ */
+ virtual ~CompositeContextImpl();
+ private:
+ CompositeContextImpl(const CompositeContextImpl&);
+ CompositeContextImpl& operator=(const CompositeContextImpl&);
+
+ /**
+ * Pointer to the runtime model Composite object to which this
+ * context refers.
+ */
+ tuscany::sca::model::Composite* composite;
+
+ typedef vector<tuscany::sca::ServiceProxy*> PROXIES;
+ /**
+ * Vector of proxies created from calls to the locateService
+ * method.
+ */
+ PROXIES proxies;
+ };
+ } // End namespace sca
+} // End namespace osoa
+
+#endif // osoa_sca_compositecontextimpl_h
Propchange: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/CompositeContextImpl.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h Tue Aug 8 14:47:01 2006
@@ -215,7 +215,7 @@
}; // End ComponentContextException class definition
/**
- * Unable to find the specified entry point in the module.
+ * Unable to find the specified entry point in the composite.
*/
class SCA_API EntryPointNotFoundException: public ServiceRuntimeException
{
Modified: incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/sca.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/sca.h?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/sca.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/osoa/sca/sca.h Tue Aug 8 14:47:01 2006
@@ -21,7 +21,7 @@
#define osoa_sca_sca_h
#include "osoa/sca/export.h"
-#include "osoa/sca/ModuleContext.h"
+#include "osoa/sca/CompositeContext.h"
#include "osoa/sca/ComponentContext.h"
#include "osoa/sca/ServiceList.h"
#include "osoa/sca/ServiceRuntimeException.h"
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp?rev=429833&r1=429832&r2=429833&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp Tue Aug 8 14:47:01 2006
@@ -72,7 +72,7 @@
void* ComponentServiceWrapper::getImplementation()
{
CPPInterface::SCOPE scope = interf->getScope();
- if (scope == CPPInterface::MODULE)
+ if (scope == CPPInterface::COMPOSITE)
{
if (!staticImpl)
{
@@ -159,7 +159,7 @@
// ------------
// Load the dll
// ------------
- string fullDllName = targetComponent->getModule()->getRoot() + "/" + dllName;
+ string fullDllName = targetComponent->getComposite()->getRoot() + "/" + dllName;
typedef ComponentServiceWrapper* (* WRAPPERFACTORY) (Service*);
Library* wrapperLib = new Library(fullDllName);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org