diff options
Diffstat (limited to 'CIAO/tests/DAnCE/ExecutionManager-Deployments')
17 files changed, 1296 insertions, 88 deletions
diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp index 4f2ef3b3395..66b84533cb1 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp @@ -207,13 +207,13 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>hello_</portName> + <portName>hello_emits</portName> <provider>false</provider> <kind>EventEmitter</kind> <instance xmi:idref="SimpleEmitterComponentInstance" /> </internalEndpoint> <internalEndpoint> - <portName>hello_</portName> + <portName>hello_consumes</portName> <provider>true</provider> <kind>EventConsumer</kind> <instance xmi:idref="SimpleConsumerComponentInstance" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp new file mode 100644 index 00000000000..fa462d3c8b7 --- /dev/null +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp @@ -0,0 +1,261 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Home implementation --> + <implementation xmi:id="SimpleEmitterHomeImplementation"> + <name>SimpleEmitterHomeImplementation</name> + <source/> + <artifact xmi:idref="SimpleEmitter_ExecArtifact" /> + <artifact xmi:idref="SimpleEmitter_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleEmitterHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleEmitterHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleEmitter_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleEmitter_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleEmitterComponentImplementation"> + <name>SimpleEmitterComponentImplementation</name> + <source/> + <artifact xmi:idref="SimpleEmitter_ExecArtifact" /> + <artifact xmi:idref="SimpleEmitter_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerHomeImplementation"> + <name>SimpleConsumerHomeImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerComponentImplementation"> + <name>SimpleConsumerComponentImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="SimpleEmitterHomeInstance"> + <name>SimpleEmitterHome</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleEmitterHomeImplementation" /> + </instance> + + <instance xmi:id="SimpleEmitterComponentInstance"> + <name>SimpleEmitterComponent</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleEmitterComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleEmitterHome</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleEmitterComponent</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SimpleConsumerHomeInstance"> + <name>SimpleConsumerHome</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerHomeImplementation" /> + </instance> + + <instance xmi:id="SimpleConsumerComponentInstance"> + <name>SimpleConsumerComponent</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerHome</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>TestConnection</name> + <internalEndpoint> + <portName>hello_consumes</portName> + <provider>true</provider> + <kind>EventConsumer</kind> + <instance xmi:idref="SimpleConsumerComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimpleEmitterComponent</location> + <provider>false</provider> + <portName>hello_emits</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <!-- Artifacts declarations --> + <artifact xmi:id="SimpleEmitter_ExecArtifact"> + <name>SimpleEmitter_exec</name> + <source/> + <node/> + <location>SimpleEmitter_exec</location> + </artifact> + <artifact xmi:id="SimpleEmitter_SvntArtifact"> + <name>SimpleEmitter_svnt</name> + <source/> + <node/> + <location>SimpleEmitter_svnt</location> + </artifact> + + <artifact xmi:id="SimpleConsumer_ExecArtifact"> + <name>SimpleConsumer_exec</name> + <source/> + <node/> + <location>SimpleConsumer_exec</location> + </artifact> + <artifact xmi:id="SimpleConsumer_SvntArtifact"> + <name>SimpleConsumer_svnt</name> + <source/> + <node/> + <location>SimpleConsumer_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp index 35b9916d38e..f56dc419b0c 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp @@ -226,13 +226,13 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> </internalEndpoint> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> @@ -242,13 +242,13 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstanceReverse" /> </internalEndpoint> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp index 3b839da2323..32039e10b0f 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp @@ -258,14 +258,8 @@ <connection> <name>TestConnection</name> -<!-- <internalEndpoint> - <portName>trig</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> --> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> @@ -273,21 +267,15 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> <connection> <name>TestConnection_2</name> -<!-- <internalEndpoint> - <portName>trig</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> --> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> @@ -295,7 +283,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -303,7 +291,7 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -311,7 +299,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleMultipleUserComponentReverse</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses_m</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -319,7 +307,7 @@ <connection> <name>TestConnectionReverse_2</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -327,7 +315,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleMultipleUserComponentReverse</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses_m</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp index f145805483e..86f4820f61d 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp @@ -258,14 +258,8 @@ <connection> <name>TestConnection</name> -<!-- <internalEndpoint> - <portName>trig</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> --> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> @@ -273,21 +267,15 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> <connection> <name>TestConnection_2</name> -<!-- <internalEndpoint> - <portName>trig</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> --> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> @@ -295,7 +283,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -303,7 +291,7 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -311,7 +299,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleMultipleUserComponentReverse</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses_m</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -319,7 +307,7 @@ <connection> <name>TestConnectionReverse_2</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -327,7 +315,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleMultipleUserComponentReverse</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses_m</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp index 5d500d5d76f..303af027f56 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp @@ -258,14 +258,8 @@ <connection> <name>TestConnection</name> -<!-- <internalEndpoint> - <portName>trig</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> --> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> @@ -273,21 +267,15 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> <connection> <name>TestConnection_2</name> -<!-- <internalEndpoint> - <portName>trig</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> --> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses_m</portName> <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> @@ -295,7 +283,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -303,7 +291,7 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -311,7 +299,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleMultipleUserComponentReverse</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses_m</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -319,7 +307,7 @@ <connection> <name>TestConnectionReverse_2</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -327,7 +315,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleMultipleUserComponentReverse</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses_m</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp index 4fa193e0196..b207fc0ee8c 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp @@ -207,13 +207,13 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>hello_</portName> + <portName>hello_publishes</portName> <provider>false</provider> <kind>EventPublisher</kind> <instance xmi:idref="SimplePublisherComponentInstance" /> </internalEndpoint> <internalEndpoint> - <portName>hello_</portName> + <portName>hello_consumes</portName> <provider>true</provider> <kind>EventConsumer</kind> <instance xmi:idref="SimpleConsumerComponentInstance" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp new file mode 100644 index 00000000000..6ac893350ca --- /dev/null +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp @@ -0,0 +1,277 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Home implementation --> + <implementation xmi:id="SimplePublisherHomeImplementation"> + <name>SimplePublisherHomeImplementation</name> + <source/> + <artifact xmi:idref="SimplePublisher_ExecArtifact" /> + <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimplePublisherHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimplePublisherHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisher_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisher_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimplePublisherComponentImplementation"> + <name>SimplePublisherComponentImplementation</name> + <source/> + <artifact xmi:idref="SimplePublisher_ExecArtifact" /> + <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerHomeImplementation"> + <name>SimpleConsumerHomeImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerComponentImplementation"> + <name>SimpleConsumerComponentImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="SimplePublisherHomeInstance"> + <name>SimplePublisherHome</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherHomeImplementation" /> + </instance> + + <instance xmi:id="SimplePublisherComponentInstance"> + <name>SimplePublisherComponent</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisherHome</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SimpleConsumerHomeInstance"> + <name>SimpleConsumerHome</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerHomeImplementation" /> + </instance> + + <instance xmi:id="SimpleConsumerComponentInstance"> + <name>SimpleConsumerComponent</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerHome</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerComponent</string> + </value> + </value> + </configProperty> + </instance> + + <!--connection> + <name>TestConnection</name> + <internalEndpoint> + <portName>hello_publishes</portName> + <provider>false</provider> + <kind>EventPublisher</kind> + <instance xmi:idref="SimplePublisherComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>hello_consumes</portName> + <provider>true</provider> + <kind>EventConsumer</kind> + <instance xmi:idref="SimpleConsumerComponentInstance" /> + </internalEndpoint> + </connection--> + + <connection> + <name>TestConnection</name> + <internalEndpoint> + <portName>hello_publishes</portName> + <provider>false</provider> + <kind>EventPublisher</kind> + <instance xmi:idref="SimplePublisherComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimpleConsumerComponent</location> + <provider>true</provider> + <portName>hello_consumes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <!-- Artifacts declarations --> + <artifact xmi:id="SimplePublisher_ExecArtifact"> + <name>SimplePublisher_exec</name> + <source/> + <node/> + <location>SimplePublisher_exec</location> + </artifact> + <artifact xmi:id="SimplePublisher_SvntArtifact"> + <name>SimplePublisher_svnt</name> + <source/> + <node/> + <location>SimplePublisher_svnt</location> + </artifact> + + <artifact xmi:id="SimpleConsumer_ExecArtifact"> + <name>SimpleConsumer_exec</name> + <source/> + <node/> + <location>SimpleConsumer_exec</location> + </artifact> + <artifact xmi:id="SimpleConsumer_SvntArtifact"> + <name>SimpleConsumer_svnt</name> + <source/> + <node/> + <location>SimpleConsumer_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_DP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_DP.cdp new file mode 100644 index 00000000000..b7c18385afb --- /dev/null +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_DP.cdp @@ -0,0 +1,353 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Home implementation --> + <implementation xmi:id="SimplePublisherHomeImplementation"> + <name>SimplePublisherHomeImplementation</name> + <source/> + <artifact xmi:idref="SimplePublisher_ExecArtifact" /> + <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimplePublisherHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimplePublisherHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisher_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisher_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimplePublisherComponentImplementation"> + <name>SimplePublisherComponentImplementation</name> + <source/> + <artifact xmi:idref="SimplePublisher_ExecArtifact" /> + <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerHomeImplementation"> + <name>SimpleConsumerHomeImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerComponentImplementation"> + <name>SimpleConsumerComponentImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="SimplePublisherHomeInstance"> + <name>SimplePublisherHome</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherHomeImplementation" /> + </instance> + + <instance xmi:id="SimplePublisherComponentInstance"> + <name>SimplePublisherComponent</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisherHome</string> + </value> + </value> + </configProperty> + </instance> + + + <instance xmi:id="SimpleConsumerHomeInstance"> + <name>SimpleConsumerHome</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerHomeImplementation" /> + </instance> + + <instance xmi:id="SimpleConsumerComponentInstance"> + <name>SimpleConsumerComponent</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerHome</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerComponent</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SimplePublisherComponentInstanceReverse"> + <name>SimplePublisherComponentReverse</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisherHome</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisherComponentReverse</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>TestConnection</name> + <internalEndpoint> + <portName>hello_publishes</portName> + <provider>false</provider> + <kind>EventPublisher</kind> + <instance xmi:idref="SimplePublisherComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimpleConsumerComponent</location> + <provider>true</provider> + <portName>hello_consumes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <connection> + <name>TestConnection_2</name> + <internalEndpoint> + <portName>hello_publishes</portName> + <provider>false</provider> + <kind>EventPublisher</kind> + <instance xmi:idref="SimplePublisherComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimpleConsumerComponent</location> + <provider>true</provider> + <portName>hello_consumes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <connection> + <name>TestConnectionReverse</name> + <internalEndpoint> + <portName>hello_consumes</portName> + <provider>true</provider> + <kind>EventConsumer</kind> + <instance xmi:idref="SimpleConsumerComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimplePublisherComponentReverse</location> + <provider>false</provider> + <portName>hello_publishes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <connection> + <name>TestConnectionReverse_2</name> + <internalEndpoint> + <portName>hello_consumes</portName> + <provider>true</provider> + <kind>EventConsumer</kind> + <instance xmi:idref="SimpleConsumerComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimplePublisherComponentReverse</location> + <provider>false</provider> + <portName>hello_publishes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <!-- Artifacts declarations --> + <artifact xmi:id="SimplePublisher_ExecArtifact"> + <name>SimplePublisher_exec</name> + <source/> + <node/> + <location>SimplePublisher_exec</location> + </artifact> + <artifact xmi:id="SimplePublisher_SvntArtifact"> + <name>SimplePublisher_svnt</name> + <source/> + <node/> + <location>SimplePublisher_svnt</location> + </artifact> + + <artifact xmi:id="SimpleConsumer_ExecArtifact"> + <name>SimpleConsumer_exec</name> + <source/> + <node/> + <location>SimpleConsumer_exec</location> + </artifact> + <artifact xmi:id="SimpleConsumer_SvntArtifact"> + <name>SimpleConsumer_svnt</name> + <source/> + <node/> + <location>SimpleConsumer_svnt</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="SimplePublisherHomeInstance" /> + <constrainedInstance xmi:idref="SimplePublisherComponentInstance" /> + <constrainedInstance xmi:idref="SimplePublisherComponentInstanceReverse" /> + </localityConstraint> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="SimpleConsumerHomeInstance" /> + <constrainedInstance xmi:idref="SimpleConsumerComponentInstance" /> + </localityConstraint> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_SP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_SP.cdp new file mode 100644 index 00000000000..a93ad5a583a --- /dev/null +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS_PL_SP.cdp @@ -0,0 +1,349 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Home implementation --> + <implementation xmi:id="SimplePublisherHomeImplementation"> + <name>SimplePublisherHomeImplementation</name> + <source/> + <artifact xmi:idref="SimplePublisher_ExecArtifact" /> + <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimplePublisherHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimplePublisherHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisher_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisher_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimplePublisherComponentImplementation"> + <name>SimplePublisherComponentImplementation</name> + <source/> + <artifact xmi:idref="SimplePublisher_ExecArtifact" /> + <artifact xmi:idref="SimplePublisher_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerHomeImplementation"> + <name>SimpleConsumerHomeImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Simple_SimpleConsumerHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumer_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SimpleConsumerComponentImplementation"> + <name>SimpleConsumerComponentImplementation</name> + <source/> + <artifact xmi:idref="SimpleConsumer_ExecArtifact" /> + <artifact xmi:idref="SimpleConsumer_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.CCM.HomedComponent</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="SimplePublisherHomeInstance"> + <name>SimplePublisherHome</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherHomeImplementation" /> + </instance> + + <instance xmi:id="SimplePublisherComponentInstance"> + <name>SimplePublisherComponent</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisherHome</string> + </value> + </value> + </configProperty> + </instance> + + + <instance xmi:id="SimpleConsumerHomeInstance"> + <name>SimpleConsumerHome</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerHomeImplementation" /> + </instance> + + <instance xmi:id="SimpleConsumerComponentInstance"> + <name>SimpleConsumerComponent</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerHome</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerComponent</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SimplePublisherComponentInstanceReverse"> + <name>SimplePublisherComponentReverse</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimplePublisherComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisherHome</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimplePublisherComponentReverse</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>TestConnection</name> + <internalEndpoint> + <portName>hello_publishes</portName> + <provider>false</provider> + <kind>EventPublisher</kind> + <instance xmi:idref="SimplePublisherComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimpleConsumerComponent</location> + <provider>true</provider> + <portName>hello_consumes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <connection> + <name>TestConnection_2</name> + <internalEndpoint> + <portName>hello_publishes</portName> + <provider>false</provider> + <kind>EventPublisher</kind> + <instance xmi:idref="SimplePublisherComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimpleConsumerComponent</location> + <provider>true</provider> + <portName>hello_consumes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <connection> + <name>TestConnectionReverse</name> + <internalEndpoint> + <portName>hello_consumes</portName> + <provider>true</provider> + <kind>EventConsumer</kind> + <instance xmi:idref="SimpleConsumerComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimplePublisherComponentReverse</location> + <provider>false</provider> + <portName>hello_publishes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <connection> + <name>TestConnectionReverse_2</name> + <internalEndpoint> + <portName>hello_consumes</portName> + <provider>true</provider> + <kind>EventConsumer</kind> + <instance xmi:idref="SimpleConsumerComponentInstance" /> + </internalEndpoint> + <externalReference> + <location>corbaname:rir:/NameService#SimplePublisherComponentReverse</location> + <provider>false</provider> + <portName>hello_publishes</portName> + <supportedType>Meaningless</supportedType> + </externalReference> + </connection> + + <!-- Artifacts declarations --> + <artifact xmi:id="SimplePublisher_ExecArtifact"> + <name>SimplePublisher_exec</name> + <source/> + <node/> + <location>SimplePublisher_exec</location> + </artifact> + <artifact xmi:id="SimplePublisher_SvntArtifact"> + <name>SimplePublisher_svnt</name> + <source/> + <node/> + <location>SimplePublisher_svnt</location> + </artifact> + + <artifact xmi:id="SimpleConsumer_ExecArtifact"> + <name>SimpleConsumer_exec</name> + <source/> + <node/> + <location>SimpleConsumer_exec</location> + </artifact> + <artifact xmi:id="SimpleConsumer_SvntArtifact"> + <name>SimpleConsumer_svnt</name> + <source/> + <node/> + <location>SimpleConsumer_svnt</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="SimplePublisherHomeInstance" /> + <constrainedInstance xmi:idref="SimplePublisherComponentInstance" /> + <constrainedInstance xmi:idref="SimplePublisherComponentInstanceReverse" /> + <constrainedInstance xmi:idref="SimpleConsumerHomeInstance" /> + <constrainedInstance xmi:idref="SimpleConsumerComponentInstance" /> + </localityConstraint> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp index cc9adc76a2c..838047f3daa 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp @@ -226,13 +226,13 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> </internalEndpoint> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SimpleUserComponentInstance" /> @@ -242,13 +242,13 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SimpleUserComponentInstanceReverse" /> </internalEndpoint> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp index 47d78248fe8..327d4ed21c4 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp @@ -248,7 +248,7 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -256,7 +256,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleUserComponent</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -264,7 +264,7 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SimpleUserComponentInstanceReverse" /> @@ -272,7 +272,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp index e1debbaf8a7..cf31086434d 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp @@ -248,7 +248,7 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -256,7 +256,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleUserComponent</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -264,7 +264,7 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SimpleUserComponentInstanceReverse" /> @@ -272,7 +272,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp index 89d99f7f087..54eb24301ce 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp @@ -248,7 +248,7 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> @@ -256,7 +256,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleUserComponent</location> <provider>false</provider> - <portName>trig</portName> + <portName>trig_uses</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> @@ -264,7 +264,7 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SimpleUserComponentInstanceReverse" /> @@ -272,7 +272,7 @@ <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> - <portName>trig</portName> + <portName>trig_provides</portName> <supportedType>Meaningless</supportedType> </externalReference> </connection> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp index 302ea09d258..1040b880d3a 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NilFacet.cdp @@ -226,13 +226,13 @@ <connection> <name>TestConnection</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleNilFacetProviderComponentInstance" /> </internalEndpoint> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SimpleNilFacetUserComponentInstance" /> @@ -242,13 +242,13 @@ <connection> <name>TestConnectionReverse</name> <internalEndpoint> - <portName>trig</portName> + <portName>trig_uses</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SimpleNilFacetUserComponentInstanceReverse" /> </internalEndpoint> <internalEndpoint> - <portName>trig</portName> + <portName>trig_provides</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleNilFacetProviderComponentInstance" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl index a85382f4f53..5f996ff9791 100755 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl @@ -12,6 +12,8 @@ $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; $DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; +$ENV{'CIAO_LOG_LEVEL'}=1; + $daemons_running = 0; $em_running = 0; $ns_running = 0; diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl index f0a5594eba1..702e38b10c1 100755 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl @@ -12,6 +12,8 @@ $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; $DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; +$ENV{'CIAO_LOG_LEVEL'}=1; + $daemons_running = 0; $em_running = 0; $ns_running = 0; |