Tue Nov 18 15:22:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 52 insertions, 48 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 127601d5f29..adf64b928ca 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 18 15:22:23 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * DAnCE/Utils/DAnCE_Utils.mpc:
+        * DAnCE/Utils/Plan_Handler.cpp:
+          Fixed compilation
+
 Tue Nov 18 15:15:23 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * ciao/Servants/Servant_Impl_Base.h:
diff --git a/flat/CIAO/DAnCE/Utils/DAnCE_Utils.mpc b/flat/CIAO/DAnCE/Utils/DAnCE_Utils.mpc
index 33d31af1d09..cf8d3db5c49 100644
--- a/flat/CIAO/DAnCE/Utils/DAnCE_Utils.mpc
+++ b/flat/CIAO/DAnCE/Utils/DAnCE_Utils.mpc
@@ -3,7 +3,6 @@
 
 project (DAnCE_Utils): dance_lib, dance_deployment_svnt, naming  {
   sharedname = DAnCE_Utils
-  requires += dummy_label
   dynamicflags = DANCE_UTILS_BUILD_DLL
 
   Source_Files {
diff --git a/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp b/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp
index b6c84deff01..c72e61a1378 100644
--- a/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp
+++ b/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp
@@ -1,22 +1,21 @@
 // $Id$
 
 #include "Plan_Handler.h"
-
-#include "ace/OS.h"
+#include "DAnCE/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
-  void 
+  void
   DAnCE_Utils::add_instance (
-      ::Deployment::DeploymentPlan &deployment_plan, 
-      const char *instance_name, 
-      const char *node_name, 
-      const char *impl_name, 
+      ::Deployment::DeploymentPlan &deployment_plan,
+      const char *instance_name,
+      const char *node_name,
+      const char *impl_name,
       const char *ns_name)
     throw (ImplementationNotFound)
   {
     // Modifying the deployment plan in order to include the new instance ...
-    ::Deployment::InstanceDeploymentDescriptions instance = 
+    ::Deployment::InstanceDeploymentDescriptions instance =
       deployment_plan.instance;
 
     instance.length (instance.length()+1);
@@ -26,7 +25,7 @@ namespace DAnCE
     instance[instance.length()-1].source.length(0);
 
     // Looking for implementation block with name equals to type ...
-    ::Deployment::MonolithicDeploymentDescriptions implementation = 
+    ::Deployment::MonolithicDeploymentDescriptions implementation =
       deployment_plan.implementation;
 
     CORBA::ULong i;
@@ -38,7 +37,7 @@ namespace DAnCE
       instance[instance.length()-1].implementationRef = i;
     else
       throw ImplementationNotFound();
-    
+
     if (ns_name != 0)
     {
       instance[instance.length()-1].configProperty.length(1);
@@ -177,7 +176,7 @@ namespace DAnCE
 
   void
   DAnCE_Utils::remove_connection (
-      ::Deployment::DeploymentPlan_var &deployment_plan, 
+      ::Deployment::DeploymentPlan_var &deployment_plan,
       const char *connection_name)
     throw (ConnectionNotFound)
   {
@@ -237,115 +236,115 @@ namespace DAnCE
   void
   DAnCE_Utils::print_instances (const ::Deployment::DeploymentPlan &deployment_plan)
   {
-    const ::Deployment::InstanceDeploymentDescriptions instance = 
+    const ::Deployment::InstanceDeploymentDescriptions instance =
       deployment_plan.instance;
 
     for (CORBA::ULong i = 0; i < instance.length(); ++i)
     {
       DANCE_DEBUG((LM_DEBUG, "[%M] \nInstance no. %d\n", i));
-      DANCE_DEBUG((LM_DEBUG, "[%M] \tName: %s\n", instance[i].name.in()));
-      DANCE_DEBUG((LM_DEBUG, "[%M] \tNode: %s\n", instance[i].node.in()));
+      DANCE_DEBUG((LM_DEBUG, "[%M] \tName: %C\n", instance[i].name.in()));
+      DANCE_DEBUG((LM_DEBUG, "[%M] \tNode: %C\n", instance[i].node.in()));
 
       DANCE_DEBUG((LM_DEBUG, "[%M] \tImplementationRef: %d\n", instance[i].implementationRef));
       DANCE_DEBUG((LM_DEBUG, "[%M] \tNumber of properties: %d\n", instance[i].configProperty.length()));
 
       for (CORBA::ULong k = 0; k < instance[i].configProperty.length(); k++)
-          DANCE_DEBUG((LM_DEBUG, "[%M] \t\tName: %s\n", instance[i].configProperty[k].name.in()));
+          DANCE_DEBUG((LM_DEBUG, "[%M] \t\tName: %C\n", instance[i].configProperty[k].name.in()));
     }
   }
 
   void
   DAnCE_Utils::print_connections (const ::Deployment::DeploymentPlan &deployment_plan)
   {
-    const ::Deployment::PlanConnectionDescriptions connection = 
+    const ::Deployment::PlanConnectionDescriptions connection =
       deployment_plan.connection;
 
     for (CORBA::ULong i = 0; i < connection.length(); ++i)
       {
         DANCE_DEBUG((LM_DEBUG, "[%M] \nConnection no. %d\n", i));
-        DANCE_DEBUG((LM_DEBUG, "[%M] \tName: %s\n", connection[i].name.in()));
+        DANCE_DEBUG((LM_DEBUG, "[%M] \tName: %C\n", connection[i].name.in()));
 
-        DANCE_DEBUG((LM_DEBUG, "[%M] \tNo of deployRequirements: %d\n", 
+        DANCE_DEBUG((LM_DEBUG, "[%M] \tNo of deployRequirements: %d\n",
                     connection[i].deployRequirement.length()));
 
         for (CORBA::ULong j = 0; j < connection[i].deployRequirement.length(); ++j)
         {
-           DANCE_DEBUG((LM_DEBUG, 
-                       "\t\tDeploy Requirement %d:\n", 
+           DANCE_DEBUG((LM_DEBUG,
+                       "\t\tDeploy Requirement %d:\n",
                        j+1));
-           DANCE_DEBUG((LM_DEBUG, 
-                       "\t\t\tResource Type: %s\n", 
+           DANCE_DEBUG((LM_DEBUG,
+                       "\t\t\tResource Type: %C\n",
                        connection[i].deployRequirement[j].resourceType.in()));
-           DANCE_DEBUG((LM_DEBUG, 
-                       "\t\t\tName: %s\n",
+           DANCE_DEBUG((LM_DEBUG,
+                       "\t\t\tName: %C\n",
                        connection[i].deployRequirement[j].name.in()));
-           DANCE_DEBUG((LM_DEBUG, 
+           DANCE_DEBUG((LM_DEBUG,
                        "\t\t\tNo of Properties: %d\n",
                        connection[i].deployRequirement[j].property.length()));
            for (CORBA::ULong k = 0; k < connection[i].deployRequirement[j].property.length(); ++k)
            {
               DANCE_DEBUG((LM_DEBUG, "[%M] \t\t\tProperty %d:\n", k+1));
-              DANCE_DEBUG((LM_DEBUG, 
-                          "\t\t\t\tName: %s\n", 
+              DANCE_DEBUG((LM_DEBUG,
+                          "\t\t\t\tName: %C\n",
                           connection[i].deployRequirement[j].property[k].name.in()));
            }
         }
 
-        DANCE_DEBUG((LM_DEBUG, 
+        DANCE_DEBUG((LM_DEBUG,
                     "\tNo of externalEndpoints: %d\n",
                     connection[i].externalEndpoint.length()));
         for (CORBA::ULong j = 0; j < connection[i].externalEndpoint.length(); j++)
-           DANCE_DEBUG((LM_DEBUG, 
-                       "\t\tPortname %d: %s\n", j+1,
+           DANCE_DEBUG((LM_DEBUG,
+                       "\t\tPortname %d: %C\n", j+1,
                        connection[i].externalEndpoint[j].portName.in()));
 
-        DANCE_DEBUG((LM_DEBUG, 
+        DANCE_DEBUG((LM_DEBUG,
                     "\tNo of internalEndpoints: %d\n",
                     connection[i].internalEndpoint.length()));
         for (CORBA::ULong j = 0; j < connection[i].internalEndpoint.length(); j++)
           {
             DANCE_DEBUG((LM_DEBUG, "[%M] \t\tInternalEndpoint %d:\n", j+1));
-            DANCE_DEBUG((LM_DEBUG, "[%M] \t\t\tPortname: %s\n", connection[i].internalEndpoint[j].portName.in()));
+            DANCE_DEBUG((LM_DEBUG, "[%M] \t\t\tPortname: %C\n", connection[i].internalEndpoint[j].portName.in()));
             DANCE_DEBUG((LM_DEBUG,  "\t\t\tProvider: %d\n", connection[i].internalEndpoint[j].provider));
 
-              if (connection[i].internalEndpoint[j].kind == ::Deployment::Facet || 
+              if (connection[i].internalEndpoint[j].kind == ::Deployment::Facet ||
                 connection[i].internalEndpoint[j].kind == ::Deployment::SimplexReceptacle)
-                DANCE_DEBUG((LM_DEBUG, 
-                            "\t\t\tKind: %s\n", 
-                          (connection[i].internalEndpoint[j].kind == ::Deployment::Facet) ? 
+                DANCE_DEBUG((LM_DEBUG,
+                            "\t\t\tKind: %C\n",
+                          (connection[i].internalEndpoint[j].kind == ::Deployment::Facet) ?
                           "Facet" : "SimplexReceptacle"));
             else
-                DANCE_DEBUG((LM_DEBUG, 
+                DANCE_DEBUG((LM_DEBUG,
                             "\t\t\tKind: %d\n",
                             connection[i].internalEndpoint[j].kind));
 
-            DANCE_DEBUG((LM_DEBUG, 
+            DANCE_DEBUG((LM_DEBUG,
                         "\t\t\tInstanceRef: %ld",
                         (long) connection[i].internalEndpoint[j].instanceRef));
-            DANCE_DEBUG((LM_DEBUG, "[%M] \tInstanceName: %s\n", 
+            DANCE_DEBUG((LM_DEBUG, "[%M] \tInstanceName: %C\n",
                         deployment_plan.instance[connection[i].internalEndpoint[j].instanceRef].name.in()));
           }
 
-        DANCE_DEBUG((LM_DEBUG, 
+        DANCE_DEBUG((LM_DEBUG,
                     "\tNo of externalReferenceEndpoints: %d\n",
                     connection[i].externalReference.length()));
         for (CORBA::ULong  j = 0; j < connection[i].externalReference.length(); ++j)
-           DANCE_DEBUG((LM_DEBUG, 
-                       "\t\tLocation %d: %s\n", 
+           DANCE_DEBUG((LM_DEBUG,
+                       "\t\tLocation %d: %C\n",
                        j+1,
                        connection[i].externalReference[j].location.in()));
 
-        DANCE_DEBUG((LM_DEBUG, 
+        DANCE_DEBUG((LM_DEBUG,
                     "\tNo of deployedResources: %d\n",
                     connection[i].deployedResource.length()));
         for (CORBA::ULong j = 0; j < connection[i].deployedResource.length(); j++)
           {
-            DANCE_DEBUG((LM_DEBUG, 
-                        "\t\tTargetName: %s\n",
+            DANCE_DEBUG((LM_DEBUG,
+                        "\t\tTargetName: %C\n",
                         connection[i].deployedResource[j].targetName.in()));
-            DANCE_DEBUG((LM_DEBUG, "[%M] \t\tRequirementName: %s\n",
+            DANCE_DEBUG((LM_DEBUG, "[%M] \t\tRequirementName: %C\n",
                         connection[i].deployedResource[j].requirementName.in()));
-            DANCE_DEBUG((LM_DEBUG, "[%M] \t\tResourceName: %s\n",
+            DANCE_DEBUG((LM_DEBUG, "[%M] \t\tResourceName: %C\n",
                         connection[i].deployedResource[j].resourceName.in()));
           }
       }