Merged revisions 81158-81159,81161 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO

........
  r81158 | vzykov | 2008-03-31 03:33:46 -0500 (Mon, 31 Mar 2008) | 1 line
  
  ChangeLogTag: Mon Mar 31 08:31:18 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
........
  r81159 | johnnyw | 2008-03-31 03:41:47 -0500 (Mon, 31 Mar 2008) | 1 line
  
  Mon Mar 31 08:39:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81161 | johnnyw | 2008-03-31 03:45:34 -0500 (Mon, 31 Mar 2008) | 1 line
  
  Mon Mar 31 08:45:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........

12 files changed, 88 insertions, 34 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b38bc86d012..7126d7d0042 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,37 @@
+Mon Mar 31 08:45:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * configure.ac:
+          Improved TAO autoconf support, fixes bugzilla 3274
+          This to Thomas Girard <thomas dot g dot girard at free dot fr>
+          for reporting this
+
+Mon Mar 31 08:39:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+          Corrected length of MIOP packet_length. This fixes bugzilla 3275. Thanks
+          to Alvaro Vega Garcia <avega at tid dot es> for reporting this
+
+        * orbsvcs/examples/PSS/server.cpp:
+        * orbsvcs/examples/PSS/Simple_Naming.cpp:
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+          No need to specify empty orb name
+
+        * orbsvcs/Naming_Service/Naming_Service.cpp:
+          Const change
+
+        * orbsvcvs/tests/Notify/Test_Filter/Test_Filter.mpc:
+          Layout changes
+
+Mon Mar 31 08:31:18 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Bug_3276_Regression/Manager.h:
+        * tests/Bug_3276_Regression/Manager.cpp:
+        * tests/Bug_3276_Regression/Servant_Locator.h:
+        * tests/Bug_3276_Regression/Bug_3276_Regression.mpc:
+
+          Changed a bit the tests in spirit of TAO and excluded it from
+          corba_e_compact and corba_e_micro builds.
+
 Fri Mar 28 15:30:12 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
 
         * tao/Invocation_Base.h:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 470f1e3e57c..e40f57c7ad4 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -124,10 +124,6 @@ dnl Check the C++ compiler and preprocessor.
 AC_PROG_CXX
 AC_PROG_CXXCPP
 
-dnl Configure libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
 ACE_CHECK_THREADS
 
 dnl Set the test language as C++
@@ -188,6 +184,33 @@ ACE_PATH_ZLIB
 TAO_ENABLE_EXAMPLES
 TAO_ENABLE_TESTS
 
+dnl The user's/default C++ flags are stored in "CXXFLAGS."  We use
+dnl the variable "ACE_CXXFLAGS" to set the C++ flags we want.  At the end
+dnl of the configuration process we combine ACE_CXXFLAGS and CXXFLAGS
+dnl into CXXFLAGS (e.g., CXXFLAGS="$ACE_CXXFLAGS $CXXFLAGS").  CXXFLAGS
+dnl goes after ACE_CXXFLAGS so that the user's C++ flag command line
+dnl choices always override the configure script's choices.
+ACE_CXXFLAGS=""
+ACE_CFLAGS=""
+
+ACE_SET_COMPILER_FLAGS
+
+dnl Disable building of static libraries by default
+AC_DISABLE_STATIC
+
+dnl Enable Libtool module support
+AC_LIBTOOL_DLOPEN
+
+dnl Enable support for "clean" DLLs.
+AC_LIBTOOL_WIN32_DLL
+
+dnl Check for libtool and turn on Automake processing for Libtool
+AC_PROG_LIBTOOL
+
+CXXFLAGS="$ACE_CXXFLAGS $X_CFLAGS $CXXFLAGS"
+CFLAGS="$ACE_CFLAGS $X_CFLAGS $CFLAGS"
+CPPFLAGS="$ACE_CPPFLAGS $CPPFLAGS"
+LDFLAGS="$ACE_LDFLAGS $LDFLAGS"
 
 dnl
 dnl SECTION 16: AC_CONFIG_FILES([FILE...])
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index f6885365f7e..cdf138c397a 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -72,7 +72,7 @@ TAO_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[])
         {
         case 't':
           {
-            int time = ACE_OS::atoi (get_opts.opt_arg ());
+            int const time = ACE_OS::atoi (get_opts.opt_arg ());
             if (time >= 0)
               this->time_ = time;
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 802053ebdcd..ff09458fd94 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -41,8 +41,7 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv [])
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->orb_ = CORBA::ORB_init (command_line.get_argc(),
-                                command_line.get_ASCII_argv(),
-                                "");
+                                command_line.get_ASCII_argv());
 
   CORBA::Object_var object =
     this->orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
index 5feb2e0864e..576e7b28517 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
@@ -57,10 +57,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) == -1)
         return -1;
diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp
index 03afbd321e7..696b5faa71e 100644
--- a/TAO/orbsvcs/examples/PSS/server.cpp
+++ b/TAO/orbsvcs/examples/PSS/server.cpp
@@ -30,10 +30,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 6ae4bf66180..13c49d3b8d2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -160,7 +160,7 @@ TAO_UIPMC_Transport<CONNECTION_HANDLER>::send (iovec *iov, int iovcnt,
      bytes_to_send += iov[i].iov_len;
 
   MIOP_Packet fragments[MIOP_MAX_FRAGMENTS];
-  MIOP_Packet *current_fragment;
+  MIOP_Packet *current_fragment = 0;
   int num_fragments = 1;
 
   UIPMC_Message_Block_Data_Iterator mb_iter (iov, iovcnt);
@@ -168,7 +168,7 @@ TAO_UIPMC_Transport<CONNECTION_HANDLER>::send (iovec *iov, int iovcnt,
   // Initialize the first fragment
   current_fragment = &fragments[0];
   current_fragment->iovcnt = 1;  // The MIOP Header
-  current_fragment->length = MIOP_HEADER_SIZE;
+  current_fragment->length = 0;
 
   // Go through all of the message blocks.
   while (mb_iter.next_block (MIOP_MAX_DGRAM_SIZE - current_fragment->length,
@@ -403,7 +403,7 @@ TAO_UIPMC_Transport<CONNECTION_HANDLER>::recv (char *buf,
     }
 
   // Trim off the header for now.
-  ssize_t miop_header_size = (MIOP_ID_CONTENT_OFFSET + id_length + 7) & ~0x7;
+  ssize_t const miop_header_size = (MIOP_ID_CONTENT_OFFSET + id_length + 7) & ~0x7;
   if (miop_header_size > n)
     {
       if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
index 1964722a76f..75e32c6a6fa 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
@@ -2,14 +2,10 @@
 // $Id$
 
 project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification_skel, rtcorba, etcl, dynamicany, portableserver, iortable {
-				    
   sharedname = TAO_RT_NotifyTests_Filter
-
   dynamicflags    = TAO_RT_Test_Filter_BUILD_DLL
-
-  IDL_Files {  
+  IDL_Files {
   }
-
   Source_Files{
     RT_Test_Filter.cpp
     RT_Test_FilterFactory.cpp
diff --git a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
index fa17ef0e663..92565612bf4 100644
--- a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
+++ b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
@@ -1,11 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba, pi {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*Client): taoclient, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = client
+  after += *idl
 
   IDL_Files {
-    test.idl
   }
 
   Source_Files {
@@ -14,9 +21,9 @@ project(*Client): taoclient, anytypecode, avoids_minimum_corba, pi {
   }
 }
 
-project(*Manager): taoserver, avoids_minimum_corba {
+project(*Manager): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = manager
-  after += *Client
+  after += *idl
 
   IDL_Files {
   }
diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp
index 99873c00bae..35d3167fd10 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.cpp
+++ b/TAO/tests/Bug_3276_Regression/Manager.cpp
@@ -195,11 +195,11 @@ Manager::activate_servant ()
                     Servant_Locator,
                     CORBA::NO_MEMORY ());
 
-  this->servant_locator_.reset (tmp);
+  this->servant_locator_ = tmp;
 
   // Set ServantLocator object as the servant Manager of
   // secondPOA.
-  this->new_poa_var_->set_servant_manager (this->servant_locator_.get ());
+  this->new_poa_var_->set_servant_manager (this->servant_locator_.in ());
 
   // Try to create a reference with user created ID in new_poa
   // which uses ServantLocator.
diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h
index 7ad190181e4..1a24ef65849 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.h
+++ b/TAO/tests/Bug_3276_Regression/Manager.h
@@ -3,7 +3,6 @@
 #ifndef _MANAGER_H_
 #define _MANAGER_H_
 
-#include "ace/Auto_Ptr.h"
 #include "Servant_Locator.h"
 
 class Manager
@@ -36,7 +35,7 @@ private:
   PortableServer::POA_var new_poa_var_;
   // The new poa that is created.
 
-  ACE_Auto_Ptr<Servant_Locator> servant_locator_;
+  PortableServer::ServantLocator_var servant_locator_;
   // Our servant locator
 
   CORBA::Object_var server_;
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.h b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
index a22e5612d7f..edfe869d26e 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.h
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
@@ -5,9 +5,11 @@
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/ServantLocatorC.h"
-#include "tao/ORB.h"
+#include "tao/LocalObject.h"
 
-class Servant_Locator : public PortableServer::ServantLocator
+class Servant_Locator
+  : public PortableServer::ServantLocator
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
@@ -25,4 +27,4 @@ public:
   // request.
 };
 
-#endif /* _SERVANT_LOCATOR_H */
+#endif /* _SERVANT_LOCATOR_H_ */