Sat Oct 1 15:38:23 2005 William Otte <wotte@dre.vanderbilt.edu>

4 files changed, 54 insertions, 23 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 4b406e9bfcc..742dad4574f 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Sat Oct 1 15:38:23  2005  William Otte <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Config_Handlers.mpc
+        * tools/Config_Handlers/test.cpp
+        
+        Corrected the config handler test to properly test the handlers. 
+        
+        * tools/Config_Handlers/PSPE_Handler.cpp
+        
+        Fixed a run-time bug that was causing corrupted plans in Borland
+        builds. 
+        
 Friday Sep 30 15:12:43 2005  William Otte <wotte@dre.vanderbilt.edu>
 
         * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index 1eed83e0080..8e78d1ee9b9 100644
--- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -74,15 +74,16 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces {
   }
 }
 
-//project (XSC_Config_Handlers_Tests) : ciao_config_handlers, ifr_client {
-//  requires += dummy_label
-//  exename = test
-//  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
-//  macros   += XML_USE_PTHREAD/S
+project (XSC_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client {
+  requires += dummy_label
+  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  exename = test
+  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
+  macros   += XML_USE_PTHREAD/S
 
-//  Source_Files {
-//    test.cpp
-//  }
-//}
+  Source_Files {
+    test.cpp
+  }
+}
 
 
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 6b186d383d7..14a8af2a2fc 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -56,18 +56,36 @@ namespace CIAO
             
       dest.instanceRef = tmp;
 
-      if (src.kind () == CCMComponentPortKind::Facet)
-        dest.kind = Deployment::Facet;
-      if (src.kind () == CCMComponentPortKind::SimplexReceptacle)
-        dest.kind = Deployment::SimplexReceptacle;
-      if (src.kind () == CCMComponentPortKind::MultiplexReceptacle)
-        dest.kind = Deployment::MultiplexReceptacle;
-      if (src.kind () == CCMComponentPortKind::EventEmitter)
-        dest.kind = Deployment::EventEmitter;
-      if (src.kind () == CCMComponentPortKind::EventPublisher)
-        dest.kind = Deployment::EventPublisher;
-      if (src.kind () == CCMComponentPortKind::EventConsumer)
-        dest.kind = Deployment::EventConsumer;
+      switch (src.kind ().integral ())
+        {
+          case CCMComponentPortKind::Facet_l:
+            dest.kind = Deployment::Facet;
+            break;
+            
+          case CCMComponentPortKind::SimplexReceptacle_l:
+            dest.kind = Deployment::SimplexReceptacle;
+            break;
+            
+          case CCMComponentPortKind::MultiplexReceptacle_l:
+            dest.kind = Deployment::MultiplexReceptacle;
+            break;
+            
+          case CCMComponentPortKind::EventEmitter_l:
+            dest.kind = Deployment::EventEmitter;
+            break;
+            
+          case CCMComponentPortKind::EventPublisher_l:
+            dest.kind = Deployment::EventPublisher;
+            break;
+            
+          case CCMComponentPortKind::EventConsumer_l:
+            dest.kind = Deployment::EventConsumer;
+            break;
+          
+          default:
+            ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n"));
+            
+         }
     }
 
     PlanSubcomponentPortEndpoint
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/test.cpp
index aa89b5e9b84..96c19b6688d 100644
--- a/TAO/CIAO/tools/Config_Handlers/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/test.cpp
@@ -7,7 +7,7 @@
 #include "ciao/Deployment_DataC.h"
 #include "ciao/ServerResourcesC.h"
 #include "ace/Get_Opt.h"
-#include "XML_Helper.h"
+#include "Utils/XML_Helper.h"
 #include "DnC_Dump.h"
 #include "tao/ORB.h"
 static const char *input_file = "BasicSP.cdp";
@@ -85,7 +85,7 @@ int main (int argc, char *argv[])
       
 
       //Write it to test.xml
-      the_helper.write_DOM(doc, "test.xml");
+      the_helper.write_DOM(the_xsc, "test.xml");
 
       //Cleanliness is next to Godliness
       delete doc;