Wed Dec 9 14:29:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/Containers/Container_Base.cpp:
        * ciao/Containers/Container_Base.h:
        * ciao/Containers/Container_Base.idl:
        * ciao/Containers/Container_Base.inl:
          Get rid of the receptacle policy map, this doesn't do a thing

5 files changed, 28 insertions, 69 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 0b841ec74d7..f55b2ca1e3d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec  9 14:29:33 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Containers/Container_Base.cpp:
+        * ciao/Containers/Container_Base.h:
+        * ciao/Containers/Container_Base.idl:
+        * ciao/Containers/Container_Base.inl:
+          Get rid of the receptacle policy map, this doesn't do a thing
+
 Wed Dec  9 14:26:17 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl:
diff --git a/CIAO/ciao/Containers/Container_Base.cpp b/CIAO/ciao/Containers/Container_Base.cpp
index 872220c6560..fc7e260a491 100644
--- a/CIAO/ciao/Containers/Container_Base.cpp
+++ b/CIAO/ciao/Containers/Container_Base.cpp
@@ -45,24 +45,4 @@ namespace CIAO
         this->home_servant_poa_->destroy (1, 1);
       }
   }
-
-  CORBA::PolicyList *
-  Container_i::get_receptacle_policy (const char* name)
-  {
-    CORBA::PolicyList_var policy_list;
-
-    ACE_NEW_THROW_EX (policy_list,
-                      CORBA::PolicyList (),
-                      CORBA::NO_MEMORY ());
-
-    if (this->rec_pol_map_.find (name, policy_list) != 0)
-      {
-        CIAO_ERROR ((LM_DEBUG, CLINFO
-                    "Container_i::get_receptacle_policy - No policies found "
-                    "for the receptacle %C\n",
-                    name));
-      }
-
-    return policy_list._retn ();
-  }
 }
diff --git a/CIAO/ciao/Containers/Container_Base.h b/CIAO/ciao/Containers/Container_Base.h
index 4f8e7192069..b249c630842 100644
--- a/CIAO/ciao/Containers/Container_Base.h
+++ b/CIAO/ciao/Containers/Container_Base.h
@@ -40,15 +40,6 @@ namespace CIAO
     class CIAO_Container_i;
   }
 
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                  CORBA::PolicyList,
-                                  ACE_Hash<ACE_CString>,
-                                  ACE_Equal_To<ACE_CString>,
-                                  ACE_Null_Mutex> REC_POL_MAP;
-  typedef ACE_Hash_Map_Iterator<ACE_CString,
-                                CORBA::PolicyList,
-                                ACE_Null_Mutex> REC_POL_MAP_ITERATOR;
-
   /**
    * @class Container_i
    *
@@ -80,9 +71,6 @@ namespace CIAO
     virtual PortableServer::POA_ptr the_POA (void);
     virtual PortableServer::POA_ptr the_port_POA (void);
 
-    /// Get the receptacle policy given the receptacle name
-    CORBA::PolicyList * get_receptacle_policy (const char *name);
-
     /// Install a new home
     virtual Components::CCMHome_ptr install_home (const char *primary_artifact,
                                                   const char *entry_point,
@@ -120,9 +108,6 @@ namespace CIAO
     /// Get a reference to the underlying ORB.
     CORBA::ORB_ptr the_ORB (void) const;
 
-    /// Set the policy map for all the receptacles hosted in this container.
-    void set_receptacle_policy_map (::CIAO::REC_POL_MAP &rec_pol_map);
-
   protected:
     /// Reference to the ORB
     CORBA::ORB_var orb_;
@@ -146,8 +131,6 @@ namespace CIAO
 
     Deployment::CIAO_Container_i *container_impl_;
 
-    ::CIAO::REC_POL_MAP rec_pol_map_;
-
   private:
     /// Not allowed to be used
     Container_i (void);
diff --git a/CIAO/ciao/Containers/Container_Base.idl b/CIAO/ciao/Containers/Container_Base.idl
index 8c29b6817a3..e3581f6417e 100644
--- a/CIAO/ciao/Containers/Container_Base.idl
+++ b/CIAO/ciao/Containers/Container_Base.idl
@@ -21,42 +21,41 @@ module CIAO
       FACET_CONSUMER_t
     };
   };
-  
+
   exception InvalidComponent
-  {  
+  {
   };
-  
+
   /**
    * @interface Container
-   * @brief Internal container interfaces. 
+   * @brief Internal container interfaces.
    *
    * This interface provides interfactes to two portions of the CIAO
-   * container architecture:  The generic external container interface 
+   * container architecture:  The generic external container interface
    * created by the component server, and the component specific container
    * portions generated by the CIDL compiler (the component servant)
    */
-  local interface Container 
+  local interface Container
   {
-    CORBA::PolicyList get_receptacle_policy (in string name);
     // **** Methods used by external container
     Components::CCMHome install_home (in string primary_artifact,
                                       in string entry_point,
                                       in string servant_artifact,
                                       in string servant_entrypoint,
                                       in string name);
-    
+
     void uninstall_home (in Components::CCMHome homeptr);
-    
+
     Components::CCMObject install_component (in string primary_artifact,
                                              in string entry_point,
                                              in string servant_artifact,
                                              in string servant_entrypoint,
                                              in string name);
-    
+
     void activate_component (in Components::CCMObject name);
-    
+
     void passivate_component (in Components::CCMObject name);
-    
+
     void uninstall_component (in Components::CCMObject compptr);
 
     void connect_local_facet (in ::Components::CCMObject provider_ref,
@@ -65,7 +64,7 @@ module CIAO
 			      in string user_port)
       raises (::Components::InvalidConnection,
 	      ::Components::AlreadyConnected);
-    
+
     void disconnect_local_facet (in ::Components::CCMObject provider_ref,
 				 in string provider_port,
 				 in ::Components::CCMObject user_ref,
@@ -73,24 +72,24 @@ module CIAO
       raises (::Components::InvalidConnection);
 
     // *** Methods used by component specific container portions
-    Object install_servant (in PortableServer::Servant svnt, 
+    Object install_servant (in PortableServer::Servant svnt,
                             in Container_Types::OA_Type type,
                             out PortableServer::ObjectId oid);
-    
-    void uninstall_servant (in PortableServer::Servant compptr, 
+
+    void uninstall_servant (in PortableServer::Servant compptr,
                             in Container_Types::OA_Type type,
                             out PortableServer::ObjectId oid);
-    
+
     Servant_Activator ports_servant_activator ();
-    
+
     Object generate_reference (in string obj_id,
                                in string repo_id,
                                in Container_Types::OA_Type type);
-    
+
     Object get_objref (in PortableServer::Servant p);
-    
+
     PortableServer::POA the_POA ();
-    
+
     PortableServer::POA the_port_POA ();
   };
 };
diff --git a/CIAO/ciao/Containers/Container_Base.inl b/CIAO/ciao/Containers/Container_Base.inl
index b4198116983..6ef5175d838 100644
--- a/CIAO/ciao/Containers/Container_Base.inl
+++ b/CIAO/ciao/Containers/Container_Base.inl
@@ -19,15 +19,4 @@ namespace CIAO
   {
     return this->orb_.in ();
   }
-
-  ACE_INLINE void
-  Container_i::set_receptacle_policy_map (::CIAO::REC_POL_MAP &rec_pol_map)
-  {
-    for (::CIAO::REC_POL_MAP_ITERATOR it = rec_pol_map.begin ();
-         it != rec_pol_map.end ();
-         ++it)
-      {
-        this->rec_pol_map_.bind ((*it).ext_id_, (*it).int_id_);
-      }
-  }
 }