diff options
Diffstat (limited to 'TAO/CIAO')
| -rw-r--r-- | TAO/CIAO/examples/UAV/descriptors/BBN_UAV.cad | 6 | ||||
| -rw-r--r-- | TAO/CIAO/examples/UAV/descriptors/BBN_UAV_2.cad | 5 | ||||
| -rw-r--r-- | TAO/CIAO/examples/UAV/descriptors/test.dat | 14 | ||||
| -rw-r--r-- | TAO/CIAO/examples/UAV/descriptors/two_component.cad | 3 | ||||
| -rw-r--r-- | TAO/CIAO/examples/UAV/descriptors/two_host.cad | 24 |
5 files changed, 13 insertions, 39 deletions
diff --git a/TAO/CIAO/examples/UAV/descriptors/BBN_UAV.cad b/TAO/CIAO/examples/UAV/descriptors/BBN_UAV.cad index af257e9cc02..45f3fcf3497 100644 --- a/TAO/CIAO/examples/UAV/descriptors/BBN_UAV.cad +++ b/TAO/CIAO/examples/UAV/descriptors/BBN_UAV.cad @@ -102,7 +102,7 @@ <componentinstantiation id="a_Battle"> </componentinstantiation> </homeplacement> - <destination>EngagementBattleHost</destination> + <destination>CAOCHost</destination> </processcollocation> @@ -112,7 +112,7 @@ <componentinstantiation id="a_UCAV_GS"> </componentinstantiation> </homeplacement> - <destination>UCAVGSHost</destination> + <destination>UAVGSHost</destination> </processcollocation> @@ -134,7 +134,7 @@ <componentinstantiation id="c_UCAV"> </componentinstantiation> </homeplacement> - <destination>UAVHost</destination> + <destination>UCAVHost</destination> </processcollocation> <!-- A plain vanilla partition. We don't even need the processcollocation tag here. --> diff --git a/TAO/CIAO/examples/UAV/descriptors/BBN_UAV_2.cad b/TAO/CIAO/examples/UAV/descriptors/BBN_UAV_2.cad index 033ed88c9b7..70f8022e2b7 100644 --- a/TAO/CIAO/examples/UAV/descriptors/BBN_UAV_2.cad +++ b/TAO/CIAO/examples/UAV/descriptors/BBN_UAV_2.cad @@ -74,14 +74,12 @@ <componentinstantiation id="a_UAV"> </componentinstantiation> </homeplacement> - <destination>UAVHost</destination> <homeplacement id="b_UAVHome"> <componentfileref idref="com-UAV"/> <componentinstantiation id="b_UAV"> </componentinstantiation> </homeplacement> - <destination>UAVHost</destination> <homeplacement id="c_UAVHome"> <componentfileref idref="com-UAV"/> @@ -98,7 +96,6 @@ <componentinstantiation id="a_Engagement"> </componentinstantiation> </homeplacement> - <destination>EngagementBattleHost</destination> <homeplacement id="a_Battle"> <componentfileref idref="com-Battle"/> @@ -125,14 +122,12 @@ <componentinstantiation id="a_UCAV"> </componentinstantiation> </homeplacement> - <destination>UAVHost</destination> <homeplacement id="b_UCAVHome"> <componentfileref idref="com-UCAV"/> <componentinstantiation id="b_UCAV"> </componentinstantiation> </homeplacement> - <destination>UAVHost</destination> <homeplacement id="c_UCAVHome"> <componentfileref idref="com-UCAV"/> diff --git a/TAO/CIAO/examples/UAV/descriptors/test.dat b/TAO/CIAO/examples/UAV/descriptors/test.dat index 915badbbb83..5321d6c6062 100644 --- a/TAO/CIAO/examples/UAV/descriptors/test.dat +++ b/TAO/CIAO/examples/UAV/descriptors/test.dat @@ -1,7 +1,7 @@ -CAOCHost corbaloc:iiop:pc105.emulab.net:20000/ServerActivator -EngagementBattleHost corbaloc:iiop:pc125.emulab.net:20000/ServerActivator -SatelliteHost corbaloc:iiop:pc143.emulab.net:20000/ServerActivator -UAVGSHost corbaloc:iiop:pc128.emulab.net:20000/ServerActivator -UAVHost corbaloc:iiop:pc138.emulab.net:20000/ServerActivator -UCAVGSHost corbaloc:iiop:pc20.emulab.net:20000/ServerActivator -UCAVHost corbaloc:iiop:pc26.emulab.net:20000/ServerActivator +CAOCHost corbaloc:iiop:pc106.emulab.net:20000/ServerActivator +EngagementBattleHost corbaloc:iiop:pc150.emulab.net:20000/ServerActivator +SatelliteHost corbaloc:iiop:pc151.emulab.net:20000/ServerActivator +UAVGSHost corbaloc:iiop:pc162.emulab.net:20000/ServerActivator +UAVHost corbaloc:iiop:pc146.emulab.net:20000/ServerActivator +UCAVGSHost corbaloc:iiop:pc100.emulab.net:20000/ServerActivator +UCAVHost corbaloc:iiop:pc108.emulab.net:20000/ServerActivator diff --git a/TAO/CIAO/examples/UAV/descriptors/two_component.cad b/TAO/CIAO/examples/UAV/descriptors/two_component.cad index 76a4561fbdc..93bce108f72 100644 --- a/TAO/CIAO/examples/UAV/descriptors/two_component.cad +++ b/TAO/CIAO/examples/UAV/descriptors/two_component.cad @@ -16,6 +16,7 @@ <partitioning> + <processcollocation> <homeplacement id="a_SatelliteHome"> <componentfileref idref="com-Satellite"/> <componentinstantiation id="a_Satellite"> @@ -25,6 +26,8 @@ </registercomponent> </componentinstantiation> </homeplacement> + <destination>SatelliteHost</destination> + </processcollocation> <processcollocation> <homeplacement id="a_CAOCHome"> diff --git a/TAO/CIAO/examples/UAV/descriptors/two_host.cad b/TAO/CIAO/examples/UAV/descriptors/two_host.cad index 573da2b62b8..29582b74153 100644 --- a/TAO/CIAO/examples/UAV/descriptors/two_host.cad +++ b/TAO/CIAO/examples/UAV/descriptors/two_host.cad @@ -62,18 +62,6 @@ </componentinstantiation> </homeplacement> - <homeplacement id="b_UAVHome"> - <componentfileref idref="com-UAV"/> - <componentinstantiation id="b_UAV"> - </componentinstantiation> - </homeplacement> - - <homeplacement id="c_UAVHome"> - <componentfileref idref="com-UAV"/> - <componentinstantiation id="c_UAV"> - </componentinstantiation> - </homeplacement> - <homeplacement id="a_EngagementHome"> <componentfileref idref="com-Engagement"/> <componentinstantiation id="a_Engagement"> @@ -92,18 +80,6 @@ </componentinstantiation> </homeplacement> - <homeplacement id="a_UCAVHome"> - <componentfileref idref="com-UCAV"/> - <componentinstantiation id="a_UCAV"> - </componentinstantiation> - </homeplacement> - - <homeplacement id="b_UCAVHome"> - <componentfileref idref="com-UCAV"/> - <componentinstantiation id="b_UCAV"> - </componentinstantiation> - </homeplacement> - <processcollocation> <homeplacement id="c_UCAVHome"> <componentfileref idref="com-UCAV"/> |