Tue Jul 22 10:02:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 130 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e422c565a23..28ed016e83e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,40 @@
+Tue Jul 22 10:02:28 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bzip2Compressor.mpc:
+          Use correct base project
+
+        * tao/Compression.mpc:
+          Generate Any insertion operators
+
+        * tao/GIOP_Fragmentation_Strategy.h:
+          Layout changes
+
+        * tao/Muxed_TMS.cpp:
+          When the unbind fails print the request id that failed
+
+        * tao/Object.h:
+          Use false instead of 0
+
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+          Updated layout of some debug message to match other messages
+          in TAO
+
+        * tao/BiDir_GIOP/BiDirPolicy_Validator.cpp:
+          Use is_nil to check whether a policy is nil or not, don't compare
+          it with 0
+
+        * tao/IIOP_Acceptor.cpp:
+          Documentation change
+
+        * tao/Messaging/Messaging_Policy_i.h:
+          Layout change
+
+        * tao/tao.mpc:
+        * tao/ZIOP_Adapter.{h,cpp}:
+          Added new ZIOP Adapter for the ZIOP library which will be added
+          to the repository soon
+
 Tue Jul 22 08:14:28 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Compression.mpc:
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index fbe9963a98a..d0bff88c6b7 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -21,13 +21,13 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies)
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP);
 
-  if (policy.in () == 0)
+  if (CORBA::is_nil (policy.in ()))
     return;
 
   BiDirPolicy::BidirectionalPolicy_var srp =
     BiDirPolicy::BidirectionalPolicy::_narrow (policy.in ());
 
-  if (srp.in () == 0)
+  if (CORBA::is_nil (srp.in ()))
     return;
 
   BiDirPolicy::BidirectionalPolicyValue val = srp->value ();
diff --git a/TAO/tao/Bzip2Compressor.mpc b/TAO/tao/Bzip2Compressor.mpc
index 5fa58ac44fb..853166b7a59 100644
--- a/TAO/tao/Bzip2Compressor.mpc
+++ b/TAO/tao/Bzip2Compressor.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(Bzip2Compressor) : taolib, tao_output, install, compression, tao_versioning_idl_defaults, ace_zlib {
+project(Bzip2Compressor) : taolib, tao_output, install, compression, tao_versioning_idl_defaults, bzip2 {
   requires += bzip2
   sharedname   = TAO_Bzip2Compressor
   dynamicflags = TAO_BZIP2COMPRESSOR_BUILD_DLL
diff --git a/TAO/tao/Compression.mpc b/TAO/tao/Compression.mpc
index 9a99872462a..9097fcb40e9 100644
--- a/TAO/tao/Compression.mpc
+++ b/TAO/tao/Compression.mpc
@@ -2,7 +2,7 @@
 project(Compression) : taolib, tao_output, install, tao_versioning_idl_defaults, core_anytypecode {
   sharedname   = TAO_Compression
   dynamicflags = TAO_COMPRESSION_BUILD_DLL
-  idlflags += -SS -Sorb -Sci \
+  idlflags += -SS -Sorb -Sci -GA \
               -Wb,export_macro=TAO_Compression_Export \
               -o Compression
 
@@ -31,7 +31,8 @@ project(Compression) : taolib, tao_output, install, tao_versioning_idl_defaults,
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sal \
+    idlflags -= -Sa -St
+    idlflags += -Gp -Gd -Sal\
                 -Wb,export_macro=TAO_Compression_Export \
                 -Wb,export_include=tao/Compression/compression_export.h \
                 -Wb,include_guard=TAO_COMPRESSION_SAFE_INCLUDE \
@@ -40,7 +41,7 @@ project(Compression) : taolib, tao_output, install, tao_versioning_idl_defaults,
   }
 
   IDL_Files {
-    idlflags += -GX \
+    idlflags += \
                 -Wb,export_include=tao/Compression/compression_export.h \
                 -Wb,unique_include=tao/Compression/Compression.h
     Compression/Compression_include.pidl
diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.h b/TAO/tao/GIOP_Fragmentation_Strategy.h
index daf40acaedc..9e805fc82de 100644
--- a/TAO/tao/GIOP_Fragmentation_Strategy.h
+++ b/TAO/tao/GIOP_Fragmentation_Strategy.h
@@ -70,11 +70,9 @@ public:
                         ACE_CDR::ULong pending_length) = 0;
 
 private:
-
   // Disallow copying and assignment.
   TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &);
   void operator= (TAO_GIOP_Fragmentation_Strategy const &);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 3c5d6f4fb40..274506e253e 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -166,7 +166,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
   TAO_Profile *pfile = 0;
   TAO_IIOP_Profile *iiop_profile = 0;
 
-  // First see if <mprofile> already contains a IIOP profile.
+  // First see if @a mprofile already contains a IIOP profile.
   for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
     {
       pfile = mprofile.get_profile (i);
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 804fd215485..24870b0d814 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -116,8 +116,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   );
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_Sync_Scope_Policy *clone (void) const;
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index eff593ff590..6890654c02f 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -138,7 +138,8 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
         if (TAO_debug_level > 0)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::dispatch_reply, ")
-                      ACE_TEXT ("unbind dispatcher failed: result = %d\n"),
+                      ACE_TEXT ("unbind dispatcher failed, id %d: result = %d\n"),
+                      params.request_id_,
                       result));
 
         // This return value means that the mux strategy was not able
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index b924864cc13..0a38bc35326 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -38,7 +38,7 @@ namespace PortableInterceptor
       if (TAO_Singleton_Manager::instance ()->init () == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) register_orb_initializer: ")
+                      ACE_TEXT ("TAO (%P|%t) - register_orb_initializer: ")
                       ACE_TEXT ("Unable to pre-initialize TAO\n")));
         }
     }
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 62ca241ab3d..f4a6320dd94 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -274,7 +274,7 @@ namespace CORBA
 
     /// Constructor
     Object (TAO_Stub *p,
-            CORBA::Boolean collocated = 0,
+            CORBA::Boolean collocated = false,
             TAO_Abstract_ServantBase *servant = 0,
             TAO_ORB_Core *orb_core = 0);
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index c67f54d99f5..c457173f0d6 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -85,7 +85,7 @@ TAO::ORBInitializer_Registry::fini (void)
       --i;
       if (TAO_debug_level > 8)
         {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("TAO(%P|%t)OrbInitializer::fini clearing %d @%@\n"),
+          ACE_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ORBInitializer_Registry::fini clearing %d @%@\n"),
             i, this->initializers_[i].operator->()
             ));
         }
@@ -114,7 +114,7 @@ TAO::ORBInitializer_Registry::register_orb_initializer (
       // Add the given ORBInitializer to the sequence.
       if (TAO_debug_level > 8)
         {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("TAO(%P|%t)OrbInitializer::register_orb_initializer %d @%@\n"),
+          ACE_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ORBInitializer_Registry::register_orb_initializer %d @%@\n"),
             cur_len, init
             ));
         }
diff --git a/TAO/tao/ZIOP_Adapter.cpp b/TAO/tao/ZIOP_Adapter.cpp
new file mode 100644
index 00000000000..1b18773362e
--- /dev/null
+++ b/TAO/tao/ZIOP_Adapter.cpp
@@ -0,0 +1,15 @@
+// $Id$
+
+#include "tao/ZIOP_Adapter.h"
+
+ACE_RCSID(tao,
+          ZIOP_Adapter,
+          "$Id$")
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_ZIOP_Adapter::~TAO_ZIOP_Adapter (void)
+{
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ZIOP_Adapter.h b/TAO/tao/ZIOP_Adapter.h
new file mode 100644
index 00000000000..73be3fad27c
--- /dev/null
+++ b/TAO/tao/ZIOP_Adapter.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ZIOP_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+#ifndef TAO_ZIOP_ADAPTER_H
+#define TAO_ZIOP_ADAPTER_H
+
+#include /**/ "ace/pre.h"
+#include "ace/Service_Object.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/TAO_Export.h"
+#include "tao/orbconf.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/Profile_Transport_Resolver.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_Policy_Validator;
+
+/**
+ * @class TAO_ZIOP_Adapter
+ *
+ * @brief TAO_ZIOP_Adapter
+ *
+ * Class that offers an interface to the ORB to load and manipulate
+ * ZIOP library.
+ */
+class TAO_Export TAO_ZIOP_Adapter : public ACE_Service_Object
+{
+public:
+  virtual bool decompress (TAO_ServerRequest& server_request) = 0;
+
+  virtual bool marshal_data (TAO_Operation_Details &details, TAO_OutputCDR &stream, TAO::Profile_Transport_Resolver &resolver_) = 0;
+
+  virtual void load_policy_validators (TAO_Policy_Validator &validator) = 0;
+
+  virtual bool marshal_reply_data (TAO_ServerRequest& server_request,
+                                   TAO::Argument * const * args,
+                                   size_t nargs) = 0;
+
+  /// The virtual destructor
+  virtual ~TAO_ZIOP_Adapter (void);
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_ZIOP_ADAPTER_H */
+
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 078fc0e5686..97ce7ccb505 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -242,6 +242,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     WrongTransactionC.cpp
     WStringSeqC.cpp
     GUIResource_Factory.cpp
+    ZIOP_Adapter.cpp
   }
 
   Header_Files {
@@ -576,6 +577,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v
     WrongTransactionS.h
     WStringSeqC.h
     WStringSeqS.h
+    ZIOP_Adapter.h
   }
 
   Inline_Files {