*** empty log message ***

3 files changed, 9 insertions, 142 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
index f33f04afdf3..4e39010461f 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
@@ -48,67 +48,7 @@ namespace CIAO
     this->context_->_remove_ref ();
   }
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::FacetDescriptions *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_facets (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::FacetDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::FacetDescriptions,
-                    0);
-
-    ::Components::FacetDescriptions_var retval = tmp;
-
-    retval->length (this->facet_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (FacetTable::iterator iter = this->facet_table_.begin ();
-         iter != this->facet_table_.end ();
-         ++iter, ++i)
-      {
-        FacetTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::ConsumerDescriptions *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_consumers (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::ConsumerDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::ConsumerDescriptions,
-                    0);
-
-    ::Components::ConsumerDescriptions_var retval = tmp;
-
-    retval->length (this->consumer_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
-         iter != this->consumer_table_.end ();
-         ++iter, ++i)
-      {
-        ConsumerTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
+  // Operations for CCMObject interface.
 
   template <typename BASE_SKEL,
             typename EXEC,
@@ -155,65 +95,6 @@ namespace CIAO
             typename EXEC,
             typename EXEC_VAR,
             typename CONTEXT>
-  ::Components::PrimaryKeyBase *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_primary_key (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::Components::NoKeyAvailable))
-  {
-    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::ComponentPortDescription *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_ports (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    OBV_Components::ComponentPortDescription *cps = 0;
-    ACE_NEW_RETURN (cps,
-                    OBV_Components::ComponentPortDescription,
-                    0);
-    ::Components::ComponentPortDescription_var retv = cps;
-
-    ::Components::FacetDescriptions_var facets_desc =
-      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ReceptacleDescriptions_var receptacle_desc =
-      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ConsumerDescriptions_var consumer_desc =
-      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::EmitterDescriptions_var emitter_desc =
-      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::PublisherDescriptions_var publisher_desc =
-      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    retv->facets (facets_desc.in ());
-    retv->receptacles (receptacle_desc.in ());
-    retv->consumers (consumer_desc.in ());
-    retv->emitters (emitter_desc.in ());
-    retv->publishers (publisher_desc.in ());
-
-    return retv._retn ();
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
   CORBA::Object_ptr
   Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_get_component (
       ACE_ENV_SINGLE_ARG_DECL
@@ -248,7 +129,7 @@ namespace CIAO
                       ::CORBA::Object::_nil ());
   }
 
-    // CIAO-specific operations.
+  // CIAO-specific operations.
 
   template <typename BASE_SKEL,
             typename EXEC,
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
index 48af7435c3c..45f223f57b5 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
@@ -43,21 +43,16 @@ namespace CIAO
             typename EXEC_VAR, 
             typename CONTEXT>
   class Servant_Impl : public virtual BASE_SKEL,
-                       public Servant_Impl_Base
+                       public virtual Servant_Impl_Base
   {
   public:
     Servant_Impl (EXEC * exe,
                   Session_Container * c);
+                  
     virtual ~Servant_Impl (void);
    
-    virtual ::Components::FacetDescriptions *
-    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual ::Components::ConsumerDescriptions *
-    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-      
+    // Operations for CCMObject interface.
+
     virtual CORBA::Boolean
     same_component (CORBA::Object_ptr object_ref
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -67,20 +62,11 @@ namespace CIAO
     get_ccm_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual ::Components::PrimaryKeyBase *
-    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::NoKeyAvailable));
-
-    virtual ::Components::ComponentPortDescription *
-    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
     virtual CORBA::Object_ptr
     _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // CIAO-specific operations.
+   // CIAO-specific operations.
 
     void
     ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h b/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h
index 39bf3a132dd..0395f8adc10 100644
--- a/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h
+++ b/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h
@@ -4,7 +4,7 @@
 /**
  *  @file    StandardConfigurator_Impl.h
  *
- *  $Id$:StandardConfigurator_Impl.h,v 1.0 2004/08/12 20:00:00 jules
+ *  $Id$
  *
  *  This file contains implementation for the servant of
  *  Components::StandardConfigurator interface.
@@ -61,7 +61,7 @@ namespace CIAO
         ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void StandardConfigurator_Impl::configure (
+    void configure (
         Components::CCMObject_ptr comp
         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,