ChangeLogTag: Wed Dec 6 16:15:58 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>

5 files changed, 89 insertions, 74 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e73f29f2406..fbb10a98c27 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed Dec  6 16:15:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
+        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+
+          Fixing fuzz (missing $id$) and compile errors on
+          TAO_HAS_MINIMUM_CORBA builds, which define the POAManager
+          inteface without the deactivate() method.
+
 Wed Dec  6 16:10:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
@@ -18,48 +29,48 @@ Wed Dec  6 15:55:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 Wed Dec  6 15:29:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * tests/Abstract_Interface/Makefile.am:
-	* tests/Any/Recursive/Makefile.am:
-	* tests/BiDirectional/Makefile.am:
-	* tests/BiDirectional_DelayedUpcall/Makefile.am:
-	* tests/BiDirectional_NestedUpcall/Makefile.am:
-	* tests/Big_AMI/Makefile.am:
-	* tests/Big_Oneways/Makefile.am:
-	* tests/Big_Reply/Makefile.am:
-	* tests/Big_Request_Muxing/Makefile.am:
-	* tests/Big_Twoways/Makefile.am:
-	* tests/Blocking_Sync_None/Makefile.am:
-	* tests/Bug_1020_Basic_Regression/Makefile.am:
-	* tests/Bug_1020_Regression/Makefile.am:
-	* tests/Bug_1254_Regression/Makefile.am:
-	* tests/Bug_1269_Regression/Makefile.am:
-	* tests/Bug_1270_Regression/Makefile.am:
-	* tests/Bug_1330_Regression/Makefile.am:
-	* tests/Bug_1361_Regression/Makefile.am:
-	* tests/Bug_1476_Regression/Makefile.am:
-	* tests/Bug_1482_Regression/Makefile.am:
-
-	  Regenerated.
-
-	* tests/Abstract_Interface/Abstract_Interface.mpc:
-	* tests/Any/Recursive/RecursiveHello.mpc:
-	* tests/BiDirectional/BiDirectional.mpc:
-	* tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
-	* tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
-	* tests/Big_AMI/Big_AMI.mpc:
-	* tests/Big_Oneways/Big_Oneways.mpc:
-	* tests/Big_Reply/Big_Reply.mpc:
-	* tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
-	* tests/Big_Twoways/Big_Twoways.mpc:
-	* tests/Blocking_Sync_None/Blocking_Sync_None.mpc:
-	* tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc:
-	* tests/Bug_1020_Regression/Bug_1020_Regression.mpc:
-	* tests/Bug_1254_Regression/Bug_1254_Regression.mpc:
-	* tests/Bug_1269_Regression/Bug_1269_Regression.mpc:
-	* tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
-	* tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
-	* tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
-	* tests/Bug_1476_Regression/Bug_1476_Regression.mpc:
-	* tests/Bug_1482_Regression/Bug_1482_Regression.mpc:
+        * tests/Any/Recursive/Makefile.am:
+        * tests/BiDirectional/Makefile.am:
+        * tests/BiDirectional_DelayedUpcall/Makefile.am:
+        * tests/BiDirectional_NestedUpcall/Makefile.am:
+        * tests/Big_AMI/Makefile.am:
+        * tests/Big_Oneways/Makefile.am:
+        * tests/Big_Reply/Makefile.am:
+        * tests/Big_Request_Muxing/Makefile.am:
+        * tests/Big_Twoways/Makefile.am:
+        * tests/Blocking_Sync_None/Makefile.am:
+        * tests/Bug_1020_Basic_Regression/Makefile.am:
+        * tests/Bug_1020_Regression/Makefile.am:
+        * tests/Bug_1254_Regression/Makefile.am:
+        * tests/Bug_1269_Regression/Makefile.am:
+        * tests/Bug_1270_Regression/Makefile.am:
+        * tests/Bug_1330_Regression/Makefile.am:
+        * tests/Bug_1361_Regression/Makefile.am:
+        * tests/Bug_1476_Regression/Makefile.am:
+        * tests/Bug_1482_Regression/Makefile.am:
+
+          Regenerated.
+
+        * tests/Abstract_Interface/Abstract_Interface.mpc:
+        * tests/Any/Recursive/RecursiveHello.mpc:
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
+        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
+        * tests/Big_AMI/Big_AMI.mpc:
+        * tests/Big_Oneways/Big_Oneways.mpc:
+        * tests/Big_Reply/Big_Reply.mpc:
+        * tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
+        * tests/Big_Twoways/Big_Twoways.mpc:
+        * tests/Blocking_Sync_None/Blocking_Sync_None.mpc:
+        * tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc:
+        * tests/Bug_1020_Regression/Bug_1020_Regression.mpc:
+        * tests/Bug_1254_Regression/Bug_1254_Regression.mpc:
+        * tests/Bug_1269_Regression/Bug_1269_Regression.mpc:
+        * tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
+        * tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
+        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
+        * tests/Bug_1476_Regression/Bug_1476_Regression.mpc:
+        * tests/Bug_1482_Regression/Bug_1482_Regression.mpc:
 
           Split out IDL compilation into separate MPC project.
 
@@ -87,20 +98,20 @@ Wed Dec  6 14:15:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Wed Dec  6 13:40:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* examples/CSD_Strategy/ThreadPool6/Makefile.am:
-	* examples/Simple/time-date/Makefile.am:
-	* orbsvcs/examples/ORT/Makefile.am:
-	* orbsvcs/tests/Bug_2709_Regression/Makefile.am:
-	* tests/Bug_2654_Regression/Makefile.am:
-	* tests/OctetSeq/Makefile.am:
-	* tests/Oneway_Timeouts/Makefile.am:
-	* tests/Param_Test/Makefile.am:
-	* tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/tests/Bug_2709_Regression/Makefile.am:
+        * tests/Bug_2654_Regression/Makefile.am:
+        * tests/OctetSeq/Makefile.am:
+        * tests/Oneway_Timeouts/Makefile.am:
+        * tests/Param_Test/Makefile.am:
+        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
 
           Regenerate.
 
         * configure.ac:
-	* orbsvcs/tests/Makefile.am:
+        * orbsvcs/tests/Makefile.am:
         * tests/Makefile.am:
 
           Changes for move of Bug_2709_Regression unit test.
@@ -214,19 +225,19 @@ Tue Dec  5 04:21:50 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
 Tue Dec  5 04:10:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* tests/AMH_Exceptions/Makefile.am:
-	* tests/AMH_Oneway/Makefile.am:
-	* tests/AMI/Makefile.am:
-	* tests/AMI_Buffering/Makefile.am:
-	* tests/AMI_Timeouts/Makefile.am:
+        * tests/AMH_Exceptions/Makefile.am:
+        * tests/AMH_Oneway/Makefile.am:
+        * tests/AMI/Makefile.am:
+        * tests/AMI_Buffering/Makefile.am:
+        * tests/AMI_Timeouts/Makefile.am:
 
           Regenerated.
 
-	* tests/AMH_Exceptions/AMH_Exceptions.mpc:
-	* tests/AMH_Oneway/AMH_Oneway.mpc:
-	* tests/AMI/AMI.mpc:
-	* tests/AMI_Buffering/AMI_Buffering.mpc:
-	* tests/AMI_Timeouts/AMI_Timeouts.mpc:
+        * tests/AMH_Exceptions/AMH_Exceptions.mpc:
+        * tests/AMH_Oneway/AMH_Oneway.mpc:
+        * tests/AMI/AMI.mpc:
+        * tests/AMI_Buffering/AMI_Buffering.mpc:
+        * tests/AMI_Timeouts/AMI_Timeouts.mpc:
 
           Split out IDL compilation into separate MPC project.
 
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
index 9abb91eba67..fc17619cd0d 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
@@ -1,3 +1,6 @@
+
+// $Id:$
+
 project (DllOrb) : taolib, portableserver {
 
         dynamicflags = DLLORB_BUILD_DLL
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index a9721864e44..c04e3b1f253 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2005 Tradescape Inc.  All rights reserved.
- *
  * @author Iliyan jeliazkov <iliyan@ociweb.com>
  * @author Lothar Werzinger <lothar@tradescape.biz>
+ *
+ * $Id:$
  */
 
 
@@ -56,7 +56,7 @@ int DllOrb::init (int argc, char *argv[])
     if (m_failPrePostInit < 3)
       {
         ACE_DEBUG((LM_DEBUG, "TEST (%P|%t) Pre-ORB initialization ...\n"));
-        //      LOG4CPLUS_TRACE(ms_logger, "Pre-ORB initialization ...");
+
         // -----------------------------------------------------------------
         // Pre-ORB initialization steps necessary for proper DLL ORB
         // support.
@@ -116,7 +116,9 @@ int DllOrb::fini (void)
 
   try
     {
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA)
       mv_poaManager->deactivate(1, 1);
+#endif
       mv_poaManager = PortableServer::POAManager::_nil();
 
       // attempt to protect against sporadic BAD_INV_ORDER exceptions
@@ -149,7 +151,7 @@ int DllOrb::fini (void)
   if (m_failPrePostInit < 3)
     {
       ACE_DEBUG((LM_DEBUG, "TEST (%P|%t) Post-ORB finalization ...\n"));
-      //LOG4CPLUS_TRACE(ms_logger, "Post-ORB finalization ...");
+
       // -----------------------------------------------------------------
       // Post-ORB finalization steps necessary for proper DLL ORB
       // support.
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
index 9efd8f9885d..7e3f0a9ba42 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2005 Tradescape Inc.  All rights reserved.
- *
  * @author Iliyan jeliazkov <iliyan@ociweb.com>
  * @author Lothar Werzinger <lothar@tradescape.biz>
+ *
+ * $Id:$
  */
 
-#ifndef tradescape_utility_DllOrb_h
-#define tradescape_utility_DllOrb_h
+#ifndef DllOrb_h
+#define DllOrb_h
 
 #include "ace/Barrier.h"
 #include "ace/Task.h"
@@ -22,7 +22,6 @@ class DllOrb_Export DllOrb
 :
   public ACE_Task_Base
 {
-  // public types and methods
   public:
     /// Default constructor.
     DllOrb ( );
@@ -43,8 +42,6 @@ class DllOrb_Export DllOrb
 
   // private methods and instance variables
   private:
-    //    static log4cplus::Logger       ms_logger;
-
     unsigned int                   m_failPrePostInit;
     ACE_Thread_Barrier *           mp_barrier;
     CORBA::ORB_var                 mv_orb;
@@ -56,4 +53,4 @@ class DllOrb_Export DllOrb
 ACE_FACTORY_DECLARE (DllOrb, DllOrb)
 
 
-#endif /* tradescape_utility_DllOrb_h */
+#endif /* DllOrb_h */
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
index 213c2e47158..ba2e77b6bb9 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
@@ -1,6 +1,8 @@
 /*
  * @author Iliyan jeliazkov <iliyan@ociweb.com>
  * @author Lothar Werzinger <lothar@tradescape.biz>
+ *
+ * $Id:$
  */
 
 #include "ace/OS.h"