Tue Nov 18 15:15:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 129 insertions, 99 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 42a2125886e..127601d5f29 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,27 @@
+Tue Nov 18 15:15:23 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * ciao/Servants/Servant_Impl_Base.h:
+        * DAnCE/Deployment/Deployment_TargetManager.idl:
+        * DAnCE/TargetManager/DomainDataManager.h:
+          Layout changes
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+          wchar changes
+
+        * DAnCE/TargetManager/DomainEvents.idl:
+          Updated includes
+
+        * DAnCE/TargetManager/TargetManager.mpc:
+        * DAnCE/TargetManager/TargetManagerImpl.idl
+          Updated for all refactoring
+
+        * MPC/config/ciao_nodemanager_stub.mpb:
+        * MPC/config/ciao_targetmanager_stub.mpb:
+        * MPC/config/ciao_targetmanager_svnt.mpb:
+        * MPC/config/dance_nodemanager_stub.mpb:
+        * MPC/config/dance_nodemanager_svnt.mpb:
+          Updated these with unique lib names and correct aftes
+
 Tue Nov 18 14:55:23 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * DAnCE/Interfaces/Interfaces.mpc:
diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
index f304105c5d1..7e74ae2b8bd 100644
--- a/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
+++ b/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl
@@ -11,13 +11,12 @@
 #include "DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl"
 
 module Deployment {
-
-	enum DomainUpdateKind {
-		Add,
-		Delete,
-		UpdateAll,
-		UpdateDynamic
-	};
+  enum DomainUpdateKind {
+    Add,
+    Delete,
+    UpdateAll,
+    UpdateDynamic
+  };
 
 	interface TargetManager {
 
@@ -28,11 +27,11 @@ module Deployment {
 		//@! in DOCGroup renamed to createResourceCommitment
 		ResourceCommitmentManager commitResources (in ResourceAllocations resources)
 			raises (ResourceCommitmentFailure);
-			
+
 		void destroyResourceCommitment (in ResourceCommitmentManager manager);
-		
-		void updateDomain (	in ::CORBA::StringSeq elements, 
-							in Domain domainSubset, 
+
+		void updateDomain (	in ::CORBA::StringSeq elements,
+							in Domain domainSubset,
 							in DomainUpdateKind updateKind);
 	};
 };
diff --git a/flat/CIAO/DAnCE/TargetManager/CmpClient.cpp b/flat/CIAO/DAnCE/TargetManager/CmpClient.cpp
index 2d98d97cc47..6616e0c1234 100644
--- a/flat/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/flat/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -33,7 +33,7 @@ namespace TM_Tester
   void write_to_file (::Deployment::Domain domain);
 
   /// variable contains IOR of the TM
-  const char * stringified_TM_IOR;
+  const ACE_TCHAR * stringified_TM_IOR;
 
   /// if add or delete from domain
   bool add_to_domain = true;
@@ -45,9 +45,9 @@ namespace TM_Tester
   const char * host_name;
 
     /// parses the arguments and extracts the params
-  bool parse_args (int argc, char *argv[])
+  bool parse_args (int argc, ACE_TCHAR *argv[])
   {
-    ACE_Get_Opt get_opts (argc, argv, "t:u:d");
+    ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:u:d"));
     int c;
     while ((c = get_opts ()) != -1)
       switch (c)
@@ -79,13 +79,11 @@ namespace TM_Tester
 }
 
   /// The main function
-  int main (int argc, char* argv[])
+  int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   {
     try {
       // First initialize the ORB, that will remove some arguments...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv,
-            "" /* the ORB name, it can be anything! */);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (!TM_Tester::parse_args (argc, argv))
         return -1;
@@ -142,7 +140,7 @@ namespace TM_Tester
       CORBA::Long d = 20;
       resource_seq[0].property[0].value <<= d;
 
-      ::Deployment::ResourceCommitmentManager_ptr manager = 
+      ::Deployment::ResourceCommitmentManager_ptr manager =
         ::Deployment::ResourceCommitmentManager::_nil ();
 
       try
diff --git a/flat/CIAO/DAnCE/TargetManager/DomainDataManager.h b/flat/CIAO/DAnCE/TargetManager/DomainDataManager.h
index 3df2bfcf437..b443ff7b83d 100644
--- a/flat/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/flat/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -49,8 +49,7 @@ namespace DAnCE
          */
         int update_domain (const ::CORBA::StringSeq & elements,
                            const ::Deployment::Domain & domainSubset,
-                           ::Deployment::DomainUpdateKind updateKind
-                           );
+                           ::Deployment::DomainUpdateKind updateKind);
       /**
        * @brief        This function is called from the Executor code
        *               to get the Original Domain data.
@@ -75,17 +74,16 @@ namespace DAnCE
        *
        */
       static DomainDataManager * create (CORBA::ORB_ptr orb,
-                                  ::Deployment::TargetManager_ptr target
-                                  );
+                                  ::Deployment::TargetManager_ptr target);
 
       /**
        * @brief Returns the static pointer to the
        *        data manager.
        * @return DomainDataManager*
-       * The staic get_data_manger function returning
+       * The static get_data_manger function returning
        *              the data_manager pointer
        */
-      static DomainDataManager* get_data_manager ();
+      static DomainDataManager* get_data_manager (void);
 
       /**
        * @brief deletes the data manager
@@ -253,7 +251,6 @@ namespace DAnCE
       int commit_release_RA (
           const ::Deployment::ResourceAllocations& resources);
 
-
       /// The ORB pointer
       CORBA::ORB_var orb_;
 
@@ -264,10 +261,10 @@ namespace DAnCE
       /// at total capacity
       ::Deployment::Domain initial_domain_;
 
-      /// The staic data member , replacing a global variable
-      static DomainDataManager* global_data_manager_; 
-      /// The Current Domain - contains resources
-      /// at current capacity
+      /// The static data member, replacing a global variable
+      static DomainDataManager* global_data_manager_;
+
+      /// The Current Domain - contains resources at current capacity
       ::Deployment::Domain current_domain_;
 
       /// The Target Manager Context
@@ -278,7 +275,7 @@ namespace DAnCE
        */
       ::Deployment::Domain provisioned_data_;
 
-      /// temporary domain used in commit/release to
+      /// Temporary domain used in commit/release to
       /// guard against exceptions
       ::Deployment::Domain temp_provisioned_data_;
 
diff --git a/flat/CIAO/DAnCE/TargetManager/DomainEvents.idl b/flat/CIAO/DAnCE/TargetManager/DomainEvents.idl
index 334eb0fb89d..243c329f264 100644
--- a/flat/CIAO/DAnCE/TargetManager/DomainEvents.idl
+++ b/flat/CIAO/DAnCE/TargetManager/DomainEvents.idl
@@ -11,7 +11,7 @@
 #define DOMAIN_CHANGE_IDL
 
 #include "DAnCE/Deployment/Deployment_TargetManager.idl"
-#include "ciao/CCM_Events.idl"
+#include "ccm/CCM_Events.idl"
 
 module DAnCE
 {
diff --git a/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc b/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 37f967d7cde..a4f44b3ab71 100644
--- a/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -1,19 +1,26 @@
 // $Id$
 
-project(CIAO_TargetManager_stub):  dance_lib, ccm_stub, dance_deployment_stub, dance_nodemanager_stub {
-  sharedname = TargetManager_stub
+project (CIAO_TargetManager_idl): taoidldefaults, anytypecode {
+  custom_only = 1
   idlflags += -Wb,stub_export_macro=TARGETMANAGER_STUB_Export \
               -Wb,stub_export_include=TargetManager_stub_export.h \
               -Wb,skel_export_macro=TARGETMANAGER_SVNT_Export \
               -Wb,skel_export_include=TargetManager_svnt_export.h
-  dynamicflags   = TARGETMANAGER_STUB_BUILD_DLL
-  requires += dummy_label
-  
   IDL_Files {
     TargetManagerImpl.idl
     TargetManagerExt.idl
     DomainEvents.idl
   }
+}
+
+
+project(CIAO_TargetManager_stub):  dance_lib, ccm_stub, dance_deployment_stub, dance_nodemanager_stub {
+  sharedname = CIAO_TargetManager_stub
+  after += CIAO_TargetManager_idl
+  dynamicflags   = TARGETMANAGER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
 
   Source_Files {
     TargetManagerImplC.cpp
@@ -22,43 +29,43 @@ project(CIAO_TargetManager_stub):  dance_lib, ccm_stub, dance_deployment_stub, d
   }
 }
 
-//project(CIAO_TargetManager_svnt) : ciao_servant, ciao_targetmanager_stub {
-//  sharedname  = TargetManager_svnt
-
-//  idlflags  +=  -Wb,export_macro=TARGETMANAGER_SVNT_Export \
-//                -Wb,export_include=TargetManager_svnt_export.h
+project(CIAO_TargetManager_svnt) : ciao_servant, ciao_targetmanager_stub, dance_deployment_svnt {
+  sharedname  = CIAO_TargetManager_svnt
+  after += CIAO_TargetManager_idl
+  idlflags  +=  -Wb,export_macro=TARGETMANAGER_SVNT_Export \
+                -Wb,export_include=TargetManager_svnt_export.h
 
-//  dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
+  dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
 
-//  CIDL_Files {
-//    TargetManager.cidl
-//  }
+  CIDL_Files {
+    TargetManager.cidl
+  }
 
-//  IDL_Files {
-//    TargetManagerE.idl
-//  }
+  IDL_Files {
+    TargetManagerE.idl
+  }
 
-//  Source_Files {
-//    TargetManagerEC.cpp
-//    TargetManagerImplS.cpp
-//    TargetManagerExtS.cpp
-//    TargetManager_svnt.cpp
-//    DomainEventsS.cpp
-//  }
-//}
+  Source_Files {
+    TargetManager_svnt.cpp
+    TargetManagerEC.cpp
+    TargetManagerImplS.cpp
+    TargetManagerExtS.cpp
+    DomainEventsS.cpp
+  }
+}
 
 
-//project(CIAO_TargetManager_exec) : ciao_executor, ciao_domainapplicationmanager_dnc, ciao_targetmanager_svnt {
-//  sharedname = TargetManager_exec
+project(CIAO_TargetManager_exec) : ciao_executor, ciao_domainapplicationmanager_dnc, ciao_targetmanager_svnt {
+  sharedname = TargetManager_exec
 
-//  dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
+  dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
 
-//  Source_Files {
-//    DomainDataManager.cpp
-//    TargetManager_exec.cpp
-//    ResourceCommitmentManager.cpp
-//  }
+  Source_Files {
+    DomainDataManager.cpp
+    TargetManager_exec.cpp
+    ResourceCommitmentManager.cpp
+  }
 
-//  IDL_Files {
-//  }
-//}
+  IDL_Files {
+  }
+}
diff --git a/flat/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl b/flat/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
index 2357323e7a5..dc65c29f6e2 100644
--- a/flat/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
+++ b/flat/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
@@ -7,10 +7,10 @@
  * @author Nilabja R <nilabjar@dre.vanderbilt.edu>
  */
 
-#ifndef TARGETMGR_IDL
-#define TARGETMGR_IDL
+#ifndef DANCE_TARGETMGR_IDL
+#define DANCE_TARGETMGR_IDL
 
-#include "ciao/Components.idl"
+#include "ccm/Components.idl"
 #include "DAnCE/Deployment/Deployment_PlanError.idl"
 #include "DAnCE/TargetManager/TargetManagerExt.idl"
 #include "DAnCE/TargetManager/DomainEvents.idl"
diff --git a/flat/CIAO/MPC/config/ciao_nodemanager_stub.mpb b/flat/CIAO/MPC/config/ciao_nodemanager_stub.mpb
index f725d8cf257..b0252f28d76 100644
--- a/flat/CIAO/MPC/config/ciao_nodemanager_stub.mpb
+++ b/flat/CIAO/MPC/config/ciao_nodemanager_stub.mpb
@@ -4,6 +4,6 @@
 project : dance_deployment_stub {
   includes += $(CIAO_ROOT)/DAnCE/Interfaces
   includes += $(CIAO_ROOT)/DAnCE/NodeManager
-  libs     += NodeManager_stub
-  after    += NodeManager_stub
+  libs     += DAnCE_NodeManager_Stub
+  after    += DAnCE_NodeManager_stub
 }
diff --git a/flat/CIAO/MPC/config/ciao_targetmanager_stub.mpb b/flat/CIAO/MPC/config/ciao_targetmanager_stub.mpb
index 59d2a646212..f9cf898c3a0 100644
--- a/flat/CIAO/MPC/config/ciao_targetmanager_stub.mpb
+++ b/flat/CIAO/MPC/config/ciao_targetmanager_stub.mpb
@@ -3,6 +3,6 @@
 
 project : ciao_nodemanager_stub {
   includes += $(CIAO_ROOT)/DAnCE/TargetManager
-  libs     += TargetManager_stub
+  libs     += CIAO_TargetManager_stub
   after    += CIAO_TargetManager_stub
 }
diff --git a/flat/CIAO/MPC/config/ciao_targetmanager_svnt.mpb b/flat/CIAO/MPC/config/ciao_targetmanager_svnt.mpb
index 6b6ea42cd7e..edfccb7f45d 100644
--- a/flat/CIAO/MPC/config/ciao_targetmanager_svnt.mpb
+++ b/flat/CIAO/MPC/config/ciao_targetmanager_svnt.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 project : ciao_targetmanager_stub {
-  libs     += TargetManager_svnt
+  libs     += CIAO_TargetManager_svnt
   after    += CIAO_TargetManager_svnt
 }
diff --git a/flat/CIAO/MPC/config/dance_nodemanager_stub.mpb b/flat/CIAO/MPC/config/dance_nodemanager_stub.mpb
index 0387f5817cb..cbad1f594fb 100644
--- a/flat/CIAO/MPC/config/dance_nodemanager_stub.mpb
+++ b/flat/CIAO/MPC/config/dance_nodemanager_stub.mpb
@@ -5,5 +5,5 @@ project : dance_deployment_stub {
   includes += $(CIAO_ROOT)/DAnCE/Interfaces
   includes += $(CIAO_ROOT)/DAnCE/NodeManager
   libs     += DAnCE_NodeManager_stub
-  after    += NodeManager_stub
+  after    += DAnCE_NodeManager_stub
 }
diff --git a/flat/CIAO/MPC/config/dance_nodemanager_svnt.mpb b/flat/CIAO/MPC/config/dance_nodemanager_svnt.mpb
new file mode 100644
index 00000000000..8acb50fbfe5
--- /dev/null
+++ b/flat/CIAO/MPC/config/dance_nodemanager_svnt.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_svnt {
+  includes += $(CIAO_ROOT)/DAnCE/Interfaces
+  includes += $(CIAO_ROOT)/DAnCE/NodeManager
+  libs     += DAnCE_NodeManager_svnt
+  after    += DAnCE_NodeManager_svnt
+}
diff --git a/flat/CIAO/ciao/Servants/Servant_Impl_Base.h b/flat/CIAO/ciao/Servants/Servant_Impl_Base.h
index e2e22b643fe..ad43b47f04f 100644
--- a/flat/CIAO/ciao/Servants/Servant_Impl_Base.h
+++ b/flat/CIAO/ciao/Servants/Servant_Impl_Base.h
@@ -56,7 +56,7 @@ namespace CIAO
     Servant_Impl_Base (Components::CCMHome_ptr home,
                        Home_Servant_Impl_Base *home_servant,
                        Container_ptr  c);
-    
+
   public:
     virtual ~Servant_Impl_Base (void);
 
@@ -65,17 +65,17 @@ namespace CIAO
     virtual ::Components::PrimaryKeyBase * get_primary_key (void);
 
     virtual CORBA::IRObject_ptr get_component_def (void);
-    
+
     virtual Components::SessionComponent_ptr get_executor (void);
 
     virtual void configuration_complete (void);
-    
+
     virtual void activate_component (void);
-    
+
     virtual void passivate_component (void);
-    
+
     virtual ::Components::CCMHome_ptr get_ccm_home (void);
-    
+
     virtual void remove (void);
 
     virtual ::Components::ConnectionDescriptions *
@@ -124,28 +124,28 @@ namespace CIAO
 
     virtual ::Components::Cookie * subscribe (const char * publisher_name,
                                               ::Components::EventConsumerBase_ptr subscriber);
-    
+
     virtual ::Components::EventConsumerBase_ptr unsubscribe (const char * publisher_name,
                                                              ::Components::Cookie * ck);
-    
+
     virtual void connect_consumer (const char * emitter_name,
                                    ::Components::EventConsumerBase_ptr consumer);
-    
+
     virtual ::Components::EventConsumerBase_ptr disconnect_consumer (const char * source_name);
-    
+
     virtual ::Components::EmitterDescriptions * get_all_emitters (void);
-    
+
     virtual ::Components::PublisherDescriptions * get_all_publishers (void);
-    
+
     virtual ::CORBA::Boolean same_component (::CORBA::Object_ptr object_ref);
-    
+
     virtual ::Components::Cookie * connect (const char * name,
                                             ::CORBA::Object_ptr connection);
-    
+
     virtual ::CORBA::Object_ptr disconnect (const char * name,
                                             ::Components::Cookie * ck);
 
-    
+
   protected:
     void add_facet (const char *port_name,
                     ::CORBA::Object_ptr port_ref);
@@ -177,8 +177,7 @@ namespace CIAO
         const char *port_type_repo_id,
         T_var &connection,
         ::Components::ReceptacleDescriptions_var &descriptions,
-        CORBA::ULong slot
-      );
+        CORBA::ULong slot);
 
     template<typename T_var>
     static void describe_multiplex_receptacle (
@@ -186,8 +185,7 @@ namespace CIAO
         const char *port_type_repo_id,
         ACE_Array_Map<ptrdiff_t, T_var> &objrefs,
         ::Components::ReceptacleDescriptions_var &descriptions,
-        CORBA::ULong slot
-      );
+        CORBA::ULong slot);
 
     template<typename T_var>
     static void describe_pub_event_source (
@@ -195,8 +193,7 @@ namespace CIAO
         const char *port_type_repo_id,
         ACE_Array_Map<ptrdiff_t, T_var> &consumers,
         ::Components::PublisherDescriptions_var &descriptions,
-        CORBA::ULong slot
-      );
+        CORBA::ULong slot);
 
     template<typename T_var>
     static void describe_emit_event_source (
@@ -204,8 +201,7 @@ namespace CIAO
         const char *port_type_repo_id,
         T_var &consumer_ref,
         ::Components::EmitterDescriptions_var &descriptions,
-        CORBA::ULong slot
-      );
+        CORBA::ULong slot);
 
   protected:
     typedef ACE_Array_Map<ACE_CString,