Thu Apr 8 07:29:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ccm/CCM_Entity2Context.idl
        * ccm/CCM_EntityComponent.idl
        * ccm/CCM_EntityContext.idl
        * ciao/ComponentServer/Client_init.cpp
        * ciao/Contexts/Context_Impl_Base.cpp
        * ciao/Contexts/Context_Impl_Base.h
        * ciao/Servants/Connector_Servant_Impl_Base.cpp
        * ciao/Servants/Connector_Servant_Impl_Base.h
        * ciao/Servants/Servant_Impl_Base.cpp
        * ciao/Servants/Servant_Impl_Base.h
        * ciao/Servants/Servant_Impl_Utils_T.cpp
        * ciao/Servants/StandardConfigurator_Impl.cpp
        * ciao/Servants/StandardConfigurator_Impl.h
          Disabled more idl and code for lwccm. This is really work 
          in progress, some lwccm code uses methods from full ccm which
          means that code has to be rewritten to use other types. First step
          is to update all IDL and get code to compile to see what runs
          and what not

14 files changed, 134 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 3204ae8d547..f0d2991eaed 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,24 @@
+Thu Apr  8 07:29:31 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ccm/CCM_Entity2Context.idl
+        * ccm/CCM_EntityComponent.idl
+        * ccm/CCM_EntityContext.idl
+        * ciao/ComponentServer/Client_init.cpp
+        * ciao/Contexts/Context_Impl_Base.cpp
+        * ciao/Contexts/Context_Impl_Base.h
+        * ciao/Servants/Connector_Servant_Impl_Base.cpp
+        * ciao/Servants/Connector_Servant_Impl_Base.h
+        * ciao/Servants/Servant_Impl_Base.cpp
+        * ciao/Servants/Servant_Impl_Base.h
+        * ciao/Servants/Servant_Impl_Utils_T.cpp
+        * ciao/Servants/StandardConfigurator_Impl.cpp
+        * ciao/Servants/StandardConfigurator_Impl.h
+          Disabled more idl and code for lwccm. This is really work
+          in progress, some lwccm code uses methods from full ccm which
+          means that code has to be rewritten to use other types. First step
+          is to update all IDL and get code to compile to see what runs
+          and what not
+
 Thu Apr  8 06:48:07 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl:
diff --git a/CIAO/ccm/CCM_Entity2Context.idl b/CIAO/ccm/CCM_Entity2Context.idl
index d21772bfb6b..7ab07b2046f 100644
--- a/CIAO/ccm/CCM_Entity2Context.idl
+++ b/CIAO/ccm/CCM_Entity2Context.idl
@@ -9,6 +9,8 @@
 
 // *************** Extended Container Interfaces ***************
 
+#if !defined (CCM_LW)
+
 module Components
 {
   typeprefix Components "omg.org";
@@ -32,4 +34,6 @@ module Components
       raises (BadComponentReference);
   };
 };
+#endif
+
 #endif /* CCM_ENTITY2CONTEXT_IDL */
diff --git a/CIAO/ccm/CCM_EntityComponent.idl b/CIAO/ccm/CCM_EntityComponent.idl
index 4fb219a7904..795db51d287 100644
--- a/CIAO/ccm/CCM_EntityComponent.idl
+++ b/CIAO/ccm/CCM_EntityComponent.idl
@@ -7,6 +7,8 @@
 #include "ccm/CCM_EnterpriseComponent.idl"
 #include "ccm/CCM_EntityContext.idl"
 
+#if !defined (CCM_LW)
+
 module Components
 {
   typeprefix Components "omg.org";
@@ -35,4 +37,7 @@ module Components
       raises (CCMException);
   };
 };
+
+#endif
+
 #endif /* CCM_ENTITYCOMPONENT_IDL */
diff --git a/CIAO/ccm/CCM_EntityContext.idl b/CIAO/ccm/CCM_EntityContext.idl
index 3375c44717d..200077752a9 100644
--- a/CIAO/ccm/CCM_EntityContext.idl
+++ b/CIAO/ccm/CCM_EntityContext.idl
@@ -6,6 +6,8 @@
 #include "ccm/CCM_Context.idl"
 #include "ccm/CCM_Object.idl"
 
+#if !defined (CCM_LW)
+
 module Components
 {
   typeprefix Components "omg.org";
@@ -19,4 +21,7 @@ module Components
       raises (IllegalState);
   };
 };
+
+#endif
+
 #endif /* CCM_ENTITYCONTEXT_IDL */
diff --git a/CIAO/ciao/ComponentServer/Client_init.cpp b/CIAO/ciao/ComponentServer/Client_init.cpp
index 73925495579..317ee2aec11 100644
--- a/CIAO/ciao/ComponentServer/Client_init.cpp
+++ b/CIAO/ciao/ComponentServer/Client_init.cpp
@@ -23,7 +23,8 @@ namespace CIAO
                                  Components::ConnectionDescription);
     CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init,
                                  Components::ReceptacleDescription);
-    CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init,
+ #if !defined (CCM_LW)
+   CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init,
                                  Components::ConsumerDescription);
     CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init,
                                  Components::EmitterDescription);
@@ -35,6 +36,7 @@ namespace CIAO
                                  Components::ConfigValue);
     CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init,
                                  Components::ComponentPortDescription);
+#endif                                 
     return 0;
   }
 }
diff --git a/CIAO/ciao/Contexts/Context_Impl_Base.cpp b/CIAO/ciao/Contexts/Context_Impl_Base.cpp
index 98a75fcd2f4..06a01d40353 100644
--- a/CIAO/ciao/Contexts/Context_Impl_Base.cpp
+++ b/CIAO/ciao/Contexts/Context_Impl_Base.cpp
@@ -34,11 +34,13 @@ namespace CIAO
 
   // Operations from ::Components::CCMContext.
 
+#if !defined (CCM_LW)
   Components::Principal_ptr
   Context_Impl_Base::get_caller_principal (void)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
+#endif
 
   Components::CCMHome_ptr
   Context_Impl_Base::get_CCM_home (void)
@@ -46,29 +48,37 @@ namespace CIAO
     return Components::CCMHome::_duplicate (this->home_.in ());
   }
 
+#if !defined (CCM_LW)
   CORBA::Boolean
   Context_Impl_Base::get_rollback_only (void)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
+#endif
 
+#if !defined (CCM_LW)
   Components::Transaction::UserTransaction_ptr
   Context_Impl_Base::get_user_transaction (void)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
+#endif
 
+#if !defined (CCM_LW)
   CORBA::Boolean
   Context_Impl_Base::is_caller_in_role (const char * /* role */)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
+#endif
 
+#if !defined (CCM_LW)
   void
   Context_Impl_Base::set_rollback_only (void)
   {
     throw CORBA::NO_IMPLEMENT ();
   }
+#endif
 
   CORBA::Object_ptr
   Context_Impl_Base::resolve_service_reference(const char *)
diff --git a/CIAO/ciao/Contexts/Context_Impl_Base.h b/CIAO/ciao/Contexts/Context_Impl_Base.h
index 0281d93fada..1a845c85693 100644
--- a/CIAO/ciao/Contexts/Context_Impl_Base.h
+++ b/CIAO/ciao/Contexts/Context_Impl_Base.h
@@ -62,17 +62,27 @@ namespace CIAO
 
     // Operations from ::Components::CCMContext.
 
+#if !defined (CCM_LW)
     virtual Components::Principal_ptr get_caller_principal ();
+#endif
 
     virtual Components::CCMHome_ptr get_CCM_home ();
 
+#if !defined (CCM_LW)
     virtual CORBA::Boolean get_rollback_only ();
+#endif
 
+#if !defined (CCM_LW)
     virtual Components::Transaction::UserTransaction_ptr get_user_transaction ();
+#endif
 
+#if !defined (CCM_LW)
     virtual CORBA::Boolean is_caller_in_role (const char *role);
+#endif
 
+#if !defined (CCM_LW)
     virtual void set_rollback_only ();
+#endif
 
     virtual CORBA::Object_ptr resolve_service_reference(const char *service_id);
 
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
index 679166af9db..4caacd0f261 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
@@ -186,6 +186,7 @@ namespace CIAO
     return 0;
   }
 
+#if !defined (CCM_LW)
   ::Components::ComponentPortDescription *
   Connector_Servant_Impl_Base::get_all_ports (void)
   {
@@ -208,12 +209,15 @@ namespace CIAO
 
     return retv._retn ();
   }
+#endif
 
+#if !defined (CCM_LW)
   ::Components::ConsumerDescriptions *
   Connector_Servant_Impl_Base::get_all_consumers (void)
   {
     return 0;
   }
+#endif
 
   ::Components::EventConsumerBase_ptr
   Connector_Servant_Impl_Base::get_consumer (
@@ -222,13 +226,16 @@ namespace CIAO
     return ::Components::EventConsumerBase::_nil ();
   }
 
+#if !defined (CCM_LW)
   ::Components::ConsumerDescriptions *
   Connector_Servant_Impl_Base::get_named_consumers (
     const ::Components::NameList & /* names */)
   {
     return 0;
   }
+#endif
 
+#if !defined (CCM_LW)
   ::Components::EmitterDescriptions *
   Connector_Servant_Impl_Base::get_named_emitters (
       const ::Components::NameList & /* names */)
@@ -241,6 +248,7 @@ namespace CIAO
   {
     return 0;
   }
+#endif
 
   ::Components::ReceptacleDescriptions *
   Connector_Servant_Impl_Base::get_named_receptacles (
@@ -298,6 +306,7 @@ namespace CIAO
     return retval._retn ();
   }
 
+#if !defined (CCM_LW)
   ::Components::PublisherDescriptions *
   Connector_Servant_Impl_Base::get_named_publishers (
     const ::Components::NameList & /* names */)
@@ -310,6 +319,7 @@ namespace CIAO
   {
     return 0;
   }
+#endif
 
   ::Components::Cookie *
   Connector_Servant_Impl_Base::subscribe (
@@ -365,6 +375,7 @@ namespace CIAO
   {
   }
 
+#if !defined (CCM_LW)
   ::Components::StandardConfigurator_ptr
   Connector_Servant_Impl_Base::get_standard_configurator (void)
   {
@@ -383,6 +394,7 @@ namespace CIAO
 
     return configurator._retn ();
   }
+#endif
 
   PortableServer::POA_ptr
   Connector_Servant_Impl_Base::_default_POA (void)
@@ -432,8 +444,7 @@ namespace CIAO
   }
 
   CORBA::Object_ptr
-  Connector_Servant_Impl_Base::lookup_facet (
-    const char *port_name)
+  Connector_Servant_Impl_Base::lookup_facet (const char *port_name)
   {
     CIAO_TRACE("Connector_Servant_Impl_Base::lookup_facet");
 
@@ -458,8 +469,7 @@ namespace CIAO
   }
 
   ::Components::FacetDescription *
-  Connector_Servant_Impl_Base::lookup_facet_description (
-    const char *port_name)
+  Connector_Servant_Impl_Base::lookup_facet_description (const char *port_name)
   {
     CIAO_TRACE ("Connector_Servant_Impl_Base::lookup_facet_description");
 
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
index 7431fdcff66..7517a99cb52 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
@@ -100,21 +100,29 @@ namespace CIAO
 
     virtual ::Components::PrimaryKeyBase * get_primary_key (void);
 
+#if !defined (CCM_LW)
     virtual ::Components::ComponentPortDescription * get_all_ports (void);
+#endif
 
+#if !defined (CCM_LW)
     virtual ::Components::ConsumerDescriptions * get_all_consumers (void);
+#endif
 
     virtual ::Components::EventConsumerBase_ptr
     get_consumer (const char *sink_name);
 
+#if !defined (CCM_LW)
     virtual ::Components::ConsumerDescriptions *
     get_named_consumers (const ::Components::NameList & names);
+#endif
 
+#if !defined (CCM_LW)
     virtual ::Components::EmitterDescriptions *
     get_named_emitters (const ::Components::NameList & names);
 
     virtual ::Components::EmitterDescriptions *
     get_all_emitters (void);
+#endif
 
     virtual ::Components::ReceptacleDescriptions *
     get_named_receptacles (const ::Components::NameList & names);
@@ -122,11 +130,13 @@ namespace CIAO
     virtual ::Components::ReceptacleDescriptions *
     get_all_receptacles (void);
 
+#if !defined (CCM_LW)
     virtual ::Components::PublisherDescriptions *
     get_named_publishers (const ::Components::NameList & names);
 
     virtual ::Components::PublisherDescriptions *
     get_all_publishers (void);
+#endif
 
     virtual ::Components::Cookie *
     subscribe (const char * publisher_name,
@@ -154,9 +164,11 @@ namespace CIAO
     /// Operation to set attributes on the component.
     virtual void set_attributes (const Components::ConfigValues &descr);
 
+#if !defined (CCM_LW)
     // Creates and returns the StandardConfigurator for the component.
     virtual ::Components::StandardConfigurator_ptr
     get_standard_configurator (void);
+#endif
 
     /// Override that returns the (passed-in) default POA of our member
     /// component's container, to ensure that we get registered
diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
index 63f4741414b..77f3555e5a9 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
@@ -21,6 +21,7 @@ namespace CIAO
   Servant_Impl_Base::remove (void)
   {
     CIAO_TRACE("Servant_Impl_Base::remove (void)");
+#if !defined (CCM_LW)
     
     try
     {
@@ -52,6 +53,7 @@ namespace CIAO
       ex._tao_print_exception ("Port not active\n");
       return;
     }
+#endif
     
     /// This call deactivates facets, removes executor and home
     /// servant (if any), and uninstalls us from the container.
@@ -59,6 +61,7 @@ namespace CIAO
     this->Connector_Servant_Impl_Base::remove ();
   }
 
+#if !defined (CCM_LW)
   ::Components::ComponentPortDescription *
   Servant_Impl_Base::get_all_ports (void)
   {
@@ -82,14 +85,18 @@ namespace CIAO
 
     return retv._retn ();
   }
+#endif
 
+#if !defined (CCM_LW)
   ::Components::PrimaryKeyBase *
   Servant_Impl_Base::get_primary_key (void)
   {
     CIAO_TRACE("Servant_Impl_Base::get_primary_key");
     throw ::Components::NoKeyAvailable ();
   }
+#endif
 
+#if !defined (CCM_LW)
   ::Components::ConsumerDescriptions *
   Servant_Impl_Base::get_all_consumers (void)
   {
@@ -116,6 +123,7 @@ namespace CIAO
 
     return retval._retn ();
   }
+#endif
 
   ::Components::EventConsumerBase_ptr
   Servant_Impl_Base::get_consumer (const char *sink_name)
@@ -124,7 +132,7 @@ namespace CIAO
     
     if (sink_name == 0)
       {
-        throw Components::InvalidName ();
+        throw ::Components::InvalidName ();
       }
 
     Components::EventConsumerBase_ptr retval =
@@ -138,6 +146,7 @@ namespace CIAO
     return retval;
   }
 
+#if !defined (CCM_LW)
   ::Components::ConsumerDescriptions *
   Servant_Impl_Base::get_named_consumers (
     const ::Components::NameList & names)
@@ -168,7 +177,9 @@ namespace CIAO
 
     return safe_retval._retn ();
   }
+#endif
 
+#if !defined (CCM_LW)
   ::Components::EmitterDescriptions *
   Servant_Impl_Base::get_named_emitters (
       const ::Components::NameList & /* names */)
@@ -176,6 +187,7 @@ namespace CIAO
     CIAO_TRACE("Servant_Impl_Base::get_named_emitters");
     throw CORBA::NO_IMPLEMENT ();
   }
+#endif
 
   ::Components::ReceptacleDescriptions *
   Servant_Impl_Base::get_all_receptacles (void)
@@ -233,6 +245,7 @@ namespace CIAO
     throw ::CORBA::NO_IMPLEMENT ();
   }
 
+#if !defined (CCM_LW)
   ::Components::PublisherDescriptions *
   Servant_Impl_Base::get_named_publishers (
     const ::Components::NameList & /* names */)
@@ -240,6 +253,7 @@ namespace CIAO
     CIAO_TRACE("Servant_Impl_Base::get_named_publishers");
     throw ::CORBA::NO_IMPLEMENT ();
   }
+#endif
 
   /// Protected operations.
   void
@@ -260,6 +274,7 @@ namespace CIAO
         return;
       }
 
+#if !defined (CCM_LW)
     ::Components::ConsumerDescription *cd = 0;
     ACE_NEW_THROW_EX (cd,
                       ::OBV_Components::ConsumerDescription,
@@ -279,6 +294,7 @@ namespace CIAO
                               CORBA::NO_RESOURCES ());
 
     (void) this->consumer_table_.insert (entry);
+#endif
   }
 
   ::Components::EventConsumerBase_ptr
@@ -286,6 +302,7 @@ namespace CIAO
   {
     CIAO_TRACE("Servant_Impl_Base::lookup_consumer");
     
+#if !defined (CCM_LW)
     if (0 == port_name)
       {
         return ::Components::EventConsumerBase::_nil ();
@@ -307,8 +324,12 @@ namespace CIAO
     return
       ::Components::EventConsumerBase::_duplicate (
         iter->second->consumer ());
+#else        
+    return ::Components::EventConsumerBase::_nil ();
+#endif
   }
 
+#if !defined (CCM_LW)
   ::Components::ConsumerDescription *
   Servant_Impl_Base::lookup_consumer_description (
     const char *port_name)
@@ -340,5 +361,6 @@ namespace CIAO
 
     return cd._retn ();
   }
+#endif
 }
 
diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.h b/CIAO/ciao/Servants/Servant_Impl_Base.h
index 47b766ae1b5..1cbfe38703a 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Base.h
+++ b/CIAO/ciao/Servants/Servant_Impl_Base.h
@@ -26,6 +26,7 @@
 
 namespace CIAO
 {
+#if !defined (CCM_LW)
   namespace Servant
   {
     template<typename T_var>
@@ -44,7 +45,7 @@ namespace CIAO
         ::Components::EmitterDescriptions_var &descriptions,
         CORBA::ULong slot);
   } /* Servant */
-
+#endif
   /**
    * @class Servant_Impl_Base
    *
@@ -70,20 +71,29 @@ namespace CIAO
 
     virtual void remove (void);
 
+#if !defined (CCM_LW)
     virtual ::Components::ComponentPortDescription * get_all_ports (void);
+#endif
 
+#if !defined (CCM_LW)
     virtual ::Components::PrimaryKeyBase * get_primary_key (void);
-
+#endif
+#if !defined (CCM_LW)
     virtual ::Components::ConsumerDescriptions * get_all_consumers (void);
+#endif
 
     virtual ::Components::EventConsumerBase_ptr
     get_consumer (const char *sink_name);
 
+#if !defined (CCM_LW)
     virtual ::Components::ConsumerDescriptions *
     get_named_consumers (const ::Components::NameList & names);
+#endif
 
+#if !defined (CCM_LW)
     virtual ::Components::EmitterDescriptions *
     get_named_emitters (const ::Components::NameList & names);
+#endif
 
     virtual ::Components::ReceptacleDescriptions *
     get_named_receptacles (const ::Components::NameList & names);
@@ -91,8 +101,10 @@ namespace CIAO
     virtual ::Components::ReceptacleDescriptions *
     get_all_receptacles (void);
 
+#if !defined (CCM_LW)
     virtual ::Components::PublisherDescriptions *
     get_named_publishers (const ::Components::NameList & names);
+#endif
 
   protected:
     void add_consumer (const char *port_name,
@@ -101,15 +113,19 @@ namespace CIAO
     ::Components::EventConsumerBase_ptr lookup_consumer (
       const char *port_name);
 
+#if !defined (CCM_LW)
     ::Components::ConsumerDescription *lookup_consumer_description (
       const char *port_name);
+#endif
 
   protected:
+#if !defined (CCM_LW)
     typedef ACE_Array_Map<ACE_CString,
                           ::Components::ConsumerDescription_var>
        ConsumerTable;
 
     ConsumerTable consumer_table_;
+#endif    
   };
 }
 
diff --git a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp b/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
index 9c832324cdc..c87f12b006c 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp
@@ -7,6 +7,7 @@
 #include "ciao/Valuetype_Factories/Cookies.h"
 #include "ciao/Logger/Log_Macros.h"
 
+#if !defined (CCM_LW)
 namespace CIAO
 {
   template<typename T_var>
@@ -87,5 +88,6 @@ namespace CIAO
     descriptions[slot] = safe_elem._retn ();
   }
 }
+#endif
 
 #endif /* CIAO_SERVANT_IMPL_UTILS_T_C */
diff --git a/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp b/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp
index c0eb5fe3483..0b2bf4f2d6f 100644
--- a/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp
+++ b/CIAO/ciao/Servants/StandardConfigurator_Impl.cpp
@@ -3,6 +3,8 @@
 #include "StandardConfigurator_Impl.h"
 #include "Servant_Impl_Base.h"
 
+#if !defined (CCM_LW)
+
 namespace CIAO
 {
   StandardConfigurator_Impl::StandardConfigurator_Impl (
@@ -27,3 +29,5 @@ namespace CIAO
   {
   }
 }
+
+#endif
\ No newline at end of file
diff --git a/CIAO/ciao/Servants/StandardConfigurator_Impl.h b/CIAO/ciao/Servants/StandardConfigurator_Impl.h
index 949484e5074..784d28f9dbc 100644
--- a/CIAO/ciao/Servants/StandardConfigurator_Impl.h
+++ b/CIAO/ciao/Servants/StandardConfigurator_Impl.h
@@ -31,6 +31,8 @@ namespace CIAO
   class Connector_Servant_Impl_Base;
 }
 
+#if !defined (CCM_LW)
+
 namespace CIAO
 {
   /**
@@ -67,6 +69,7 @@ namespace CIAO
     Connector_Servant_Impl_Base* const component_;
   };
 }
+#endif
 
 #include /**/ "ace/post.h"