Thu Oct 13 19:04:17 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>

        * ciao/Base/CIAO_Properties.idl:
        * ciao/Deployment/Handlers/Component_Handler.cpp:
        * ciao/Deployment/Handlers/Home_Handler.cpp:
        * ciao/Deployment/Handlers/Homed_Component_Handler.cpp:

          Changed to use constants in the CIAO_Properties file to identify
          implementation type.

5 files changed, 18 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fc5a0f06402..d92c91e0e14 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 13 19:04:17 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Base/CIAO_Properties.idl:
+        * ciao/Deployment/Handlers/Component_Handler.cpp:
+        * ciao/Deployment/Handlers/Home_Handler.cpp:
+        * ciao/Deployment/Handlers/Homed_Component_Handler.cpp:
+
+          Changed to use constants in the CIAO_Properties file to identify
+          implementation type.
+
 Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * CIAO version 1.0.5 released.
diff --git a/CIAO/ciao/Base/CIAO_Properties.idl b/CIAO/ciao/Base/CIAO_Properties.idl
index 31028553201..22ff63e9e57 100644
--- a/CIAO/ciao/Base/CIAO_Properties.idl
+++ b/CIAO/ciao/Base/CIAO_Properties.idl
@@ -20,11 +20,11 @@ module CIAO
     const string COMPONENT_HOME = "edu.vanderbilt.dre.CIAO.ComponentHomeId";
     const string CONTAINER_ID = "edu.vanderbilt.dre.CIAO.ContainerId";
 
-    const string CCM_CONTAINER = "edu.dre.vanderbilt.dre.CCM.Container";
-    const string CCM_HOME = "edu.dre.vanderbilt.dre.CCM.Home";
-    const string CCM_COMPONENT = "edu.dre.vanderbilt.dre.CCM.Component";
-    const string CCM_HOMEDCOMPONENT = "edu.dre.vanderbilt.dre.CCM.HomedComponent";
-    const string CCM_CONNECTOR = "edu.dre.vanderbilt.dre.CCM.Connector";
+    const string CCM_CONTAINER = "edu.vanderbilt.dre.CCM.Container";
+    const string CCM_HOME = "edu.vanderbilt.dre.CCM.Home";
+    const string CCM_COMPONENT = "edu.vanderbilt.dre.CCM.Component";
+    const string CCM_HOMEDCOMPONENT = "edu.vanderbilt.dre.CCM.HomedComponent";
+    const string CCM_CONNECTOR = "edu.vanderbilt.dre.CCM.Connector";
   };
 };
 #endif /* CIAO_PROPERTIES_IDL */
diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp
index 7cbe68f9c02..3b378248fdc 100644
--- a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp
@@ -45,7 +45,7 @@ namespace CIAO
   Component_Handler_i::instance_type (void)
   {
     CIAO_TRACE ("Component_Handler_i::instance_type");
-    return CORBA::string_dup ("edu.dre.vanderbilt.dre.CCM.Component");
+    return CORBA::string_dup (CIAO::Deployment::CCM_COMPONENT);
   }
 
   void
diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
index af873593ff6..d0202ce2e90 100644
--- a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
@@ -43,7 +43,7 @@ namespace CIAO
   Home_Handler_i::instance_type (void)
   {
     CIAO_TRACE ("Home_Handler_i::instance_type");
-    return CORBA::string_dup ("edu.dre.vanderbilt.dre.CCM.Home");
+    return CORBA::string_dup (CIAO::Deployment::CCM_HOME);
   }
 
   void
diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
index c2c82df40e4..8ace206582d 100644
--- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
@@ -45,7 +45,7 @@ namespace CIAO
   Homed_Component_Handler_i::instance_type (void)
   {
     CIAO_TRACE ("Homed_Component_Handler_i::instance_type");
-    return CORBA::string_dup ("edu.vanderbilt.dre.CCM.HomedComponent");
+    return CORBA::string_dup (CIAO::Deployment::CCM_HOMEDCOMPONENT);
   }
 
   void