Wed Nov 26 14:22:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 84 insertions, 51 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 7e6dac02146..4161ff178ec 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,33 @@
+Wed Nov 26 14:22:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/TargetManager/TargetManager.mpc:
+          Disabled a few projects
+
+        * DAnCE/tests/MocksTest/MocksTest.cpp:
+          Unicode change
+
+        * DAnCE/tests/NameServiceTest/srv_main.cpp:
+        * DAnCE/tests/ObjectLocatorTest/srv_main.cpp:
+        * DAnCE/tests/RedirectionServiceTest/srv_main.cpp:
+          Fixed compile errors with msvc
+
+        * examples/BasicSP/BasicSP.mpc:
+          Refactored this file a little bit. With msvc I do see that cidl
+          is each time executed even when nothing changes. This has to be fixed
+
+        * MPC/config/dance_cdmw_idl.mpb:
+          Fixed after
+
+        * ofccm/Cdmw/CDMW_Deployment.idl:
+        * ofccm/Cdmw/CDMW_IDL_Ext.idl:
+          Updated includes
+
+        * ofccm/Cdmw/CDMW_IDL.mpc:
+          Use seperate idl project
+
+        * ofccm/NodeApplication/ServerActivator_Impl.h:
+          Updated include
+
 Tue Nov 25 15:55:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ccm/ComponentServer/CCM_ComponentServer.idl:
diff --git a/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc b/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc
index a4f44b3ab71..edbfc33466e 100644
--- a/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/flat/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -57,7 +57,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant, ciao_targetmanager_stub, dance_
 
 project(CIAO_TargetManager_exec) : ciao_executor, ciao_domainapplicationmanager_dnc, ciao_targetmanager_svnt {
   sharedname = TargetManager_exec
-
+   requires += dummy_label
   dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
 
   Source_Files {
diff --git a/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp b/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp
index fb0621ebf52..c347f5fc388 100644
--- a/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp
+++ b/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp
@@ -2,7 +2,7 @@
 #include "Mocks/ComponentServer_Impl.h"
 #include "tao/ORB.h"
 
-int main(int argc, char* argv[])
+int main(int argc, ACE_TCHAR* argv[])
   {
 
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
@@ -14,23 +14,23 @@ int main(int argc, char* argv[])
 
     obj = orb->resolve_initial_references ("NameService");
     CosNaming::NamingContext_var naming = CosNaming::NamingContext::_narrow (obj.in ());
-    
+
     ComponentServer_Impl* comp_server = 0;
-    
+
     ACE_NEW_THROW_EX (comp_server,
                       ComponentServer_Impl (orb.in (), poa.in ()),
                       CORBA::NO_MEMORY());
-    
+
     PortableServer::ObjectId_var oid = poa->activate_object (comp_server);
     obj = poa->id_to_reference (oid.in ());
     CdmwCcmComponentServer::ComponentServer_var server = CdmwCcmComponentServer::ComponentServer::_narrow (obj.in ());
-    
+
     CosNaming::Name name(1);
     name.length(1);
     name[0].id = CORBA::string_dup("MockTest");
     name[0].kind = CORBA::string_dup("ComponentServer");
     naming->bind (name, server.in ());
-    
+
     orb->run ();
     return 0;
   }
diff --git a/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp b/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp
index ed29f51666d..789e4ab4409 100644
--- a/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp
+++ b/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp
@@ -14,7 +14,7 @@ int main (int argc, char * argv[])
   try
     {
       int argcm = argc + 2;
-      char * argvm[argcm+1];
+      char ** argvm = new char* [argcm+1];
       for (int i = 0; i < argc; ++i)
         {
           argvm[i] = argv[i];
@@ -66,5 +66,6 @@ int main (int argc, char * argv[])
     {
       DANCE_ERROR((LM_ERROR, "[%M] An error has occured."));
     }
+  return 0;
 }
 
diff --git a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
index 7a8472930e2..4850a4de657 100644
--- a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
+++ b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp
@@ -10,20 +10,21 @@
 using namespace ObjectLocatorTest;
 
 
-int main (int argc, char * argv[])
+int main (int argc, ACE_TCHAR * argv[])
 {
   try
     {
-      char * argvm[argc+3];
+      int argcm = argc + 2;
+      char ** argvm = new ACE_TCHAR* [argcm+1];
       for (int i = 0; i < argc; ++i)
         {
           argvm[i] = argv[i];
         }
-      char buf1[32];
-      ACE_OS::sprintf (buf1, "-ORBListenEndpoints");
+      ACE_TCHAR buf1[32];
+      ACE_OS::sprintf (buf1, ACE_TEXT("-ORBListenEndpoints"));
       argvm[argcm-2] = buf1;
       char buf2[32];
-      ACE_OS::sprintf (buf2, "iiop://:12345");
+      ACE_OS::sprintf (buf2, ACE_TEXT("iiop://:12345"));
       argvm[argcm-1] = buf2;
       argvm[argcm] = 0;
       CORBA::ORB_var orb = CORBA::ORB_init (argcm, argvm);
@@ -49,5 +50,6 @@ int main (int argc, char * argv[])
     {
       DANCE_ERROR((LM_ERROR, "[%M] An error has occured."));
     }
+  return 0;
 }
 
diff --git a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
index 6cd6d4f3450..06ce907b82e 100644
--- a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
+++ b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
@@ -15,7 +15,7 @@ int main (int argc, char * argv[])
 //    try
   {
     int argcm = argc + 2;
-    char * argvm[argcm+1];
+    char ** argvm = new char* [argcm+1];
     for (int i = 0; i < argc; ++i)
       {
         argvm[i] = argv[i];
diff --git a/flat/CIAO/MPC/config/dance_cdmw_idl.mpb b/flat/CIAO/MPC/config/dance_cdmw_idl.mpb
index 698bbbd7cee..c1b3a524ca0 100644
--- a/flat/CIAO/MPC/config/dance_cdmw_idl.mpb
+++ b/flat/CIAO/MPC/config/dance_cdmw_idl.mpb
@@ -3,5 +3,5 @@
 
 project : dance {
   libs     += DAnCE_Cdmw_IDL
-  after    += CDMW_IDL
+  after    += Cdmw_IDL
 }
diff --git a/flat/CIAO/examples/BasicSP/BasicSP.mpc b/flat/CIAO/examples/BasicSP/BasicSP.mpc
index bc8ac6ace99..97377aa445b 100644
--- a/flat/CIAO/examples/BasicSP/BasicSP.mpc
+++ b/flat/CIAO/examples/BasicSP/BasicSP.mpc
@@ -11,20 +11,24 @@ project(BasicSP_stub_gen): taoidldefaults, anytypecode {
   IDL_Files {
     BasicSP.idl
   }
-
 }
 
-project(BasicSP_lem_gen) : ciaocidldefaults, taoidldefaults {
+project(BasicSP_lem_gen) : ciaocidldefaults {
   custom_only = 1
-  idlflags  += -Wb,stub_export_macro=BASICSP_EXEC_Export \
-               -Wb,stub_export_include=BasicSP_exec_export.h \
-               -SS
   cidlflags -= --
   cidlflags += --lem-force-all --
 
   CIDL_Files {
     BasicSP.idl
   }
+}
+
+project(BasicSP_lem_gen_idl) : taoidldefaults {
+  custom_only = 1
+  after += BasicSP_lem_gen
+  idlflags  += -Wb,stub_export_macro=BASICSP_EXEC_Export \
+               -Wb,stub_export_include=BasicSP_exec_export.h \
+               -SS
 
   IDL_Files {
     BasicSPE.idl
@@ -39,23 +43,18 @@ project(BasicSP_stub): ccm_stub {
 
   IDL_Files {
   }
-
   Header_Files {
     BasicSPC.h
   }
-
   Source_Files {
     BasicSPC.cpp
   }
-
   Inline_Files {
-
   }
-
 }
 
 project(BasicSP_exec) : ciao_executor {
-  after += BasicSP_stub BasicSP_lem_gen
+  after += BasicSP_stub BasicSP_lem_gen_idl
   sharedname = BasicSP_exec
   libs += BasicSP_stub
   dynamicflags = BASICSP_EXEC_BUILD_DLL
@@ -63,20 +62,16 @@ project(BasicSP_exec) : ciao_executor {
 
   IDL_Files {
   }
-
   Header_Files {
     BasicSP_exec.h
     BasicSP_exec_export.h
     BasicSPEC.h
   }
-
   Source_Files {
     BasicSP_exec.cpp
     BasicSPEC.cpp
   }
-
   Inline_Files {
-
   }
 }
 
@@ -88,24 +83,17 @@ project(BasicSP_svnt) : ciao_servant {
   dynamicflags = BASICSP_SVNT_BUILD_DLL
 
   IDL_Files {
-
   }
-
   CIDL_Files {
-
   }
-
   Header_Files {
     BasicSPS.h
     BasicSP_svnt.h
   }
-
   Source_Files {
     BasicSPS.cpp
     BasicSP_svnt.cpp
   }
-
   Inline_Files {
-
   }
 }
diff --git a/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl b/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl
index 1e565a845bd..a592ca407e8 100644
--- a/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl
+++ b/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl
@@ -6,7 +6,7 @@
 #define CDMW_DEPLOYMENT_EXT
 
 #include "ofccm/Cdmw/CDMW_IDL.idl"
-#include "ccm/ComponentServer/ComponentServer.idl"
+#include "ccm/ComponentServer/CCM_ComponentServer.idl"
 
 #pragma prefix "thalesgroup.com"
 
diff --git a/flat/CIAO/ofccm/Cdmw/CDMW_IDL.mpc b/flat/CIAO/ofccm/Cdmw/CDMW_IDL.mpc
index 51371bfdb43..ef09ec8c532 100644
--- a/flat/CIAO/ofccm/Cdmw/CDMW_IDL.mpc
+++ b/flat/CIAO/ofccm/Cdmw/CDMW_IDL.mpc
@@ -1,20 +1,32 @@
 // -*- MPC -*-
 // $Id$
-    
+
+project(Cdmw_IDL_Gen) : taolib_with_idl, anytypecode {
+  custom_only = 1
+  idlflags     += -Wb,export_include=DAnCE_Cdmw_IDL_export.h -Wb,export_macro=DAnCE_Cdmw_IDL_Export
+  idlflags     += -I$(CIAO_ROOT)/DAnCE
+  IDL_Files {
+    CDMW_IDL.idl
+    CDMW_IDL_Ext.idl
+    CDMW_Deployment.idl
+  }
+}
+
 project(Cdmw_IDL) : taolib_with_idl, tao_output, messaging, ccm_componentserver_svnt,  anytypecode  {
     requires += ofccm
+    after += Cdmw_IDL_Gen
     sharedname   = DAnCE_Cdmw_IDL
     dynamicflags = DANCE_CDMW_IDL_BUILD_DLL
-    idlflags     += -Wb,export_include=DAnCE_Cdmw_IDL_export.h -Wb,export_macro=DAnCE_Cdmw_IDL_Export
-    idlflags     += -I$(CIAO_ROOT)/DAnCE    
-   
-    Source_Files {
-        CDMW_IDLC.cpp
-        CDMW_IDLS.cpp
-        CDMW_IDL_ExtC.cpp
-        CDMW_DeploymentC.cpp
-        CDMW_DeploymentS.cpp
-    } 
+
+  Source_Files {
+    CDMW_IDLC.cpp
+    CDMW_IDLS.cpp
+    CDMW_IDL_ExtC.cpp
+    CDMW_DeploymentC.cpp
+    CDMW_DeploymentS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 
diff --git a/flat/CIAO/ofccm/Cdmw/CDMW_IDL_Ext.idl b/flat/CIAO/ofccm/Cdmw/CDMW_IDL_Ext.idl
index c208f4bc445..1041b358c9d 100644
--- a/flat/CIAO/ofccm/Cdmw/CDMW_IDL_Ext.idl
+++ b/flat/CIAO/ofccm/Cdmw/CDMW_IDL_Ext.idl
@@ -16,7 +16,7 @@
 
 #include "ofccm/Cdmw/CDMW_IDL.idl"
 #include "ccm/CCM_KeylessCCMHome.idl"
-#include "ccm/ComponentServer/ComponentServer.idl"
+#include "ccm/ComponentServer/CCM_ComponentServer.idl"
 
 #pragma prefix "thalesgroup.com"
 
diff --git a/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h b/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h
index c28db7c4902..3cbd6bd1b41 100644
--- a/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h
+++ b/flat/CIAO/ofccm/NodeApplication/ServerActivator_Impl.h
@@ -20,7 +20,7 @@
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "ofccm/Cdmw/CDMW_IDLS.h"
-#include "ComponentServer/ComponentServerS.h"
+#include "ccm/ComponentServer/CCM_ComponentServerS.h"
 #include "NodeApplication_Export.h"
 
 namespace DAnCE