ChangeLogTag:Mon May 12 14:00:57 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

12 files changed, 350 insertions, 0 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 0d7e01f950a..c3ebf5a676d 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Mon May 12 14:00:57 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* examples/handcrafted/BasicSP/BasicSP.idl
+	* examples/handcrafted/BasicSP/BasicSP.mpc
+	* examples/handcrafted/BasicSP/BasicSPE.idl
+	* examples/handcrafted/BasicSP/BasicSP_stub_export.h
+	* examples/handcrafted/BasicSP/BasicSP_svnt_export.h
+	* examples/handcrafted/BasicSP/README
+	* examples/handcrafted/BasicSP/BMClosedED/BMClosedED.idl
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice.idl
+	* examples/handcrafted/BasicSP/BMDisplay/BMDisplay.idl
+	* examples/handcrafted/BasicSP/EC/EC.idl
+	* examples/handcrafted/BasicSP/EC/README
+
+	  A framework on which the new BasicSP would be developed. 
+
 Mon May 12 13:34:16 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* README: Updated the list of TAO librearies CIAO depends on.
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.idl
new file mode 100644
index 00000000000..251c5a45fc9
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.idl
@@ -0,0 +1,17 @@
+//$Id$
+#include "../BasicSP.idl"
+
+module BasicSP
+{
+  component BMClosedED
+    {
+      provides  ReadData dataOut;
+      uses      ReadData dataIn;
+      publishes DataAvailable outDataAvailable;
+      consumes  DataAvailable inDataAvailable;
+    };
+
+  home BMClosedEDHome manages BMClosedED
+    {
+    };
+};
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.idl
new file mode 100644
index 00000000000..8b647a87fa4
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.idl
@@ -0,0 +1,16 @@
+//$Id$
+#include "../BasicSP.idl"
+
+module BasicSP
+{
+  component BMDevice
+    {
+      provides ReadData dataOut;
+      publishes DataAvailable outDataAvailable;
+      consumes TimeOut timeOut20;
+    };
+
+  home BMDeviceHome manages BMDevice
+    {
+    };
+};
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.idl
new file mode 100644
index 00000000000..a703e89e421
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.idl
@@ -0,0 +1,15 @@
+//$Id$
+#include "../BasicSP.idl"
+
+module BasicSP
+{
+  component BMDisplay
+    {
+      uses ReadData dataIn;
+      consumes  DataAvailable inDataAvailable;
+    };
+
+  home BMDisplayHome manages BMDisplay
+    {
+    };
+};
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl
new file mode 100644
index 00000000000..4198c9381eb
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl
@@ -0,0 +1,47 @@
+// $Id$
+//=============================================================================
+/**
+ * @file HUDisplay.idl
+ *
+ * Definition of events, and common interfaces used in the BasicSP module.
+ *
+ * @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+#ifndef CIAO_BASIC_SP_IDL
+#define CIAO_BASIC_SP_IDL
+
+#include "ciao/CCM_Component.idl"
+
+// @@NOTE: Do we need a pragma prefix. Anyway its broken now in TAO..
+// #pragma prefix ""
+
+module BasicSP
+{
+
+  /**
+   * @NOTE: Not sure whether this is a good abstraction. Just copying
+   *  the stuff from Cadena folks.
+   */
+  /**
+   * @interface ReadData
+   *
+   */
+
+  interface ReadData {
+    string getData();
+  };
+
+  /**
+   * @eventtype Events that represent timeouts
+   */
+  eventtype TimeOut {};
+
+  /**
+   * @eventtype Events that represent data availability
+   */
+  eventtype DataAvailable {};
+};
+
+#endif /*CIAO_BASIC_SP_IDL*/
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
new file mode 100644
index 00000000000..0b408bf5c6e
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
@@ -0,0 +1,36 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -n HUDisplay"
+
+project(BasicSP_stub): ciao_client {
+
+  sharedname = BasicSP_stub
+  idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h
+  dllflags   = BASICSP_STUB_BUILD_DLL
+
+  IDL_Files {
+    BasicSP.idl
+  }
+
+  Source_Files {
+    BasicSPC.cpp
+  }
+}
+
+project(BasicSP_svnt) : ciao_server {
+  depends +=  BasicSP_stub
+  sharedname = BasicSP_svnt
+  libs    += BasicSP_stub
+
+  idlflags  +=  -Wb,export_macro=BASICSP_SVNT_Export -Wb,export_include=BasicSP_svnt_export.h
+  dllflags = BASICSP_SVNT_BUILD_DLL
+
+  IDL_Files {
+    BasicSPE.idl
+  }
+
+  Source_Files {
+    BasicSPC.cpp
+    BasicSPS.cpp
+    BasicSP_svnt.cpp
+  }
+}
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSPE.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSPE.idl
new file mode 100644
index 00000000000..4de945c339f
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSPE.idl
@@ -0,0 +1,58 @@
+// $Id$
+
+//=============================================================================
+/**
+ * @file BasicSPE.idl
+ *
+ * Executor definitions of events, and common interfaces used in
+ * BasicSP module.  This file should eventually be generated by the
+ * CCIDL compiler automatically when it does become available.
+ *
+ * @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
+ */
+//=============================================================================
+
+#ifndef CIAO_BASICSPE_IDL
+#define CIAO_BASICSPE_IDL
+
+
+#include "BasicSP.idl"
+
+module BasicSP
+{
+  /**
+   * @interface CCM_ReadData
+   *
+   * Executor interface mapping for supported interfaces.
+   *
+   */
+  local interface CCM_ReadData : ReadData
+  {
+  };
+
+  /**
+   * @interface CCM_Timeout
+   *
+   * Executor interface for timeout consumers.  This interface is
+   * only needed if a component implementation uses the
+   * ExecutorLocator strategy.
+   */
+  local interface CCM_TimeOut
+    {
+      void push (in TimeOut to);
+    };
+
+  /**
+   * @interface CCM_DataAvailable
+   *
+   * Executor interface for DataAvailable consumers.  This interface
+   * is only needed if a component implementation uses the
+   * ExecutorLocator strategy.
+   */
+  local interface CCM_DataAvailable
+    {
+      void push (in DataAvailable da);
+    };
+};
+
+#endif /* CIAO_BASICSPE_IDL */
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP_stub_export.h b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP_stub_export.h
new file mode 100644
index 00000000000..1ae476b4082
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP_stub_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BASICSP_STUB
+// ------------------------------
+#ifndef BASICSP_STUB_EXPORT_H
+#define BASICSP_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BASICSP_STUB_HAS_DLL)
+#  define BASICSP_STUB_HAS_DLL 1
+#endif /* ! BASICSP_STUB_HAS_DLL */
+
+#if defined (BASICSP_STUB_HAS_DLL) && (BASICSP_STUB_HAS_DLL == 1)
+#  if defined (BASICSP_STUB_BUILD_DLL)
+#    define BASICSP_STUB_Export ACE_Proper_Export_Flag
+#    define BASICSP_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BASICSP_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BASICSP_STUB_BUILD_DLL */
+#    define BASICSP_STUB_Export ACE_Proper_Import_Flag
+#    define BASICSP_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BASICSP_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BASICSP_STUB_BUILD_DLL */
+#else /* BASICSP_STUB_HAS_DLL == 1 */
+#  define BASICSP_STUB_Export
+#  define BASICSP_STUB_SINGLETON_DECLARATION(T)
+#  define BASICSP_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BASICSP_STUB_HAS_DLL == 1 */
+
+// Set BASICSP_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BASICSP_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BASICSP_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BASICSP_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BASICSP_STUB_NTRACE */
+
+#if (BASICSP_STUB_NTRACE == 1)
+#  define BASICSP_STUB_TRACE(X)
+#else /* (BASICSP_STUB_NTRACE == 1) */
+#  define BASICSP_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (BASICSP_STUB_NTRACE == 1) */
+
+#endif /* BASICSP_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP_svnt_export.h b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP_svnt_export.h
new file mode 100644
index 00000000000..23c48f384d7
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP_svnt_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl BASICSP_SVNT
+// ------------------------------
+#ifndef BASICSP_SVNT_EXPORT_H
+#define BASICSP_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (BASICSP_SVNT_HAS_DLL)
+#  define BASICSP_SVNT_HAS_DLL 1
+#endif /* ! BASICSP_SVNT_HAS_DLL */
+
+#if defined (BASICSP_SVNT_HAS_DLL) && (BASICSP_SVNT_HAS_DLL == 1)
+#  if defined (BASICSP_SVNT_BUILD_DLL)
+#    define BASICSP_SVNT_Export ACE_Proper_Export_Flag
+#    define BASICSP_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define BASICSP_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* BASICSP_SVNT_BUILD_DLL */
+#    define BASICSP_SVNT_Export ACE_Proper_Import_Flag
+#    define BASICSP_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define BASICSP_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* BASICSP_SVNT_BUILD_DLL */
+#else /* BASICSP_SVNT_HAS_DLL == 1 */
+#  define BASICSP_SVNT_Export
+#  define BASICSP_SVNT_SINGLETON_DECLARATION(T)
+#  define BASICSP_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* BASICSP_SVNT_HAS_DLL == 1 */
+
+// Set BASICSP_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (BASICSP_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define BASICSP_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define BASICSP_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !BASICSP_SVNT_NTRACE */
+
+#if (BASICSP_SVNT_NTRACE == 1)
+#  define BASICSP_SVNT_TRACE(X)
+#else /* (BASICSP_SVNT_NTRACE == 1) */
+#  define BASICSP_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (BASICSP_SVNT_NTRACE == 1) */
+
+#endif /* BASICSP_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.idl b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.idl
new file mode 100644
index 00000000000..88e7f6a3270
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.idl
@@ -0,0 +1,27 @@
+// $Id$
+//=============================================================================
+/**
+ * @file HUDisplay.idl
+ *
+ * Definition of events, and common interfaces used in the BasicSP module.
+ *
+ * @author Balachandran Natarajan <nanbor@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef CIAO_EC_IDL
+#define CIAO_EC_IDL
+
+#include "../BasicSP.idl"
+
+module BasicSP
+{
+  component EventChannel {
+    publishes TimeOut timeOut20;
+  };
+
+  home EventChannelHome manages EventChannel
+    {
+    };
+};
+#endif /*CIAO_EC_IDL*/
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/README b/TAO/CIAO/examples/handcrafted/BasicSP/EC/README
new file mode 100644
index 00000000000..7e032780ab1
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/README
@@ -0,0 +1,9 @@
+/**
+
+@page EC README File
+
+      The EC component. This shouldnt be needed if we had a way to
+integrate EC sugly into CIAO. We dont at the time of writing this
+example on May 12, 2003. Hence this holy hack!
+
+*/
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/README b/TAO/CIAO/examples/handcrafted/BasicSP/README
new file mode 100644
index 00000000000..eea34886dbe
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/README
@@ -0,0 +1,9 @@
+/**
+
+@page BasicSP README File
+
+      The most basic of the Boeing scenarios that form part of the
+OEP. This is done to illustrate how the OEP can be implemented using
+CIAO. 
+
+*/