merge from trunkOCI_Asynch_IMR

10 files changed, 56 insertions, 15 deletions

diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index cb8660c0335..93fcb08f269 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,32 @@
+Mon May 13 07:14:07 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Make 1.1.9 public and prepare for the next minor release
+
+Mon May 13 08:52:11 CEST 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.1.9 released.
+
+Fri May 10 09:00:38 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+          Fixed gcc 4.8 warning
+
+Fri Apr 12 20:38:29 UTC 2013  Adam Mitz  <mitza@ociweb.com>
+
+        * dance/Logger/Log_Macros.h:
+        * dance/Logger/Log_Macros.cpp:
+
+          Use a distinct ACE Log Category for DAnCE logging.
+
+Thu Apr 11 17:30:55 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/dance_tests.lst:
+          Added ending newline
+
+        * docs/releasenotes/index.html:
+          Updated email address
+
 Thu Mar 14 08:39:07 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * NEWS:
diff --git a/DAnCE/NEWS b/DAnCE/NEWS
index d05633f69db..8b08c8ef09b 100644
--- a/DAnCE/NEWS
+++ b/DAnCE/NEWS
@@ -1,6 +1,11 @@
-USER VISIBLE CHANGES BETWEEN DAnCE-1.1.8 and DAnCE-1.2.0
+USER VISIBLE CHANGES BETWEEN DAnCE-1.1.9 and DAnCE-1.2.0
 =======================================================
 
+USER VISIBLE CHANGES BETWEEN DAnCE-1.1.8 and DAnCE-1.1.9
+=======================================================
+
+. None
+
 USER VISIBLE CHANGES BETWEEN DAnCE-1.1.7 and DAnCE-1.1.8
 =======================================================
 
diff --git a/DAnCE/PROBLEM-REPORT-FORM b/DAnCE/PROBLEM-REPORT-FORM
index c7a963b0e5c..6d0543248f8 100644
--- a/DAnCE/PROBLEM-REPORT-FORM
+++ b/DAnCE/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
 To: ciao-users@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    DAnCE VERSION: 1.1.8
-    TAO VERSION : 2.1.8
-    ACE VERSION : 6.1.8
+    DAnCE VERSION: 1.1.9
+    TAO VERSION : 2.1.9
+    ACE VERSION : 6.1.9
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/DAnCE/VERSION b/DAnCE/VERSION
index e4edbaaa875..adff64ba9c7 100644
--- a/DAnCE/VERSION
+++ b/DAnCE/VERSION
@@ -1,4 +1,4 @@
-This is DAnCE version 1.1.8, released Thu Mar 14 09:04:46 CET 2013
+This is DAnCE version 1.1.9, released Mon May 13 08:52:11 CEST 2013
 
 If you have any problems with or questions about DAnCE, please send
 e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/DAnCE/bin/dance_tests.lst b/DAnCE/bin/dance_tests.lst
index 5880df334c7..6de5f2689d5 100644
--- a/DAnCE/bin/dance_tests.lst
+++ b/DAnCE/bin/dance_tests.lst
@@ -14,4 +14,4 @@ TAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: !STATIC !MINIMUM !COR
 TAO/DAnCE/tests/LocalityManager/ProcessName/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST LINUX
 TAO/DAnCE/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/DAnCE/tests/Plan_Launcher/EM-Delay/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
-TAO/DAnCE/tests/Plan_Launcher/EM-Delay/run_test_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
\ No newline at end of file
+TAO/DAnCE/tests/Plan_Launcher/EM-Delay/run_test_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
index 8b64cff2628..4ebb93083aa 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
@@ -685,8 +685,6 @@ namespace DAnCE
   {
     DANCE_TRACE ("LocalityManager_i::disconnect_connections");
 
-    typedef std::map < std::string, CORBA::ULong > ConnMap;
-
     Deployment_Completion completion (this->scheduler_);
 
     DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
diff --git a/DAnCE/dance/Logger/Log_Macros.cpp b/DAnCE/dance/Logger/Log_Macros.cpp
index b583f84322d..ae4ff53b384 100644
--- a/DAnCE/dance/Logger/Log_Macros.cpp
+++ b/DAnCE/dance/Logger/Log_Macros.cpp
@@ -4,3 +4,4 @@
 
 DAnCE_Logger_Export unsigned int DAnCE_debug_level = 1;
 
+DAnCE_Logger_Export ACE_Log_Category DAnCE_log_category ("DAnCE");
diff --git a/DAnCE/dance/Logger/Log_Macros.h b/DAnCE/dance/Logger/Log_Macros.h
index db75b5db10c..a9aacb3cfe4 100644
--- a/DAnCE/dance/Logger/Log_Macros.h
+++ b/DAnCE/dance/Logger/Log_Macros.h
@@ -9,6 +9,8 @@
 #ifndef DANCE_LOG_MACROS_H_
 #define DANCE_LOG_MACROS_H_
 
+#include "ace/Log_Category.h"
+
 #include "DAnCE_Logger_Export.h"
 
 #if !defined (DLINFO)
@@ -17,6 +19,8 @@
 
 extern DAnCE_Logger_Export unsigned int DAnCE_debug_level;
 
+extern DAnCE_Logger_Export ACE_Log_Category DAnCE_log_category;
+
 // Defines for logging levels
 
 /// Used for errors that cause the fatal shutdown of any portion
@@ -102,7 +106,8 @@ extern DAnCE_Logger_Export unsigned int DAnCE_debug_level;
     if (DAnCE_debug_level >= L) \
       { \
         int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Msg *ace___ = ACE_Log_Msg::instance ();               \
+        ACE_Log_Category_TSS *ace___ = DAnCE_log_category.per_thr_obj (); \
+        if (ace___ == 0) break; \
         ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \
         ace___->log X; \
       } \
@@ -114,7 +119,8 @@ extern DAnCE_Logger_Export unsigned int DAnCE_debug_level;
     if (DAnCE_debug_level >= L) \
       { \
         int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
+        ACE_Log_Category_TSS *ace___ = DAnCE_log_category.per_thr_obj (); \
+        if (ace___ == 0) break; \
         ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
         ace___->log X; \
       } \
@@ -126,7 +132,8 @@ extern DAnCE_Logger_Export unsigned int DAnCE_debug_level;
     if (DAnCE_debug_level >= L) \
       { \
         int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
+        ACE_Log_Category_TSS *ace___ = DAnCE_log_category.per_thr_obj (); \
+        if (ace___ == 0) break; \
         ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
         ace___->log X; \
       } \
@@ -138,7 +145,8 @@ extern DAnCE_Logger_Export unsigned int DAnCE_debug_level;
     if (DAnCE_debug_level >= L) \
       { \
         int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
+        ACE_Log_Category_TSS *ace___ = DAnCE_log_category.per_thr_obj (); \
+        if (ace___ == 0) break; \
         ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \
         ace___->log X; \
         return Y; \
diff --git a/DAnCE/dance/Version.h b/DAnCE/dance/Version.h
index 7d019eb3c80..b21f30883bd 100644
--- a/DAnCE/dance/Version.h
+++ b/DAnCE/dance/Version.h
@@ -5,5 +5,5 @@
 
 #define DAnCE_MAJOR_VERSION 1
 #define DAnCE_MINOR_VERSION 1
-#define DAnCE_BETA_VERSION 8
-#define DAnCE_VERSION "1.1.8"
+#define DAnCE_BETA_VERSION 9
+#define DAnCE_VERSION "1.1.9"
diff --git a/DAnCE/docs/releasenotes/index.html b/DAnCE/docs/releasenotes/index.html
index 659c6466f3d..ed82951626f 100644
--- a/DAnCE/docs/releasenotes/index.html
+++ b/DAnCE/docs/releasenotes/index.html
@@ -88,7 +88,7 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>:
 
 </ol>
 
-<b>Email: </b><a href="mailto:"</a<ADDRESS>ciao-users@cse.wustl.edu</ADDRESS>
+<b>Email: </b><a href="mailto:"</a<ADDRESS>ciao-users@list.isis.vanderbilt.edu</ADDRESS>
 </body> </html>
 
 <!--  LocalWords:  TODOs CCM IDL backend idl