*** empty log message ***

6 files changed, 12 insertions, 9 deletions

diff --git a/TAO/CIAO/examples/UAV/BBN_UAV.idl b/TAO/CIAO/examples/UAV/BBN_UAV.idl
index 19840f5c30d..7b1b1928ae6 100644
--- a/TAO/CIAO/examples/UAV/BBN_UAV.idl
+++ b/TAO/CIAO/examples/UAV/BBN_UAV.idl
@@ -13,7 +13,7 @@
 #ifndef CIAO_BBN_UAV_IDL
 #define CIAO_BBN_UAV_IDL
 
-#include "Components.idl"
+#include <Components.idl>
 
 // @@NOTE: Do we need a pragma prefix. Anyway its broken now in TAO..
 // #pragma prefix ""
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle.cidl b/TAO/CIAO/examples/UAV/Battle/Battle.cidl
index 82d063b2ab3..d3c609f8ff3 100644
--- a/TAO/CIAO/examples/UAV/Battle/Battle.cidl
+++ b/TAO/CIAO/examples/UAV/Battle/Battle.cidl
@@ -3,7 +3,7 @@
 #ifndef BATTLE_CIDL
 #define BATTLE_CIDL
 
-#include "Engagement.idl"
+#include "Battle.idl"
 
 composition session Battle_Impl
 {
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle.mpc b/TAO/CIAO/examples/UAV/Battle/Battle.mpc
index 5abb21d3ac3..f8a69721334 100644
--- a/TAO/CIAO/examples/UAV/Battle/Battle.mpc
+++ b/TAO/CIAO/examples/UAV/Battle/Battle.mpc
@@ -3,6 +3,7 @@
 
 project(Battle_stub): ciao_client {
   
+  after += BBN_UAV_stub
   sharedname = Battle_stub
   idlflags += -Wb,stub_export_macro=BATTLE_STUB_Export -Wb,stub_export_include=Battle_stub_export.h -Wb,skel_export_macro=BATTLE_SVNT_Export -Wb,skel_export_include=Battle_svnt_export.h
   dynamicflags   = BATTLE_STUB_BUILD_DLL
@@ -17,7 +18,7 @@ project(Battle_stub): ciao_client {
 }
 
 project(Battle_svnt) : ciao_servant {
-  after +=  Battle_stub
+  after +=  BBN_UAV_svnt Battle_stub
   sharedname  = Battle_svnt
   libs    += Battle_stub 
   
@@ -41,7 +42,7 @@ project(Battle_svnt) : ciao_servant {
 
 
 project(Battle_exec) : ciao_component {
-  after   += Battle_svnt
+  after   += BBN_UAV_svnt Battle_svnt
   sharedname = Battle_exec
   libs      += Battle_stub Battle_svnt 
   
diff --git a/TAO/CIAO/examples/UAV/Engagement/Engagement.idl b/TAO/CIAO/examples/UAV/Engagement/Engagement.idl
index 58ec6f6369d..9fd3708403f 100644
--- a/TAO/CIAO/examples/UAV/Engagement/Engagement.idl
+++ b/TAO/CIAO/examples/UAV/Engagement/Engagement.idl
@@ -18,7 +18,7 @@ module BBN_UAV
 {
   component Engagement
     {
-      publishes EngageTarget engage_target;
+      publishes StartEngage start_engage;
       publishes PrepareMove prepare_move;
       consumes PrepareEngage prepare_engage;
     };
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc b/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
index b924552512f..9c788584ec6 100644
--- a/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
@@ -3,6 +3,7 @@
 
 project(Satellite_stub): ciao_client {
   
+  after += BBN_UAV_stub
   sharedname = Satellite_stub
   idlflags += -Wb,stub_export_macro=SATELLITE_STUB_Export -Wb,stub_export_include=Satellite_stub_export.h -Wb,skel_export_macro=SATELLITE_SVNT_Export -Wb,skel_export_include=Satellite_svnt_export.h
   dynamicflags   = SATELLITE_STUB_BUILD_DLL
@@ -17,7 +18,7 @@ project(Satellite_stub): ciao_client {
 }
 
 project(Satellite_svnt) : ciao_servant {
-  after +=  Satellite_stub
+  after +=  BBN_UAV_svnt Satellite_stub
   sharedname  = Satellite_svnt
   libs    += Satellite_stub 
   
@@ -41,7 +42,7 @@ project(Satellite_svnt) : ciao_servant {
 
 
 project(Satellite_exec) : ciao_component {
-  after   += Satellite_svnt
+  after   += BBN_UAV_svnt Satellite_svnt
   sharedname = Satellite_exec
   libs      += Satellite_stub Satellite_svnt 
   
diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.mpc b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.mpc
index 460696e6b5b..049aee0863e 100644
--- a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.mpc
+++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.mpc
@@ -3,6 +3,7 @@
 
 project(UCAV_GS_stub): ciao_client {
   
+  after += BBN_UAV_stub
   sharedname = UCAV_GS_stub
   idlflags += -Wb,stub_export_macro=UCAV_GS_STUB_Export -Wb,stub_export_include=UCAV_GS_stub_export.h -Wb,skel_export_macro=UCAV_GS_SVNT_Export -Wb,skel_export_include=UCAV_GS_svnt_export.h
   dynamicflags   = UCAV_GS_STUB_BUILD_DLL
@@ -17,7 +18,7 @@ project(UCAV_GS_stub): ciao_client {
 }
 
 project(UCAV_GS_svnt) : ciao_servant {
-  after +=  UCAV_GS_stub
+  after +=  BBN_UAV_svnt UCAV_GS_stub
   sharedname  = UCAV_GS_svnt
   libs    += UCAV_GS_stub 
   
@@ -41,7 +42,7 @@ project(UCAV_GS_svnt) : ciao_servant {
 
 
 project(UCAV_GS_exec) : ciao_component {
-  after   += UCAV_GS_svnt
+  after   += BBN_UAV_svnt UCAV_GS_svnt
   sharedname = UCAV_GS_exec
   libs      += UCAV_GS_stub UCAV_GS_svnt