Mon Apr 27 03:20:52 UTC 2009 Yan Dai <dai_y@ociweb.com>

8 files changed, 40 insertions, 27 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 68613505a86..692d49a455b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,22 @@
-Sat Apr 25 06:25:37 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+Mon Apr 27 03:20:52 UTC 2009  Yan Dai  <dai_y@ociweb.com>
 
-        Added IMR changes OCI prepared for some customers. 
+        * orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/test.idl:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h:
+        * orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp:
+
+          Fixed fuzz errors and compilation errors in unicode builds.
+          
+        * NEWS:
           
+          Added entry for the new features.
+                    
+Sat Apr 25 06:25:37 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        Added IMR changes OCI prepared for some customers.
+
         * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
         * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
         * orbsvcs/ImplRepo_Service/Locator_Options.h:
diff --git a/TAO/NEWS b/TAO/NEWS
index 679cd785a1b..ab573724a30 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -3,8 +3,18 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 USER VISIBLE CHANGES BETWEEN TAO-1.6.9 and TAO-1.7.0
 ====================================================
-
-
+ . Merged in changes from OCI's distribution which originate from
+   OCI request ticket [RT 12912]. In their totality, the changes 
+   added new features for IMR to support the capability of client 
+   automatically reconnects servers within same port range upon  
+   server restart. The ServerId is added to ServerInfo in IMR to
+   help identify server process. The -UnregisterIfAddressReused 
+   option is added to IMR to enable the address reuse checking 
+   upon server registering. The servers that address is reused 
+   are unregistered from IMR. The -ORBForwardInvocationOnObjectNotExist
+   option is added to forward request to next available profile 
+   upon receiving OBJECT_NOT_EXIST exception reply. 
+  
 USER VISIBLE CHANGES BETWEEN TAO-1.6.8 and TAO-1.6.9
 ====================================================
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index 3b64fbddf4a..be83ecdb364 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -1,3 +1,4 @@
+// $Id$
 #include "testS.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
@@ -5,7 +6,7 @@
 #include <ace/OS.h>
 
 
-const ACE_TCHAR *ior_input_file = "file://serverA.ior";
+const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://serverA.ior");
 int test_duration_sec = 15;
 
 class Client_Task : public ACE_Task_Base
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
index eff5140b8b1..3d25595abd1 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
@@ -1,3 +1,4 @@
+// $Id$
 #include "test_i.h"
 #include "tao/ImR_Client/ImR_Client.h"
 #include <ace/Task.h>
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index fd4f207447f..8ba084efde0 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -1,3 +1,4 @@
+// $Id$
 #include "test_i.h"
 #include "tao/ImR_Client/ImR_Client.h"
 #include <ace/Task.h>
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test.idl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test.idl
index b29892067a6..3e16ed854f5 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test.idl
@@ -1,3 +1,4 @@
+// $Id$
 module Test
 {
   interface Dummy
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
index 703d319472b..0487df28e12 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
@@ -1,3 +1,4 @@
+// $Id$
 #include "test_i.h"
 #include "ace/OS_NS_time.h"
 
@@ -15,9 +16,6 @@ Test_Dummy_i::~Test_Dummy_i (void)
 char * Test_Dummy_i::getMessage (
     void
   )
-  throw (
-    ::CORBA::SystemException
-  )
 {
    // Add your implementation here
    return CORBA::string_dup("Test::Dummy---->Hello World");
@@ -35,9 +33,6 @@ Test_Time_i::~Test_Time_i (void)
 ::CORBA::Long Test_Time_i::current_time (
     void
   )
-  throw (
-    ::CORBA::SystemException
-  )
 {
    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n"));
    return CORBA::Long (ACE_OS::time (0));
@@ -46,9 +41,6 @@ Test_Time_i::~Test_Time_i (void)
 void Test_Time_i::shutdown (
     void
   )
-  throw (
-    ::CORBA::SystemException
-  )
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index 165c90becf9..ccb9c6c524c 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -1,5 +1,6 @@
-#ifndef IMR_SWITCHSERVER_H
-#define IMR_SWITCHSERVER_H
+// $Id$
+#ifndef IMR_RECONNECTSERVER_H
+#define IMR_RECONNECTSERVER_H
 
 #include "testS.h"
 
@@ -18,10 +19,7 @@ public:
   // Destructor 
   virtual ~Test_Dummy_i (void);
   
-  virtual  char * getMessage (void)
-    throw (
-      ::CORBA::SystemException
-    );
+  virtual  char * getMessage (void);
 };
 
 class  Test_Time_i
@@ -37,20 +35,14 @@ public:
   virtual
   ::CORBA::Long current_time (
       void
-    )
-    throw (
-      ::CORBA::SystemException
     );
   
   virtual
   void shutdown (
       void
-    )
-    throw (
-      ::CORBA::SystemException
     );
 };
 
 
-#endif /* IMR_SWITCHSERVER_H  */
+#endif /* IMR_RECONNECTSERVER_H  */