*** empty log message ***

30 files changed, 1118 insertions, 12 deletions

diff --git a/TAO/CIAO/examples/UAV/BBN_UAV.idl b/TAO/CIAO/examples/UAV/BBN_UAV.idl
index 899fddcbe07..19840f5c30d 100644
--- a/TAO/CIAO/examples/UAV/BBN_UAV.idl
+++ b/TAO/CIAO/examples/UAV/BBN_UAV.idl
@@ -6,6 +6,7 @@
  * Definition of events, and used in the BBN_UAV module.
  *
  * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
  */
 //=============================================================================
 
@@ -19,31 +20,41 @@
 
 module BBN_UAV
 {
-
   /**
-   * @eventtype 
+   * @eventtype: emitted by Satellite, and consumed by CAOC.
    */
   eventtype TargetLocated {};
 
   /**
-   * @eventtype 
+   * @eventtype: emitted by CAOC, and consumed by UAV_GS
+   *             (UAV ground station).
    */
   eventtype PrepareCapture {};
 
   /**
-   * @eventtype 
+   * @eventtype: published by UAV_GS, and consumed by UAVs.
    */
   eventtype StartCapture {};
 
   /**
-   * @eventtype 
+   * @eventtype: emitted by CAOC, and consumed by Engagement.
    */
-  eventtype TargetRecognized {};
+  eventtype PrepareEngage {};
 
   /**
-   * @eventtype 
+   * @eventtype: emitted by Engagement, and consumed by Battle.
+   */
+  eventtype StartEngage {};
+  
+  /**
+   * @eventtype: emitted by Engagement, and consumed by UCAV_GS.
+   */
+  eventtype PrepareMove {};
+  
+  /**
+   * @eventtype: published by UCAV_GS, and consumed by UCAVs.
    */
-  eventtype EngageTarget {};
+  eventtype StartMove {};
 
 };
 
diff --git a/TAO/CIAO/examples/UAV/BBN_UAV.mpc b/TAO/CIAO/examples/UAV/BBN_UAV.mpc
index 5640d16ea4b..e8f3275a357 100644
--- a/TAO/CIAO/examples/UAV/BBN_UAV.mpc
+++ b/TAO/CIAO/examples/UAV/BBN_UAV.mpc
@@ -16,7 +16,7 @@ project(BBN_UAV_stub): ciao_client {
   }
 }
 
-project(BBN_UAV_svnt) : ciao_server {
+project(BBN_UAV_svnt) : ciao_servant {
   after +=  BBN_UAV_stub
   sharedname  = BBN_UAV_svnt
   libs    += BBN_UAV_stub 
@@ -24,8 +24,18 @@ project(BBN_UAV_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=BBN_UAV_SVNT_Export -Wb,export_include=BBN_UAV_svnt_export.h
   dynamicflags = BBN_UAV_SVNT_BUILD_DLL
 
+  CIDL_Files {
+    BBN_UAV.cidl
+  }
+
+  IDL_Files {
+    BBN_UAVE.idl
+  }
+
   Source_Files {
+    BBN_UAVEC.cpp
     BBN_UAVS.cpp
+    BBN_UAV_svnt.cpp
   }
 }
 
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle.cidl b/TAO/CIAO/examples/UAV/Battle/Battle.cidl
new file mode 100644
index 00000000000..82d063b2ab3
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Battle/Battle.cidl
@@ -0,0 +1,17 @@
+//$Id$
+
+#ifndef BATTLE_CIDL
+#define BATTLE_CIDL
+
+#include "Engagement.idl"
+
+composition session Battle_Impl
+{
+  home executor BattleHome_Exec
+  {
+    implements BBN_UAV::BattleHome;
+    manages Battle_Exec;
+  };
+};
+
+#endif /* BATTLE_CIDL */
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle.idl b/TAO/CIAO/examples/UAV/Battle/Battle.idl
new file mode 100644
index 00000000000..0d80ee27e08
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Battle/Battle.idl
@@ -0,0 +1,29 @@
+//$Id$
+//=============================================================================
+/**
+ * @file Battle.idl
+ *
+ * Definition of the Battle component
+ *
+ * @author Gan Deng <gan.deng@vanderbilt.edu> 
+ * @author George Edwards <g.edwards@vanderbilt.edu>
+ */
+//=============================================================================
+#ifndef CIAO_BATTLE_IDL
+#define CIAO_BATTLE_IDL
+
+#include "../BBN_UAV.idl"
+
+module BBN_UAV
+{
+  component Battle
+    {
+      consumes StartEngage start_engage;
+    };
+
+  home BattleHome manages Battle
+    {
+    };
+};
+
+#endif /*CIAO_BATTLE_IDL */
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle.mpc b/TAO/CIAO/examples/UAV/Battle/Battle.mpc
new file mode 100644
index 00000000000..5abb21d3ac3
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Battle/Battle.mpc
@@ -0,0 +1,62 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl Battle"
+
+project(Battle_stub): ciao_client {
+  
+  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
+
+  IDL_Files {
+    Battle.idl
+  }
+
+  Source_Files {
+    BattleC.cpp
+  }
+}
+
+project(Battle_svnt) : ciao_servant {
+  after +=  Battle_stub
+  sharedname  = Battle_svnt
+  libs    += Battle_stub 
+  
+  idlflags  +=  -Wb,export_macro=BATTLE_SVNT_Export -Wb,export_include=Battle_svnt_export.h
+  dynamicflags = BATTLE_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    Battle.cidl
+  }
+
+  IDL_Files {
+    BattleE.idl
+  }
+
+  Source_Files {
+    BattleEC.cpp
+    BattleS.cpp
+    Battle_svnt.cpp
+  }
+}
+
+
+project(Battle_exec) : ciao_component {
+  after   += Battle_svnt
+  sharedname = Battle_exec
+  libs      += Battle_stub Battle_svnt 
+  
+  idlflags  +=  -Wb,export_macro=BATTLE_EXEC_Export -Wb,export_include=Battle_exec_export.h
+  dynamicflags   = BATTLE_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    
+    Battle_exec.cpp
+  }
+}
+
+
+
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle_exec_export.h b/TAO/CIAO/examples/UAV/Battle/Battle_exec_export.h
new file mode 100644
index 00000000000..eb5880e3548
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Battle/Battle_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BATTLE_EXEC
+// ------------------------------
+#ifndef BATTLE_EXEC_EXPORT_H
+#define BATTLE_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BATTLE_EXEC_HAS_DLL)
+#  define BATTLE_EXEC_HAS_DLL 1
+#endif /* ! BATTLE_EXEC_HAS_DLL */
+
+#if defined (BATTLE_EXEC_HAS_DLL) && (BATTLE_EXEC_HAS_DLL == 1)
+#  if defined (BATTLE_EXEC_BUILD_DLL)
+#    define BATTLE_EXEC_Export ACE_Proper_Export_Flag
+#    define BATTLE_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BATTLE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BATTLE_EXEC_BUILD_DLL */
+#    define BATTLE_EXEC_Export ACE_Proper_Import_Flag
+#    define BATTLE_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BATTLE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BATTLE_EXEC_BUILD_DLL */
+#else /* BATTLE_EXEC_HAS_DLL == 1 */
+#  define BATTLE_EXEC_Export
+#  define BATTLE_EXEC_SINGLETON_DECLARATION(T)
+#  define BATTLE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BATTLE_EXEC_HAS_DLL == 1 */
+
+// Set BATTLE_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BATTLE_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BATTLE_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BATTLE_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BATTLE_EXEC_NTRACE */
+
+#if (BATTLE_EXEC_NTRACE == 1)
+#  define BATTLE_EXEC_TRACE(X)
+#else /* (BATTLE_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define BATTLE_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (BATTLE_EXEC_NTRACE == 1) */
+
+#endif /* BATTLE_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle_stub_export.h b/TAO/CIAO/examples/UAV/Battle/Battle_stub_export.h
new file mode 100644
index 00000000000..305fd0ff3c1
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Battle/Battle_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BATTLE_STUB
+// ------------------------------
+#ifndef BATTLE_STUB_EXPORT_H
+#define BATTLE_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BATTLE_STUB_HAS_DLL)
+#  define BATTLE_STUB_HAS_DLL 1
+#endif /* ! BATTLE_STUB_HAS_DLL */
+
+#if defined (BATTLE_STUB_HAS_DLL) && (BATTLE_STUB_HAS_DLL == 1)
+#  if defined (BATTLE_STUB_BUILD_DLL)
+#    define BATTLE_STUB_Export ACE_Proper_Export_Flag
+#    define BATTLE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BATTLE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BATTLE_STUB_BUILD_DLL */
+#    define BATTLE_STUB_Export ACE_Proper_Import_Flag
+#    define BATTLE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BATTLE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BATTLE_STUB_BUILD_DLL */
+#else /* BATTLE_STUB_HAS_DLL == 1 */
+#  define BATTLE_STUB_Export
+#  define BATTLE_STUB_SINGLETON_DECLARATION(T)
+#  define BATTLE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BATTLE_STUB_HAS_DLL == 1 */
+
+// Set BATTLE_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BATTLE_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BATTLE_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BATTLE_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BATTLE_STUB_NTRACE */
+
+#if (BATTLE_STUB_NTRACE == 1)
+#  define BATTLE_STUB_TRACE(X)
+#else /* (BATTLE_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define BATTLE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (BATTLE_STUB_NTRACE == 1) */
+
+#endif /* BATTLE_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/Battle/Battle_svnt_export.h b/TAO/CIAO/examples/UAV/Battle/Battle_svnt_export.h
new file mode 100644
index 00000000000..9c98171dd68
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Battle/Battle_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BATTLE_SVNT
+// ------------------------------
+#ifndef BATTLE_SVNT_EXPORT_H
+#define BATTLE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BATTLE_SVNT_HAS_DLL)
+#  define BATTLE_SVNT_HAS_DLL 1
+#endif /* ! BATTLE_SVNT_HAS_DLL */
+
+#if defined (BATTLE_SVNT_HAS_DLL) && (BATTLE_SVNT_HAS_DLL == 1)
+#  if defined (BATTLE_SVNT_BUILD_DLL)
+#    define BATTLE_SVNT_Export ACE_Proper_Export_Flag
+#    define BATTLE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BATTLE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BATTLE_SVNT_BUILD_DLL */
+#    define BATTLE_SVNT_Export ACE_Proper_Import_Flag
+#    define BATTLE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BATTLE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BATTLE_SVNT_BUILD_DLL */
+#else /* BATTLE_SVNT_HAS_DLL == 1 */
+#  define BATTLE_SVNT_Export
+#  define BATTLE_SVNT_SINGLETON_DECLARATION(T)
+#  define BATTLE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BATTLE_SVNT_HAS_DLL == 1 */
+
+// Set BATTLE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BATTLE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BATTLE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BATTLE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BATTLE_SVNT_NTRACE */
+
+#if (BATTLE_SVNT_NTRACE == 1)
+#  define BATTLE_SVNT_TRACE(X)
+#else /* (BATTLE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define BATTLE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (BATTLE_SVNT_NTRACE == 1) */
+
+#endif /* BATTLE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/CAOC/CAOC.idl b/TAO/CIAO/examples/UAV/CAOC/CAOC.idl
index f00fea092ed..026d188f114 100644
--- a/TAO/CIAO/examples/UAV/CAOC/CAOC.idl
+++ b/TAO/CIAO/examples/UAV/CAOC/CAOC.idl
@@ -6,6 +6,7 @@
  * Definition of the CAOC component
  *
  * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
  */
 //=============================================================================
 #ifndef CIAO_CAOC_IDL
@@ -18,6 +19,7 @@ module BBN_UAV
   component CAOC
     {
       publishes PrepareCapture prepare_capture;
+      publishes PrepareEngage prepare_engage;
       consumes TargetLocated target_located;
     };
 
diff --git a/TAO/CIAO/examples/UAV/Engagement/Engagement.idl b/TAO/CIAO/examples/UAV/Engagement/Engagement.idl
index 99d6c8def31..58ec6f6369d 100644
--- a/TAO/CIAO/examples/UAV/Engagement/Engagement.idl
+++ b/TAO/CIAO/examples/UAV/Engagement/Engagement.idl
@@ -6,6 +6,7 @@
  * Definition of the Engagement component
  *
  * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
  */
 //=============================================================================
 #ifndef CIAO_ENGAGEMENT_IDL
@@ -18,7 +19,8 @@ module BBN_UAV
   component Engagement
     {
       publishes EngageTarget engage_target;
-      consumes TargetRecognized target_recognized;
+      publishes PrepareMove prepare_move;
+      consumes PrepareEngage prepare_engage;
     };
 
   home EngagementHome manages Engagement
diff --git a/TAO/CIAO/examples/UAV/Ground/UAV_GS.cidl b/TAO/CIAO/examples/UAV/Ground/UAV_GS.cidl
new file mode 100644
index 00000000000..58b9370c988
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Ground/UAV_GS.cidl
@@ -0,0 +1,17 @@
+//$Id$
+
+#ifndef UAV_GS_CIDL
+#define UAV_GS_CIDL
+
+#include "UAV_GS.idl"
+
+composition session UAV_GS_Impl
+{
+  home executor UAV_GSHome_Exec
+  {
+    implements BBN_UAV::UAV_GSHome;
+    manages UAV_GS_Exec;
+  };
+};
+
+#endif /* UAV_GS_CIDL */
diff --git a/TAO/CIAO/examples/UAV/Ground/UAV_GS.idl b/TAO/CIAO/examples/UAV/Ground/UAV_GS.idl
new file mode 100644
index 00000000000..8e7c9003c17
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Ground/UAV_GS.idl
@@ -0,0 +1,30 @@
+//$Id$
+//=============================================================================
+/**
+ * @file UAV_GS.idl
+ *
+ * Definition of the UAV_GS component
+ *
+ * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
+ */
+//=============================================================================
+#ifndef CIAO_UAV_GS_IDL
+#define CIAO_UAV_GS_IDL
+
+#include "../BBN_UAV.idl"
+
+module BBN_UAV
+{
+  component UAV_GS
+    {
+      publishes StartCapture start_capture;
+      consumes PrepareCapture prepare_capture;
+    };
+
+  home UAV_GSHome manages UAV_GS
+    {
+    };
+};
+
+#endif /*CIAO_UAV_GS_IDL */
diff --git a/TAO/CIAO/examples/UAV/Ground/UAV_GS.mpc b/TAO/CIAO/examples/UAV/Ground/UAV_GS.mpc
new file mode 100644
index 00000000000..d9207aa13bf
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Ground/UAV_GS.mpc
@@ -0,0 +1,62 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl UAV_GS"
+
+project(UAV_GS_stub): ciao_client {
+  
+  sharedname = UAV_GS_stub
+  idlflags += -Wb,stub_export_macro=UAV_GS_STUB_Export -Wb,stub_export_include=UAV_GS_stub_export.h -Wb,skel_export_macro=UAV_GS_SVNT_Export -Wb,skel_export_include=UAV_GS_svnt_export.h
+  dynamicflags   = UAV_GS_STUB_BUILD_DLL
+
+  IDL_Files {
+    UAV_GS.idl
+  }
+
+  Source_Files {
+    UAV_GSC.cpp
+  }
+}
+
+project(UAV_GS_svnt) : ciao_servant {
+  after +=  UAV_GS_stub
+  sharedname  = UAV_GS_svnt
+  libs    += UAV_GS_stub 
+  
+  idlflags  +=  -Wb,export_macro=UAV_GS_SVNT_Export -Wb,export_include=UAV_GS_svnt_export.h
+  dynamicflags = UAV_GS_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    UAV_GS.cidl
+  }
+
+  IDL_Files {
+    UAV_GSE.idl
+  }
+
+  Source_Files {
+    UAV_GSEC.cpp
+    UAV_GSS.cpp
+    UAV_GS_svnt.cpp
+  }
+}
+
+
+project(UAV_GS_exec) : ciao_component {
+  after   += UAV_GS_svnt
+  sharedname = UAV_GS_exec
+  libs      += UAV_GS_stub UAV_GS_svnt 
+  
+  idlflags  +=  -Wb,export_macro=UAV_GS_EXEC_Export -Wb,export_include=UAV_GS_exec_export.h
+  dynamicflags   = UAV_GS_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    
+    UAV_GS_exec.cpp
+  }
+}
+
+
+
diff --git a/TAO/CIAO/examples/UAV/Ground/UAV_GS_exec_export.h b/TAO/CIAO/examples/UAV/Ground/UAV_GS_exec_export.h
new file mode 100644
index 00000000000..bd204360f8d
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Ground/UAV_GS_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl UAV_GS_EXEC
+// ------------------------------
+#ifndef UAV_GS_EXEC_EXPORT_H
+#define UAV_GS_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (UAV_GS_EXEC_HAS_DLL)
+#  define UAV_GS_EXEC_HAS_DLL 1
+#endif /* ! UAV_GS_EXEC_HAS_DLL */
+
+#if defined (UAV_GS_EXEC_HAS_DLL) && (UAV_GS_EXEC_HAS_DLL == 1)
+#  if defined (UAV_GS_EXEC_BUILD_DLL)
+#    define UAV_GS_EXEC_Export ACE_Proper_Export_Flag
+#    define UAV_GS_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define UAV_GS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* UAV_GS_EXEC_BUILD_DLL */
+#    define UAV_GS_EXEC_Export ACE_Proper_Import_Flag
+#    define UAV_GS_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define UAV_GS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* UAV_GS_EXEC_BUILD_DLL */
+#else /* UAV_GS_EXEC_HAS_DLL == 1 */
+#  define UAV_GS_EXEC_Export
+#  define UAV_GS_EXEC_SINGLETON_DECLARATION(T)
+#  define UAV_GS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* UAV_GS_EXEC_HAS_DLL == 1 */
+
+// Set UAV_GS_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (UAV_GS_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define UAV_GS_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define UAV_GS_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !UAV_GS_EXEC_NTRACE */
+
+#if (UAV_GS_EXEC_NTRACE == 1)
+#  define UAV_GS_EXEC_TRACE(X)
+#else /* (UAV_GS_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define UAV_GS_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (UAV_GS_EXEC_NTRACE == 1) */
+
+#endif /* UAV_GS_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/Ground/UAV_GS_stub_export.h b/TAO/CIAO/examples/UAV/Ground/UAV_GS_stub_export.h
new file mode 100644
index 00000000000..a32896a11da
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Ground/UAV_GS_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl UAV_GS_STUB
+// ------------------------------
+#ifndef UAV_GS_STUB_EXPORT_H
+#define UAV_GS_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (UAV_GS_STUB_HAS_DLL)
+#  define UAV_GS_STUB_HAS_DLL 1
+#endif /* ! UAV_GS_STUB_HAS_DLL */
+
+#if defined (UAV_GS_STUB_HAS_DLL) && (UAV_GS_STUB_HAS_DLL == 1)
+#  if defined (UAV_GS_STUB_BUILD_DLL)
+#    define UAV_GS_STUB_Export ACE_Proper_Export_Flag
+#    define UAV_GS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define UAV_GS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* UAV_GS_STUB_BUILD_DLL */
+#    define UAV_GS_STUB_Export ACE_Proper_Import_Flag
+#    define UAV_GS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define UAV_GS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* UAV_GS_STUB_BUILD_DLL */
+#else /* UAV_GS_STUB_HAS_DLL == 1 */
+#  define UAV_GS_STUB_Export
+#  define UAV_GS_STUB_SINGLETON_DECLARATION(T)
+#  define UAV_GS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* UAV_GS_STUB_HAS_DLL == 1 */
+
+// Set UAV_GS_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (UAV_GS_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define UAV_GS_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define UAV_GS_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !UAV_GS_STUB_NTRACE */
+
+#if (UAV_GS_STUB_NTRACE == 1)
+#  define UAV_GS_STUB_TRACE(X)
+#else /* (UAV_GS_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define UAV_GS_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (UAV_GS_STUB_NTRACE == 1) */
+
+#endif /* UAV_GS_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/Ground/UAV_GS_svnt_export.h b/TAO/CIAO/examples/UAV/Ground/UAV_GS_svnt_export.h
new file mode 100644
index 00000000000..af1404bc262
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Ground/UAV_GS_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl UAV_GS_SVNT
+// ------------------------------
+#ifndef UAV_GS_SVNT_EXPORT_H
+#define UAV_GS_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (UAV_GS_SVNT_HAS_DLL)
+#  define UAV_GS_SVNT_HAS_DLL 1
+#endif /* ! UAV_GS_SVNT_HAS_DLL */
+
+#if defined (UAV_GS_SVNT_HAS_DLL) && (UAV_GS_SVNT_HAS_DLL == 1)
+#  if defined (UAV_GS_SVNT_BUILD_DLL)
+#    define UAV_GS_SVNT_Export ACE_Proper_Export_Flag
+#    define UAV_GS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define UAV_GS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* UAV_GS_SVNT_BUILD_DLL */
+#    define UAV_GS_SVNT_Export ACE_Proper_Import_Flag
+#    define UAV_GS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define UAV_GS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* UAV_GS_SVNT_BUILD_DLL */
+#else /* UAV_GS_SVNT_HAS_DLL == 1 */
+#  define UAV_GS_SVNT_Export
+#  define UAV_GS_SVNT_SINGLETON_DECLARATION(T)
+#  define UAV_GS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* UAV_GS_SVNT_HAS_DLL == 1 */
+
+// Set UAV_GS_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (UAV_GS_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define UAV_GS_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define UAV_GS_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !UAV_GS_SVNT_NTRACE */
+
+#if (UAV_GS_SVNT_NTRACE == 1)
+#  define UAV_GS_SVNT_TRACE(X)
+#else /* (UAV_GS_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define UAV_GS_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (UAV_GS_SVNT_NTRACE == 1) */
+
+#endif /* UAV_GS_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite.cidl b/TAO/CIAO/examples/UAV/Satellite/Satellite.cidl
new file mode 100644
index 00000000000..44ec09e3178
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite.cidl
@@ -0,0 +1,17 @@
+//$Id$
+
+#ifndef SATELLITE_CIDL
+#define SATELLITE_CIDL
+
+#include "Satellite.idl"
+
+composition session Satellite_Impl
+{
+  home executor SatelliteHome_Exec
+  {
+    implements BBN_UAV::SatelliteHome;
+    manages Satellite_Exec;
+  };
+};
+
+#endif /* SATELLITE_CIDL */
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite.idl b/TAO/CIAO/examples/UAV/Satellite/Satellite.idl
new file mode 100644
index 00000000000..da8ad4d9dcf
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite.idl
@@ -0,0 +1,28 @@
+//$Id$
+//=============================================================================
+/**
+ * @file Satellite.idl
+ *
+ * Definition of the Satellite component
+ *
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
+ */
+//=============================================================================
+#ifndef CIAO_SATELLITE_IDL
+#define CIAO_SATELLITE_IDL
+
+#include "../BBN_UAV.idl"
+
+module BBN_UAV
+{
+  component Satellite
+    {
+      publishes TargetLocated target_located;
+    };
+
+  home SatelliteHome manages Satellite
+    {
+    };
+};
+
+#endif /* CIAO_SATELLITE_IDL */
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc b/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
new file mode 100644
index 00000000000..b924552512f
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite.mpc
@@ -0,0 +1,62 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl Satellite"
+
+project(Satellite_stub): ciao_client {
+  
+  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
+
+  IDL_Files {
+    Satellite.idl
+  }
+
+  Source_Files {
+    SatelliteC.cpp
+  }
+}
+
+project(Satellite_svnt) : ciao_servant {
+  after +=  Satellite_stub
+  sharedname  = Satellite_svnt
+  libs    += Satellite_stub 
+  
+  idlflags  +=  -Wb,export_macro=SATELLITE_SVNT_Export -Wb,export_include=Satellite_svnt_export.h
+  dynamicflags = SATELLITE_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    Satellite.cidl
+  }
+
+  IDL_Files {
+    SatelliteE.idl
+  }
+
+  Source_Files {
+    SatelliteEC.cpp
+    SatelliteS.cpp
+    Satellite_svnt.cpp
+  }
+}
+
+
+project(Satellite_exec) : ciao_component {
+  after   += Satellite_svnt
+  sharedname = Satellite_exec
+  libs      += Satellite_stub Satellite_svnt 
+  
+  idlflags  +=  -Wb,export_macro=SATELLITE_EXEC_Export -Wb,export_include=Satellite_exec_export.h
+  dynamicflags   = SATELLITE_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    
+    Satellite_exec.cpp
+  }
+}
+
+
+
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite_exec_export.h b/TAO/CIAO/examples/UAV/Satellite/Satellite_exec_export.h
new file mode 100644
index 00000000000..a2f2ba8e4ab
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SATELLITE_EXEC
+// ------------------------------
+#ifndef SATELLITE_EXEC_EXPORT_H
+#define SATELLITE_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (SATELLITE_EXEC_HAS_DLL)
+#  define SATELLITE_EXEC_HAS_DLL 1
+#endif /* ! SATELLITE_EXEC_HAS_DLL */
+
+#if defined (SATELLITE_EXEC_HAS_DLL) && (SATELLITE_EXEC_HAS_DLL == 1)
+#  if defined (SATELLITE_EXEC_BUILD_DLL)
+#    define SATELLITE_EXEC_Export ACE_Proper_Export_Flag
+#    define SATELLITE_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SATELLITE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SATELLITE_EXEC_BUILD_DLL */
+#    define SATELLITE_EXEC_Export ACE_Proper_Import_Flag
+#    define SATELLITE_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SATELLITE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SATELLITE_EXEC_BUILD_DLL */
+#else /* SATELLITE_EXEC_HAS_DLL == 1 */
+#  define SATELLITE_EXEC_Export
+#  define SATELLITE_EXEC_SINGLETON_DECLARATION(T)
+#  define SATELLITE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SATELLITE_EXEC_HAS_DLL == 1 */
+
+// Set SATELLITE_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SATELLITE_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SATELLITE_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SATELLITE_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SATELLITE_EXEC_NTRACE */
+
+#if (SATELLITE_EXEC_NTRACE == 1)
+#  define SATELLITE_EXEC_TRACE(X)
+#else /* (SATELLITE_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SATELLITE_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SATELLITE_EXEC_NTRACE == 1) */
+
+#endif /* SATELLITE_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite_stub_export.h b/TAO/CIAO/examples/UAV/Satellite/Satellite_stub_export.h
new file mode 100644
index 00000000000..347169a1e5d
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SATELLITE_STUB
+// ------------------------------
+#ifndef SATELLITE_STUB_EXPORT_H
+#define SATELLITE_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (SATELLITE_STUB_HAS_DLL)
+#  define SATELLITE_STUB_HAS_DLL 1
+#endif /* ! SATELLITE_STUB_HAS_DLL */
+
+#if defined (SATELLITE_STUB_HAS_DLL) && (SATELLITE_STUB_HAS_DLL == 1)
+#  if defined (SATELLITE_STUB_BUILD_DLL)
+#    define SATELLITE_STUB_Export ACE_Proper_Export_Flag
+#    define SATELLITE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SATELLITE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SATELLITE_STUB_BUILD_DLL */
+#    define SATELLITE_STUB_Export ACE_Proper_Import_Flag
+#    define SATELLITE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SATELLITE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SATELLITE_STUB_BUILD_DLL */
+#else /* SATELLITE_STUB_HAS_DLL == 1 */
+#  define SATELLITE_STUB_Export
+#  define SATELLITE_STUB_SINGLETON_DECLARATION(T)
+#  define SATELLITE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SATELLITE_STUB_HAS_DLL == 1 */
+
+// Set SATELLITE_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SATELLITE_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SATELLITE_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SATELLITE_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SATELLITE_STUB_NTRACE */
+
+#if (SATELLITE_STUB_NTRACE == 1)
+#  define SATELLITE_STUB_TRACE(X)
+#else /* (SATELLITE_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SATELLITE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SATELLITE_STUB_NTRACE == 1) */
+
+#endif /* SATELLITE_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/Satellite/Satellite_svnt_export.h b/TAO/CIAO/examples/UAV/Satellite/Satellite_svnt_export.h
new file mode 100644
index 00000000000..2a7a87217e5
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/Satellite/Satellite_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SATELLITE_SVNT
+// ------------------------------
+#ifndef SATELLITE_SVNT_EXPORT_H
+#define SATELLITE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (SATELLITE_SVNT_HAS_DLL)
+#  define SATELLITE_SVNT_HAS_DLL 1
+#endif /* ! SATELLITE_SVNT_HAS_DLL */
+
+#if defined (SATELLITE_SVNT_HAS_DLL) && (SATELLITE_SVNT_HAS_DLL == 1)
+#  if defined (SATELLITE_SVNT_BUILD_DLL)
+#    define SATELLITE_SVNT_Export ACE_Proper_Export_Flag
+#    define SATELLITE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SATELLITE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SATELLITE_SVNT_BUILD_DLL */
+#    define SATELLITE_SVNT_Export ACE_Proper_Import_Flag
+#    define SATELLITE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SATELLITE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SATELLITE_SVNT_BUILD_DLL */
+#else /* SATELLITE_SVNT_HAS_DLL == 1 */
+#  define SATELLITE_SVNT_Export
+#  define SATELLITE_SVNT_SINGLETON_DECLARATION(T)
+#  define SATELLITE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SATELLITE_SVNT_HAS_DLL == 1 */
+
+// Set SATELLITE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SATELLITE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SATELLITE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SATELLITE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SATELLITE_SVNT_NTRACE */
+
+#if (SATELLITE_SVNT_NTRACE == 1)
+#  define SATELLITE_SVNT_TRACE(X)
+#else /* (SATELLITE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SATELLITE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SATELLITE_SVNT_NTRACE == 1) */
+
+#endif /* SATELLITE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/UAV/UAV.idl b/TAO/CIAO/examples/UAV/UAV/UAV.idl
index d21feea8ea1..7abcefa9468 100644
--- a/TAO/CIAO/examples/UAV/UAV/UAV.idl
+++ b/TAO/CIAO/examples/UAV/UAV/UAV.idl
@@ -6,6 +6,7 @@
  * Definition of the UAV component
  *
  * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
  */
 //=============================================================================
 #ifndef CIAO_UAV_IDL
@@ -17,7 +18,6 @@ module BBN_UAV
 {
   component UAV
     {
-      publishes TargetLocated target_located;
       consumes StartCapture start_capture;
     };
 
diff --git a/TAO/CIAO/examples/UAV/UCAV/UCAV.idl b/TAO/CIAO/examples/UAV/UCAV/UCAV.idl
index 8055b50bcdd..fb04763402f 100644
--- a/TAO/CIAO/examples/UAV/UCAV/UCAV.idl
+++ b/TAO/CIAO/examples/UAV/UCAV/UCAV.idl
@@ -6,6 +6,7 @@
  * Definition of the UCAV component
  *
  * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
  */
 //=============================================================================
 #ifndef CIAO_UCAV_IDL
@@ -17,7 +18,7 @@ module BBN_UAV
 {
   component UCAV
     {
-      consumes EngageTarget engage_target;
+      consumes StartMove start_move;
     };
 
   home UCAVHome manages UCAV
diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.cidl b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.cidl
new file mode 100644
index 00000000000..bccebb01815
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.cidl
@@ -0,0 +1,17 @@
+//$Id$
+
+#ifndef UCAV_GS_CIDL
+#define UCAV_GS_CIDL
+
+#include "UCAV_GS.idl"
+
+composition session UCAV_GS_Impl
+{
+  home executor UCAV_GSHome_Exec
+  {
+    implements BBN_UAV::UCAV_GSHome;
+    manages UCAV_GS_Exec;
+  };
+};
+
+#endif /* UCAV_GS_CIDL */
diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.idl b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.idl
new file mode 100644
index 00000000000..f46800c0790
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.idl
@@ -0,0 +1,29 @@
+//$Id$
+//=============================================================================
+/**
+ * @file UCAV_GS.idl
+ *
+ * Definition of the UCAV_GS component
+ *
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
+ * @author George Edwards <g.edwards@vanderbilt.edu>
+ */
+//=============================================================================
+#ifndef CIAO_UCAV_GS_IDL
+#define CIAO_UCAV_GS_IDL
+
+#include "../BBN_UAV.idl"
+
+module BBN_UAV
+{
+  component UCAV_GS
+    {
+      consumes StartMove start_move;
+    };
+
+  home UCAV_GSHome manages UCAV_GS
+    {
+    };
+};
+
+#endif /*CIAO_UCAV_GS_IDL */
diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.mpc b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.mpc
new file mode 100644
index 00000000000..460696e6b5b
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS.mpc
@@ -0,0 +1,62 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl UCAV_GS"
+
+project(UCAV_GS_stub): ciao_client {
+  
+  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
+
+  IDL_Files {
+    UCAV_GS.idl
+  }
+
+  Source_Files {
+    UCAV_GSC.cpp
+  }
+}
+
+project(UCAV_GS_svnt) : ciao_servant {
+  after +=  UCAV_GS_stub
+  sharedname  = UCAV_GS_svnt
+  libs    += UCAV_GS_stub 
+  
+  idlflags  +=  -Wb,export_macro=UCAV_GS_SVNT_Export -Wb,export_include=UCAV_GS_svnt_export.h
+  dynamicflags = UCAV_GS_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    UCAV_GS.cidl
+  }
+
+  IDL_Files {
+    UCAV_GSE.idl
+  }
+
+  Source_Files {
+    UCAV_GSEC.cpp
+    UCAV_GSS.cpp
+    UCAV_GS_svnt.cpp
+  }
+}
+
+
+project(UCAV_GS_exec) : ciao_component {
+  after   += UCAV_GS_svnt
+  sharedname = UCAV_GS_exec
+  libs      += UCAV_GS_stub UCAV_GS_svnt 
+  
+  idlflags  +=  -Wb,export_macro=UCAV_GS_EXEC_Export -Wb,export_include=UCAV_GS_exec_export.h
+  dynamicflags   = UCAV_GS_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    
+    UCAV_GS_exec.cpp
+  }
+}
+
+
+
diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec_export.h b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec_export.h
new file mode 100644
index 00000000000..3f938e6efc7
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl UCAV_GS_EXEC
+// ------------------------------
+#ifndef UCAV_GS_EXEC_EXPORT_H
+#define UCAV_GS_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (UCAV_GS_EXEC_HAS_DLL)
+#  define UCAV_GS_EXEC_HAS_DLL 1
+#endif /* ! UCAV_GS_EXEC_HAS_DLL */
+
+#if defined (UCAV_GS_EXEC_HAS_DLL) && (UCAV_GS_EXEC_HAS_DLL == 1)
+#  if defined (UCAV_GS_EXEC_BUILD_DLL)
+#    define UCAV_GS_EXEC_Export ACE_Proper_Export_Flag
+#    define UCAV_GS_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define UCAV_GS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* UCAV_GS_EXEC_BUILD_DLL */
+#    define UCAV_GS_EXEC_Export ACE_Proper_Import_Flag
+#    define UCAV_GS_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define UCAV_GS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* UCAV_GS_EXEC_BUILD_DLL */
+#else /* UCAV_GS_EXEC_HAS_DLL == 1 */
+#  define UCAV_GS_EXEC_Export
+#  define UCAV_GS_EXEC_SINGLETON_DECLARATION(T)
+#  define UCAV_GS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* UCAV_GS_EXEC_HAS_DLL == 1 */
+
+// Set UCAV_GS_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (UCAV_GS_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define UCAV_GS_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define UCAV_GS_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !UCAV_GS_EXEC_NTRACE */
+
+#if (UCAV_GS_EXEC_NTRACE == 1)
+#  define UCAV_GS_EXEC_TRACE(X)
+#else /* (UCAV_GS_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define UCAV_GS_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (UCAV_GS_EXEC_NTRACE == 1) */
+
+#endif /* UCAV_GS_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_stub_export.h b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_stub_export.h
new file mode 100644
index 00000000000..a6fdb1d7ff5
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl UCAV_GS_STUB
+// ------------------------------
+#ifndef UCAV_GS_STUB_EXPORT_H
+#define UCAV_GS_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (UCAV_GS_STUB_HAS_DLL)
+#  define UCAV_GS_STUB_HAS_DLL 1
+#endif /* ! UCAV_GS_STUB_HAS_DLL */
+
+#if defined (UCAV_GS_STUB_HAS_DLL) && (UCAV_GS_STUB_HAS_DLL == 1)
+#  if defined (UCAV_GS_STUB_BUILD_DLL)
+#    define UCAV_GS_STUB_Export ACE_Proper_Export_Flag
+#    define UCAV_GS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define UCAV_GS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* UCAV_GS_STUB_BUILD_DLL */
+#    define UCAV_GS_STUB_Export ACE_Proper_Import_Flag
+#    define UCAV_GS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define UCAV_GS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* UCAV_GS_STUB_BUILD_DLL */
+#else /* UCAV_GS_STUB_HAS_DLL == 1 */
+#  define UCAV_GS_STUB_Export
+#  define UCAV_GS_STUB_SINGLETON_DECLARATION(T)
+#  define UCAV_GS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* UCAV_GS_STUB_HAS_DLL == 1 */
+
+// Set UCAV_GS_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (UCAV_GS_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define UCAV_GS_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define UCAV_GS_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !UCAV_GS_STUB_NTRACE */
+
+#if (UCAV_GS_STUB_NTRACE == 1)
+#  define UCAV_GS_STUB_TRACE(X)
+#else /* (UCAV_GS_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define UCAV_GS_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (UCAV_GS_STUB_NTRACE == 1) */
+
+#endif /* UCAV_GS_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_svnt_export.h b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_svnt_export.h
new file mode 100644
index 00000000000..dd04aad838b
--- /dev/null
+++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl UCAV_GS_SVNT
+// ------------------------------
+#ifndef UCAV_GS_SVNT_EXPORT_H
+#define UCAV_GS_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (UCAV_GS_SVNT_HAS_DLL)
+#  define UCAV_GS_SVNT_HAS_DLL 1
+#endif /* ! UCAV_GS_SVNT_HAS_DLL */
+
+#if defined (UCAV_GS_SVNT_HAS_DLL) && (UCAV_GS_SVNT_HAS_DLL == 1)
+#  if defined (UCAV_GS_SVNT_BUILD_DLL)
+#    define UCAV_GS_SVNT_Export ACE_Proper_Export_Flag
+#    define UCAV_GS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define UCAV_GS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* UCAV_GS_SVNT_BUILD_DLL */
+#    define UCAV_GS_SVNT_Export ACE_Proper_Import_Flag
+#    define UCAV_GS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define UCAV_GS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* UCAV_GS_SVNT_BUILD_DLL */
+#else /* UCAV_GS_SVNT_HAS_DLL == 1 */
+#  define UCAV_GS_SVNT_Export
+#  define UCAV_GS_SVNT_SINGLETON_DECLARATION(T)
+#  define UCAV_GS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* UCAV_GS_SVNT_HAS_DLL == 1 */
+
+// Set UCAV_GS_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (UCAV_GS_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define UCAV_GS_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define UCAV_GS_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !UCAV_GS_SVNT_NTRACE */
+
+#if (UCAV_GS_SVNT_NTRACE == 1)
+#  define UCAV_GS_SVNT_TRACE(X)
+#else /* (UCAV_GS_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define UCAV_GS_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (UCAV_GS_SVNT_NTRACE == 1) */
+
+#endif /* UCAV_GS_SVNT_EXPORT_H */
+
+// End of auto generated file.