Mon Sep 18 18:57:51 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu>

5 files changed, 220 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ce48c1d3b0..56116b775ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep 18 18:57:51 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * common/OpString.idl:
+        * common/OpString_stub_export.h:
+        * common/RACE_common.idl:
+        * common/RACE_common.mpc: Added the operational-string IDL
+          structure.
+
 Tue Sep  5 23:29:45 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
         * Controller/Component/Controller.mpc:
diff --git a/common/OpString.idl b/common/OpString.idl
new file mode 100644
index 00000000000..a6d0f6713d7
--- /dev/null
+++ b/common/OpString.idl
@@ -0,0 +1,128 @@
+#ifndef OPERATIONAL_STRING_IDL
+#define OPERATIONAL_STRING_IDL
+
+#include "ciao/Deployment_Data.idl"
+
+module CIAO
+{
+  module RACE
+    {
+      struct TimeValue
+      {
+        /* Seconds since Jan. 1, 1970 */
+        long    sec;
+        /* and microseconds */
+        long    usec;
+      };
+
+      struct TimeWindow
+      {
+        TimeValue Earliest;
+
+        TimeValue Latest;
+      };
+
+      struct InstanceDescription
+      {
+        string UUID;
+
+        string name;
+
+        string node;
+
+        string taskId;
+
+        string suggestedImpl;
+
+        ::Deployment::Properties configProperty;
+
+        TimeWindow startWindow;
+
+        TimeWindow endWindow;
+      };
+
+      typedef sequence <InstanceDescription> InstanceDescriptions;
+
+
+      typedef ::Deployment::PlanConnectionDescription DataLinkDescription;
+
+
+      typedef sequence <DataLinkDescription> DataLinkDescriptions;
+
+      enum ConnectionType
+      {
+        CAUSAL,
+        SCHEDULING,
+        THREAT
+      };
+
+      struct OrderLinkDescription
+      {
+        string name;
+
+        ConnectionType type;
+
+        ::CORBA::StringSeq source;
+
+        ::Deployment::Requirements deployRequirement;
+
+        ::Deployment::ComponentExternalPortEndpoints externalEndpoint;
+
+        ::Deployment::PlanSubcomponentPortEndpoints internalEndpoint;
+
+        ::Deployment::ExternalReferenceEndpoints externalReference;
+
+        ::Deployment::ConnectionResourceDeploymentDescriptions deployedResource;
+      };
+
+      typedef sequence <OrderLinkDescription> OrderLinkDescriptions;
+
+
+      enum QoSComparator
+      {
+        LESS_THAN,
+        GREATER_THAN,
+        EQUAL,
+        LESS_THAN_EQUAL,
+        GREATER_THAN_EQUAL,
+        NOT_EQUAL
+      };
+
+      struct QoSSpecification
+      {
+        string name;
+
+        string type;
+
+        string MonitorID;
+
+        QoSComparator comparator;
+
+        any value;
+      };
+
+      typedef sequence <QoSSpecification> QoSSpecifications;
+
+      struct OperationalString
+      {
+
+        InstanceDescriptions instances;
+
+        DataLinkDescriptions dataLinks;
+
+        OrderLinkDescriptions orderLinks;
+
+        long priority;
+
+        QoSSpecifications QoSRequirements;
+
+        TimeWindow startWindow;
+
+        TimeWindow endWindow;
+      };
+
+
+  };
+};
+
+#endif /* OPERATIONAL_STRING_IDL */
diff --git a/common/OpString_stub_export.h b/common/OpString_stub_export.h
new file mode 100644
index 00000000000..671ab30d4c3
--- /dev/null
+++ b/common/OpString_stub_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl OPSTRING_STUB
+// ------------------------------
+#ifndef OPSTRING_STUB_EXPORT_H
+#define OPSTRING_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (OPSTRING_STUB_HAS_DLL)
+#  define OPSTRING_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && OPSTRING_STUB_HAS_DLL */
+
+#if !defined (OPSTRING_STUB_HAS_DLL)
+#  define OPSTRING_STUB_HAS_DLL 1
+#endif /* ! OPSTRING_STUB_HAS_DLL */
+
+#if defined (OPSTRING_STUB_HAS_DLL) && (OPSTRING_STUB_HAS_DLL == 1)
+#  if defined (OPSTRING_STUB_BUILD_DLL)
+#    define OPSTRING_STUB_Export ACE_Proper_Export_Flag
+#    define OPSTRING_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define OPSTRING_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* OPSTRING_STUB_BUILD_DLL */
+#    define OPSTRING_STUB_Export ACE_Proper_Import_Flag
+#    define OPSTRING_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define OPSTRING_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* OPSTRING_STUB_BUILD_DLL */
+#else /* OPSTRING_STUB_HAS_DLL == 1 */
+#  define OPSTRING_STUB_Export
+#  define OPSTRING_STUB_SINGLETON_DECLARATION(T)
+#  define OPSTRING_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* OPSTRING_STUB_HAS_DLL == 1 */
+
+// Set OPSTRING_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (OPSTRING_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define OPSTRING_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define OPSTRING_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !OPSTRING_STUB_NTRACE */
+
+#if (OPSTRING_STUB_NTRACE == 1)
+#  define OPSTRING_STUB_TRACE(X)
+#else /* (OPSTRING_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define OPSTRING_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (OPSTRING_STUB_NTRACE == 1) */
+
+#endif /* OPSTRING_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/common/RACE_common.idl b/common/RACE_common.idl
index 716fe6831de..f21a8978601 100644
--- a/common/RACE_common.idl
+++ b/common/RACE_common.idl
@@ -1,4 +1,3 @@
-//RACE_common.idl,v 1.1 2005/09/06 19:57:23 wotte Exp
 #ifndef RACE_COMMON_IDL
 #define RACE_COMMON_IDL
 
diff --git a/common/RACE_common.mpc b/common/RACE_common.mpc
index 5ad2bc13d91..359320e9f10 100644
--- a/common/RACE_common.mpc
+++ b/common/RACE_common.mpc
@@ -23,3 +23,29 @@ project(RACE_common_stub): ciao_deployment_stub {
     RACE_commonC.inl
   }
 }
+
+project(OpString_stub): ciao_deployment_stub {
+
+  sharedname = OpString_stub
+  idlflags += -Wb,stub_export_macro=OPSTRING_STUB_Export \
+              -Wb,stub_export_include=OpString_stub_export.h \
+              -SS
+
+  dynamicflags   = OPSTRING_STUB_BUILD_DLL
+
+  IDL_Files {
+    OpString.idl
+  }
+
+  Header_Files {
+    OpStringC.h
+  }
+
+  Inline_Files {
+    OpStringC.inl
+  }
+
+  Source_Files {
+    OpStringC.cpp
+  }
+}