Wed Sep 29 10:23:38 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * ccm/CCM_CCMException.idl:

        * ciao/Containers/Container_Base_T.cpp:

        * ciao/Containers/Extension/Extension_Container.h:
        * ciao/Containers/Extension/Extension_Container.idl:
        * ciao/Containers/Extension/Extension_Container.cpp:
          Added and implemented install_service_reference,
          uninstall_service_reference, and, resolve_service_reference.

        * ciao/Containers/Servant_Activator.h:

        * ciao/Contexts/Extension/Extension_Context_T.cpp:
          Calling new implemented methods (install_service_refence and
          uninstall_service_reference).

        * ciao/Servants/Connector_Servant_Impl_Base.h:
        * ciao/Servants/Connector_Servant_Impl_Base.cpp:
        * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp:
        * ciao/Servants/Servant_Impl_Base.h:
        * ciao/Servants/Servant_Impl_Base.cpp:
        * ciao/Servants/Servant_Impl_Utils_T.cpp:
          Replaced ACE_Array_Map with a std::map.

6 files changed, 13 insertions, 21 deletions

diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
index 932285a074a..a8fcea51aa4 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
@@ -456,15 +456,11 @@ namespace CIAO
         throw ::CORBA::BAD_PARAM ();
       }
 
-    FacetTable::value_type entry;
-    entry.first = port_name;
-    entry.second = ::CORBA::Object::_duplicate (port_ref);
-
     {
       ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_,
                           CORBA::NO_RESOURCES ());
 
-      (void) this->facet_table_.insert (entry);
+      this->facet_table_[port_name] = ::CORBA::Object::_duplicate (port_ref);
     }
   }
 
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
index aa849abf9ca..0aebab42c21 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
@@ -31,7 +31,7 @@
 #include "ccm/CCM_EnterpriseComponentC.h"
 #include "ciao/Containers/Container_BaseC.h"
 
-#include "ace/Array_Map.h"
+#include <map>
 
 namespace CIAO
 {
@@ -50,7 +50,7 @@ namespace CIAO
     void describe_multiplex_receptacle (
         const char *port_name,
         const char *port_type_repo_id,
-        ACE_Array_Map<ptrdiff_t, T_var> &objrefs,
+        std::map<ptrdiff_t, T_var> &objrefs,
         ::Components::ReceptacleDescriptions_var &descriptions,
         CORBA::ULong slot);
   } /* Servant */
@@ -207,8 +207,8 @@ namespace CIAO
 #endif
 
   protected:
-    typedef ACE_Array_Map<ACE_CString,
-                          ::CORBA::Object_var>
+    typedef std::map<ACE_CString,
+                     ::CORBA::Object_var>
        FacetTable;
 
     FacetTable facet_table_;
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp
index 744cb956b0c..0d74cccab12 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Utils_T.cpp
@@ -50,7 +50,7 @@ namespace CIAO
   Servant::describe_multiplex_receptacle (
     const char *port_name,
     const char *port_type_repo_id,
-    ACE_Array_Map<ptrdiff_t, T_var> &objrefs,
+    std::map<ptrdiff_t, T_var> &objrefs,
     ::Components::ReceptacleDescriptions_var &descriptions,
     CORBA::ULong slot)
   {
@@ -71,7 +71,7 @@ namespace CIAO
     CORBA::ULong seq_slot = 0UL;
     ::Components::ConnectionDescription *conn = 0;
 
-    typedef typename ACE_Array_Map<ptrdiff_t, T_var>::const_iterator
+    typedef typename std::map<ptrdiff_t, T_var>::const_iterator
       CONST_ITERATOR;
 
     for (CONST_ITERATOR iter = objrefs.begin ();
diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
index d65100d5f49..4ba93d1f17e 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
@@ -270,15 +270,11 @@ namespace CIAO
         throw ::CORBA::BAD_PARAM ();
       }
 
-    ConsumerTable::value_type entry;
-    entry.first = port_name;
-    entry.second = ::Components::EventConsumerBase::_duplicate (port_ref);
-
     {
       ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_,
                           CORBA::NO_RESOURCES ());
 
-      (void) this->consumer_table_.insert (entry);
+      this->consumer_table_[port_name] = ::Components::EventConsumerBase::_duplicate (port_ref);
     }
   }
 
diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.h b/CIAO/ciao/Servants/Servant_Impl_Base.h
index c9286e9ce58..1b2ac6ec7e6 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Base.h
+++ b/CIAO/ciao/Servants/Servant_Impl_Base.h
@@ -33,7 +33,7 @@ namespace CIAO
     void describe_pub_event_source (
         const char *port_name,
         const char *port_type_repo_id,
-        ACE_Array_Map<ptrdiff_t, T_var> &consumers,
+        std::map<ptrdiff_t, T_var> &consumers,
         ::Components::PublisherDescriptions_var &descriptions,
         CORBA::ULong slot);
 
@@ -124,8 +124,8 @@ namespace CIAO
 #endif
 
   protected:
-    typedef ACE_Array_Map<ACE_CString,
-                          ::Components::EventConsumerBase_var>
+    typedef std::map<ACE_CString,
+                     ::Components::EventConsumerBase_var>
        ConsumerTable;
 
     ConsumerTable consumer_table_;
diff --git a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
index c87f12b006c..eaf893d6d2c 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
@@ -15,7 +15,7 @@ namespace CIAO
   Servant::describe_pub_event_source (
     const char *port_name,
     const char *port_type_repo_id,
-    ACE_Array_Map<ptrdiff_t, T_var> &consumers,
+    std::map<ptrdiff_t, T_var> &consumers,
     ::Components::PublisherDescriptions_var &descriptions,
     CORBA::ULong slot)
   {
@@ -35,7 +35,7 @@ namespace CIAO
     ptrdiff_t map_slot = 0UL;
     ::Components::SubscriberDescription *sub = 0;
 
-    typedef typename ACE_Array_Map<ptrdiff_t, T_var>::const_iterator
+    typedef typename std::map<ptrdiff_t, T_var>::const_iterator
       CONST_ITERATOR;
 
     for (CONST_ITERATOR iter = consumers.begin ();