1 files changed, 382 insertions, 376 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.cpp b/TAO/CIAO/tools/Config_Handlers/Deployment.cpp
index 3e4e5bd8497..3d4ddb419c0 100644
--- a/TAO/CIAO/tools/Config_Handlers/Deployment.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Deployment.cpp
@@ -3,12 +3,12 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
- 
+
 #include "Deployment.hpp"
 
 namespace CIAO
@@ -34,15 +34,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "domain")
-      {
-        ::CIAO::Config_Handlers::Domain r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::Domain r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
 
     ::CIAO::Config_Handlers::DeploymentPlan
@@ -50,15 +50,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "deploymentPlan")
-      {
-        ::CIAO::Config_Handlers::DeploymentPlan r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::DeploymentPlan r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
 
     ::CIAO::Config_Handlers::ImplementationArtifactDescription
@@ -66,15 +66,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "implementationArtifactDescription")
-      {
-        ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
 
     ::CIAO::Config_Handlers::ComponentInterfaceDescription
@@ -82,15 +82,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "componentInterfaceDescription")
-      {
-        ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
 
     ::CIAO::Config_Handlers::ComponentImplementationDescription
@@ -98,15 +98,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "componentImplementationDescription")
-      {
-        ::CIAO::Config_Handlers::ComponentImplementationDescription r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::ComponentImplementationDescription r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
 
     ::CIAO::Config_Handlers::ComponentPackageDescription
@@ -114,15 +114,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "componentPackageDescription")
-      {
-        ::CIAO::Config_Handlers::ComponentPackageDescription r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::ComponentPackageDescription r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
 
     ::CIAO::Config_Handlers::PackageConfiguration
@@ -130,15 +130,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "packageConfiguration")
-      {
-        ::CIAO::Config_Handlers::PackageConfiguration r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::PackageConfiguration r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
 
     ::CIAO::Config_Handlers::TopLevelPackageDescription
@@ -146,15 +146,15 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () == "topLevelPackageDescription")
-      {
-        ::CIAO::Config_Handlers::TopLevelPackageDescription r (e);
-        return r;
-      }
+        {
+          ::CIAO::Config_Handlers::TopLevelPackageDescription r (e);
+          return r;
+        }
 
       else
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
     }
   }
 }
@@ -201,39 +201,39 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "domain")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::Domain,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::Node,
-      virtual ::CIAO::Config_Handlers::Writer::Interconnect,
-      virtual ::CIAO::Config_Handlers::Writer::Bridge,
-      virtual ::CIAO::Config_Handlers::Writer::Resource,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::SharedResource,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::Node,
+        virtual ::CIAO::Config_Handlers::Writer::Interconnect,
+        virtual ::CIAO::Config_Handlers::Writer::Bridge,
+        virtual ::CIAO::Config_Handlers::Writer::Resource,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::SharedResource,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -247,51 +247,51 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "deploymentPlan")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::DeploymentPlan,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::InstanceResourceDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::PlanConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::PlanSubcomponentPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::ConnectionResourceDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription,
+        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::Requirement,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription,
+        virtual ::CIAO::Config_Handlers::Writer::InstanceResourceDeploymentDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+        virtual ::CIAO::Config_Handlers::Writer::PlanConnectionDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::PlanSubcomponentPortEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::ConnectionResourceDeploymentDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+        virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -305,34 +305,34 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "implementationArtifactDescription")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::Requirement,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -346,35 +346,35 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "componentInterfaceDescription")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -388,59 +388,61 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "componentImplementationDescription")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
+        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+        virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+        virtual ::CIAO::Config_Handlers::Writer::Requirement,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Capability,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -454,59 +456,61 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "componentPackageDescription")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+        virtual ::CIAO::Config_Handlers::Writer::Requirement,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Capability,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -520,60 +524,61 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "packageConfiguration")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Requirement,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Capability,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };
@@ -587,61 +592,62 @@ namespace CIAO
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
       if (e.name () != "topLevelPackageDescription")
-      {
-        throw 1;
-      }
+        {
+          throw 1;
+        }
 
       struct W : virtual ::CIAO::Config_Handlers::Writer::TopLevelPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::EnumType,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< ACE_TCHAR >
+        virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Property,
+        virtual ::CIAO::Config_Handlers::Writer::Any,
+        virtual ::CIAO::Config_Handlers::Writer::DataType,
+        virtual ::CIAO::Config_Handlers::Writer::TCKind,
+        virtual ::CIAO::Config_Handlers::Writer::EnumType,
+        virtual ::CIAO::Config_Handlers::Writer::DataValue,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
+        virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Requirement,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
+        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+        virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
+        virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
+        virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
+        virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
+        virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
+        virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
+        virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
+        virtual ::CIAO::Config_Handlers::Writer::Capability,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
+        virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
+        virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
+        virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
+          : ::XSCRT::Writer< ACE_TCHAR > (e)
         {
         }
       };