various export fixes

11 files changed, 89 insertions, 89 deletions

diff --git a/flat/CIAO/MPC/config/ccm_stub.mpb b/flat/CIAO/MPC/config/ccm_stub.mpb
index aa8b5aabdd8..871cbb57062 100644
--- a/flat/CIAO/MPC/config/ccm_stub.mpb
+++ b/flat/CIAO/MPC/config/ccm_stub.mpb
@@ -2,8 +2,8 @@
 // $Id$
 
 project : ifr_client, valuetype, pi, codecfactory, ciao_vcwarnings, tao_output, ccm {
-  after += CCM_stub
-  includes   += $(CIAO_ROOT)
+  includes += $(CIAO_ROOT)
   idlflags += -I$(CIAO_ROOT)
-  libs     += CCM_stub
+  after += CCM_stub
+  libs  += CCM_stub
 }
diff --git a/flat/CIAO/ccm/CCM.mpc b/flat/CIAO/ccm/CCM.mpc
index 6d636482276..0f7673c94b7 100644
--- a/flat/CIAO/ccm/CCM.mpc
+++ b/flat/CIAO/ccm/CCM.mpc
@@ -1,12 +1,12 @@
 // $Id$
 
-project(CCM_idl) : taolib_with_idl, valuetype {
+project(CCM_stub_idl) : taolib_with_idl, valuetype {
   idlflags  += -Wb,stub_export_include=CCM_Stub_Export.h
   idlflags  += -Wb,stub_export_macro=CCM_Stub_Export
   idlflags  += -Wb,skel_export_include=CCM_Svnt_Export.h
-  idlflags  += -Wb,skel_export_macro=CCM_Stub_Export
-  custom_only=1
-
+  idlflags  += -Wb,skel_export_macro=CCM_Svnt_Export
+  idlflags  += -I$(CIAO_ROOT)/ciao
+  custom_only = 1
   IDL_Files {
     idlflags += -SS -Sci
     CCM_Base.idl
@@ -48,6 +48,50 @@ project(CCM_idl) : taolib_with_idl, valuetype {
     CCM_EventConsumerBase.idl
   }
 
+}
+
+project(CCM_stub) : taolib_with_idl, tao_output, valuetype, ifr_client {
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+  dynamicflags = CCM_STUB_BUILD_DLL
+  after += CCM_stub_idl
+  IDL_Files {
+  }
+
+  Source_Files {
+    CCM_BaseC.cpp
+    CCM_EventsC.cpp
+    CCM_EventBaseC.cpp
+    CCM_EventConsumerBaseC.cpp
+    CCM_ComponentC.cpp
+    CCM_EnumerationC.cpp
+    CCM_HomeC.cpp
+    CCM_ConfiguratorC.cpp
+    CCM_HomeConfigurationC.cpp
+    CCM_KeylessCCMHomeC.cpp
+    CCM_StandardConfiguratorC.cpp
+    CCM_HomeFinderC.cpp
+    CCM_NavigationC.cpp
+    CCM_ReceptacleC.cpp
+    CCM_CookieC.cpp
+    CCM_ObjectC.cpp
+    CCM_PrimaryKeyBaseC.cpp
+    CCM_ExceptionsC.cpp
+    ComponentsC.cpp
+  }
+}
+
+project(CCM_svnt_idl) : taolib_with_idl, valuetype {
+  idlflags   += -Wb,export_include=CCM_Svnt_Export.h
+  idlflags   += -Wb,export_macro=CCM_Svnt_Export
+  custom_only = 1
+  IDL_Files {
+    idlflags += -SS -Sci \
+                -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
+                -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
+    Security.idl
+  }
+
   IDL_Files {
     idlflags += -SS -Sci
     CCM_Context.idl
@@ -77,45 +121,6 @@ project(CCM_idl) : taolib_with_idl, valuetype {
     CCM_HomeExecutorBase.idl
   }
 
-  IDL_Files {
-    idlflags += -SS -Sci \
-                -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
-                -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
-    Security.idl
-  }
-}
-
-
-project(CCM_stub) : taolib_with_idl, tao_output, valuetype, ifr_client {
-  dynamicflags += CCM_STUB_BUILD_DLL
-  after += CCM_idl
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CCM_BaseC.cpp
-    CCM_EventsC.cpp
-    CCM_EventBaseC.cpp
-    CCM_EventConsumerBaseC.cpp
-    CCM_ComponentC.cpp
-    CCM_EnumerationC.cpp
-    CCM_HomeC.cpp
-    CCM_ConfiguratorC.cpp
-    CCM_HomeConfigurationC.cpp
-    CCM_KeylessCCMHomeC.cpp
-    CCM_StandardConfiguratorC.cpp
-    CCM_HomeFinderC.cpp
-    CCM_NavigationC.cpp
-    CCM_ReceptacleC.cpp
-    CCM_CookieC.cpp
-    CCM_ObjectC.cpp
-    CCM_PrimaryKeyBaseC.cpp
-    CCM_ExceptionsC.cpp
-    ComponentsC.cpp
-  }
 }
 
 project(CCM_svnt) : orbsvcslib, orbsvcs_output \
@@ -128,11 +133,8 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \
                            , avoids_corba_e_compact \
                            , avoids_corba_e_micro \
 {
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)
-  dynamicflags += CCM_SVNT_BUILD_DLL
-  after += CCM_idl
-
+  dynamicflags = CCM_SVNT_BUILD_DLL
+  after += CCM_svnt_idl
   IDL_Files {
   }
 
@@ -175,3 +177,4 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \
     ComponentsS.cpp
   }
 }
+
diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
index 39751bf0ee2..24a1b98097c 100644
--- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
+++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
@@ -54,7 +54,7 @@ project(CIAO_CS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_componen
 }
 
 project(CIAO_ComponentServer_svnt) : ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \
-                                   ciao_session_container, naming, ciao_server {
+                                     ciao_session_container, naming, ciao_server {
 
   dynamicflags =   CIAO_COMPONENTSERVER_SVNT_BUILD_DLL
   after += CIAO_Basic_Configurator
diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
index 17991eba2b6..2535ed5d73b 100644
--- a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
+++ b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
@@ -22,53 +22,53 @@ namespace CIAO
   {
     /**
      * @class CIAO_Container
-     * @brief Implements external interface for CIAO container. 
+     * @brief Implements external interface for CIAO container.
      */
-    class CIAO_ComponentServer_svnt_Export  CIAO_Container_i
+    class CIAO_ComponentServer_svnt_Export CIAO_Container_i
       : public virtual POA_CIAO::Deployment::Container
     {
     public:
-      // Constructor 
+      // Constructor
       CIAO_Container_i (const Components::ConfigValues &config,
 			const Static_Config_EntryPoints_Maps *,
 			const char *,
 			const CORBA::PolicyList *,
 			CORBA::ORB_ptr,
 			PortableServer::POA_ptr);
-      // Destructor 
+      // Destructor
       virtual ~CIAO_Container_i (void);
-  
+
       virtual
 	::Components::CCMObject_ptr install_component (const char * id,
 						       const char * entrypt,
 						       const ::Components::ConfigValues & config);
-  
+
       virtual
 	void remove_component (::Components::CCMObject_ptr cref);
-  
+
       virtual
 	::CIAO::Deployment::CCMObjects * get_components (void);
-  
+
       virtual
 	::Components::ConfigValues * configuration (void);
-  
+
       virtual
 	::Components::Deployment::ComponentServer_ptr get_component_server (void);
-  
+
       virtual
 	::Components::CCMHome_ptr install_home (const char * id,
 						const char * entrypt,
 						const ::Components::ConfigValues & config);
-  
+
       virtual
 	void remove_home (::Components::CCMHome_ptr href);
-  
+
       virtual
 	::Components::CCMHomes * get_homes (void);
-  
+
       virtual
 	void remove (void);
-      
+
       virtual void activate_component (::Components::CCMObject_ptr comp);
 
       virtual void passivate_component (::Components::CCMObject_ptr comp);
@@ -80,13 +80,13 @@ namespace CIAO
       CORBA::ORB_var orb_;
 
       PortableServer::POA_var poa_;
-      
+
       CIAO::Container_var container_;
 
       Components::ConfigValues config_;
-      
+
       const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
-      
+
       /// To store all created CCMHome object
       typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
 	Components::CCMHome_var,
@@ -95,7 +95,7 @@ namespace CIAO
 	ACE_Null_Mutex> CCMHome_Map;
       typedef CCMHome_Map::iterator Home_Iterator;
       CCMHome_Map home_map_;
-      
+
       /// To store all created Component object.
       // @@Gan, see how this caching is duplicated..
       typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
@@ -105,14 +105,14 @@ namespace CIAO
 	ACE_Null_Mutex> CCMComponent_Map;
       typedef CCMComponent_Map::iterator Component_Iterator;
       CCMComponent_Map component_map_;
-  
+
       typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
 				      ACE_CString,
 				      ACE_Hash<ACE_CString>,
 				      ACE_Equal_To<ACE_CString>,
 				      ACE_Null_Mutex> CCMNaming_Map;
       CCMNaming_Map naming_map_;
-  
+
     };
   }
 }
diff --git a/flat/CIAO/ciao/Containers/Containers.mpc b/flat/CIAO/ciao/Containers/Containers.mpc
index 80f4e36a7a6..732c9437c4c 100644
--- a/flat/CIAO/ciao/Containers/Containers.mpc
+++ b/flat/CIAO/ciao/Containers/Containers.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(CIAO_Container_Base) : ciao_lib, ccm_svnt, ciao_servant_activator, ciao_port_activator_stub  {
-  dynamicflags += CONTAINER_BASE_BUILD_DLL
+  dynamicflags += CIAO_CONTAINER_BASE_BUILD_DLL
   idlflags  += -Wb,export_include=Container_Base_export.h
   idlflags  += -Wb,export_macro=CIAO_Container_Base_Export
 
diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.mpc b/flat/CIAO/ciao/Containers/Session/Session_Container.mpc
index 3401ebb0264..bfda75932b4 100644
--- a/flat/CIAO/ciao/Containers/Session/Session_Container.mpc
+++ b/flat/CIAO/ciao/Containers/Session/Session_Container.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project(CIAO_Session_Container) : ccm_svnt, ciao_lib, ciao_container_base, utils,  \
-                                  ccm_componentserver_stub, ciao_servant_activator {
+                                  ccm_componentserver_stub, ciao_servant_activator, ciao_servant {
   dynamicflags = SESSION_CONTAINER_BUILD_DLL
 
   IDL_Files {
diff --git a/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h b/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h
index 4396f0b9eac..1ad5b984346 100644
--- a/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h
+++ b/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h
@@ -54,12 +54,11 @@ namespace CIAO
 
     virtual ::CORBA::IRObject_ptr get_home_def (void);
 
-    virtual void
-    update_component_map (PortableServer::ObjectId &oid) = 0;
+    virtual void update_component_map (PortableServer::ObjectId &oid) = 0;
 
   protected:
     Container_var container_;
-    
+
   private:
     /// Not to be used
     Home_Servant_Impl_Base (void);
diff --git a/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
index 89aad12fc90..a75c1b94fc7 100644
--- a/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
+++ b/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
@@ -80,7 +80,7 @@ namespace CIAO
       }
 
     _ciao_comp->remove ();
-    
+
     CIAO_DEBUG ((LM_INFO, CLINFO "Home_Servant_Impl<>::remove_component - Removed the component\n"));
   }
 
@@ -135,7 +135,7 @@ namespace CIAO
 
     if (this->executor_.in () == 0)
       {
-	CIAO_ERROR ((LM_ERROR, CLINFO "Home_Servant_Impl<>:create - nil executor reference\n"));
+        CIAO_ERROR ((LM_ERROR, CLINFO "Home_Servant_Impl<>:create - nil executor reference\n"));
         throw CORBA::INTERNAL ();
       }
 
@@ -176,18 +176,18 @@ namespace CIAO
 				 this,
 				 this->container_),
 		      CORBA::NO_MEMORY ());
-    
+
     PortableServer::ServantBase_var safe (svt);
     PortableServer::ObjectId_var oid;
-    
+
     CORBA::Object_var objref =
-      this->container_->install_servant (svt, 
+      this->container_->install_servant (svt,
                                          Container_Types::COMPONENT_t,
                                          oid.out ());
-    
+
     typedef typename COMP_SVNT::_stub_type stub_type;
     typename COMP_SVNT::_stub_var_type ho = stub_type::_narrow (objref.in ());
-    
+
     Components::CCMObject_var ccmobjref =
       Components::CCMObject::_narrow (objref.in ());
 
diff --git a/flat/CIAO/ciao/Servants/Servants.mpc b/flat/CIAO/ciao/Servants/Servants.mpc
index f696a3a7c4a..7538ee90519 100644
--- a/flat/CIAO/ciao/Servants/Servants.mpc
+++ b/flat/CIAO/ciao/Servants/Servants.mpc
@@ -2,7 +2,7 @@ project(CIAO_Port_Activator_stub) : portableserver, taoidldefaults, ciao_lib {
    dynamicflags = CIAO_PORT_ACTIVATOR_BUILD_DLL
    idlflags  += -Wb,stub_export_include=CIAO_Port_Activator_export.h
    idlflags  += -Wb,stub_export_macro=CIAO_Port_Activator_Export
-   idlflags  += -SS   
+   idlflags  += -SS
    IDL_Files {
      CIAO_Port_Activator.idl
    }
@@ -15,8 +15,7 @@ project(CIAO_Port_Activator_stub) : portableserver, taoidldefaults, ciao_lib {
    }
 }
 
-project(CIAO_Servant_Impl) : ccm_svnt, ciao_servant_activator, ciao_port_activator_stub, ciao_container_base {
-
+project(CIAO_Servant_Impl) : ciao_servant_activator, ciao_port_activator_stub, ciao_container_base, ccm_svnt {
    dynamicflags = CIAO_SERVANT_IMPL_BUILD_DLL
    IDL_Files {
    }
diff --git a/flat/CIAO/ciao/Servants/StandardConfigurator_Impl.h b/flat/CIAO/ciao/Servants/StandardConfigurator_Impl.h
index 806aa5b5cd5..4f49e216b88 100644
--- a/flat/CIAO/ciao/Servants/StandardConfigurator_Impl.h
+++ b/flat/CIAO/ciao/Servants/StandardConfigurator_Impl.h
@@ -63,7 +63,7 @@ namespace CIAO
   private:
     /// The component whose attributes are going to be configured via
     /// set_attributes
-    Servant_Impl_Base* component_;
+    Servant_Impl_Base* const component_;
   };
 
 }
diff --git a/flat/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc b/flat/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
index 29ebdfb75b0..ea5e04392d0 100644
--- a/flat/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+++ b/flat/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project (CIAO_Events_Base) : orbsvcslib, orbsvcs_output, ccm_svnt {
-  requires += dummy_label
   sharedname  = CIAO_Events_Base
   idlflags  += -Wb,export_include=CIAO_Events_Export.h \
                -Wb,export_macro=CIAO_EVENTS_Export