ChangeLogTag: Thu Sep 24 17:35:36 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>idl3_plus

4 files changed, 49 insertions, 16 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index d93781532a1..32cfb54e973 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Thu Sep 24 17:35:36 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc:
+        
+          Added separate IDL processing project.
+          
+        * DAnCE/RepositoryManager/RepositoryManager.mpc:
+        
+          Updated base project on IDL processing project, and
+          cosmetic changes.
+          
+        * DAnCE/RepositoryManager/repository_manager_admin.cpp:
+        
+          Commented out or removed unused args.
+
 Wed Sep 23 21:50:44 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp:
diff --git a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index a44a2944468..b80c7f1f17f 100644
--- a/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/modules/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -1,8 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project (DAnCE_RepositoryManager_IDL) : ciaoidldefaults {
+project (DAnCE_RepositoryManager_IDL) : componentidldefaults {
   custom_only = 1
+  
   IDL_Files {
     RepositoryManagerDaemon.idl
   }
diff --git a/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp b/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp
index 5a73a1fb536..8d46f56b2cf 100644
--- a/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp
+++ b/modules/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp
@@ -33,7 +33,7 @@ namespace DAnCE
           DANCE_DEBUG ((LM_TRACE, DLINFO "Admin::install_package - "
                         "Package installed successfully\n"));
         }
-      catch (Deployment::NameExists &ex)
+      catch (Deployment::NameExists &)
         {
           DANCE_ERROR ((LM_ERROR, DLINFO "Admin::install_package - "
                         "Package with name %C already installed.\n",
@@ -68,10 +68,10 @@ namespace DAnCE
       
     /// Create new package.
     bool 
-    Admin::create_package (const ACE_TCHAR *pc_path,
-                           const ACE_TCHAR *name,
-                           const ACE_TCHAR *baselocation,
-                           bool replace)
+    Admin::create_package (const ACE_TCHAR * /* pc_path */,
+                           const ACE_TCHAR * /* name */,
+                           const ACE_TCHAR * /* baselocation */,
+                           bool /* replace */)
     {
       DANCE_TRACE ("Admin::create_package");
       
@@ -95,7 +95,7 @@ namespace DAnCE
                         "Successfully uninstalled package %s\n",
                         uuid));
         }
-      catch (Deployment::NoSuchName &ex)
+      catch (Deployment::NoSuchName &)
         {
           DANCE_ERROR ((LM_ERROR, DLINFO "Admin::uninstall_package - "
                         "No package with the given UUID found: %C\n",
diff --git a/modules/CIAO/DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc b/modules/CIAO/DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc
index d9d9b3fd8fd..c4c2eb8681e 100644
--- a/modules/CIAO/DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc
+++ b/modules/CIAO/DAnCE/tests/RedirectionServiceTest/RedirectionServiceTest.mpc
@@ -1,25 +1,42 @@
 // $Id$
+
+project (RedirectionServiceTest_idl_gen) : taoidldefaults {
+  custom_only = 1
+  
+  IDL_Files {
+    Dummy.idl
+  }
+}
+
 project (RedirectionServiceTestServer): dance, taoserver, iortable, naming, dance_redirection_service, dance_logger, naming_serv  {
+	after += RedirectionServiceTest_idl_gen
 	exename = RedirectionServiceTestServer
 
 	IDL_Files {
-   		Dummy.idl
-  	}
+  }
 
 	Source_Files {
 		srv_main.cpp
-   		DummyC.cpp
-   		DummyS.cpp
-   		DummyImpl.cpp
-  	}
+    DummyC.cpp
+   	DummyS.cpp
+   	DummyImpl.cpp
+  }
 }
 
-project (RedirectionServiceTestClient): dance, taoclient, naming, dance_logger, naming, portableserver, anytypecode {
-	after = *RedirectionServiceTestServer
+project (RedirectionServiceTestClient): dance, taoclient, naming, dance_logger, naming, portableserver {
+	after = RedirectionServiceTest_idl_gen
 	exename = RedirectionServiceTestClient
 
 	Source_Files {
 		clt_main.cpp
 		DummyC.cpp
-   	}
+  }
+  
+  Header_Files {
+    DummyC.h
+  }
+  
+  Inline_Files {
+    DummyC.inl
+  }
 }