ChangeLogTag:Mon May 12 16:53:33 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

9 files changed, 333 insertions, 5 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 1eb7943e736..d721a6176c9 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon May 12 16:53:33 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* examples/handcrafted/BasicSP/BasicSP.idl: 
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice.idl: 
+	* examples/handcrafted/BasicSP/BMDevice/BMDeviceE.idl:
+	* examples/handcrafted/BasicSP/BMDevice/BMDeviceEI.idl:
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice_exec_export.h:
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice_stub_export.h:
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt_export.h:
+
+	  Some standard files for thr BMDevice component
+
 Mon May 12 14:48:12 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* examples/handcrafted/Hello/run_simple_test.pl:
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.idl
index 8b647a87fa4..b8d98e90156 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.idl
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.idl
@@ -1,16 +1,30 @@
 //$Id$
+//=============================================================================
+/**
+ * @file BMDevice.idl
+ *
+ * Definition of the BMDevice component
+ *
+ * @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
+ */
+//=============================================================================
+#ifndef CIAO_BMDEVICE_IDL
+#define CIAO_BMDEVICE_IDL
+
 #include "../BasicSP.idl"
 
 module BasicSP
 {
   component BMDevice
     {
-      provides ReadData dataOut;
-      publishes DataAvailable outDataAvailable;
-      consumes TimeOut timeOut20;
+      provides ReadData data_out;
+      publishes DataAvailable out_data;
+      consumes TimeOut timeout20;
     };
 
   home BMDeviceHome manages BMDevice
     {
     };
 };
+
+#endif /*CIAO_BMDEVICE_IDL */
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
new file mode 100644
index 00000000000..35f60fa1e4a
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
@@ -0,0 +1,58 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i NavDisplay"
+
+project(BMDevice_stub): ciao_client {
+  depends += BMDevice_stub
+  sharedname = BMDevice_stub
+  idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h
+  dllflags   = NAVDISPLAY_STUB_BUILD_DLL
+
+  IDL_Files {
+    BMDevice.idl
+  }
+
+  Source_Files {
+    BMDeviceC.cpp
+  }
+}
+
+project(BMDevice_svnt) : ciao_server {
+  depends += BMDevice_svnt BMDevice_stub
+  sharedname  = BMDevice_svnt
+  libs    += BMDevice_stub BMDevice_stub BMDevice_svnt
+  libpaths += ..
+  idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h
+  dllflags = BMDEVICE_SVNT_BUILD_DLL
+
+  IDL_Files {
+    BMDeviceE.idl
+  }
+
+  Source_Files {
+    NavDisplayEC.cpp
+    NavDisplayS.cpp
+    NavDisplay_svnt.cpp
+  }
+}
+
+
+project(NavDisplay_exec) : ciao_server {
+  depends   += BMDevice_svnt
+  sharedname = BMDevice_exec
+  libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
+  libpaths += ..
+  idlflags  +=  -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDEVICE_exec_export.h
+  dllflags   = BMDEVICE_EXEC_BUILD_DLL
+
+  IDL_Files {
+    BMDeviceEI.idl
+  }
+
+  Source_Files {
+    BMDeviceEIC.cpp
+    BMDevice_exec.cpp
+  }
+}
+
+
+
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDeviceE.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDeviceE.idl
new file mode 100644
index 00000000000..85dba9d7c1c
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDeviceE.idl
@@ -0,0 +1,64 @@
+// $Id$
+
+// ===========================================================
+//
+// @file BMDeviceE.idl
+//
+// Handlecrafted "generated" code. :)
+//
+// @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
+//
+// ===========================================================
+
+#ifndef CIAO_BMDEVICEE_IDL
+#define CIAO_BMDEVICEE_IDL
+
+#include "CCM_Container.idl"
+#include "BMDevice.idl"       // Original component IDL definition
+#include "../BasicSPE.idl"
+
+module BasicSP
+{
+  local interface CCM_BMDevice_Executor
+  : Components::EnterpriseComponent
+  {
+  };
+
+  local interface CCM_BMDevice
+    : Components::EnterpriseComponent
+  {
+    CCM_ReadData get_data_out ();
+    void push_timeout20 (in TimeOut ev);
+  };
+
+  /** Context Interface
+   *
+   * Notice that we are taking a shortcut here to inherit the
+   * component-specific context from SessionContext directly instead
+   * of CCMContext.
+   */
+  local interface CCM_BMDevice_Context
+  : Components::SessionContext
+  {
+    void push_out_data (in DataAvailable ev);
+  };
+
+  local interface CCM_BMDeviceHomeExplicit
+    : Components::HomeExecutorBase
+  {
+  };
+
+  local interface CCM_BMDeviceHomeImplicit
+  {
+    ::Components::EnterpriseComponent create ()
+      raises (::Components::CCMException);
+  };
+
+  local interface CCM_BMDeviceHome
+    : CCM_NavDisplayHomeExplicit,
+      CCM_NavDisplayHomeImplicit
+  {
+  };
+};
+
+#endif /* NAVDISPLAYE_IDL */
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDeviceEI.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDeviceEI.idl
new file mode 100644
index 00000000000..7d1e6c01747
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDeviceEI.idl
@@ -0,0 +1,29 @@
+// $Id$
+//=============================================================================
+/**
+ * @file BMDeviceEI.idl
+ *
+ * Definition of the BMDevice component implementation.
+ *
+ * @author Nanbor Wang <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+#ifndef CIAO_BMDEVICEEI_IDL
+#define CIAO_BMDEVICEEI_IDL
+
+#include "BMDeviceE.idl"
+
+module BasicSP
+{
+  /**
+   * @interface BMDevice_Exec
+   */
+  local interface BMDevice_Exec :
+    CCM_BM_Device,
+    Components::SessionComponent
+  {
+  };
+
+};
+
+#endif /* CIAO_BMDEVICEEI_IDL */
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec_export.h b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec_export.h
new file mode 100644
index 00000000000..0aa2a34ba17
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BMDEVICE_EXEC
+// ------------------------------
+#ifndef BMDEVICE_EXEC_EXPORT_H
+#define BMDEVICE_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BMDEVICE_EXEC_HAS_DLL)
+#  define BMDEVICE_EXEC_HAS_DLL 1
+#endif /* ! BMDEVICE_EXEC_HAS_DLL */
+
+#if defined (BMDEVICE_EXEC_HAS_DLL) && (BMDEVICE_EXEC_HAS_DLL == 1)
+#  if defined (BMDEVICE_EXEC_BUILD_DLL)
+#    define BMDEVICE_EXEC_Export ACE_Proper_Export_Flag
+#    define BMDEVICE_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BMDEVICE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BMDEVICE_EXEC_BUILD_DLL */
+#    define BMDEVICE_EXEC_Export ACE_Proper_Import_Flag
+#    define BMDEVICE_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BMDEVICE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BMDEVICE_EXEC_BUILD_DLL */
+#else /* BMDEVICE_EXEC_HAS_DLL == 1 */
+#  define BMDEVICE_EXEC_Export
+#  define BMDEVICE_EXEC_SINGLETON_DECLARATION(T)
+#  define BMDEVICE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BMDEVICE_EXEC_HAS_DLL == 1 */
+
+// Set BMDEVICE_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BMDEVICE_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BMDEVICE_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BMDEVICE_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BMDEVICE_EXEC_NTRACE */
+
+#if (BMDEVICE_EXEC_NTRACE == 1)
+#  define BMDEVICE_EXEC_TRACE(X)
+#else /* (BMDEVICE_EXEC_NTRACE == 1) */
+#  define BMDEVICE_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (BMDEVICE_EXEC_NTRACE == 1) */
+
+#endif /* BMDEVICE_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_stub_export.h b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_stub_export.h
new file mode 100644
index 00000000000..b0f1a552d4b
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_stub_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BMDEVICE_STUB
+// ------------------------------
+#ifndef BMDEVICE_STUB_EXPORT_H
+#define BMDEVICE_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BMDEVICE_STUB_HAS_DLL)
+#  define BMDEVICE_STUB_HAS_DLL 1
+#endif /* ! BMDEVICE_STUB_HAS_DLL */
+
+#if defined (BMDEVICE_STUB_HAS_DLL) && (BMDEVICE_STUB_HAS_DLL == 1)
+#  if defined (BMDEVICE_STUB_BUILD_DLL)
+#    define BMDEVICE_STUB_Export ACE_Proper_Export_Flag
+#    define BMDEVICE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BMDEVICE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BMDEVICE_STUB_BUILD_DLL */
+#    define BMDEVICE_STUB_Export ACE_Proper_Import_Flag
+#    define BMDEVICE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BMDEVICE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BMDEVICE_STUB_BUILD_DLL */
+#else /* BMDEVICE_STUB_HAS_DLL == 1 */
+#  define BMDEVICE_STUB_Export
+#  define BMDEVICE_STUB_SINGLETON_DECLARATION(T)
+#  define BMDEVICE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BMDEVICE_STUB_HAS_DLL == 1 */
+
+// Set BMDEVICE_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BMDEVICE_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BMDEVICE_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BMDEVICE_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BMDEVICE_STUB_NTRACE */
+
+#if (BMDEVICE_STUB_NTRACE == 1)
+#  define BMDEVICE_STUB_TRACE(X)
+#else /* (BMDEVICE_STUB_NTRACE == 1) */
+#  define BMDEVICE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (BMDEVICE_STUB_NTRACE == 1) */
+
+#endif /* BMDEVICE_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt_export.h b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt_export.h
new file mode 100644
index 00000000000..653db47fefb
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BMDEVICE_SVNT
+// ------------------------------
+#ifndef BMDEVICE_SVNT_EXPORT_H
+#define BMDEVICE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BMDEVICE_SVNT_HAS_DLL)
+#  define BMDEVICE_SVNT_HAS_DLL 1
+#endif /* ! BMDEVICE_SVNT_HAS_DLL */
+
+#if defined (BMDEVICE_SVNT_HAS_DLL) && (BMDEVICE_SVNT_HAS_DLL == 1)
+#  if defined (BMDEVICE_SVNT_BUILD_DLL)
+#    define BMDEVICE_SVNT_Export ACE_Proper_Export_Flag
+#    define BMDEVICE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BMDEVICE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BMDEVICE_SVNT_BUILD_DLL */
+#    define BMDEVICE_SVNT_Export ACE_Proper_Import_Flag
+#    define BMDEVICE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BMDEVICE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BMDEVICE_SVNT_BUILD_DLL */
+#else /* BMDEVICE_SVNT_HAS_DLL == 1 */
+#  define BMDEVICE_SVNT_Export
+#  define BMDEVICE_SVNT_SINGLETON_DECLARATION(T)
+#  define BMDEVICE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BMDEVICE_SVNT_HAS_DLL == 1 */
+
+// Set BMDEVICE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BMDEVICE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BMDEVICE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BMDEVICE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BMDEVICE_SVNT_NTRACE */
+
+#if (BMDEVICE_SVNT_NTRACE == 1)
+#  define BMDEVICE_SVNT_TRACE(X)
+#else /* (BMDEVICE_SVNT_NTRACE == 1) */
+#  define BMDEVICE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (BMDEVICE_SVNT_NTRACE == 1) */
+
+#endif /* BMDEVICE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl
index 4198c9381eb..93bbb362123 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl
@@ -1,7 +1,7 @@
 // $Id$
 //=============================================================================
 /**
- * @file HUDisplay.idl
+ * @file BasicSP.idl
  *
  * Definition of events, and common interfaces used in the BasicSP module.
  *
@@ -30,7 +30,7 @@ module BasicSP
    */
 
   interface ReadData {
-    string getData();
+    string get_data ();
   };
 
   /**