Fri Oct 13 15:52:30 UTC 2006 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>

5 files changed, 67 insertions, 223 deletions

diff --git a/ChangeLog b/ChangeLog
index c1f2b2c89ed..f0764f22cc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+Fri Oct 13 15:52:30 UTC 2006  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
+
+        * SA_POP/Builder.h
+        * SA_POP/Converter.cpp
+        * SA_POP/Converter.h
+        * SA_POP/Driver.cpp
+        * SA_POP/LogFileOut.cpp
+        * SA_POP/LogFileOut.h
+        * SA_POP/LogScreenOut.cpp
+        * SA_POP/LogScreenOut.h
+        * SA_POP/OutAdapter.h
+        * SA_POP/PlanCommands.h
+        * SA_POP/PlanHeuristics.h
+        * SA_POP/Planner.cpp
+        * SA_POP/Planner.h
+        * SA_POP/PlanStrategy.h
+        * SA_POP/SA_Builder.cpp
+        * SA_POP/SA_Builder.h
+        * SA_POP/SA_PlanCommands.cpp
+        * SA_POP/SA_PlanCommands.h
+        * SA_POP/SA_PlanHeuristics.cpp
+        * SA_POP/SA_PlanHeuristics.h
+        * SA_POP/SA_PlanStrategy.cpp
+        * SA_POP/SA_PlanStrategy.h
+        * SA_POP/SA_POP.mpc
+        * SA_POP/SA_POP_Exceptions.cpp
+        * SA_POP/SA_POP_Exceptions.h
+        * SA_POP/SA_POP_Types.h
+        * SA_POP/SA_SchedStrategy.cpp
+        * SA_POP/SA_SchedStrategy.h
+        * SA_POP/SA_WorkingPlan.cpp
+        * SA_POP/SA_WorkingPlan.h
+        * SA_POP/SchedStrategy.h
+        * SA_POP/SPACE.san.xml
+        * SA_POP/SPACE.tm.xml
+        * SA_POP/SPACE_Goal1.san.xml
+        * SA_POP/SPACE_Goal2.san.xml
+        * SA_POP/TaskImpl.cpp
+        * SA_POP/TaskImpl.h
+        * SA_POP/TaskMap.cpp
+        * SA_POP/TaskMap.h
+        * SA_POP/TaskMapFileIn.cpp
+        * SA_POP/TaskMapFileIn.h
+        * SA_POP/WorkingPlan.h
+        * SA_POP/XML_TaskMap.cpp
+        * SA_POP/XML_TaskMap.hpp
+        * SA_POP/SANet/SANet.cpp
+        * SA_POP/SANet/SANet.h
+        * SA_POP/SANet/SANetFileIn.cpp
+        * SA_POP/SANet/SANetFileIn.h
+        * SA_POP/SANet/SANet_Exceptions.cpp
+        * SA_POP/SANet/SANet_Exceptions.h
+        * SA_POP/SANet/SANet_Types.h
+        * SA_POP/SANet/SANode.cpp
+        * SA_POP/SANet/SANode.h
+        * SA_POP/SANet/XML_SANet.cpp
+        * SA_POP/SANet/XML_SANet.hpp
+        * common/OpString.idl: Revised to fix namespace problem with TimeValue.
+        * Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc: Removed Converter project.
+        * Input_Adapters/Interactive_Input_Adapter/Converter.cpp: Moved to SA_POP directory.
+        * Input_Adapters/Interactive_Input_Adapter/Converter.h: Moved to SA_POP directory.
+
+        Added SA-POP files.
+
+
 Wed Oct 11 14:02:30 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
         * Controller/Component/starter.cpp:
diff --git a/Input_Adapters/Interactive_Input_Adapter/Converter.cpp b/Input_Adapters/Interactive_Input_Adapter/Converter.cpp
deleted file mode 100644
index 85c31648059..00000000000
--- a/Input_Adapters/Interactive_Input_Adapter/Converter.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include "Converter.h"
-namespace CIAO
-{
-
-  namespace RACE
-  {
-
-    Converter::Converter (int argc, char **argv)
-      : iia_name_ ("RACE::InteractiveInput"),
-        history_ (false)
-    {
-      try
-        {
-          this->orb_ = CORBA::ORB_init (argc, argv, "");
-          // Resolve naming service
-          CORBA::Object_var ns_tmp =
-            this->orb_->resolve_initial_references ("NameService");
-          ::CosNaming::NamingContext_var ns =
-              ::CosNaming::NamingContext::_narrow (ns_tmp.in ());
-          ::CosNaming::Name ns_name;
-          CORBA::ULong i = 0;
-          ACE_Tokenizer tok (this->iia_name_.rep ());
-          tok.delimiter_replace (':', 0);
-          tok.delimiter_replace ('/', 0);
-          char *name_element = 0;
-          while ((name_element = tok.next ()) != 0)
-            {
-              ns_name.length (ns_name.length () + 1);
-              ns_name[i].id = CORBA::string_dup (name_element);
-              ++i;
-            }
-
-          /// now try to resolve the reference to the IIA.
-          CORBA::Object_var iia_tmp = ns->resolve (ns_name);
-          this->iia_ =
-            ::CIAO::RACE::Interactive_Input_Adapter::_narrow (iia_tmp.in ());
-
-          this->plan_gen_.init (this->orb_);
-
-        }
-      catch (CORBA::Exception &ex)
-        {
-          ACE_PRINT_EXCEPTION (ex, "Error in initializing the Injector!\n");
-        }
-
-    }
-
-    Converter::~Converter ()
-    {}
-
-
-    int
-    Converter::convert (OperationalString &op_string,
-                        ::Deployment::DeploymentPlan &plan)
-    {
-      plan.label = op_string.name;
-
-      plan.UUID = op_string.UUID;
-
-      plan.connection = op_string.dataLinks;
-
-      plan.infoProperty = op_string.properties;
-
-      int position;
-
-      for (CORBA::ULong itr = 0; itr < op_string.instances.length (); ++itr)
-        {
-          ::CIAO::RACE::InstanceDescription op_instance =
-            op_string.instances [itr];
-          if (this->plan_gen_.generate_plan
-              (plan,
-               op_instance.suggestedImpl.in (),
-               position))
-            {
-              ::Deployment::InstanceDeploymentDescription instance;
-              instance.name = op_instance.name;
-              instance.node = CORBA::string_dup ("Satellite");
-              instance.implementationRef = position;
-              instance.configProperty = op_instance.configProperty;
-              CORBA::ULong cur_len = plan.instance.length ();
-              plan.instance.length (cur_len+1);
-              plan.instance [cur_len] = instance;
-
-            }
-          else
-            {
-              ACE_ERROR ((LM_ERROR, "Given suggested type is not available "
-                          "in the Repoman!!\n Bailing out....\n"));
-              return -1;
-            }
-        }
-
-      return 0;
-    }
-
-    int
-    Converter::deploy_plan (::Deployment::DeploymentPlan &plan)
-    {
-      CIAO::RACE::Metadata_var metadata = new OBV_CIAO::RACE::Metadata;
-
-      try
-        {
-
-          if (this->history_)
-            {
-              metadata->command (::CIAO::RACE::TEARDOWN);
-              metadata->plan (this->previous_);
-              this->iia_->get_consumer_meta_data ()->push_Metadata (metadata.in ());
-            }
-
-          metadata->command (::CIAO::RACE::DEPLOY);
-          metadata->plan (plan);
-          this->iia_->get_consumer_meta_data ()->push_Metadata (metadata.in ());
-          this->history_ = true;
-          this->previous_ = plan;
-        }
-      catch (CORBA::Exception &ex)
-        {
-          ACE_PRINT_EXCEPTION (ex, "Exception caught\n");
-          return -1;
-        }
-
-      catch (...)
-        {
-          ACE_ERROR ((LM_ERROR, "(%P|%t) Injector: Unknown exception\n"));
-          return -1;
-        }
-
-      return 0;
-    }
-
-  }
-}
-
-
-int main (int argc, char **argv)
-{
-  try
-    {
-      ::CIAO::RACE::Converter converter (argc, argv);
-
-      ::CIAO::RACE::OperationalString op_string;
-
-      ::Deployment::DeploymentPlan plan;
-
-      if (converter.convert (op_string, plan) == 0)
-        {
-          converter.deploy_plan (plan);
-        }
-      else
-        {
-          return -1;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "(%P|%t) Unknown exception\n"));
-      return -1;
-    }
-}
diff --git a/Input_Adapters/Interactive_Input_Adapter/Converter.h b/Input_Adapters/Interactive_Input_Adapter/Converter.h
deleted file mode 100644
index bb150884cd1..00000000000
--- a/Input_Adapters/Interactive_Input_Adapter/Converter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "Interactive_Input_AdapterC.h"
-#include "ace/OS.h"
-#include "ace/SString.h"
-#include "orbsvcs/CosNamingC.h"
-#include "RACE/common/OpStringC.h"
-#include "Plan_Generator_impl.h"
-namespace CIAO
-{
-  namespace RACE
-  {
-
-    class Converter
-    {
-    public:
-      Converter (int argc, char **argv);
-
-      virtual ~Converter ();
-
-      virtual int convert (OperationalString &op_string,
-                           ::Deployment::DeploymentPlan &plan);
-
-      virtual int deploy_plan (::Deployment::DeploymentPlan &plan);
-
-    private:
-      ::CIAO::Plan_Generator::Plan_Generator_i plan_gen_;
-
-      ACE_CString iia_name_;
-
-      CORBA::ORB_var orb_;
-
-      CIAO::RACE::Interactive_Input_Adapter_var iia_;
-
-      bool history_;
-
-      ::Deployment::DeploymentPlan previous_;
-    };
-
-  }
-}
diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
index 9037c14308e..0b502e74c76 100644
--- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
+++ b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
@@ -107,25 +107,3 @@ project(Injector) : ciao_component_dnc, ciao_race_component, taoexe {
       Injector.cpp
    }
 }
-
-project(Converter) : ciao_component_dnc, ciao_race_component, taoexe, ciao_plan_generator {
-  after += Interactive_Input_Adapter_exec OpString_stub
-   exename = converter
-   libs += Interactive_Input_Adapter_stub \
-           Input_Adapter_stub \
-           Plan_Analyzer_Interface_stub\
-           OpString_stub
-
-
-
-   IDL_Files {
-   }
-
-   Header_Files {
-      Converter.h
-   }
-
-   Source_Files {
-      Converter.cpp
-   }
-}
diff --git a/common/OpString.idl b/common/OpString.idl
index c279f00178b..ebdcd86e77e 100644
--- a/common/OpString.idl
+++ b/common/OpString.idl
@@ -20,9 +20,9 @@ module CIAO
 
       struct TimeWindow
       {
-        TimeValue Earliest;
+        CIAO::RACE::TimeValue Earliest;
 
-        TimeValue Latest;
+        CIAO::RACE::TimeValue Latest;
       };
 
       struct InstanceDescription