Tue Nov 25 08:30:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 102 insertions, 20 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index b2755f65971..b9c17ff0bcf 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Tue Nov 25 08:30:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Servants/Swapping/CIAO_SwapExec.idl:
+        * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp
+        * ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h
+        * ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h
+        * examples/Swapping/Receiver/Receiver_exec.h
+        * examples/Swapping/Sender/Sender_exec_1.h
+        * examples/Swapping/Sender/Sender_exec_2.h
+        * ofccm/NodeApplication/ComponentInstallation_Impl.h
+        * ofccm/NodeApplication/NodeApplication_Impl.cpp
+        * ofccm/NodeApplication/NodeApplication_Impl.h
+        * ofccm/NodeApplication/ServerActivator_Impl.cpp
+        * ofccm/NodeApplication/ServerActivator_Impl.h
+          Updated includes
+
+        * ciao/Servants/Swapping/Swapping_Servants.mpc
+        * ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h
+          New files
+
 Mon Nov 24 20:08:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Servants/Home_Servant_Impl_T.cpp:
diff --git a/flat/CIAO/ciao/Servants/Swapping/CIAO_SwapExec.idl b/flat/CIAO/ciao/Servants/Swapping/CIAO_SwapExec.idl
index 2349988f46d..b52f7db782a 100644
--- a/flat/CIAO/ciao/Servants/Swapping/CIAO_SwapExec.idl
+++ b/flat/CIAO/ciao/Servants/Swapping/CIAO_SwapExec.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/CCM_EnterpriseComponent.idl"
+#include "ccm/CCM_EnterpriseComponent.idl"
 
 module CIAO
 {
diff --git a/flat/CIAO/ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h b/flat/CIAO/ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h
new file mode 100644
index 00000000000..672c412e343
--- /dev/null
+++ b/flat/CIAO/ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl CIAO_Swapping_Servant
+// ------------------------------
+#ifndef CIAO_SWAPPING_SERVANT_EXPORT_H
+#define CIAO_SWAPPING_SERVANT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_SWAPPING_SERVANT_HAS_DLL)
+#  define CIAO_SWAPPING_SERVANT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && CIAO_SWAPPING_SERVANT_HAS_DLL */
+
+#if !defined (CIAO_SWAPPING_SERVANT_HAS_DLL)
+#  define CIAO_SWAPPING_SERVANT_HAS_DLL 1
+#endif /* ! CIAO_SWAPPING_SERVANT_HAS_DLL */
+
+#if defined (CIAO_SWAPPING_SERVANT_HAS_DLL) && (CIAO_SWAPPING_SERVANT_HAS_DLL == 1)
+#  if defined (CIAO_SWAPPING_SERVANT_BUILD_DLL)
+#    define CIAO_Swapping_Servant_Export ACE_Proper_Export_Flag
+#    define CIAO_SWAPPING_SERVANT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_SWAPPING_SERVANT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* CIAO_SWAPPING_SERVANT_BUILD_DLL */
+#    define CIAO_Swapping_Servant_Export ACE_Proper_Import_Flag
+#    define CIAO_SWAPPING_SERVANT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAO_SWAPPING_SERVANT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* CIAO_SWAPPING_SERVANT_BUILD_DLL */
+#else /* CIAO_SWAPPING_SERVANT_HAS_DLL == 1 */
+#  define CIAO_Swapping_Servant_Export
+#  define CIAO_SWAPPING_SERVANT_SINGLETON_DECLARATION(T)
+#  define CIAO_SWAPPING_SERVANT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* CIAO_SWAPPING_SERVANT_HAS_DLL == 1 */
+
+// Set CIAO_SWAPPING_SERVANT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (CIAO_SWAPPING_SERVANT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define CIAO_SWAPPING_SERVANT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define CIAO_SWAPPING_SERVANT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !CIAO_SWAPPING_SERVANT_NTRACE */
+
+#if (CIAO_SWAPPING_SERVANT_NTRACE == 1)
+#  define CIAO_SWAPPING_SERVANT_TRACE(X)
+#else /* (CIAO_SWAPPING_SERVANT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define CIAO_SWAPPING_SERVANT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (CIAO_SWAPPING_SERVANT_NTRACE == 1) */
+
+#endif /* CIAO_SWAPPING_SERVANT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp b/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp
index 820dc71898c..5127e369f92 100644
--- a/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp
+++ b/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.cpp
@@ -1,4 +1,4 @@
-#include "ciao/Dynamic_Component_Servant_Base.h"
+#include "ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h"
 
 ACE_RCSID (ciao,
            Dynamic_Component_Servant_Base,
diff --git a/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h b/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h
index 6e6173dd2af..75f32819036 100644
--- a/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h
+++ b/flat/CIAO/ciao/Servants/Swapping/Dynamic_Component_Servant_Base.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_Server_Export.h"
+#include "ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,8 @@
 namespace CIAO
 {
   class Session_Container;
-  
-  class CIAO_SERVER_Export Dynamic_Component_Servant_Base
+
+  class CIAO_Swapping_Servant_Export Dynamic_Component_Servant_Base
   {
   public:
     /// @todo Not to be used, no idea why this should be public, have to check this
diff --git a/flat/CIAO/ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h b/flat/CIAO/ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h
index 0064c39a744..749eefe4ce7 100644
--- a/flat/CIAO/ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h
+++ b/flat/CIAO/ciao/Servants/Swapping/Swapping_Servant_Home_Impl_Base.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_Server_Export.h"
+#include "ciao/Servants/Swapping/CIAO_Swapping_Servant_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,7 +36,7 @@ namespace CIAO
   // This is a home implementation and that is why inheriting from
   // "home".
   //
-  class CIAO_SERVER_Export Swapping_Home_Servant_Impl_Base
+  class CIAO_Swapping_Servant_Export Swapping_Home_Servant_Impl_Base
     : public virtual POA_Components::CCMHome
   {
   public:
@@ -51,7 +51,7 @@ namespace CIAO
 
   protected:
     Swapping_Container *container_;
-    
+
   private:
     /// Not to be used
     Swapping_Home_Servant_Impl_Base (void);
diff --git a/flat/CIAO/ciao/Servants/Swapping/Swapping_Servants.mpc b/flat/CIAO/ciao/Servants/Swapping/Swapping_Servants.mpc
new file mode 100644
index 00000000000..0815af50445
--- /dev/null
+++ b/flat/CIAO/ciao/Servants/Swapping/Swapping_Servants.mpc
@@ -0,0 +1,6 @@
+// $Id$
+
+project(CIAO_Swapping_Servants) : ciao_lib, ciao_container_base, utils, \
+                                  ccm_componentserver_stub, ciao_servant_activator, ciao_session_container {
+  dynamicflags = CIAO_SWAPPING_SERVANT_BUILD_DLL
+}
diff --git a/flat/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/flat/CIAO/examples/Swapping/Receiver/Receiver_exec.h
index fdc9ba7875e..42399771078 100644
--- a/flat/CIAO/examples/Swapping/Receiver/Receiver_exec.h
+++ b/flat/CIAO/examples/Swapping/Receiver/Receiver_exec.h
@@ -10,7 +10,7 @@
 #ifndef RECEIVER_EXEC_H
 #define RECEIVER_EXEC_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "ciao/Servants/Swapping/CIAO_SwapExecC.h"
 #include "ReceiverEC.h"
 #include "Receiver_exec_export.h"
 #include "tao/LocalObject.h"
diff --git a/flat/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/flat/CIAO/examples/Swapping/Sender/Sender_exec_1.h
index c0304006770..186862097ae 100644
--- a/flat/CIAO/examples/Swapping/Sender/Sender_exec_1.h
+++ b/flat/CIAO/examples/Swapping/Sender/Sender_exec_1.h
@@ -10,7 +10,7 @@
 #ifndef SENDER_EXEC_1_H
 #define SENDER_EXEC_1_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "ciao/Servants/Swapping/CIAO_SwapExecC.h"
 #include "SenderEC.h"
 #include "Sender_exec_1_export.h"
 #include "tao/LocalObject.h"
diff --git a/flat/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/flat/CIAO/examples/Swapping/Sender/Sender_exec_2.h
index de10964e343..8f590001cad 100644
--- a/flat/CIAO/examples/Swapping/Sender/Sender_exec_2.h
+++ b/flat/CIAO/examples/Swapping/Sender/Sender_exec_2.h
@@ -10,7 +10,7 @@
 #ifndef SENDER_EXEC_2_H
 #define SENDER_EXEC_2_H
 
-#include "ciao/CIAO_SwapExecC.h"
+#include "ciao/Servants/Swapping/CIAO_SwapExecC.h"
 #include "SenderEC.h"
 #include "Sender_exec_2_export.h"
 #include "tao/LocalObject.h"
diff --git a/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h b/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h
index 04fd984079f..130a8ab62de 100644
--- a/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h
+++ b/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h
@@ -18,7 +18,7 @@
 #include "ace/Map_Manager.h"
 #include "ccm/CCM_ComponentC.h"
 
-#include "Cdmw/CDMW_DeploymentS.h"
+#include "ofccm/Cdmw/CDMW_DeploymentS.h"
 #include "tao/ORB.h"
 #include "NodeApplication_Export.h"
 
diff --git a/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp
index 83c5ff45411..356432a4bbd 100644
--- a/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp
+++ b/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp
@@ -7,7 +7,7 @@
 
 #include "ciao/Valuetype_Factories/ConfigValue.h"
 #include "ccm/CCM_ObjectC.h"
-#include "Cdmw/CDMW_IDL_ExtC.h"
+#include "ofccm/Cdmw/CDMW_IDL_ExtC.h"
 #include "Deployment/Deployment_BaseC.h"
 #include "Deployment/Deployment_ApplicationC.h"
 
diff --git a/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.h b/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.h
index 3b9ce9e8f0b..1802e649b0f 100644
--- a/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.h
+++ b/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.h
@@ -20,7 +20,7 @@
 
 #include "ccm/CCM_KeylessCCMHomeC.h"
 #include "ccm/ComponentsC.h"
-#include "Cdmw/CDMW_IDLC.h"
+#include "ofccm/Cdmw/CDMW_IDLC.h"
 #include "ComponentServer/ComponentServerC.h"
 #include "Deployment/Deployment_NodeApplicationS.h"
 #include "Deployment/Deployment_DeploymentPlanC.h"
@@ -115,11 +115,9 @@ namespace DAnCE
 
       virtual void finishLaunch (
         const Deployment::Connections & providedReference,
-        ::CORBA::Boolean start
-      );
+        ::CORBA::Boolean start);
 
-      virtual void start (
-      );
+      virtual void start (void);
 
       Deployment::Connections * getAllConnections()
       ;
diff --git a/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.cpp b/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.cpp
index dff2141d085..fba84d827b5 100644
--- a/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.cpp
+++ b/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ServerActivator_Impl.h"
-#include "Cdmw/CDMW_IDL_ExtC.h"
+#include "ofccm/Cdmw/CDMW_IDL_ExtC.h"
 
 const char* COMPONENT_SERVER_NAME = "ComponentServer";
 
diff --git a/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h b/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h
index d5ca2053cfe..c28db7c4902 100644
--- a/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h
+++ b/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h
@@ -19,7 +19,7 @@
 #include "tao/ORB.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 
-#include "Cdmw/CDMW_IDLS.h"
+#include "ofccm/Cdmw/CDMW_IDLS.h"
 #include "ComponentServer/ComponentServerS.h"
 #include "NodeApplication_Export.h"