Tue Oct 10 09:28:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 57 insertions, 29 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d2c0f7078d2..d64db5c51fa 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,25 @@
+Tue Oct 10 09:28:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+	* ciao/CCM_Base.idl:
+	  Removed a remark about RTF 1.1, method is now according to the spec
+
+	* ciao/CCM_Component.idl:
+	* ciao/CCM_Container.idl:
+	* ciao/CCM_Event.idl:
+	* ciao/Deployment.idl:
+	* ciao/Target_Data.idl
+	  Updated some documentation and added some todos about things which
+	  are CIAO specific
+
+	* ciao/Server_init.cpp:
+	  With LM_ERROR use ACE_ERROR
+
+	* ciao/Dynamic_Component_Activator.{h,cpp}:
+	  Removed some invalid comments and a mutex that was not used at all
+
+	* ciao/Context_Impl_Base.h:
+	  Documentation update
+
 Thu Oct 05 00:35:37 2006  William R. Otte  wotte@dre.vanderbilt.edu
 
         * CIAO version 0.5.3 released.
diff --git a/CIAO/ciao/CCM_Base.idl b/CIAO/ciao/CCM_Base.idl
index 63c05a79578..a37d55c099f 100644
--- a/CIAO/ciao/CCM_Base.idl
+++ b/CIAO/ciao/CCM_Base.idl
@@ -122,7 +122,6 @@ module Components
               AlreadyConnected,
               ExceededConnectionLimit);
 
-    // @@ Changed to return the previously connected object reference -- basef on RTF 1.1.
     Object disconnect (in FeatureName name, in Cookie ck)
       raises (InvalidName,
               InvalidConnection,
diff --git a/CIAO/ciao/CCM_Component.idl b/CIAO/ciao/CCM_Component.idl
index 4ff4549326b..32c0299acf0 100644
--- a/CIAO/ciao/CCM_Component.idl
+++ b/CIAO/ciao/CCM_Component.idl
@@ -94,8 +94,11 @@ module Components
     CCMHome get_ccm_home( );
     PrimaryKeyBase get_primary_key( )
       raises (NoKeyAvailable);
+    void remove()
+      raises (RemoveFailure);
+    ComponentPortDescription get_all_ports ();
 
-    // Factory method to return a StandardConfigurator interface
+    /// Factory method to return a StandardConfigurator interface. CIAO specific
     StandardConfigurator get_standard_configurator ( );
 
     /// CIAO specific operations to have some control on when and how
@@ -131,14 +134,12 @@ module Components
 
     void configuration_complete ()
       raises (InvalidConfiguration);
-
-    void remove()
-      raises (RemoveFailure);
-    ComponentPortDescription get_all_ports ();
   };
 
-  // @@ Enumeration and DefaultEnumeration are only for EJB to CCM
-  // mapping?  At any rate, we should be able to skip them for now.
+  /// @@ Enumeration and DefaultEnumeration are only for EJB to CCM
+  /// mapping?  At any rate, we should be able to skip them for now.
+  /// @todo Move these then to a seperate file so that the linker can
+  /// optimize things out of the executable when building staticly
   abstract valuetype Enumeration
   {
     boolean has_more_elements();
diff --git a/CIAO/ciao/CCM_Container.idl b/CIAO/ciao/CCM_Container.idl
index 220a09ea261..b8a6ab3286b 100644
--- a/CIAO/ciao/CCM_Container.idl
+++ b/CIAO/ciao/CCM_Container.idl
@@ -81,11 +81,15 @@ module Components
     void ccm_passivate()
       raises (CCMException);
 
-    /// The following two methods are CIAO specific extension.
+
+    void ccm_remove ()
+      raises (CCMException);
+
     /**
      * This method is invoked before ccm_activate () is called. All
      * components in the assembly get this callback before the
      * ccm_activate () is called.
+     * @note CIAO specific
      */
     void ciao_preactivate ()
       raises (CCMException);
@@ -94,12 +98,10 @@ module Components
      * This method is invoked after ccm_activate () is called. All
      * components in the assembly get this callback after the
      * ccm_activate () is called.
+     * @note CIAO specific
      */
     void ciao_postactivate ()
       raises (CCMException);
-
-    void ccm_remove ()
-      raises (CCMException);
   };
 
   local interface SessionSynchronization
diff --git a/CIAO/ciao/CCM_Event.idl b/CIAO/ciao/CCM_Event.idl
index 59fa878f97f..6349682550a 100644
--- a/CIAO/ciao/CCM_Event.idl
+++ b/CIAO/ciao/CCM_Event.idl
@@ -28,9 +28,9 @@ module Components
   {
     void push_event (in EventBase evt) raises (BadEventType);
 
-    // CIAO-specific operation to help support the capability
-    // to subscribe to eventtypes more derived than the type
-    // consumed.
+    /// CIAO-specific operation to help support the capability
+    /// to subscribe to eventtypes more derived than the type
+    /// consumed.
     boolean ciao_is_substitutable (in string event_repo_id);
   };
 
@@ -64,6 +64,10 @@ module Components
     EventConsumerBase get_consumer (in FeatureName sink_name)
       raises (InvalidName);
 
+    /**
+     * @todo Mismatch with 06-04-01, AlreadyConnected is not listed in the
+     * spec with this operation
+     */
     Cookie subscribe (in FeatureName publisher_name,
                       in EventConsumerBase subscriber)
       raises (InvalidName,
diff --git a/CIAO/ciao/Context_Impl_Base.h b/CIAO/ciao/Context_Impl_Base.h
index 62df2bba097..dbed5dcafa3 100644
--- a/CIAO/ciao/Context_Impl_Base.h
+++ b/CIAO/ciao/Context_Impl_Base.h
@@ -99,9 +99,9 @@ namespace CIAO
 
     CIAO::Session_Container *_ciao_the_Container (void) const;
 
+    // Accessors for the private member.
     const char *_ciao_instance_id (void) const;
     void _ciao_instance_id (const char *instance_id);
-    // Accessors for the private member.
 
   protected:
     Components::CCMHome_var home_;
diff --git a/CIAO/ciao/Deployment.idl b/CIAO/ciao/Deployment.idl
index b5515f5fe59..cf3b49ff457 100644
--- a/CIAO/ciao/Deployment.idl
+++ b/CIAO/ciao/Deployment.idl
@@ -24,24 +24,24 @@ module Deployment {
   exception InvalidReference {
   };
 
-  // Below exception types are CIAO specific
+  /// Below exception types are CIAO specific
   exception PlanNotExist {
   };
 
-  // CIAO specific struct type used for shared component management
-  // mapping the name of component to its plan_uuid
+  /// CIAO specific struct type used for shared component management
+  /// mapping the name of component to its plan_uuid
   struct ComponentPlan
   {
     string name;
     string plan_uuid;
   };
+
   /**
    * @struct Sched_Params
    * @brief Carries Scheduling Params
    * @description  CIAO specific structure to carry the scheduling params
    *  to set the process, required by RACE
    */
-
   struct Sched_Params
   {
     long policy_;
diff --git a/CIAO/ciao/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp
index 3cd903e7d9d..11883fc6056 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.cpp
+++ b/CIAO/ciao/Dynamic_Component_Activator.cpp
@@ -25,7 +25,6 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest))
   {
-    // @@Jai, where i sth emutex used at all?
     Dynamic_Component_Servant_Base* servant = 0;
     PortableServer::ObjectId new_oid (oid);
 
diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h
index d42fa216698..a8d0b26549a 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/CIAO/ciao/Dynamic_Component_Activator.h
@@ -88,11 +88,6 @@ namespace CIAO
     /// Pointer to our ORB
     CORBA::ORB_var orb_;
 
-    // @@ Jai, why are there two mutexes here?Can you get one of them
-    //out of the way?
-    /// Mutex that synchronizes access to the array.
-    ACE_SYNCH_MUTEX  mutex_;
-
     ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
                             Dynamic_Component_Servant_Base *,
                             TAO_ObjectId_Hash,
diff --git a/CIAO/ciao/Server_init.cpp b/CIAO/ciao/Server_init.cpp
index 27c4d035cdc..efb4e9144af 100644
--- a/CIAO/ciao/Server_init.cpp
+++ b/CIAO/ciao/Server_init.cpp
@@ -91,7 +91,7 @@ namespace CIAO
 
       if (lengthMissing == name.length())
         {
-          ACE_DEBUG ((LM_ERROR, "Null name length.\n\n"));
+          ACE_ERROR ((LM_ERROR, "Null name length.\n\n"));
         }
 
       if (isNotFound)
@@ -161,7 +161,7 @@ namespace CIAO
         }
       if (CORBA::is_nil(tmpContextV.in ()))
         {
-          ACE_DEBUG ((LM_ERROR, "listBindings: Nil context.\n"));
+          ACE_ERROR ((LM_ERROR, "listBindings: Nil context.\n"));
           return 0;
         }
 
@@ -207,7 +207,7 @@ namespace CIAO
       tmpContextV = CosNaming::NamingContext::_narrow(objV.in ());
       if (CORBA::is_nil(tmpContextV.in ()))
         {
-          ACE_DEBUG ((LM_ERROR, "recursiveUnbind: Nil context reference.\n"));
+          ACE_ERROR ((LM_ERROR, "recursiveUnbind: Nil context reference.\n"));
           return;
         }
 
diff --git a/CIAO/ciao/Target_Data.idl b/CIAO/ciao/Target_Data.idl
index 19c7d3ca4d0..ba1d895c784 100644
--- a/CIAO/ciao/Target_Data.idl
+++ b/CIAO/ciao/Target_Data.idl
@@ -21,11 +21,17 @@ module Deployment {
   };
 
 
+  /**
+   * @todo The ResourceCommitmentManager is part of 06-04-01 and this is not
+   * part of the Target Manager yet
+   */
   interface TargetManager {
     Domain getAllResources ();
     Domain getAvailableResources ();
+    /// @todo 06-04-01 specifies this differently
     void commitResources (in DeploymentPlan plan)
       raises (ResourceNotAvailable, PlanError);
+    /// @todo This is not part of 06-04-01
     void releaseResources (in DeploymentPlan argname);
     void updateDomain (in ::CORBA::StringSeq elements,
                        in Domain domainSubset,