ChangeLogTag: Mon Jan 19 19:42:00 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 54 insertions, 19 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 02751ec69b4..d4becc0d8d9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Mon Jan 19 19:42:00 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/LWFT/LWFT.mpc:
+        
+          Added lwft_server.mpb as a base project for LWFT_ReplicationManagerImpl.
+          
+        * orbsvcs/orbsvcs/LWFT/AppInfo.idl:
+        
+          Added include of LWFTDataStructures.idl and replaced typedef of
+          Object sequence with typedef of ObjectList. This change fixes
+          a link problem with Visual Studio.
+          
+        * orbsvcs/LWFT_Service/ReplicationManager_process.cpp:
+        
+          Removed an unused local variable, and removed an unintended
+          semicolon between an IF statement and its associated braces.
+          
+        * orbsvcs/LWFT_Service/LWFT_Service.mpc:
+        
+          Added lwft_server.mpb as a base project for ReplicationManager.
+
 Mon Jan 19 18:43:55 UTC 2009  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
         * orbsvcs/orbsvcs/LWFT/AppInfo.idl:
diff --git a/TAO/orbsvcs/LWFT_Service/LWFT_Service.mpc b/TAO/orbsvcs/LWFT_Service/LWFT_Service.mpc
index 4c6debc3ec6..c3489a2cfe8 100644
--- a/TAO/orbsvcs/LWFT_Service/LWFT_Service.mpc
+++ b/TAO/orbsvcs/LWFT_Service/LWFT_Service.mpc
@@ -1,12 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(ReplicationManager) : taoserver, naming {
+project(ReplicationManager) : taoserver, naming, lwft_server {
   after += LWFT_ReplicationManagerImpl
-  libs += LWFT_Common \
-          LWFT_ReplicationManager \
-          LWFT_ReplicationManagerImpl \
-          LWFT_Server
+  libs += LWFT_ReplicationManagerImpl
   exename = ReplicationManager
   
   IDL_Files {
diff --git a/TAO/orbsvcs/LWFT_Service/ReplicationManager_process.cpp b/TAO/orbsvcs/LWFT_Service/ReplicationManager_process.cpp
index 75f844bf247..ed4266563e4 100644
--- a/TAO/orbsvcs/LWFT_Service/ReplicationManager_process.cpp
+++ b/TAO/orbsvcs/LWFT_Service/ReplicationManager_process.cpp
@@ -40,7 +40,7 @@ public:
           AppOptions::instance ()->role (),
           local_rm_.in ());
       }
-    catch (CORBA::Exception & ex)
+    catch (CORBA::Exception &)
       {
         ACE_ERROR ((LM_ERROR, "RM: Could not register reference to "
                     " the ReplicationManager with the primary "
@@ -211,8 +211,8 @@ main (int argc, char *argv[])
       // register its own StateSynchronizationAgent
       rm_i->register_state_synchronization_agent (
         AppOptions::instance ()->host_id ().c_str (),
-	AppOptions::instance ()->process_id ().c_str (),
-	sync_agent_thread.agent_ref ());
+	      AppOptions::instance ()->process_id ().c_str (),
+	      sync_agent_thread.agent_ref ());
 
       sync_agent_thread.agent_ref ()->register_application (rm_i->object_id (),
                                                             rm.in ());
@@ -222,10 +222,10 @@ main (int argc, char *argv[])
                          rm.in (),
                          orb.in ());
 
-      if (registration_task.activate () == 0);
-      {
-        orb->run ();
-      }
+      if (registration_task.activate () == 0)
+        {
+          orb->run ();
+        }
 
       // ACE_DEBUG ((LM_DEBUG, "(%P|%t) RM - event loop finished\n"));
 
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/AppInfo.idl b/TAO/orbsvcs/orbsvcs/LWFT/AppInfo.idl
index 7edb86303c9..a14ea6fef86 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/AppInfo.idl
+++ b/TAO/orbsvcs/orbsvcs/LWFT/AppInfo.idl
@@ -1,3 +1,20 @@
+// -*- IDL -*-
+
+//=============================================================================
+/**
+ *  @file    AppInfo.idl
+ *
+ *  $Id$
+ *
+ *  @author  Friedhelm Wolf (fwolf@dre.vanderbilt.edu)
+ */
+//=============================================================================
+
+#ifndef _LWFT_APPINFO_IDL_
+#define _LWFT_APPINFO_IDL_
+
+#include "LWFTDataStructures.idl"
+
 module FLARE
 {
   module ReplicationManager
@@ -20,7 +37,7 @@ module FLARE
 
     typedef sequence<AppInfo> AppInfoSeq;
 
-    typedef sequence<Object> AgentList;
+    typedef ObjectList AgentList;
 
     struct HostUtil
     {
@@ -39,3 +56,6 @@ module FLARE
     };
   }; // end module ReplicationManager
 }; // end module FLARE
+
+
+#endif /* _LWFT_APPINFO_IDL_ */
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/LWFT.mpc b/TAO/orbsvcs/orbsvcs/LWFT/LWFT.mpc
index bd9b78e9b3e..4995000fd53 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/LWFT.mpc
+++ b/TAO/orbsvcs/orbsvcs/LWFT/LWFT.mpc
@@ -189,12 +189,9 @@ project(*ReplicationManager) : portableserver, orbsvcs_output {
   }
 }
 
-project(*ReplicationManagerImpl) : portableserver, orbsvcs_output {
-  after += *ReplicationManager *Client
-  libs += LWFT_Common \
-          LWFT_Client \
-          LWFT_ReplicationManager \
-          LWFT_StateSyncAgent
+project(*ReplicationManagerImpl) : portableserver, orbsvcs_output, lwft_server {
+  after += *Client
+  libs += LWFT_Client
   dynamicflags = RM_IMPL_BUILD_DLL
   sharedname = LWFT_ReplicationManagerImpl