Wed Nov 22 10:54:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 59 insertions, 38 deletions

diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
index a94f2e97302..33695590b87 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   GUIResource_Factory::GUIResource_Factory (void)
-    : dynamically_allocated_reactor_ (0)
+    : dynamically_allocated_reactor_ (false)
   {
   }
 
@@ -41,7 +41,7 @@ namespace TAO
       reactor = 0;
     }
     else
-      this->dynamically_allocated_reactor_ = 1;
+      this->dynamically_allocated_reactor_ = true;
 
     return reactor;
   }
@@ -51,7 +51,7 @@ namespace TAO
   {
     ACE_GUARD ( TAO_SYNCH_MUTEX, ace_mon, this->lock_ );
 
-    if (this->dynamically_allocated_reactor_ == 1)
+    if (this->dynamically_allocated_reactor_)
       delete reactor;
   }
 }
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
index aae6da6ba35..e0f2dab0543 100644
--- a/TAO/tao/GUIResource_Factory.h
+++ b/TAO/tao/GUIResource_Factory.h
@@ -59,7 +59,8 @@ namespace TAO
      */
     virtual ACE_Reactor *get_reactor (void) ;
 
-    /** Reclaim the reactor if allocated by this factory.
+    /**
+     * Reclaim the reactor if allocated by this factory.
      * Please note that this call is NOT synchronized. Left to the
      * higher level versions to synchronize access.
      */
@@ -67,7 +68,8 @@ namespace TAO
 
   protected:
 
-    /** Create or return current reactor instance.
+    /**
+     * Create or return current reactor instance.
      * Please note that this call is NOT synchronized. Left to the
      * get_reactor to synchronize access.
      */
@@ -76,9 +78,9 @@ namespace TAO
   private:
 
     /**
-     * Flag that is set to 1 if the reactor obtained from the
+     * Flag that is set to true if the reactor obtained from the
      * get_reactor() method is dynamically allocated.  If this flag is
-     * set to 1, then the reclaim_reactor() method with call the delete
+     * set to true, then the reclaim_reactor() method with call the delete
      * operator on the given reactor.  This flag is necessary to make
      * sure that a reactor not allocated by the default resource factory
      * is not reclaimed by the default resource factory.  Such a
@@ -86,7 +88,7 @@ namespace TAO
      * default one overrides the get_reactor() method but does not
      * override the reclaim_reactor() method.
      */
-    int dynamically_allocated_reactor_;
+    bool dynamically_allocated_reactor_;
 
     /// for internal locking.
     TAO_SYNCH_MUTEX lock_;
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4b33583f878..da12853bf47 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -250,11 +250,11 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     tm_ (),
     tss_cleanup_funcs_ (),
     tss_resources_ (),
-    has_shutdown_ (1),  // Start the ORB in a  "shutdown" state.  Only
-                        // after CORBA::ORB_init() is called will the
-                        // ORB no longer be shutdown.  This does not
-                        // mean that the ORB can be reinitialized.  It
-                        // can only be initialized once.
+    has_shutdown_ (true),  // Start the ORB in a  "shutdown" state.  Only
+                           // after CORBA::ORB_init() is called will the
+                           // ORB no longer be shutdown.  This does not
+                           // mean that the ORB can be reinitialized.  It
+                           // can only be initialized once.
     thread_per_connection_use_timeout_ (1),
     open_lock_ (),
     endpoint_selector_factory_ (0),
@@ -1345,7 +1345,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
   // The ORB has been initialized, meaning that the ORB is no longer
   // in the shutdown state.
-  this->has_shutdown_ = 0;
+  this->has_shutdown_ = false;
 
   return 0;
 }
@@ -2178,7 +2178,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
   // We don't need to do this because we use the Reactor
   // mechanisms to shutdown in a thread-safe way.
 
-  while (this->has_shutdown () == 0)
+  while (this->has_shutdown () == false)
     {
       // Every time we perform an interation we have to become the
       // leader again, because it is possible that a client has
@@ -2250,7 +2250,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
       // Otherwise just continue..
     }
 
-  if (this->has_shutdown () == 1 &&
+  if (this->has_shutdown () == true &&
       this->server_factory_->activate_server_connections ())
       this->tm_.wait ();
 
@@ -2273,7 +2273,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
-    if (this->has_shutdown () != 0)
+    if (this->has_shutdown () == true)
       return;
 
     // Check if we are on the right state, i.e. do not accept
@@ -2285,7 +2285,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
 
     // Set the 'has_shutdown' flag, so any further attempt to shutdown
     // becomes a noop.
-    this->has_shutdown_ = 1;
+    this->has_shutdown_ = true;
 
     // need to release the mutex, because some of the shutdown
     // operations invoke application code, that could (and in practice
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index d114ef39412..6c4403358d4 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -596,7 +596,7 @@ public:
                  ACE_ENV_ARG_DECL);
 
   /// Get the shutdown flag value
-  int has_shutdown (void);
+  bool has_shutdown (void) const;
 
   /// Shutdown the ORB and free resources
   void destroy (ACE_ENV_SINGLE_ARG_DECL);
@@ -1183,7 +1183,7 @@ protected:
   ACE_TSS_TYPE (TAO_ORB_Core_TSS_Resources) tss_resources_;
 
   /// Flag which denotes that the ORB has been shutdown.
-  int has_shutdown_;
+  bool has_shutdown_;
 
   /// The value of the timeout if the flag above is not zero.
   //@{
diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl
index ca3defce178..480a0df637c 100644
--- a/TAO/tao/ORB_Core.inl
+++ b/TAO/tao/ORB_Core.inl
@@ -346,8 +346,8 @@ TAO_ORB_Core::tss_cleanup_funcs (void)
   return &(this->tss_cleanup_funcs_);
 }
 
-ACE_INLINE int
-TAO_ORB_Core::has_shutdown (void)
+ACE_INLINE bool
+TAO_ORB_Core::has_shutdown (void) const
 {
   return this->has_shutdown_;
 }
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index 15a60e3197b..c4fcd13826b 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,7 +1,6 @@
 //$Id$
 
-project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
-  avoids      += ace_for_tao    // Requires Unix domain sockets and MEM stuff
+project : taolib, core, core_anytypecode, core_strategies, tao_versioning_idl_defaults {
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
 
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 5c8582c2f82..8873a811a89 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -10,6 +10,7 @@
 #include "tao/CORBANAME_Parser.h"
 #include "tao/CORBALOC_Parser.h"
 #include "tao/FILE_Parser.h"
+#include "tao/HTTP_Parser.h"
 #include "tao/DLL_Parser.h"
 #include "tao/ORB_Core.h"
 #include "tao/Adapter_Factory.h"
@@ -539,6 +540,7 @@ namespace
     pcfg->process_directive (ace_svc_desc_TAO_CORBALOC_Parser);
     pcfg->process_directive (ace_svc_desc_TAO_FILE_Parser);
     pcfg->process_directive (ace_svc_desc_TAO_DLL_Parser);
+    pcfg->process_directive (ace_svc_desc_TAO_HTTP_Parser);
     pcfg->process_directive (ace_svc_desc_TAO_Default_Stub_Factory);
     pcfg->process_directive (
       ace_svc_desc_TAO_Default_Endpoint_Selector_Factory);
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index 50229951b3c..5afc6af0025 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -191,10 +191,10 @@ namespace CORBA
 
   public:  // otherwise these cannot be called from a static function
 
-    /// during marshal jump to the most derived part
+    /// During marshal jump to the most derived part
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const = 0;
 
-    /// called after obtaining the fresh object from create_for_unmarshal ()
+    /// Called after obtaining the fresh object from create_for_unmarshal ()
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0;
 
     /// Notify the truncated parent valuetype to skip the rest of the chunks
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 34418e1b0d5..29082bada75 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -601,7 +601,7 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names,
     }
 
   // OK fallback on the hardcoded ones....
-  this->parser_names_count_ = 5; // HOW MANY DO WE HAVE?
+  this->parser_names_count_ = 6; // HOW MANY DO WE HAVE?
   ACE_NEW_RETURN (this->parser_names_,
                   char *[this->parser_names_count_],
                   -1);
@@ -623,6 +623,9 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names,
   this->parser_names_[index] = CORBA::string_dup ("MCAST_Parser");
   ++index;
 
+  this->parser_names_[index] = CORBA::string_dup ("HTTP_Parser");
+  ++index;
+
   names = this->parser_names_;
 
   number_of_names = index;
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 8caf8dfac31..4e560cf25dc 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -78,6 +78,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers
     GIOP_Message_State.cpp
     GIOP_Message_Version.cpp
     GIOPC.cpp
+    HTTP_Client.cpp
+    HTTP_Handler.cpp
+    HTTP_Parser.cpp
     IFR_Client_Adapter.cpp
     IIOP_Acceptor.cpp
     IIOP_Connection_Handler.cpp
@@ -349,6 +352,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers
     GIOPS.h
     GIOP_Utils.h
     GUIResource_Factory.h
+    HTTP_Client.h
+    HTTP_Handler.h
+    HTTP_Parser.h
     IFR_Client_Adapter.h
     IIOP_Acceptor.h
     IIOPC.h
@@ -598,19 +604,12 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers
                 -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \
                 -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
     idlflags -= -Sa -St
-    BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp
-    CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp
     CONV_FRAME.pidl >> AnyTypeCode/CONV_FRAMEA.h AnyTypeCode/CONV_FRAMEA.cpp
     Current.pidl >> AnyTypeCode/CurrentA.h AnyTypeCode/CurrentA.cpp
-    DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp
-    FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp
     IIOP.pidl >> AnyTypeCode/IIOPA.h AnyTypeCode/IIOPA.cpp
     IIOP_Endpoints.pidl >> AnyTypeCode/IIOP_EndpointsA.h AnyTypeCode/IIOP_EndpointsA.cpp
     IOP.pidl >> AnyTypeCode/IOPA.h AnyTypeCode/IOPA.cpp
     IOP_IOR.pidl >> AnyTypeCode/IOP_IORA.h AnyTypeCode/IOP_IORA.cpp
-    LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp
-    LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp
-    LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp
     Messaging_PolicyValue.pidl >> AnyTypeCode/Messaging_PolicyValueA.h AnyTypeCode/Messaging_PolicyValueA.cpp
     Messaging_SyncScope.pidl >> AnyTypeCode/Messaging_SyncScopeA.h AnyTypeCode/Messaging_SyncScopeA.cpp
     ObjectIdList.pidl >> AnyTypeCode/ObjectIdListA.h AnyTypeCode/ObjectIdListA.cpp
@@ -620,10 +619,26 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers
     PI_Forward.pidl >> AnyTypeCode/PI_ForwardA.h AnyTypeCode/PI_ForwardA.cpp
     PortableInterceptor.pidl >> AnyTypeCode/PortableInterceptorA.h AnyTypeCode/PortableInterceptorA.cpp
     Services.pidl >> AnyTypeCode/ServicesA.h AnyTypeCode/ServicesA.cpp
-    ShortSeq.pidl >> AnyTypeCode/ShortSeqA.h AnyTypeCode/ShortSeqA.cpp
-    StringSeq.pidl >> AnyTypeCode/StringSeqA.h AnyTypeCode/StringSeqA.cpp
     TAO.pidl >> AnyTypeCode/TAOA.h AnyTypeCode/TAOA.cpp
     TimeBase.pidl >> AnyTypeCode/TimeBaseA.h AnyTypeCode/TimeBaseA.cpp
+  }
+
+  IDL_Files {
+    idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \
+                -Wb,export_macro=TAO_Export \
+                -Wb,export_include=tao/TAO_Export.h \
+                -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \
+                -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+    idlflags -= -Sa -St
+    BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp
+    CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp
+    DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp
+    FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp
+    LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp
+    LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp
+    LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp
+    ShortSeq.pidl >> AnyTypeCode/ShortSeqA.h AnyTypeCode/ShortSeqA.cpp
+    StringSeq.pidl >> AnyTypeCode/StringSeqA.h AnyTypeCode/StringSeqA.cpp
     ULongLongSeq.pidl >> AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongLongSeqA.cpp
     ULongSeq.pidl >> AnyTypeCode/ULongSeqA.h AnyTypeCode/ULongSeqA.cpp
     WCharSeq.pidl >> AnyTypeCode/WCharSeqA.h AnyTypeCode/WCharSeqA.cpp
@@ -633,7 +648,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers
   // These headers are generated by the above *.pidl files.
   Header_Files {
     AnyTypeCode/GIOPA.h
-    AnyTypeCode/BooleanSeqA.h 
+    AnyTypeCode/BooleanSeqA.h
     AnyTypeCode/CONV_FRAMEA.h
     AnyTypeCode/CharSeqA.h
     AnyTypeCode/CurrentA.h
@@ -663,7 +678,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers
     AnyTypeCode/WCharSeqA.h
     AnyTypeCode/WStringSeqA.h
     AnyTypeCode/orb_typesA.h
-  } 
+  }
 
   Pkgconfig_Files {
     TAO.pc.in