diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-26 14:17:12 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-26 14:17:12 +0000 |
| commit | 9134cb049e9b4bd776b4e4c985b0e871371f4ed7 (patch) | |
| tree | 1797ebfc43dd5b073d0517990cd0d21d6669a4d8 /CIAO | |
| parent | 19d48962381d61ba2caafcbd40494590fb9d566d (diff) | |
| download | ATCD-9134cb049e9b4bd776b4e4c985b0e871371f4ed7.tar.gz | |
Wed May 26 14:15:33 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp:
* DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation_Default.cdp:
Removed the deault locality test, as we no longer support the former behavior,
that is, if instances are not explicitly included as part of a locality group,
they will no longer be considered as part of a seperate locality.
Diffstat (limited to 'CIAO')
3 files changed, 10 insertions, 417 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index fb90398b613..b5b64a7fdaa 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Wed May 26 14:15:33 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp: + * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation_Default.cdp: + + Removed the deault locality test, as we no longer support the former behavior, + that is, if instances are not explicitly included as part of a locality group, + they will no longer be considered as part of a seperate locality. + Wed May 26 13:38:49 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * ciao/Containers/Container_Base.idl: @@ -5,7 +14,7 @@ Wed May 26 13:38:49 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * ciao/Containers/Session/Session_Container.cpp: * ciao/Deployment/Handlers/Home_Handler.cpp: - Enabled home attribute configuration. + Enabled home attribute configuration. Wed May 26 13:25:01 UTC 2010 Marijke Hengstmengel <m.hengstmengel@remedy.nl> diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp deleted file mode 100644 index b8aa525c2b2..00000000000 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp +++ /dev/null @@ -1,208 +0,0 @@ -<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 --> - - <!-- Server Dance implementation--> - <implementation xmi:id="ProcessColocationComponentImplementation"> - <name>ProcessColocationComponentImplementation</name> - <source/> - <artifact xmi:idref="ProcessColocation_ExecArtifact" /> - <artifact xmi:idref="ProcessColocation_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see §10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Simple_ProcessColocation_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Simple_ProcessColocation_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ProcessColocation_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ProcessColocation_exec</string> - </value> - </value> - </execParameter> - </implementation> - - <instance xmi:id="ProcessColocationComponentInstance_Default_1"> - <name>ProcessColocationComponent_Default_One</name> - <node>NodeOne</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Default Process</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_Default_2"> - <name>ProcessColocationComponent_Default_Two</name> - <node>NodeOne</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Default Process</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_1"> - <name>ProcessColocationComponent_One</name> - <node>NodeOne</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process One</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_1_2"> - <name>ProcessColocationComponent_One_Two</name> - <node>NodeOne</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process One</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_2"> - <name>ProcessColocationComponent_Two</name> - <node>NodeOne</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process Two</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_2_2"> - <name>ProcessColocationComponent_Two_Two</name> - <node>NodeOne</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process Two</string> - </value> - </value> - </configProperty> - </instance> - - <!-- Artifacts declarations --> - <artifact xmi:id="ProcessColocation_ExecArtifact"> - <name>ProcessColocation_exec</name> - <source/> - <node/> - <location>ProcessColocation_exec</location> - </artifact> - <artifact xmi:id="ProcessColocation_SvntArtifact"> - <name>ProcessColocation_svnt</name> - <source/> - <node/> - <location>ProcessColocation_svnt</location> - </artifact> - - <localityConstraint> - <constraint>SameProcess</constraint> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" /> - </localityConstraint> - - <localityConstraint> - <constraint>SameProcess</constraint> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2_2" /> - </localityConstraint> - - </Deployment:DeploymentPlan> diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation_Default.cdp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation_Default.cdp deleted file mode 100644 index 68ea0ce0c70..00000000000 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/SimpleProcessColocation_Default.cdp +++ /dev/null @@ -1,208 +0,0 @@ -<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 --> - - <!-- Server Dance implementation--> - <implementation xmi:id="ProcessColocationComponentImplementation"> - <name>ProcessColocationComponentImplementation</name> - <source/> - <artifact xmi:idref="ProcessColocation_ExecArtifact" /> - <artifact xmi:idref="ProcessColocation_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see §10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Simple_ProcessColocation_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Simple_ProcessColocation_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ProcessColocation_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ProcessColocation_exec</string> - </value> - </value> - </execParameter> - </implementation> - - <instance xmi:id="ProcessColocationComponentInstance_Default_1"> - <name>ProcessColocationComponent_Default_One</name> - <node>Node</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Default Process</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_Default_2"> - <name>ProcessColocationComponent_Default_Two</name> - <node>Node</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Default Process</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_1"> - <name>ProcessColocationComponent_One</name> - <node>Node</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process One</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_1_2"> - <name>ProcessColocationComponent_One_Two</name> - <node>Node</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process One</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_2"> - <name>ProcessColocationComponent_Two</name> - <node>Node</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process Two</string> - </value> - </value> - </configProperty> - </instance> - - <instance xmi:id="ProcessColocationComponentInstance_2_2"> - <name>ProcessColocationComponent_Two_Two</name> - <node>Node</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ProcessColocationComponentImplementation" /> - <configProperty> - <name>process_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Process Two</string> - </value> - </value> - </configProperty> - </instance> - - <!-- Artifacts declarations --> - <artifact xmi:id="ProcessColocation_ExecArtifact"> - <name>ProcessColocation_exec</name> - <source/> - <node/> - <location>ProcessColocation_exec</location> - </artifact> - <artifact xmi:id="ProcessColocation_SvntArtifact"> - <name>ProcessColocation_svnt</name> - <source/> - <node/> - <location>ProcessColocation_svnt</location> - </artifact> - - <localityConstraint> - <constraint>SameProcess</constraint> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" /> - </localityConstraint> - - <localityConstraint> - <constraint>SameProcess</constraint> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> - <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2_2" /> - </localityConstraint> - - </Deployment:DeploymentPlan> |