ChangeLogTag:Sun Oct 03 09:38:03 2004 Nanbor Wang <nanbor@cse.wustl.edu>

16 files changed, 246 insertions, 227 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index f5c35dfe927..e7a82bed9bc 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,22 @@
+Sun Oct 03 09:38:03 2004  Nanbor Wang  <nanbor@cse.wustl.edu>
+
+	* DAnCE/Config_Handlers/XSCRT/Elements.hpp:
+	* DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp:
+	* DAnCE/Config_Handlers/XSCRT/Parser.hpp:
+	* DAnCE/Config_Handlers/XSCRT/Traversal.hpp:
+	* DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp:
+	* DAnCE/Config_Handlers/pcd.hpp:
+	* DAnCE/Config_Handlers/iad.hpp:
+	* DAnCE/Config_Handlers/cpd.hpp:
+	* DAnCE/Config_Handlers/cid.hpp:
+	* DAnCE/Config_Handlers/cdp.hpp:
+	* DAnCE/Config_Handlers/cdd.hpp:
+	* DAnCE/Config_Handlers/Deployment.hpp:
+	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp:
+	* DAnCE/Config_Handlers/ccd.hpp:
+	* DAnCE/Config_Handlers/toplevel.hpp: Change to include XSCRT
+	  headers as "user libraries" instead of <system libraries>.
+
 Sun Oct 03 09:18:05 2004  Nanbor Wang  <nanbor@cse.wustl.edu>
 
 	* DAnCE/tests/Config_Handlers/handler_test.mpb: Changed to use the
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
index 735ed133b4f..9113806e87e 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
@@ -44,8 +44,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 namespace CIAO
 {
@@ -159,7 +159,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // kind
-      // 
+      //
       public:
       bool kind_p () const;
       ::CIAO::Config_Handlers::TCKind const& kind () const;
@@ -187,7 +187,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // short
-      // 
+      //
       public:
       bool short_p () const;
       ::XMLSchema::short_ const& short_ () const;
@@ -198,7 +198,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::short_ > short__;
 
       // long
-      // 
+      //
       public:
       bool long_p () const;
       ::XMLSchema::int_ const& long_ () const;
@@ -209,7 +209,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::int_ > long__;
 
       // ushort
-      // 
+      //
       public:
       bool ushort_p () const;
       ::XMLSchema::unsignedShort const& ushort () const;
@@ -220,7 +220,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedShort > ushort_;
 
       // ulong
-      // 
+      //
       public:
       bool ulong_p () const;
       ::XMLSchema::unsignedInt const& ulong () const;
@@ -231,7 +231,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedInt > ulong_;
 
       // float
-      // 
+      //
       public:
       bool float_p () const;
       ::XMLSchema::float_ const& float_ () const;
@@ -242,7 +242,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::float_ > float__;
 
       // double
-      // 
+      //
       public:
       bool double_p () const;
       ::XMLSchema::double_ const& double_ () const;
@@ -253,7 +253,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::double_ > double__;
 
       // boolean
-      // 
+      //
       public:
       bool boolean_p () const;
       ::XMLSchema::boolean const& boolean () const;
@@ -264,7 +264,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > boolean_;
 
       // octet
-      // 
+      //
       public:
       bool octet_p () const;
       ::XMLSchema::unsignedByte const& octet () const;
@@ -275,7 +275,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedByte > octet_;
 
       // objref
-      // 
+      //
       public:
       bool objref_p () const;
       ::XMLSchema::string< char > const& objref () const;
@@ -286,7 +286,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > objref_;
 
       // enum
-      // 
+      //
       public:
       bool enum_p () const;
       ::XMLSchema::string< char > const& enum_ () const;
@@ -297,7 +297,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > enum__;
 
       // string
-      // 
+      //
       public:
       bool string_p () const;
       ::XMLSchema::string< char > const& string () const;
@@ -308,7 +308,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > string_;
 
       // longlong
-      // 
+      //
       public:
       bool longlong_p () const;
       ::XMLSchema::long_ const& longlong () const;
@@ -319,7 +319,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::long_ > longlong_;
 
       // ulonglong
-      // 
+      //
       public:
       bool ulonglong_p () const;
       ::XMLSchema::unsignedLong const& ulonglong () const;
@@ -330,7 +330,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > ulonglong_;
 
       // longdouble
-      // 
+      //
       public:
       bool longdouble_p () const;
       ::XMLSchema::double_ const& longdouble () const;
@@ -341,7 +341,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::double_ > longdouble_;
 
       // fixed
-      // 
+      //
       public:
       bool fixed_p () const;
       ::XMLSchema::string< char > const& fixed () const;
@@ -352,7 +352,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > fixed_;
 
       // typecode
-      // 
+      //
       public:
       bool typecode_p () const;
       ::CIAO::Config_Handlers::DataType const& typecode () const;
@@ -380,7 +380,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // type
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::DataType const& type () const;
       ::CIAO::Config_Handlers::DataType& type ();
@@ -390,7 +390,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
 
       // value
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::DataValue const& value () const;
       ::CIAO::Config_Handlers::DataValue& value ();
@@ -417,7 +417,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -427,7 +427,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // value
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& value () const;
       ::CIAO::Config_Handlers::Any& value ();
@@ -454,7 +454,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -464,7 +464,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // label
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& label () const;
       ::XMLSchema::string< char >& label ();
@@ -531,7 +531,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -541,7 +541,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // kind
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
       ::CIAO::Config_Handlers::SatisfierPropertyKind& kind ();
@@ -551,7 +551,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
 
       // value
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& value () const;
       ::CIAO::Config_Handlers::Any& value ();
@@ -578,7 +578,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -588,7 +588,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -598,7 +598,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
       ::CIAO::Config_Handlers::SatisfierProperty& property ();
@@ -625,7 +625,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -635,7 +635,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -645,7 +645,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // node
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Node const& node () const;
       ::CIAO::Config_Handlers::Node& node ();
@@ -655,7 +655,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Node > node_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
       ::CIAO::Config_Handlers::SatisfierProperty& property ();
@@ -682,7 +682,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -692,7 +692,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -702,7 +702,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Property const& property () const;
       ::CIAO::Config_Handlers::Property& property ();
@@ -729,7 +729,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // requirementName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requirementName () const;
       ::XMLSchema::string< char >& requirementName ();
@@ -739,7 +739,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
 
       // resourceName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceName () const;
       ::XMLSchema::string< char >& resourceName ();
@@ -749,7 +749,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
 
       // resourceValue
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       ::CIAO::Config_Handlers::Any& resourceValue ();
@@ -776,7 +776,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -786,7 +786,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // source
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& source () const;
       ::XMLSchema::string< char >& source ();
@@ -796,7 +796,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // node
-      // 
+      //
       public:
       bool node_p () const;
       ::XMLSchema::string< char > const& node () const;
@@ -807,7 +807,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > node_;
 
       // location
-      // 
+      //
       public:
       typedef ::std::vector< ::XMLSchema::string< char > >::iterator location_iterator;
       typedef ::std::vector< ::XMLSchema::string< char > >::const_iterator location_const_iterator;
@@ -821,7 +821,7 @@ namespace CIAO
       ::std::vector< ::XMLSchema::string< char > > location_;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -832,7 +832,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -843,7 +843,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // deployedResource
-      // 
+      //
       public:
       bool deployedResource_p () const;
       ::CIAO::Config_Handlers::ResourceDeploymentDescription const& deployedResource () const;
@@ -854,7 +854,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -882,7 +882,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -892,7 +892,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // source
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& source () const;
       ::XMLSchema::string< char >& source ();
@@ -902,7 +902,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // artifact
-      // 
+      //
       public:
       typedef ::std::vector< ::XMLSchema::IDREF< char > >::iterator artifact_iterator;
       typedef ::std::vector< ::XMLSchema::IDREF< char > >::const_iterator artifact_const_iterator;
@@ -916,7 +916,7 @@ namespace CIAO
       ::std::vector< ::XMLSchema::IDREF< char > > artifact_;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -927,7 +927,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -938,7 +938,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -1004,7 +1004,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceUsage
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
       ::CIAO::Config_Handlers::ResourceUsageKind& resourceUsage ();
@@ -1014,7 +1014,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
 
       // requirementName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requirementName () const;
       ::XMLSchema::string< char >& requirementName ();
@@ -1024,7 +1024,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
 
       // resourceName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceName () const;
       ::XMLSchema::string< char >& resourceName ();
@@ -1034,7 +1034,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
 
       // resourceValue
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       ::CIAO::Config_Handlers::Any& resourceValue ();
@@ -1061,7 +1061,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1071,7 +1071,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // node
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& node () const;
       ::XMLSchema::string< char >& node ();
@@ -1081,7 +1081,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > node_;
 
       // source
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& source () const;
       ::XMLSchema::string< char >& source ();
@@ -1091,7 +1091,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // implementation
-      // 
+      //
       public:
       ::XMLSchema::IDREF< char > const& implementation () const;
       ::XMLSchema::IDREF< char >& implementation ();
@@ -1101,7 +1101,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::IDREF< char > > implementation_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -1112,7 +1112,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // deployedResource
-      // 
+      //
       public:
       bool deployedResource_p () const;
       ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
@@ -1123,7 +1123,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
 
       // deployedSharedResource
-      // 
+      //
       public:
       bool deployedSharedResource_p () const;
       ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
@@ -1134,7 +1134,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -1202,7 +1202,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1212,7 +1212,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // specificType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& specificType () const;
       ::XMLSchema::string< char >& specificType ();
@@ -1222,7 +1222,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > specificType_;
 
       // supportedType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& supportedType () const;
       ::XMLSchema::string< char >& supportedType ();
@@ -1232,7 +1232,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > supportedType_;
 
       // provider
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& provider () const;
       ::XMLSchema::string< char >& provider ();
@@ -1242,7 +1242,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > provider_;
 
       // exclusiveProvider
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& exclusiveProvider () const;
       ::XMLSchema::string< char >& exclusiveProvider ();
@@ -1252,7 +1252,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > exclusiveProvider_;
 
       // exclusiveUser
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& exclusiveUser () const;
       ::XMLSchema::string< char >& exclusiveUser ();
@@ -1262,7 +1262,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > exclusiveUser_;
 
       // optional
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& optional () const;
       ::XMLSchema::string< char >& optional ();
@@ -1272,7 +1272,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > optional_;
 
       // kind
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
       ::CIAO::Config_Handlers::CCMComponentPortKind& kind ();
@@ -1299,7 +1299,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1309,7 +1309,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // type
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::DataType const& type () const;
       ::CIAO::Config_Handlers::DataType& type ();
@@ -1336,7 +1336,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& portName () const;
       ::XMLSchema::string< char >& portName ();
@@ -1363,7 +1363,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& portName () const;
       ::XMLSchema::string< char >& portName ();
@@ -1373,7 +1373,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > portName_;
 
       // provider
-      // 
+      //
       public:
       bool provider_p () const;
       ::XMLSchema::string< char > const& provider () const;
@@ -1384,7 +1384,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > provider_;
 
       // kind
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
       ::CIAO::Config_Handlers::CCMComponentPortKind& kind ();
@@ -1394,7 +1394,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
       // instance
-      // 
+      //
       public:
       ::XMLSchema::IDREF< char > const& instance () const;
       ::XMLSchema::IDREF< char >& instance ();
@@ -1421,7 +1421,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // location
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& location () const;
       ::XMLSchema::string< char >& location ();
@@ -1448,7 +1448,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // targetName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& targetName () const;
       ::XMLSchema::string< char >& targetName ();
@@ -1458,7 +1458,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > targetName_;
 
       // requirementName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requirementName () const;
       ::XMLSchema::string< char >& requirementName ();
@@ -1468,7 +1468,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
 
       // resourceName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceName () const;
       ::XMLSchema::string< char >& resourceName ();
@@ -1478,7 +1478,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
 
       // resourceValue
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       ::CIAO::Config_Handlers::Any& resourceValue ();
@@ -1505,7 +1505,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1515,7 +1515,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // source
-      // 
+      //
       public:
       bool source_p () const;
       ::XMLSchema::string< char > const& source () const;
@@ -1526,7 +1526,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -1537,7 +1537,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // externalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
@@ -1551,7 +1551,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
 
       // internalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
@@ -1565,7 +1565,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_;
 
       // externalReference
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
@@ -1579,7 +1579,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
 
       // deployedResource
-      // 
+      //
       public:
       bool deployedResource_p () const;
       ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& deployedResource () const;
@@ -1607,7 +1607,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // requiredType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredType () const;
       ::XMLSchema::string< char >& requiredType ();
@@ -1634,7 +1634,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1644,7 +1644,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -1654,7 +1654,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
       ::CIAO::Config_Handlers::SatisfierProperty& property ();
@@ -1681,7 +1681,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceUsage
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
       ::CIAO::Config_Handlers::ResourceUsageKind& resourceUsage ();
@@ -1691,7 +1691,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
 
       // resourcePort
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourcePort () const;
       ::XMLSchema::string< char >& resourcePort ();
@@ -1701,7 +1701,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourcePort_;
 
       // componentPort
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& componentPort () const;
       ::XMLSchema::string< char >& componentPort ();
@@ -1711,7 +1711,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > componentPort_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -1721,7 +1721,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1731,7 +1731,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Property const& property () const;
       ::CIAO::Config_Handlers::Property& property ();
@@ -1758,7 +1758,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // requiredUUID
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredUUID () const;
       ::XMLSchema::string< char >& requiredUUID ();
@@ -1768,7 +1768,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requiredUUID_;
 
       // requiredName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredName () const;
       ::XMLSchema::string< char >& requiredName ();
@@ -1778,7 +1778,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requiredName_;
 
       // requiredType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredType () const;
       ::XMLSchema::string< char >& requiredType ();
@@ -1805,7 +1805,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& portName () const;
       ::XMLSchema::string< char >& portName ();
@@ -1815,7 +1815,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > portName_;
 
       // instance
-      // 
+      //
       public:
       ::XMLSchema::IDREF< char > const& instance () const;
       ::XMLSchema::IDREF< char >& instance ();
@@ -1842,7 +1842,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1852,7 +1852,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -1863,7 +1863,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // externalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
@@ -1877,7 +1877,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
 
       // internalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
@@ -1891,7 +1891,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_;
 
       // externalReference
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
index e4cd3aecdaf..575ea151800 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
@@ -13,8 +13,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
index ae73ae8a0b1..cfad56f4dc9 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
@@ -10,7 +10,7 @@
 #include <sstream>
 //#include <iostream> //@@ tmp
 
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/Parser.hpp"
 
 #if defined (_MSC_VER) && (_MSC_VER < 1300)
 
@@ -724,7 +724,7 @@ namespace XSCRT
 
 }
 
-#include <XSCRT/Elements.ipp>
-#include <XSCRT/Elements.tpp>
+#include "XSCRT/Elements.ipp"
+#include "XSCRT/Elements.tpp"
 
 #endif  // XSCRT_ELEMENTS_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
index 6a380e5d971..e271a54b6d6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
@@ -155,7 +155,7 @@ namespace XSCRT
   {
     ExtendedTypeInfoMap::const_iterator i (
       extended_type_info_map ().find (tid));
-    
+
     if (i == extended_type_info_map ().end ()) throw NotAvailable ();
 
     return i->second;
@@ -170,6 +170,6 @@ namespace XSCRT
   }
 }
 
-#include <XSCRT/ExtendedTypeInfo.ipp>
+#include "XSCRT/ExtendedTypeInfo.ipp"
 
 #endif  // XSCRT_EXTENDED_TYPE_INFO_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp
index 66d73e1f348..dd6363a4dfd 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp
@@ -247,7 +247,7 @@ namespace XSCRT
       XMLCh const* xns = e.dom_element ()->lookupNamespaceURI (p);
       std::basic_string<C> ns (
         xns ? transcode<C> (xns, 0) : std::basic_string<C> ());
-      
+
       delete[] p;
       return ns;
 
@@ -315,7 +315,7 @@ namespace XSCRT
   };
 }
 
-#include <XSCRT/Parser.ipp>
-#include <XSCRT/Parser.tpp>
+#include "XSCRT/Parser.ipp"
+#include "XSCRT/Parser.tpp"
 
 #endif  // XSCRT_PARSER_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp
index c898caa7681..4fbd1ee242b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp
@@ -9,7 +9,7 @@
 #include <set>
 #include <vector>
 
-#include <XSCRT/ExtendedTypeInfo.hpp>
+#include "XSCRT/ExtendedTypeInfo.hpp"
 
 namespace XSCRT
 {
@@ -192,7 +192,7 @@ namespace XSCRT
   }
 }
 
-#include <XSCRT/Traversal.ipp>
-#include <XSCRT/Traversal.tpp>
+#include "XSCRT/Traversal.ipp"
+#include "XSCRT/Traversal.tpp"
 
 #endif  // XSCRT_TRAVERSAL_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp
index 49e04e7ec00..31bad0bc207 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp
@@ -8,7 +8,7 @@
 #include <string>
 // #include <iostream> //@@ tmp
 
-#include <XSCRT/Elements.hpp>
+#include "XSCRT/Elements.hpp"
 
 namespace XMLSchema
 {
@@ -364,7 +364,7 @@ namespace XMLSchema
       NCName<C>::container (c);
 
       register_id ();
-    }    
+    }
 
   private:
     using NCName<C>::empty;
@@ -492,7 +492,7 @@ namespace XMLSchema
 //
 //
 
-#include <XSCRT/Traversal.hpp>
+#include "XSCRT/Traversal.hpp"
 
 namespace XMLSchema
 {
@@ -547,7 +547,7 @@ namespace XMLSchema
 //
 //
 
-#include <XSCRT/ExtendedTypeInfo.hpp>
+#include "XSCRT/ExtendedTypeInfo.hpp"
 
 namespace XMLSchema
 {
@@ -558,7 +558,7 @@ namespace XMLSchema
   };
 }
 
-#include <XSCRT/XMLSchema.ipp>
-#include <XSCRT/XMLSchema.tpp>
+#include "XSCRT/XMLSchema.ipp"
+#include "XSCRT/XMLSchema.tpp"
 
 #endif  // XSCRT_XMLSCHEMA_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
index 622334b2268..684dd24a4d3 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -40,7 +40,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -51,7 +51,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // specificType
-      // 
+      //
       public:
       bool specificType_p () const;
       ::XMLSchema::string< char > const& specificType () const;
@@ -62,7 +62,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > specificType_;
 
       // supportedType
-      // 
+      //
       public:
       bool supportedType_p () const;
       ::XMLSchema::string< char > const& supportedType () const;
@@ -73,7 +73,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > supportedType_;
 
       // idlFile
-      // 
+      //
       public:
       bool idlFile_p () const;
       ::XMLSchema::string< char > const& idlFile () const;
@@ -84,7 +84,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > idlFile_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -95,7 +95,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // port
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription >::const_iterator port_const_iterator;
@@ -109,7 +109,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription > port_;
 
       // property
-      // 
+      //
       public:
       bool property_p () const;
       ::CIAO::Config_Handlers::ComponentPropertyDescription const& property () const;
@@ -120,7 +120,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPropertyDescription > property_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -131,7 +131,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
index a3834aa1303..16053fce1f3 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& label () const;
       ::XMLSchema::string< char >& label ();
@@ -39,7 +39,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& UUID () const;
       ::XMLSchema::string< char >& UUID ();
@@ -49,7 +49,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // sharedResource
-      // 
+      //
       public:
       bool sharedResource_p () const;
       ::CIAO::Config_Handlers::SharedResource const& sharedResource () const;
@@ -60,7 +60,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
 
       // node
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::Node >::iterator node_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::Node >::const_iterator node_const_iterator;
@@ -74,7 +74,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::Node > node_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
index de201bfca33..012daf5621a 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "ccd.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -40,7 +40,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -51,7 +51,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // realizes
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription& realizes ();
@@ -61,7 +61,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
 
       // implementation
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::MonolithicDeploymentDescription const& implementation () const;
       ::CIAO::Config_Handlers::MonolithicDeploymentDescription& implementation ();
@@ -71,7 +71,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
 
       // instance
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator;
@@ -85,7 +85,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
 
       // connection
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator;
@@ -99,7 +99,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
 
       // dependsOn
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
@@ -113,7 +113,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
 
       // artifact
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator;
@@ -127,7 +127,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
 
       // infoProperty
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
index d3659edbe7d..8e84504bafd 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
@@ -19,8 +19,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -38,7 +38,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -48,7 +48,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // package
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ComponentPackageDescription const& package () const;
       ::CIAO::Config_Handlers::ComponentPackageDescription& package ();
@@ -58,7 +58,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > package_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -69,7 +69,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // selectRequirement
-      // 
+      //
       public:
       bool selectRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
@@ -80,7 +80,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
 
       // reference
-      // 
+      //
       public:
       bool reference_p () const;
       ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
@@ -91,7 +91,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -119,7 +119,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // propertyName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& propertyName () const;
       ::XMLSchema::string< char >& propertyName ();
@@ -129,7 +129,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > propertyName_;
 
       // instance
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance () const;
       ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& instance ();
@@ -156,7 +156,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -166,7 +166,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // externalName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& externalName () const;
       ::XMLSchema::string< char >& externalName ();
@@ -176,7 +176,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > externalName_;
 
       // delegatesTo
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo () const;
       ::CIAO::Config_Handlers::SubcomponentPropertyReference& delegatesTo ();
@@ -203,7 +203,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // instance
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
@@ -217,7 +217,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
 
       // connection
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
@@ -231,7 +231,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
 
       // externalProperty
-      // 
+      //
       public:
       bool externalProperty_p () const;
       ::CIAO::Config_Handlers::AssemblyPropertyMapping const& externalProperty () const;
@@ -259,7 +259,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -270,7 +270,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // primaryArtifact
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
@@ -284,7 +284,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::ImplementationRequirement const& deployRequirement () const;
@@ -312,7 +312,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -323,7 +323,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -334,7 +334,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // implements
-      // 
+      //
       public:
       bool implements_p () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
@@ -345,7 +345,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
 
       // assemblyImpl
-      // 
+      //
       public:
       bool assemblyImpl_p () const;
       ::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
@@ -356,7 +356,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
 
       // monolithicImpl
-      // 
+      //
       public:
       bool monolithicImpl_p () const;
       ::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
@@ -367,7 +367,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -378,7 +378,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // capability
-      // 
+      //
       public:
       bool capability_p () const;
       ::CIAO::Config_Handlers::Capability const& capability () const;
@@ -389,7 +389,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > capability_;
 
       // dependsOn
-      // 
+      //
       public:
       bool dependsOn_p () const;
       ::CIAO::Config_Handlers::ImplementationDependency const& dependsOn () const;
@@ -400,7 +400,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -411,7 +411,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
index 9d9292e8682..290af440d33 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
@@ -15,8 +15,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "ccd.hpp"
 
@@ -32,7 +32,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -42,7 +42,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // referencedImplementation
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
       ::CIAO::Config_Handlers::ComponentImplementationDescription& referencedImplementation ();
@@ -69,7 +69,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -80,7 +80,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -91,7 +91,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // realizes
-      // 
+      //
       public:
       bool realizes_p () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
@@ -102,7 +102,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -113,7 +113,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // implementation
-      // 
+      //
       public:
       bool implementation_p () const;
       ::CIAO::Config_Handlers::PackagedComponentImplementation const& implementation () const;
@@ -124,7 +124,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -135,7 +135,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
index a94ef2fd5a0..882a18332a8 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
@@ -15,8 +15,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -30,7 +30,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -40,7 +40,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // referencedArtifact
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
       ::CIAO::Config_Handlers::ImplementationArtifactDescription& referencedArtifact ();
@@ -67,7 +67,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -78,7 +78,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -89,7 +89,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // location
-      // 
+      //
       public:
       typedef ::std::vector< ::XMLSchema::string< char > >::iterator location_iterator;
       typedef ::std::vector< ::XMLSchema::string< char > >::const_iterator location_const_iterator;
@@ -103,7 +103,7 @@ namespace CIAO
       ::std::vector< ::XMLSchema::string< char > > location_;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -114,7 +114,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -125,7 +125,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // dependsOn
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
@@ -139,7 +139,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -150,7 +150,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
index 2b76f3cfdcc..94ad98b2f56 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -31,7 +31,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -42,7 +42,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -53,7 +53,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // basePackage
-      // 
+      //
       public:
       bool basePackage_p () const;
       ::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
@@ -64,7 +64,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
 
       // reference
-      // 
+      //
       public:
       bool reference_p () const;
       ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
@@ -75,7 +75,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
 
       // selectRequirement
-      // 
+      //
       public:
       bool selectRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
@@ -86,7 +86,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -97,7 +97,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
index c2f860ea87f..2897d588609 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "pcd.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // package
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration >::iterator package_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration >::const_iterator package_const_iterator;