Thu Apr 13 13:43:19 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>escher_x_4_9_integration_point

549 files changed, 48855 insertions, 35541 deletions

diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
index d16c5ce3ec1..521602ac70f 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticAction/Factory.hpp
@@ -15,7 +15,7 @@ namespace CCF
     {
       struct Composition;
       struct HomeExecutor;
-      
+
       struct Factory : virtual IDL3::SemanticAction::Factory
       {
         virtual Composition&
diff --git a/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp b/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp
index 82220fe9bb7..349f1854786 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/CIDL/SemanticGraph/Elements.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
index 57dcf02af4a..40259a694f6 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp
@@ -77,7 +77,7 @@ namespace Indentation
 
     virtual int_type
     put (char_type c) throw (Exception, ExH::System::Exception)
-    {  
+    {
       return buffer_.sputc (c);
     }
 
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
index 8b5a14cbf22..be0bd3827e0 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp
@@ -46,7 +46,7 @@ namespace regex
     if (e.empty ()) return src;
 
     wchar_t delimiter (e[0]);
-    
+
     std::wstring::size_type first = e.find (delimiter);
     std::wstring::size_type middle = e.find (delimiter, first + 1);
     std::wstring::size_type last = e.find (delimiter, middle + 1);
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp
index a87d87470b2..5e846d90211 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Enum.cpp
@@ -55,6 +55,7 @@ namespace CCF
           {
             Enumerator& e (ctx.tu ().new_node<Enumerator> ());
             ctx.tu ().new_edge<Belongs> (e, *type_);
+            ctx.tu ().new_edge<Defines> (ctx.scope (), e, name);
           }
         }
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
index 1c8d7bdadae..a716961bbf0 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/TypeId.hpp
@@ -22,7 +22,7 @@ namespace CCF
         end () = 0;
       };
 
-      
+
       struct TypePrefix
       {
         virtual void
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp
index 8399fecc6b0..6e3d2ee723d 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Enum.hpp
@@ -5,7 +5,7 @@
 #ifndef CCF_IDL2_SEMANTIC_GRAPH_ENUM_HPP
 #define CCF_IDL2_SEMANTIC_GRAPH_ENUM_HPP
 
-#include "CCF/IDL2/SemanticGraph/Elements.hpp"
+#include "CCF/IDL2/SemanticGraph/IntExpression.hpp"
 
 namespace CCF
 {
@@ -35,7 +35,7 @@ namespace CCF
       };
 
 
-      class Enumerator : public virtual Nameable, public virtual Instance
+      class Enumerator : public virtual Nameable, public virtual IntConst
       {
       public:
         static Introspection::TypeInfo const&
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp
index 84ca130cafa..9ed3a7e494b 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Exception.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp
index b57bb0fe764..597be660772 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Member.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp
index 46e24ae9c76..b2c29fe2881 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Native.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp
index 697751f14cd..83ed23ffe40 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Operation.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       // Receives
       //
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
index 463dec37f23..46fd9b9ef3a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
@@ -36,18 +36,28 @@ namespace CCF
       {
         if (defined ())
         {
+          CompilerElements::Context& ctx (
+            const_cast<CompilerElements::Context&> (context ()));
+
+          if (ctx.count ("struct-complete-test"))
+            return true;
+
+          ctx.set ("struct-complete-test", true);
+          bool c (true);
+
           for (Scope::NamesIterator i (names_begin ());
-               i != names_end ();
+               c && i != names_end ();
                ++i)
           {
             Member const& m (dynamic_cast<Member&> ((*i)->named ()));
             Type const& t (m.belongs ().type ());
 
             if (!t.complete ())
-              return false;
+              c = false;
           }
 
-          return true;
+          ctx.remove ("struct-complete-test");
+          return c;
         }
 
         return false;
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
index a1d32705644..28c673a94f3 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
@@ -142,18 +142,28 @@ namespace CCF
       {
         if (defined ())
         {
+          CompilerElements::Context& ctx (
+            const_cast<CompilerElements::Context&> (context ()));
+
+          if (ctx.count ("union-complete-test"))
+            return true;
+
+          ctx.set ("union-complete-test", true);
+          bool c (true);
+
           for (Scope::NamesIterator i (names_begin ());
-               i != names_end ();
+               c && i != names_end ();
                ++i)
           {
             Member const& m (dynamic_cast<Member&> ((*i)->named ()));
             Type const& t (m.belongs ().type ());
 
             if (!t.complete ())
-              return false;
+              c = false;
           }
 
-          return true;
+          ctx.remove ("union-complete-test");
+          return c;
         }
 
         return false;
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp
index d440907ed4c..b14f518983e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.cpp
@@ -49,7 +49,7 @@ namespace CCF
       {
       }
 
-      
+
       // Union
       //
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp
index 0237be5016d..2bcad1eb4ea 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Union.hpp
@@ -38,7 +38,7 @@ namespace CCF
         post (Type&);
       };
 
-      
+
       //
       //
       //
@@ -52,7 +52,7 @@ namespace CCF
 
         virtual void
         name (Type&);
-        
+
         virtual void
         post (Type&);
       };
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp
index 4d3b325f5fd..ab49a698842 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/Elements.cpp
@@ -12,7 +12,7 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-      
+
       namespace
       {
         TypeInfo
diff --git a/TAO/CIAO/CCF/Documentation/DesignNotes b/TAO/CIAO/CCF/Documentation/DesignNotes
index b81778b5ba4..1cf74e88400 100644
--- a/TAO/CIAO/CCF/Documentation/DesignNotes
+++ b/TAO/CIAO/CCF/Documentation/DesignNotes
@@ -1,14 +1,14 @@
 
 Note: this file is somewhat outdated
 
-Intention of this file is to capture and document CIDL complier design 
+Intention of this file is to capture and document CIDL complier design
 ideas/decisions.
 
 Conceptual parts of CIDL compiler design
 ----------------------------------------
 
 Option Parser                       Consists of option parser and option
-                                    database. 
+                                    database.
 
 C Preprocessor Interfacing          Represents mechanism of preprocessing
                                     cidl files.
@@ -30,10 +30,10 @@ Semantic Analyzer                   Traverses Syntax Tree and performs
                                     semantic expansions.
 
 
-Code Generation Stream              Stream to output generated code to. Used 
+Code Generation Stream              Stream to output generated code to. Used
                                     by concrete Code Generators
 
-Code Generators 
+Code Generators
 {
 
   Executor Mapping Generator          Generator for local executor mapping.
@@ -48,7 +48,7 @@ Code Generators
 }
 
 Compiler driver                     Establishes order of execution of
-                                    different components as part of 
+                                    different components as part of
                                     compilation process.
 
 
@@ -63,8 +63,8 @@ How everything works together
     cidl file and generates Syntax Tree by means of semantic rules.
 
 (4) At this point we have Syntax Tree corresponding to the original cidl
-    file. Compiler Driver executes Executor Mapping Generator, 
-    Executor Implementation Generator and Skeleton Thunk Generator on 
+    file. Compiler Driver executes Executor Mapping Generator,
+    Executor Implementation Generator and Skeleton Thunk Generator on
     Syntax Tree.
 
 
@@ -72,7 +72,7 @@ How everything works together
 General Design Ideas/Decision
 -------------
 
-[IDEA]: There is an effort to use autoconf/automake in ACE/TAO. Maybe it's 
+[IDEA]: There is an effort to use autoconf/automake in ACE/TAO. Maybe it's
         a good idea to start using it with CIDLC? There is one side advantage
         of this approach: if we decide to embed GCC CPP then we will have to
         use configure (or otherwise ACE-ify the code which doesn't sound like
@@ -81,7 +81,7 @@ General Design Ideas/Decision
 [IDEA]: CIDLC is a prototype for a new IDLC, PSDLC and IfR model. Here are
         basic concepts:
 
-          - use common IDL grammar, semantic rules and syntax tree nodes 
+          - use common IDL grammar, semantic rules and syntax tree nodes
             for IDLC, CIDLC, PSDLC and IfR. Possibly have several libraries
             for example ast_idl-2.so, ast_idl-3.so, scaner_idl-2.so
             scaner_idl-3.so, parser_idl-2.so, parser_idl-3.so. Dependency
@@ -102,16 +102,16 @@ General Design Ideas/Decision
                        ---------parser_idl-3.so---------
 
             Same idea applies for CIDL and PSDL.
-                                             
 
-          - use the same internal representation (syntax tree) in all 
+
+          - use the same internal representation (syntax tree) in all
             compilers and IfR. This way at some stage if we will need
             to make one of the compilers IfR-integrated (import keyword?)
             then it will be a much easier task than it's now. This internal
-            representation may also be usable in typecodes 
+            representation may also be usable in typecodes
+
+            @@ boris: not clear to me.
 
-            @@ boris: not clear to me. 
-            
             @@ jeff: A typecode is like a piece of the Syntax Tree with these
                exceptions -
 
@@ -125,44 +125,44 @@ General Design Ideas/Decision
                different classes than used to compose the ST itself.
 
             @@ boris: Ok, let me see if I got it right. So when typecode
-               is kept in parsed state (as opposite to binary) (btw, when 
+               is kept in parsed state (as opposite to binary) (btw, when
                does it happen?) it makes sense to apply the same techniques
                (if in fact not the same ST nodes and traversal mechs) as
                for XIDL compilation.
 
 [IDEA]: We should be consistent with the way external compilers that we call
         report errors. For now those are CPP and IDLC.
-                       
+
 Option Parser
 -------------
 
 [IDEA]: Use Spirit parser framework to generate option parser.
 
-[IDEA]: Option Database is probably a singleton. 
+[IDEA]: Option Database is probably a singleton.
 
-        @@ jeff: This is a good idea, especially when passing some of the 
-           options to a preprocessor or spawned IDL compier. But I think we 
-           will still need 'state' classes for the front and back ends (to 
-           hold values set by command line options and default values) so 
+        @@ jeff: This is a good idea, especially when passing some of the
+           options to a preprocessor or spawned IDL compier. But I think we
+           will still need 'state' classes for the front and back ends (to
+           hold values set by command line options and default values) so
            we can keep them decoupled).
 
 
-        @@ boris: I understand what you mean. Though I think we will be 
+        @@ boris: I understand what you mean. Though I think we will be
            able to do with one 'runtime database'. Each 'compiler module'
            will be able to populate its 'namespace' with (1) default
-           values, (2) with module-specific options and (3) arbitrary 
+           values, (2) with module-specific options and (3) arbitrary
            runtime information. I will present prototopy design shortly.
-           
+
 
 [IDEA]: It seems we will have to execute at least two external programs
         as part of CIDLC execution: CPP and IDLC. Why wouldn't we follow
         GCC specs model (gcc -dumpspecs). Here are candidates to be put into
-        specs:        
+        specs:
 
           - default CPP name and options
           - default  IDLC name and options
           - default file extensions and formats for different mappings
-          - other ideas? 
+          - other ideas?
 
 [IDEA]: Provide short and long option names (e.g. -o and --output-dir)
         for every option (maybe except -I, -D, etc).
@@ -188,9 +188,9 @@ C Preprocessor Interfacing
 IDL Compiler Interfacing
 ------------------------
 
-[IDEA]: Same as for CPP: Can we use pipes? 
+[IDEA]: Same as for CPP: Can we use pipes?
 
-        @@ jeff: check with Nanbor on this. I think there may be CCM/CIAO 
+        @@ jeff: check with Nanbor on this. I think there may be CCM/CIAO
            use cases where we need the intermediate IDL file.
 
 [IDEA]: Will need a mechanism to pass options to IDLC from CIDLC command
@@ -207,7 +207,7 @@ Scanner
         iterator"-based scanner. So this basically mean that we may have to
         keep the whole sequence in memory. BTW, this is another good reason
         to have scanner: if we manage to make scanner a predictable parser
-        (i.e. no backtracking) then we don't have to keep the whole 
+        (i.e. no backtracking) then we don't have to keep the whole
         preprocessed cidl file in memory.
 
 
@@ -221,17 +221,17 @@ Parser
         much easier to reuse/inherit even dynamically. Need to elaborate
         this idea.
 
-[IDEA]: Use functors as semantic actions. This way we can specify (via 
+[IDEA]: Use functors as semantic actions. This way we can specify (via
         functor's data member) on which Syntax Tree they are working.
         Bad side: semantic rules are defined during grammar construction.
         However we can use a modification of the factory method pattern.
-        Better ideas? 
+        Better ideas?
 
         @@ jeff: I think ST node creation with a factory
            is a good idea - another ST implementation could be plugged in,
            as long as it uses a factory with the same method names.
 
-        @@ boris: Right. In fact it's our 'improved' way of handling 'BE' 
+        @@ boris: Right. In fact it's our 'improved' way of handling 'BE'
            usecases.
 
 
@@ -242,23 +242,23 @@ Syntax Tree
 [IDEA]: Use interface repository model as a base for Syntax Tree hierarchy.
 
 [IDEA]: Currently (in IDLC) symbol lookup is accomplished by AST navigation,
-        and is probably the biggest single bottleneck in performance. Perhaps 
-        a separate symbol table would be preferable. Also, lookups could be 
-        specialized, e.g., for declaration, for references, and perhaps a 
+        and is probably the biggest single bottleneck in performance. Perhaps
+        a separate symbol table would be preferable. Also, lookups could be
+        specialized, e.g., for declaration, for references, and perhaps a
         third type for argument-related lookups.
 
 [NOTE]: If we are to implement symbol tables then we need to think how we
         are going to inherit (extend) this tables.
 
 [NOTE]: Inheritance/supports graphs: these graphs need to be traversed at
-        several points in the back end. Currently they are rebuilt for each 
-        use, using an n-squared algorithm. We could at least build them only 
-        once for each interface/valuetype, perhaps even with a better 
-        algorithm. It could be integrated into inheritance/supports error 
-        checking at node creation time, which also be streamlined. 
-
-        @@ boris: Well, I think we should design our Syntax Tree so that 
-           every interface/valuetype has a list (flat?) of interfaces it 
+        several points in the back end. Currently they are rebuilt for each
+        use, using an n-squared algorithm. We could at least build them only
+        once for each interface/valuetype, perhaps even with a better
+        algorithm. It could be integrated into inheritance/supports error
+        checking at node creation time, which also be streamlined.
+
+        @@ boris: Well, I think we should design our Syntax Tree so that
+           every interface/valuetype has a list (flat?) of interfaces it
            inherits from/supports.
 
 [IDEA]: We will probably want to use factories to instantiate Syntax Tree
@@ -272,19 +272,19 @@ Common Syntax Tree traversal Design Ideas/Decision
 
 [IDEA] If we specify Syntax Tree traversal facility then we will be able
        to specify (or even plug dynamically) Syntax Tree traversal agents
-       that may not only generate something but also annotate or modify 
+       that may not only generate something but also annotate or modify
        Syntax Tree. We are already using this technique for a number of
        features (e.g. AMI, IDL3 extension, what else?) but all these agents
        are hardwired inside TAO IDLC. If we have this facility then we will
        be able to produce modular and highly extensible design. Notes:
 
        - Some traversal agents can change Syntax Tree so that it will be
-         unusable by some later traversal agents. So maybe the more 
-         generic approach would be to produce new Syntax Tree? 
+         unusable by some later traversal agents. So maybe the more
+         generic approach would be to produce new Syntax Tree?
 
-         @@ jeff: Yes, say for example that we were using a common ST 
-            representation for the IDL compiler and the IFR. We would not 
-            want to send the extra AMI nodes to the IFR so in that case 
+         @@ jeff: Yes, say for example that we were using a common ST
+            representation for the IDL compiler and the IFR. We would not
+            want to send the extra AMI nodes to the IFR so in that case
             simple modification of the ST might not be best.
 
 [IDEA] Need a generic name for "Syntax Tree Traversal Agents". What about
@@ -306,16 +306,16 @@ Code Generation Stream
 	will result in a generated code like this:
 
        namespace N
-       {      
-         ...         
+       {
+         ...
 
          long foo (long arg0,
                    long arg1)
          {
            return arg0 + arg1;
          }
-             
-         ...      
+
+         ...
        }
 
        Note that no special actions were taken to ensure proper indentation.
@@ -336,34 +336,34 @@ Code Generators
        @@ boris: I would say may not always be correct
 
 
-       However, for purposes of type coercion and other checking (such as 
-       for positive integer values in string, array and sequence bounds) 
+       However, for purposes of type coercion and other checking (such as
+       for positive integer values in string, array and sequence bounds)
        evaluation must be done internally.
-       
+
        @@ boris: note that evaluation is needed to only verify that things
-          are correct. You don't have to (shouldn't?) substitute original 
+          are correct. You don't have to (shouldn't?) substitute original
           (const) expression with what's been evaluated.
 
 
-       @@ jeff: it may be necessary in some cases to append 'f' or 'U' to 
+       @@ jeff: it may be necessary in some cases to append 'f' or 'U' to
           a generated number to avoid a C++ compiler warning.
 
        @@ boris: shouldn't this 'f' and 'U' be in IDL as well?
 
 [IDEA] I wonder if it's a good idea to use a separate pass over syntax tree
-       for semantic checking (e.g. type coercion, positive values for 
-       sequence bounds). 
+       for semantic checking (e.g. type coercion, positive values for
+       sequence bounds).
 
-       @@ jeff: This may hurt performance a little - more lookups - but it 
+       @@ jeff: This may hurt performance a little - more lookups - but it
           will improve error reporting.
-      
+
        @@ boris:  As we dicussed earlier this pass could be used to do
           'semantic expansions' (e.g. calculate a flat list of interface's
           children, etc). Also I don't think we should worry about speed
           very much here (of course I don't say we have to be stupid ;-)
           In fact if we are trading better design vs faster compilation
           at this stage we should always go for better design.
-      
+
 
 Executor Mapping Generator
 --------------------------
@@ -394,66 +394,66 @@ Vault
 Some thoughts from Jeff that I are not directly related to CIDLC and are
 rather current IDLC design defects:
 
-* AMI/AMH implied IDL: more can be done in the BE preprocessing pass, 
-  hopefully eliminating a big chunk of the huge volume of AMI/AMH visitor 
-  code. The implied IDL generated for CCM types, for example, leaves almost 
+* AMI/AMH implied IDL: more can be done in the BE preprocessing pass,
+  hopefully eliminating a big chunk of the huge volume of AMI/AMH visitor
+  code. The implied IDL generated for CCM types, for example, leaves almost
   nothing extra for the visitors to do.
 
-* Fwd decl redefinition: forward declaration nodes all initially contain a 
-  heap-allocated dummy full-definition member, later replaced by a copy 
+* Fwd decl redefinition: forward declaration nodes all initially contain a
+  heap-allocated dummy full-definition member, later replaced by a copy
   of the full definition. This needs to be streamlined.
 
-* Memory leaks: inconsistent copying/passing policies make it almost 
-  impossible to eliminate the huge number of leaks. The front end will be 
-  more and more reused, and it may be desirable to make it executable as a 
-  function call, in which case it will important to eliminate the leaks. 
-  Perhaps copying of AST nodes can be eliminated with reference counting or 
+* Memory leaks: inconsistent copying/passing policies make it almost
+  impossible to eliminate the huge number of leaks. The front end will be
+  more and more reused, and it may be desirable to make it executable as a
+  function call, in which case it will important to eliminate the leaks.
+  Perhaps copying of AST nodes can be eliminated with reference counting or
   just with careful management, similarly for string identifiers and literals.
-  Destroy() methods have been put in all the node classes, and are called 
-  recursively from the AST root at destruction time, but they are far from 
+  Destroy() methods have been put in all the node classes, and are called
+  recursively from the AST root at destruction time, but they are far from
   doing a complete job.
 
-* Visitor instantiation: the huge visitor factory has already been much 
-  reduced, and the huge enum of context state values is being reduced. 
-  However there will still be an abundance of switch statements at nearly 
-  every instance of visitor creation at scope nesting. We could make better 
+* Visitor instantiation: the huge visitor factory has already been much
+  reduced, and the huge enum of context state values is being reduced.
+  However there will still be an abundance of switch statements at nearly
+  every instance of visitor creation at scope nesting. We could make better
   use of polymorphism to get rid of them.
 
 * Node narrowing: instead of the impenetrable macros we use now, we
-  could either generate valuetype-like downcast methods for the (C)IDL 
+  could either generate valuetype-like downcast methods for the (C)IDL
   types, or we could just use dynamic_cast.
 
 * Error reporting: making error messages more informative, and error recovery
-  could both be a lot better, as they are in most other IDL compilers. If a 
-  recursive descent parser is used (such as Spirit), there is a simple 
+  could both be a lot better, as they are in most other IDL compilers. If a
+  recursive descent parser is used (such as Spirit), there is a simple
   generic algorithm for error recovery.
 
 
-* FE/BE node classes: if BE node classes are implemented at all, there should 
-  be a complete separation of concerns - BE node classes should contain only 
-  info related to code generation, and FE node classes should contain only 
-  info related to the AST representation. As the front end becomes more 
-  modular and reusable, this will become more and more necessary. 
+* FE/BE node classes: if BE node classes are implemented at all, there should
+  be a complete separation of concerns - BE node classes should contain only
+  info related to code generation, and FE node classes should contain only
+  info related to the AST representation. As the front end becomes more
+  modular and reusable, this will become more and more necessary.
 
   @@ boris: It doesn't seem we will need two separate and parallel hierarhies.
 
 * Undefined fwd decls: now that we have dropped support for platforms without
-  namespaces, the code generated for fwd declarations not defined in the same 
-  translation unit can be much improved, most likely by the elimination of 
+  namespaces, the code generated for fwd declarations not defined in the same
+  translation unit can be much improved, most likely by the elimination of
   generated flat-name global methods, and perhaps other improvements as well.
 
-* Strategized code generation: many places now have either lots of 
-  duplication, or an explosion of branching in a single visitor. Adding code 
-  generation for use cases incrementally may give us an opportunity to 
+* Strategized code generation: many places now have either lots of
+  duplication, or an explosion of branching in a single visitor. Adding code
+  generation for use cases incrementally may give us an opportunity to
   refactor and strategize it better.
 
-* Node generator: this class does nothing more than call 'new' and pass 
-  unchanged the arguments it gets to the appropriate constructor - it can be 
+* Node generator: this class does nothing more than call 'new' and pass
+  unchanged the arguments it gets to the appropriate constructor - it can be
   eliminated.
 
-* Virtual methods: there are many member functions in the IDL compiler that 
+* Virtual methods: there are many member functions in the IDL compiler that
   are needlessly virtual.
 
-* Misc. leveraging: redesign of mechanisms listed above can have an effect 
+* Misc. leveraging: redesign of mechanisms listed above can have an effect
   on other mechanisms, such as the handling of pragma prefix, typeprefix, and
   reopened modules.
diff --git a/TAO/CIAO/CCF/Documentation/TODO b/TAO/CIAO/CCF/Documentation/TODO
index 7a70b99f513..879602513df 100644
--- a/TAO/CIAO/CCF/Documentation/TODO
+++ b/TAO/CIAO/CCF/Documentation/TODO
@@ -10,7 +10,7 @@ Legend:
 
 ------------------------------------------------------------------------
 
-@@ In operation comma member function is used both for parameters and 
+@@ In operation comma member function is used both for parameters and
    exceptions. As a result one can get unexpected extra commas.
 
 @@ Make CCF buildable with MPC.
@@ -21,7 +21,7 @@ Legend:
 
 @@ Typedef.hpp TypeId.hpp: naming inconsistency.
 
-@@ Need ICE mechanism (search for abort ()) 
+@@ Need ICE mechanism (search for abort ())
 
 @@ Need evolution of semantic action error handling/reporting.
 
@@ -31,17 +31,17 @@ Legend:
 @@+++ Currently character stream is scanned completely before parsing. The
       better approach would be scanning on demand (1).
 
-@@+++ IDL2::Parsing::parse () should be eliminated (or terminated if you 
+@@+++ IDL2::Parsing::parse () should be eliminated (or terminated if you
       like ;-). This item depends on (1).
 
 @@++ 'using namespace' cleanup.
-   
+
 @@ Replace all i++ with ++i.
 
-@@ It seems that SyntaxTree::Node origin in terms of file:line should be 
-   preserved for subsequent diagnostic implemented as separate paths 
+@@ It seems that SyntaxTree::Node origin in terms of file:line should be
+   preserved for subsequent diagnostic implemented as separate paths
    (see repository id generator for example).
- 
+
 @@++++ Diagnostic evolution
 
 @%++ XML indentation buffer
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl
index cba2229b654..3c50f4acdd2 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-0.idl
@@ -4,17 +4,17 @@
 
 module Empty
 {
-  interface I 
+  interface I
   {
   };
 };
 
 module M
-{ 
+{
   interface I {};
-  
+
   typedef I Internal;
-  
+
   //local interface CCM_I : I {};
 };
 
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
index 2140367480c..0a437cb0320 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-1.idl
@@ -9,13 +9,13 @@ module M1
 {
   interface Blah;
   interface Fool {};
-  
-  component C1 
+
+  component C1
   {
     provides M::I i;
     readonly attribute long l;
   };
-  
+
   home H1 manages C1
   {
     attribute M::I i;
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
index 8d6ccd7ad6b..51bf3d88a4b 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/test-2.idl
@@ -27,7 +27,7 @@ module M2
   {
     provides Goof pg;
     uses Goof ug;
-    
+
     publishes E pe;
     emits E me;
     consumes E ce;
@@ -40,34 +40,34 @@ module M2
     long l;
     OctetSeq octet_seq;
   };
-  
+
   typedef sequence<S> S_Seq;
-  
-  exception Ex1 
+
+  exception Ex1
   {
     string descr;
   };
-  
+
   exception Ex2
   {
   };
-  
+
   home H2 : M1::H1 supports I, J manages C2
   {
     readonly attribute long rl;
     readonly attribute M::I rai;
     attribute OctetSeq seq;
     attribute S_Seq a_s_seq;
-    
-    void 
-    foo (in long l, 
-         inout boolean b, 
-	 out long ol, 
-	 in M::I i, 
-	 out unsigned long long ull, 
-	 inout S_Seq s_seq,
-	 in V v) raises (Ex1, Ex2);
-	 	 
+
+    void
+      foo (in long l,
+           inout boolean b,
+           out long ol,
+           in M::I i,
+           out unsigned long long ull,
+           inout S_Seq s_seq,
+           in V v) raises (Ex1, Ex2);
+
     factory new (in long l, in OctetSeq s) raises (Ex2, Ex1);
     finder find (in long l, in OctetSeq s) raises (Ex1, Ex2);
   };
diff --git a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp
index b65389ca306..f244249c69b 100644
--- a/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp
+++ b/TAO/CIAO/CCF/Example/CodeGenerationKit/Indentation/XML/indent_xml.cpp
@@ -17,7 +17,7 @@ main ()
 
   cout << "<?xml version=\"1.0\"?>" << endl;
   cout << "<!DOCTYPE corbacomponent SYSYEM \"corbacomponent.dtd\">" << endl << endl;
-  
+
   cout << "<atag>whatever</atag>" << endl;
 
   cout << "<open>" << endl;
diff --git a/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl b/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl
index 1d18e7118fe..737a729524b 100644
--- a/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl
+++ b/TAO/CIAO/CCF/Test/IDL2/Compiler/test.idl
@@ -22,11 +22,11 @@ module InterfaceTest
   abstract interface AI;
   local interface LI;
   interface I;
-  
+
   abstract interface AI
   {
   };
-  
+
   interface I : AI
   {
   };
@@ -42,7 +42,7 @@ module InterfaceTest
 module MemberTest
 {
   typedef long Id;
-  
+
   struct S
   {
     Id id;
@@ -62,12 +62,12 @@ module ModuleTest
       typedef long L;
     };
   };
-  
+
   module M
   {
     typedef N::L L;
   };
-  
+
   module N
   {
     typedef M::N::L L;
@@ -95,7 +95,7 @@ module Sequence
   typedef sequence<octet> OctetSeq;
 
   typedef OctetSeq RawSeq;
-  
+
   typedef sequence<string> StringSeq, StrSeq;
 };
 
@@ -106,12 +106,12 @@ module Sequence
 module StructTest
 {
   struct S;
-  
+
   struct S
   {
     long m; // Struct cannot be empty.
   };
-  
+
 };
 
 // Typeid
@@ -120,7 +120,7 @@ module StructTest
 module TypeidTest
 {
   interface I;
-  
+
   typeid I "Foo";
   typeprefix TypeidTest "Bar";
 };
@@ -133,7 +133,7 @@ module TypeidTest
 module TypedefTest
 {
   interface I;
-  
+
   typedef I J;
 
   interface I
diff --git a/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl b/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
index dc1aa225336..a29dde465d2 100644
--- a/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
+++ b/TAO/CIAO/CCF/Test/IDL2/LexicalAnalyzer/Coverage.idl
@@ -2,7 +2,7 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
-// This file is supposed to cover an IDL2 lexical structure and intended 
+// This file is supposed to cover an IDL2 lexical structure and intended
 // for IDL2 lexer regression testing.
 //
 
diff --git a/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp b/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp
index 5125e62d580..91e3ab3cb49 100644
--- a/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp
+++ b/TAO/CIAO/CCF/Test/IDL3/Compiler/GeneratorImpl.hpp
@@ -516,9 +516,9 @@ namespace IDL3
       concrete_event_type.edge_traverser (inherits);
 
       //--
-      
+
       supports.node_traverser (type_name);
-      
+
       component_defines.node_traverser (attribute);
       component_defines.node_traverser (provider);
       component_defines.node_traverser (user);
diff --git a/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl b/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl
index e85e86a610d..a7e1cfb1d5a 100644
--- a/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl
+++ b/TAO/CIAO/CCF/Test/IDL3/Compiler/test.idl
@@ -21,7 +21,7 @@ module ComponentTest
   interface J
   {
   };
-  
+
   component A : B supports I, J
   {
   };
@@ -83,11 +83,11 @@ module HomeTest
   interface J
   {
   };
-  
+
   component A
   {
   };
-  
+
   home AH manages A
   {
   };
@@ -103,14 +103,14 @@ module HomeTest
 
 
 // HomeFactory
-// 
+//
 //
 module HomeFactoryTest
 {
   component A
   {
   };
-  
+
   home AH manages A
   {
     factory new (in long size);
@@ -126,7 +126,7 @@ module ProvidesTest
   interface I
   {
   };
-  
+
   component C
   {
     provides I i;
@@ -158,7 +158,7 @@ module UsesTest
   interface I
   {
   };
-  
+
   component C
   {
     uses I i;
diff --git a/TAO/CIAO/CIAO-INSTALL.html b/TAO/CIAO/CIAO-INSTALL.html
index ce66f61fb5f..9b98f798491 100644
--- a/TAO/CIAO/CIAO-INSTALL.html
+++ b/TAO/CIAO/CIAO-INSTALL.html
@@ -6,15 +6,15 @@
     <hr>
     <h3>Building and Installing CIAO
     </h3>
-    <p>The first thing you should do to install CIAO is to set the environment 
-      variable <code>CIAO_ROOT</code> to be <code>$TAO_ROOT/CIAO</code>. Please refer 
+    <p>The first thing you should do to install CIAO is to set the environment
+      variable <code>CIAO_ROOT</code> to be <code>$TAO_ROOT/CIAO</code>. Please refer
       to the <A href="../../ACE-INSTALL.html">ACE installation notes</A> and <A href="../TAO-INSTALL.html">
-        TAO installation notes</A> for instructions on setting <code>$ACE_ROOT</code> 
-      and <code>$TAO_ROOT</code>, respectively. They are needed since CIAO sits on 
-      top of ACE+TAO. Compiling ACE+TAO successfully is the <strong>first</strong> requirement 
+        TAO installation notes</A> for instructions on setting <code>$ACE_ROOT</code>
+      and <code>$TAO_ROOT</code>, respectively. They are needed since CIAO sits on
+      top of ACE+TAO. Compiling ACE+TAO successfully is the <strong>first</strong> requirement
       for compiling CIAO.
     </p>
-    <p>CIAO is divided into several parts, so different installation/building rules 
+    <p>CIAO is divided into several parts, so different installation/building rules
       apply to different parts of CIAO.<br>
       <br>
     </p>
@@ -25,11 +25,11 @@
       <li>
         CIDL Compiler: This part of CIAO include <code>$CIAO_ROOT/CCF</code> and <code>$CIAO_ROOT/CIDLC</code>.
       <li>
-        CIAO Deployment and Configuration Framework: This part of CIAO includes all the 
-        directories in <code>$CIAO_ROOT/DAnCE</code>. DAnCE is an implementation of the 
-        new <a href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-02">Deployment and 
-          Configuration</a> specification. We refer, henceforth, to all pieces as CIAO 
-        in general. The above two pieces will be referred specifically by their names 
+        CIAO Deployment and Configuration Framework: This part of CIAO includes all the
+        directories in <code>$CIAO_ROOT/DAnCE</code>. DAnCE is an implementation of the
+        new <a href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-02">Deployment and
+          Configuration</a> specification. We refer, henceforth, to all pieces as CIAO
+        in general. The above two pieces will be referred specifically by their names
         as CIDLC and DAnCE though they are part of CIAO.
       </li>
     </ol>
@@ -53,31 +53,31 @@
         </td>
       </tr>
       <tr>
-        <td><b>Binaries <a href="http://www.dre.vanderbilt.edu/cidlc/binary">available</a> intermittently, 
+        <td><b>Binaries <a href="http://www.dre.vanderbilt.edu/cidlc/binary">available</a> intermittently,
             no automatic builds or tests</b>
         </td>
         <td>MacOS, Solaris
         </td>
       </tr>
     </table>
-    <p>If you have <A href="../../docs/ACE-porting.html">porting questions</A> or 
-      have a problem compiling CIAO with TAO and ACE on the platforms shown above 
-      please send email to either <A href="news:comp.soft-sys.ace">ACE Newsgroup</A> or 
-      the <A href="mailto:ciao-users@cs.wustl.edu">CIAO mailing list</A> and we'll 
-      try to help you fix the problems. You can also submit bug reports and 
-      enhancement requests in our <A href="../../docs/usage-bugzilla.html">bug tracking 
+    <p>If you have <A href="../../docs/ACE-porting.html">porting questions</A> or
+      have a problem compiling CIAO with TAO and ACE on the platforms shown above
+      please send email to either <A href="news:comp.soft-sys.ace">ACE Newsgroup</A> or
+      the <A href="mailto:ciao-users@cs.wustl.edu">CIAO mailing list</A> and we'll
+      try to help you fix the problems. You can also submit bug reports and
+      enhancement requests in our <A href="../../docs/usage-bugzilla.html">bug tracking
         system</A>.
     </p>
     <p>CIAO can be obtained <a href="http://www.dre.vanderbilt.edu/Download.html">electronically</a>
-      via the WWW and ftp. <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a> is 
-      bundled with the ACE and TAO release. You'll always need the most recent 
+      via the WWW and ftp. <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a> is
+      bundled with the ACE and TAO release. You'll always need the most recent
       version of ACE and TAO because CIAO tracks changes to ACE and TAO very closely.
     </p>
     <hr>
     <h3>Install CIDL Compiler
     </h3>
     <p>We suggest you download the prebuilt binary <code>cidlc(exe)</code> from <strong>
-        <a href="http://www.dre.vanderbilt.edu/cidlc/">here</a></strong> or, if you 
+        <a href="http://www.dre.vanderbilt.edu/cidlc/">here</a></strong> or, if you
       are using Windows or Linux, you can build it by yourself.
     </p>
     <p><A href="../../MPC/README">MPC</A> is used to build the CIDL compiler on <strong>
@@ -93,14 +93,14 @@
       <li>
         Make sure you set cidl=1, boost=1, and exceptions=1 in <code>$ACE_ROOT/include/makeinclude/platfrom_macros.GNU</code>.
       <li>
-        Install <code>boost_filesystem</code>, <code>boost_regex</code> and <code>Utility 
+        Install <code>boost_filesystem</code>, <code>boost_regex</code> and <code>Utility
           Library</code>. For how to do that please see <A href="./CCF/Documentation/Build.html">
           Build.html</A>.
       <li>
         In <code>$CIAO_ROOT/CIDLC</code> run <code>$ACE_ROOT/bin/mwc.pl CIDLC.mwc</code>
       <li>
         In <code>$CIAO_ROOT/CIDLC</code> run <code>make</code>.<br>
-        Note: The linking time is a bit long (more than 5 Minutes with an Intel XEON 
+        Note: The linking time is a bit long (more than 5 Minutes with an Intel XEON
         1.90GHZ CPU, please be patient).
       </li>
     </ul>
@@ -109,30 +109,30 @@
     <ol>
       <li>
         Use the provided Visual Studio solution/project file. For detail please see <A href="./CCF/Documentation/Build.html">
-          Build.html</A>. Since MPC is now supported to build the CIDL compiler on 
+          Build.html</A>. Since MPC is now supported to build the CIDL compiler on
       Windows, these solution/project files may be removed in the future.
       <li>
         Use <A href="../../MPC/README">MPC</A>. The procedure is outlined below.
         <ul>
           <li>
             If you have not created it already, create the file <code>%ACE_ROOT%/bin/MakeProjectCreator/config/default.features</code>
-            and add <code>cidl=1</code> and <code>boost=1</code> to it, each on its own 
-            line. An easy way to do this is to copy the file <code>global.features</code> (in the 
+            and add <code>cidl=1</code> and <code>boost=1</code> to it, each on its own
+            line. An easy way to do this is to copy the file <code>global.features</code> (in the
             same directory) as <code>default.features</code>
-            and modify the appropriate lines in the new file, leaving everything else the 
+            and modify the appropriate lines in the new file, leaving everything else the
             same.
           <li>
             Install the <a href="http://www.boost.org">Boost</a>
-          libraries on your machine. For Windows, you can download either the 
-          Windows-specific .exe file or the platform-independent .zip file. Use version 
-          1.32.0 or later. The accompanying documentation on how to build and install 
+          libraries on your machine. For Windows, you can download either the
+          Windows-specific .exe file or the platform-independent .zip file. Use version
+          1.32.0 or later. The accompanying documentation on how to build and install
           Boost is pretty straightforward.
           <li>
             Set the following environment variables:
             <ul>
               <li>
                 <code>ACE_ROOT</code>
-              - [path&nbsp;ending with&nbsp;ACE_wrappers directory] (this should already be 
+              - [path&nbsp;ending with&nbsp;ACE_wrappers directory] (this should already be
               set if you're using CIAO)
               <li>
                 <code>BOOST_CFG</code> - <code>_vc7_mdsd</code>
@@ -140,18 +140,18 @@
                 <code>BOOST_ROOT</code>
               - [path ending with Boost directory]
               <li>
-                <code>BOOST_VERSION</code> - [name of the directory under <code>%BOOST_ROOT%\include</code>, 
+                <code>BOOST_VERSION</code> - [name of the directory under <code>%BOOST_ROOT%\include</code>,
                 for ex. <code>boost-1_32</code>, for Boost vesrion 1.32.0]
               <LI>
                 <code>UTILITY_ROOT</code> - <code>%ACE_ROOT%\contrib\utility</code>
               </LI>
             </ul>
           <li>
-            In <code>%CIAO_ROOT%\CIDLC</code> run <code>%ACE_ROOT%\bin\mwc.pl -type vc71 
+            In <code>%CIAO_ROOT%\CIDLC</code> run <code>%ACE_ROOT%\bin\mwc.pl -type vc71
               CIDLC.mwc</code>
           <li>
-            Open <code>CIDLC.sln</code> and build as usual. Within the solution, the CIDLC 
-            project is the top-level one, which depends on all the other projects, and 
+            Open <code>CIDLC.sln</code> and build as usual. Within the solution, the CIDLC
+            project is the top-level one, which depends on all the other projects, and
             produces <code>cidlc.exe</code> in <code>%CIAO_ROOT%\bin</code>.
           </li>
         </ul>
@@ -160,43 +160,43 @@
     <hr>
     <h3>Obtaining and Installing Xerces-C
     </h3>
-    <p>The Xerces-C XML parsing library is a necessary component to build parts of 
-      DAnCE that need to process XML based descriptor files, which include the <b>Plan 
-        Launcher</b> and the <b>Repository Manager</b>. Currently, the only Xerces-C 
+    <p>The Xerces-C XML parsing library is a necessary component to build parts of
+      DAnCE that need to process XML based descriptor files, which include the <b>Plan
+        Launcher</b> and the <b>Repository Manager</b>. Currently, the only Xerces-C
       version supported by the DOC group is version 2.6 or later.
       Earlier versions of the Xerces-C library may work.
     </p>
     <h4>Building Xerces-C
     </h4>
-    <p>You may check <a href="http://www.dre.vanderbilt.edu/~wotte/xerces/">here</a> to 
-      see if there is a prebuilt binary available for your platform. Otherwise, you 
+    <p>You may check <a href="http://www.dre.vanderbilt.edu/~wotte/xerces/">here</a> to
+      see if there is a prebuilt binary available for your platform. Otherwise, you
       will have to obtain the source from the <a href="http://xml.apache.org/xerces-c/download.cgi">
-        Xerces-C webpage</a> and build it. Building Xerces-C is fairly 
+        Xerces-C webpage</a> and build it. Building Xerces-C is fairly
       straightfoward. Please see the documentation available <a href="http://xml.apache.org/xerces-c/build.html">
         here</a> for instructions particular to your platform.
     </p>
     <ul>
       <li>
-        <strong>NOTE</strong>: Some of the provided projects with Xerces-C attach 
-      inconsistant library decorators onto the end of the Xerces-C libraries. The MPC 
-      build tool will expect these libraries to be named xerces-c for non debug 
+        <strong>NOTE</strong>: Some of the provided projects with Xerces-C attach
+      inconsistant library decorators onto the end of the Xerces-C libraries. The MPC
+      build tool will expect these libraries to be named xerces-c for non debug
       versions, and xerces-cd for debug versions.
     </ul>
     <h4>Xerces-C Environment Settings
     </h4>
-    <p>If the Xerces includes and libraries are in your system include and library 
-      paths, respectively, then you need not set up any environment and may proceed 
-      to the next step. If not, you will need to set an environment variable named 
-      XERCESCROOT to a path such that $XERCESCROOT/include points to the includes and 
-      $XERCESCROOT/lib points to the libraries. Also make sure that $XERCESCROOT/lib 
-      is in the appropriate environment variable that your platform uses to search 
+    <p>If the Xerces includes and libraries are in your system include and library
+      paths, respectively, then you need not set up any environment and may proceed
+      to the next step. If not, you will need to set an environment variable named
+      XERCESCROOT to a path such that $XERCESCROOT/include points to the includes and
+      $XERCESCROOT/lib points to the libraries. Also make sure that $XERCESCROOT/lib
+      is in the appropriate environment variable that your platform uses to search
       for dynamically linked libraries.
     </p>
     <hr>
     <h3>Install CIAO core/tools/examples
     </h3>
-    <p>Most of the GNUmakefiles/project files/solution files required to build CIAO 
-      are available in the release. If you don't like the configurations used, please 
+    <p>Most of the GNUmakefiles/project files/solution files required to build CIAO
+      are available in the release. If you don't like the configurations used, please
       feel free to regenerate them using MPC. Please see <A href="../../MPC/README">this</A>
       for more details.
     </p>
@@ -208,7 +208,7 @@
       <li>
       Make sure you have the Xerces-C libraries installed/built
       <li>
-        Make sure all ACE/TAO/etc. generated libs are in <code>$ACE_ROOT/lib</code>. To 
+        Make sure all ACE/TAO/etc. generated libs are in <code>$ACE_ROOT/lib</code>. To
         build CIAO you will need:
         <ul>
           <li>
@@ -237,7 +237,7 @@
         <p>For the supported build tools please see <a href="http://downloads.ociweb.com/MPC/MakeProjectCreator.pdf">
             MPC manual</a>.
         </p>
-        <p>You have to execute the MPC command in the following directories if you only 
+        <p>You have to execute the MPC command in the following directories if you only
           want to build the examples and have a peek at CIAO:
         </p>
         <ul>
@@ -245,7 +245,7 @@
             <code>$CIAO_ROOT/DAnCE/</code>
           </li>
         </ul>
-        <p>On <strong>Linux</strong>: do <code>$ACE_ROOT/bin/mwc.pl</code> at the 
+        <p>On <strong>Linux</strong>: do <code>$ACE_ROOT/bin/mwc.pl</code> at the
           locations specified above then <code>make</code>.
         </p>
         <p>On <strong>Windows/VC6</strong>: do <code>%ACE_ROOT%/bin/mwc.pl -type vc6</code>
@@ -255,14 +255,14 @@
           at the locations specified above then Open the solution file and build.
         </p>
         <p><strong>Note:</strong> You can run <code>mwc.pl</code> at <code>$CIAO_ROOT</code>
-          as long as you don't intend to build CIDL compiler with MPC. If this is the 
-          case(default), you can run the mwc.pl command with proper augment once then you 
-          can do <code>make</code> at <code>$CIAO_ROOT</code> (Linux) or open the 
+          as long as you don't intend to build CIDL compiler with MPC. If this is the
+          case(default), you can run the mwc.pl command with proper augment once then you
+          can do <code>make</code> at <code>$CIAO_ROOT</code> (Linux) or open the
           workspace/solution file at <code>$CIAO_ROOT</code> (Windows) to build.
         </p>
       </li>
     </ol>
-    <strong>Building CIAO quickly</strong> : You can build CIAO quickly by doing 
+    <strong>Building CIAO quickly</strong> : You can build CIAO quickly by doing
     the following:
     <ul class="noindent">
       <li>
@@ -276,12 +276,12 @@
       <li>
       Type 'make'
       <li style="LIST-STYLE-TYPE: none">
-        This will build all the required ACE+TAO libraries including CIAO libraries and 
+        This will build all the required ACE+TAO libraries including CIAO libraries and
         tools.
       </li>
     </ul>
     <hr>
-    <p>Back to the <a href="http://www.cs.wustl.edu/~schmidt/CIAO.html">CIAO</a> home 
+    <p>Back to the <a href="http://www.cs.wustl.edu/~schmidt/CIAO.html">CIAO</a> home
       page. <!--#include virtual="/~schmidt/cgi-sig.html" --></p>
   </body>
 </html>
diff --git a/TAO/CIAO/CIDLC/DescriptorGenerator.cpp b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
index 7b5b41933c2..740df3eda19 100644
--- a/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
+++ b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
@@ -56,7 +56,7 @@ namespace
       virtual void
       traverse (Type& c)
       {
-        os << "<componentrepid repid=\"" 
+        os << "<componentrepid repid=\""
            << c.context ().get<string> (STRS[REPO_ID])
            << "\"/>"
            << endl;
@@ -72,7 +72,7 @@ namespace
       virtual void
       traverse (Type& h)
       {
-        os << "<homerepid repid=\"" 
+        os << "<homerepid repid=\""
            << h.context ().get<string> (STRS[REPO_ID])
            << "\"/>"
            << endl;
@@ -90,7 +90,7 @@ namespace
       {
         os << "<homefeatures" << endl
            << "name=\"" << h.name () << "\"" << endl
-           << "repid=\"" 
+           << "repid=\""
            << h.context ().get<string> (STRS[REPO_ID])
            << "\">" << endl;
 
@@ -116,7 +116,7 @@ namespace
         virtual void
         traverse (Type& h)
         {
-          os << "<inheritshome repid=\"" 
+          os << "<inheritshome repid=\""
              << h.context ().get<string> (STRS[REPO_ID])
              << "\"/>"
              << endl;
@@ -135,7 +135,7 @@ namespace
       {
         os << "<componentfeatures" << endl
            << "name=\"" << c.name () << "\"" << endl
-           << "repid=\"" 
+           << "repid=\""
            << c.context ().get<string> (STRS[REPO_ID])
            << "\">" << endl;
 
@@ -175,7 +175,7 @@ namespace
         virtual void
         traverse (Type& c)
         {
-          os << "<inheritscomponent repid=\"" 
+          os << "<inheritscomponent repid=\""
              << c.context ().get<string> (STRS[REPO_ID])
              << "\"/>"
              << endl;
@@ -191,7 +191,7 @@ namespace
         virtual void
         traverse (Type& i)
         {
-          os << "<supportsinterface repid=\"" 
+          os << "<supportsinterface repid=\""
              << i.context ().get<string> (STRS[REPO_ID])
              << "\"/>"
              << endl;
@@ -294,7 +294,7 @@ namespace
           virtual void
           traverse (SemanticGraph::Type& t)
           {
-            os << '\"' 
+            os << '\"'
                << t.context ().get<string> (STRS[REPO_ID])
                << '\"';
           }
@@ -328,7 +328,7 @@ namespace
           os << "<interface" << endl
              << "name=\"" << i.name ()
              << "\"" << endl
-             << "repid=\"" 
+             << "repid=\""
              << i.context ().get<string> (STRS[REPO_ID])
              << "\">" << endl;
 
@@ -354,7 +354,7 @@ namespace
       virtual void
       traverse (Type& i)
       {
-        os << "<inheritsinterface repid=\"" 
+        os << "<inheritsinterface repid=\""
            << i.context ().get<string> (STRS[REPO_ID])
            << "\"/>" << endl;
       }
diff --git a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp
index 9ebe0cd300c..0cc8127cc76 100644
--- a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp
+++ b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.hpp
@@ -19,7 +19,7 @@ public:
                          CommandLine const& cl,
                          string export_macro,
                          fs::path const& file);
-                        
+
   virtual ~ExecImplHeaderEmitter () {}
 
   virtual void
diff --git a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp
index efac70d2543..bf70a53870a 100644
--- a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp
+++ b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.hpp
@@ -19,7 +19,7 @@ public:
                          CommandLine const& cl,
                          string export_macro,
                          fs::path const& file);
-                        
+
   virtual ~ExecImplSourceEmitter () {}
 
   virtual void
diff --git a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
index 073aa844f77..f3915422cde 100644
--- a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
+++ b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
@@ -38,7 +38,7 @@ namespace
 
     return 0;
   }
-  
+
   void
   compute_new_repo_id (Nameable& d)
   {
@@ -177,7 +177,7 @@ namespace
         {
           SemanticGraph::TypePrefix* prev =
             ctx.get<SemanticGraph::TypePrefix*> (STRS[TYPE_PREFIX]);
-        
+
           if (prev->prefix () != tp.prefix ())
           {
             //@@ Seems tp should contain filename and line
@@ -200,7 +200,7 @@ namespace
         else
         {
           decl->context ().set (STRS[TYPE_PREFIX], &tp);
-          
+
           // A typeprefix declaration could appear after the IDL
           // type declaration, so we want to update the repo id
           // every time.
@@ -213,7 +213,7 @@ namespace
     Diagnostic::Stream& dout_;
     SemanticGraph::TranslationUnit& tu_;
   };
-  
+
   class RepoIdGenerator : public Traversal::Interface,
                           public Traversal::EventType,
                           public Traversal::Home,
@@ -224,19 +224,19 @@ namespace
     {
       compute_repo_id (i);
     }
-    
+
     virtual void
     traverse (SemanticGraph::EventType& e)
     {
       compute_repo_id (e);
     }
-    
+
     virtual void
     traverse (SemanticGraph::Home& h)
     {
       compute_repo_id (h);
     }
-    
+
     virtual void
     traverse (SemanticGraph::Component& c)
     {
@@ -264,11 +264,11 @@ bool RepositoryIdGenerator::generate (TranslationUnit& u)
 
   Traversal::ContainsRoot contains_root;
   Traversal::Includes includes;
-  
+
   region.edge_traverser (includes);
   region.edge_traverser (contains_root);
-  
-  Traversal::Root root;  
+
+  Traversal::Root root;
   includes.node_traverser (region);
   contains_root.node_traverser (root);
 
@@ -276,17 +276,17 @@ bool RepositoryIdGenerator::generate (TranslationUnit& u)
   root.edge_traverser (defines);
 
   Traversal::Module module;
-  
+
   defines.node_traverser (module);
   defines.node_traverser (type_id);
   defines.node_traverser (type_prefix);
   defines.node_traverser (repo_id);
-  
+
   module.edge_traverser (defines);
-  
+
   Traversal::Interface iface;
   defines.node_traverser (iface);
-  
+
   unit.traverse (u);
 
   if (dout.error_count () != 0) return false;
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp
index 47fc1acf369..b81625b6b80 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.hpp
@@ -20,7 +20,7 @@ public:
                         CommandLine const& cl,
                         std::string export_macro,
                         fs::path const& file);
-                        
+
   virtual ~ServantHeaderEmitter () {}
 
   virtual void
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index c389eade22e..a83c7673f4f 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -24,41 +24,41 @@ namespace
     Context (std::ostream& os,
              string export_macro,
              CommandLine const& cl)
-        : os_ (os),
-          export_macro_ (export_macro),
-          cl_ (cl)
+      : os_ (os),
+        export_macro_ (export_macro),
+        cl_ (cl)
     {
     }
 
-  std::ostream&
-  os ()
-  {
-    return os_;
-  }
+    std::ostream&
+    os ()
+    {
+      return os_;
+    }
 
-  string
-  export_macro ()
-  {
-    return export_macro_;
-  }
+    string
+    export_macro ()
+    {
+      return export_macro_;
+    }
 
-  CommandLine const&
-  cl ()
-  {
-    return cl_;
-  }
+    CommandLine const&
+    cl ()
+    {
+      return cl_;
+    }
 
-  string
-  composition_name ()
-  {
-    return composition_name_;
-  }
+    string
+    composition_name ()
+    {
+      return composition_name_;
+    }
 
-  void
-  composition_name (const string& name)
-  {
-    composition_name_ = name;
-  }
+    void
+    composition_name (const string& name)
+    {
+      composition_name_ = name;
+    }
 
   private:
     std::ostream& os_;
@@ -280,13 +280,13 @@ namespace
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
 
-        Traversal::Operation::returns (o, ace_check_returns_);
+          Traversal::Operation::returns (o, ace_check_returns_);
 
-        os << endl;
-      }
+          os << endl;
+        }
     }
 
     virtual void
@@ -439,9 +439,9 @@ namespace
     traverse (Interface& i)
     {
       if (add (i))
-      {
-        Traversal::Interface::traverse (i);
-      }
+        {
+          Traversal::Interface::traverse (i);
+        }
     }
 
   private:
@@ -451,7 +451,7 @@ namespace
   // Generates the set operation of a ReadWriteAttribute.
   template <typename T>
   struct WriteAttributeEmitter : Traversal::ReadWriteAttribute,
-                                 EmitterBase
+    EmitterBase
   {
     WriteAttributeEmitter (Context& c, T& scope, bool swapping)
       : EmitterBase (c),
@@ -520,9 +520,9 @@ namespace
       os << "{";
 
       if (swapping_)
-      {
-        this->gen_swapping_set ();
-      }
+        {
+          this->gen_swapping_set ();
+        }
 
       os << "this->executor_->" << a.name () << " (" << endl
          << a.name () << endl
@@ -550,8 +550,8 @@ namespace
   // Generates operations associated with attributes.
   template <typename T>
   struct AttributeEmitter : Traversal::ReadAttribute,
-                            Traversal::ReadWriteAttribute,
-                            EmitterBase
+            Traversal::ReadWriteAttribute,
+            EmitterBase
   {
     AttributeEmitter (Context& c, T& scope)
       : EmitterBase (c),
@@ -640,9 +640,9 @@ namespace
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
-      {
-        this->gen_swapping_get (a);
-      }
+        {
+          this->gen_swapping_get (a);
+        }
 
       os << "return this->executor_->" << a.name () << " (" << endl
          << STRS[ENV_SNGL_ARG] << ");" << endl
@@ -719,9 +719,9 @@ namespace
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
-      {
-        this->gen_swapping_get (a);
-      }
+        {
+          this->gen_swapping_get (a);
+        }
 
       os << "return this->executor_->" << a.name () << " (" << endl
          << STRS[ENV_SNGL_ARG] << ");" << endl
@@ -750,7 +750,7 @@ namespace
   // @@@ (JP) Need to support exceptions.
   template <typename T>
   struct ReadOnlyAttributeEmitter : Traversal::ReadAttribute,
-                                    EmitterBase
+            EmitterBase
   {
     ReadOnlyAttributeEmitter (Context& c,
                               T& scope)
@@ -803,9 +803,9 @@ namespace
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
-      {
-        this->gen_swapping_get (a);
-      }
+        {
+          this->gen_swapping_get (a);
+        }
 
       os << "return this->executor_->" << a.name () << " (" << endl
          << STRS[ENV_SNGL_ARG] << ");" << endl
@@ -1068,13 +1068,13 @@ namespace
       : EmitterBase (c)
     {}
 
-  // Nested classes used by ContextEmitter.
+    // Nested classes used by ContextEmitter.
   private:
     struct ContextPortsEmitter : Traversal::SingleUserData,
-                                 Traversal::MultiUserData,
-                                 Traversal::PublisherData,
-                                 Traversal::EmitterData,
-                                 EmitterBase
+    Traversal::MultiUserData,
+    Traversal::PublisherData,
+    Traversal::EmitterData,
+    EmitterBase
     {
       ContextPortsEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
@@ -1684,14 +1684,14 @@ namespace
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
-      {
-        os << "," << endl
-           << "    ug_ctx_svnt_base (h, c, sv)" << endl;
-      }
+        {
+          os << "," << endl
+             << "    ug_ctx_svnt_base (h, c, sv)" << endl;
+        }
       else
-      {
-        os << endl;
-      }
+        {
+          os << endl;
+        }
 
       os << "{"
          << "}";
@@ -1726,55 +1726,55 @@ namespace
 
       // Extra *_Context methods for swapping container.
       if (swapping)
-      {
-        os << "// Operations defined in " << t.scoped_name ().scope_name ()
-           << "::CCM_" << t.name () << "_Context" << endl
-           << "// that enable component swapping in the container"
-           << endl << endl;
-
-        os << STRS[COMP_CD] << " *" << endl
-           << t.name () << "_Context::get_registered_consumers (" << endl
-           << "const char *publisher_name" << endl
-           << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << endl
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IN] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
-           << "{"
-           << "if (publisher_name == 0)" << endl
-           << "{"
-           << STRS[ACE_TR] << " (" << STRS[EXCP_IN] << " (), 0);"
-           << "}"
-           << STRS[COMP_CD] << " *tmp = 0;"
-           << STRS[COMP_CD] << "_var retval;"
-           << "CORBA::ULong _ciao_index = 0;"
-           << "CORBA::ULong _ciao_size = 0;"
-		       << STRS[ACE_UA] << " (tmp);"
-		       << STRS[ACE_UA] << " (retval);"
-		       << STRS[ACE_UA] << " (_ciao_index);"
-		       << STRS[ACE_UA] << " (_ciao_size);" << endl;
-
-        // Generate IF block for each event sources.
         {
-          Traversal::Component component_emitter;
-
-          Traversal::Inherits inherits;
-          inherits.node_traverser (component_emitter);
-
-          Traversal::Defines defines;
-          component_emitter.edge_traverser (defines);
-          component_emitter.edge_traverser (inherits);
-
-          SwappableGetConsumersEmitter get_consumers_emitter (ctx);
-          defines.node_traverser (get_consumers_emitter);
-
-          component_emitter.traverse (t);
+          os << "// Operations defined in " << t.scoped_name ().scope_name ()
+             << "::CCM_" << t.name () << "_Context" << endl
+             << "// that enable component swapping in the container"
+             << endl << endl;
+
+          os << STRS[COMP_CD] << " *" << endl
+             << t.name () << "_Context::get_registered_consumers (" << endl
+             << "const char *publisher_name" << endl
+             << STRS[ENV_SRC] << ")" << endl
+             << STRS[EXCP_START] << endl
+             << STRS[EXCP_SYS] << "," << endl
+             << STRS[EXCP_IN] << "," << endl
+             << STRS[EXCP_IC] << "))" << endl
+             << "{"
+             << "if (publisher_name == 0)" << endl
+             << "{"
+             << STRS[ACE_TR] << " (" << STRS[EXCP_IN] << " (), 0);"
+             << "}"
+             << STRS[COMP_CD] << " *tmp = 0;"
+             << STRS[COMP_CD] << "_var retval;"
+             << "CORBA::ULong _ciao_index = 0;"
+             << "CORBA::ULong _ciao_size = 0;"
+             << STRS[ACE_UA] << " (tmp);"
+             << STRS[ACE_UA] << " (retval);"
+             << STRS[ACE_UA] << " (_ciao_index);"
+             << STRS[ACE_UA] << " (_ciao_size);" << endl;
+
+          // Generate IF block for each event sources.
+          {
+            Traversal::Component component_emitter;
+
+            Traversal::Inherits inherits;
+            inherits.node_traverser (component_emitter);
+
+            Traversal::Defines defines;
+            component_emitter.edge_traverser (defines);
+            component_emitter.edge_traverser (inherits);
+
+            SwappableGetConsumersEmitter get_consumers_emitter (ctx);
+            defines.node_traverser (get_consumers_emitter);
+
+            component_emitter.traverse (t);
+          }
+
+          os << STRS[ACE_TR] << " (" << STRS[EXCP_IN] << " (), 0);"
+             << "}";
         }
 
-        os << STRS[ACE_TR] << " (" << STRS[EXCP_IN] << " (), 0);"
-           << "}";
-      }
-
       os << "// CIAO-specific." << endl << endl;
 
       os << t.name () << "_Context *" << endl
@@ -1794,10 +1794,10 @@ namespace
       : EmitterBase (c)
     {}
 
-  // Nested classes used by ServantEmitter.
+    // Nested classes used by ServantEmitter.
   private:
     struct NavigationEmitsEmitter : Traversal::EmitterData,
-                                    EmitterBase
+    EmitterBase
     {
       NavigationEmitsEmitter (Context& c)
         : EmitterBase (c),
@@ -1892,10 +1892,10 @@ namespace
         bool swapping = (swap_option == "upgradeable");
 
         if (swapping)
-        {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (0);" << endl;
-        }
+          {
+            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+               << STRS[ACE_CR] << " (0);" << endl;
+          }
 
         os << "return this->context_->subscribe_" << p.name ()
            << " (" << endl
@@ -1914,10 +1914,10 @@ namespace
            << "{";
 
         if (swapping)
-        {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (0);" << endl;
-        }
+          {
+            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+               << STRS[ACE_CR] << " (0);" << endl;
+          }
 
         os << "return this->context_->subscribe_" << p.name ()
            << "_generic (" << endl
@@ -1938,14 +1938,14 @@ namespace
            << "{";
 
         if (swapping)
-        {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (";
+          {
+            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+               << STRS[ACE_CR] << " (";
 
-          Traversal::PublisherData::belongs (p, belongs_);
+            Traversal::PublisherData::belongs (p, belongs_);
 
-          os << "Consumer::_nil ());" << endl;
-        }
+            os << "Consumer::_nil ());" << endl;
+          }
 
         os << "return this->context_->unsubscribe_"
            << p.name () << " (" << endl
@@ -2103,6 +2103,8 @@ namespace
            << endl
            << "c" << endl
            << STRS[ENV_ARG] << ");" << endl
+           << "this->add_receptacle (\"" << u.name ()
+           << "\", c, 0);" << endl
            << "}";
 
         Traversal::SingleUserData::belongs (u, belongs_);
@@ -2151,10 +2153,14 @@ namespace
            << STRS[EXCP_ECL] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
-           << "return this->context_->connect_" << u.name () << " ("
+           << "::Components::Cookie * cookie = "
+          "this->context_->connect_" << u.name () << " ("
            << endl
            << "c" << endl
            << STRS[ENV_ARG] << ");" << endl
+           << "this->add_receptacle (\"" << u.name ()
+           << "\", c, cookie);" << endl
+           << "return cookie;" << endl
            << "}";
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -2384,14 +2390,14 @@ namespace
         bool swapping = (swap_option == "upgradeable");
 
         if (swapping)
-        {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (";
+          {
+            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+               << STRS[ACE_CR] << " (";
 
-          Traversal::ProviderData::belongs (p, belongs_);
+            Traversal::ProviderData::belongs (p, belongs_);
 
-          os << "::_nil ());" << endl;
-        }
+            os << "::_nil ());" << endl;
+          }
 
         os << "if (! ::CORBA::is_nil (this->provide_"
            << p.name () << "_.in ()))" << endl
@@ -2899,7 +2905,7 @@ namespace
 
         os << "return ecb._retn ();" << endl
            << "}";
-     }
+      }
 
     private:
       TypeNameEmitter type_name_emitter_;
@@ -2976,29 +2982,29 @@ namespace
         }
 
         if (gen_factory_)
-        {
-          os << "CIAO_REGISTER_OBV_FACTORY (" << endl;
+          {
+            os << "CIAO_REGISTER_OBV_FACTORY (" << endl;
 
-          Traversal::ConsumerData::belongs (c, belongs_);
+            Traversal::ConsumerData::belongs (c, belongs_);
 
-          os << "_init," << endl;
+            os << "_init," << endl;
 
-          Traversal::ConsumerData::belongs (c, belongs_);
+            Traversal::ConsumerData::belongs (c, belongs_);
 
-          os << ");" << endl;
-        }
+            os << ");" << endl;
+          }
         else
-        {
-          cerr << "    " << endl
-               << "event type ";
+          {
+            cerr << "    " << endl
+                 << "event type ";
 
-          Traversal::ConsumerData::belongs (c, cerr_belongs_);
+            Traversal::ConsumerData::belongs (c, cerr_belongs_);
 
-          cerr << " consumed by " << c.scoped_name () << endl
-               << "has an operation, factory declaration,"
-               << " or private member. "
-               << "ORB registration of default factory not generated" << endl;
-        }
+            cerr << " consumed by " << c.scoped_name () << endl
+                 << "has an operation, factory declaration,"
+                 << " or private member. "
+                 << "ORB registration of default factory not generated" << endl;
+          }
       }
 
     private:
@@ -3163,24 +3169,29 @@ namespace
          << "this->context_," << endl
          << t.name () << "_Context (h, c, this));" << endl;
 
+      os << "// Set the instance id of the component on the context" << endl
+         << endl
+         << "this->context_->_ciao_instance_id (this->ins_name_);" << endl;
+
+
       // Generate the macro to register a value factory for each
       // eventtype consumed.
       if (!ctx.cl ().get_value ("suppress-register-factory", false))
-      {
-        Traversal::Component component_emitter;
+        {
+          Traversal::Component component_emitter;
 
-        Traversal::Inherits inherits;
-        inherits.node_traverser (component_emitter);
+          Traversal::Inherits inherits;
+          inherits.node_traverser (component_emitter);
 
-        Traversal::Defines defines;
-        component_emitter.edge_traverser (defines);
-        component_emitter.edge_traverser (inherits);
+          Traversal::Defines defines;
+          component_emitter.edge_traverser (defines);
+          component_emitter.edge_traverser (inherits);
 
-        RegisterValueFactoryEmitter factory_emitter (ctx);
-        defines.node_traverser (factory_emitter);
+          RegisterValueFactoryEmitter factory_emitter (ctx);
+          defines.node_traverser (factory_emitter);
 
-        component_emitter.traverse (t);
-      }
+          component_emitter.traverse (t);
+        }
 
       os << "ACE_TRY_NEW_ENV" << endl
          << "{"
@@ -3224,10 +3235,10 @@ namespace
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << "ACE_CHECK;" << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << "ACE_CHECK;" << endl;
+        }
 
       os << "for (CORBA::ULong i = 0; i < descr.length (); ++i)" << endl
          << "{"
@@ -3323,10 +3334,10 @@ namespace
          << "{";
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << STRS[ACE_CR] << " (0);" << endl;
+        }
 
       os << "// If the component has no receptacles, this will be unused."
          << endl
@@ -3371,10 +3382,10 @@ namespace
          << STRS[ACE_UA] << " (ck);" << endl;
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl;
+        }
 
       os << "if (name == 0)" << endl
          << "{"
@@ -3436,10 +3447,10 @@ namespace
          << "{";
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << "ACE_CHECK;" << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << "ACE_CHECK;" << endl;
+        }
 
       os << "if (emitter_name == 0)" << endl
          << "{"
@@ -3481,10 +3492,10 @@ namespace
          << "{";
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << STRS[ACE_CR] << " (0);" << endl;
+        }
 
       os << "// Just in case there are no if blocks" << endl
          << STRS[ACE_UA] << " (subscribe);" << endl
@@ -3527,11 +3538,11 @@ namespace
          << "{";
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (" << STRS[COMP_ECB]
-           << "::_nil ());" << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << STRS[ACE_CR] << " (" << STRS[COMP_ECB]
+             << "::_nil ());" << endl;
+        }
 
       os << "// Just in case there are no if blocks" << endl
          << STRS[ACE_UA] << " (ck);" << endl
@@ -3591,10 +3602,10 @@ namespace
          << "{";
 
       if (swapping)
-      {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl;
-      }
+        {
+          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
+             << STRS[ACE_CR] << " (CORBA::Object::_nil ());" << endl;
+        }
 
       os << "if (name == 0)" << endl
          << "{"
@@ -3603,6 +3614,7 @@ namespace
          << "::CORBA::Object::_nil ());" << endl
          << "}";
 
+
       // Generate an IF block for each facet inside provide_facet().
       {
         Traversal::Component component_emitter;
@@ -3622,6 +3634,7 @@ namespace
 
       os << " return CORBA::Object::_nil ();"
          << "}";
+
       os << "// Supported operations." << endl << endl;
 
       // Generate operations for all supported interfaces.
@@ -3746,7 +3759,7 @@ namespace
       flat_name_manages_.node_traverser (flat_name_emitter_);
     }
 
-  // Nested classes used by this emitter.
+    // Nested classes used by this emitter.
   private:
     struct HomeOpExecReturnEmitter : Traversal::Type
     {
@@ -4067,15 +4080,15 @@ namespace
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
-      {
-        os << ", \"" << ctx.composition_name ();
+        {
+          os << ", \"" << ctx.composition_name ();
 
-        Traversal::Home::manages (t, flat_name_manages_);
+          Traversal::Home::manages (t, flat_name_manages_);
 
-        os << "\", ";
+          os << "\", ";
 
-        Traversal::Home::manages (t, repo_id_manages_);
-      }
+          Traversal::Home::manages (t, repo_id_manages_);
+        }
 
       os << ")" << endl
          << "{"
@@ -4358,9 +4371,9 @@ ServantSourceEmitter::pre (TranslationUnit&)
   string file_name ("");
 
   if (! file_.empty ())
-  {
-    file_name = file_.leaf ();
-  }
+    {
+      file_name = file_.leaf ();
+    }
 
   string file_suffix = cl_.get_value ("svnt-hdr-file-suffix",
                                       "_svnt.h");
@@ -4409,7 +4422,7 @@ ServantSourceEmitter::generate (TranslationUnit& u)
 
   //--
   Traversal::Root root;
-//  includes.node_traverser (region);
+  //  includes.node_traverser (region);
   contains_root.node_traverser (root);
 
   // Layer 3
diff --git a/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp b/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
index 015053b956b..b8f44e879ed 100644
--- a/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
+++ b/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
@@ -163,12 +163,12 @@ calculate (SemanticGraph::TranslationUnit& u)
   //
   Traversal::ContainsRoot contains_root;
   Traversal::Includes includes;
-  
+
   region.edge_traverser (includes);
   region.edge_traverser (contains_root);
-  
+
   //--
-  Traversal::Root root;  
+  Traversal::Root root;
   includes.node_traverser (region);
   contains_root.node_traverser (root);
 
@@ -183,15 +183,15 @@ calculate (SemanticGraph::TranslationUnit& u)
   Traversal::UnconstrainedInterface uinterface;
   Traversal::ValueType vtype;
   Traversal::Home component_home;
-  
+
   Calculator calculator;
-  
+
   defines.node_traverser (module);
   defines.node_traverser (uinterface);
   defines.node_traverser (vtype);
   defines.node_traverser (component_home);
   defines.node_traverser (calculator);
-  
+
   // Layer 4
   //
   Traversal::Defines struct_defines;
@@ -200,16 +200,16 @@ calculate (SemanticGraph::TranslationUnit& u)
   vtype.edge_traverser (defines);
   component_home.edge_traverser (defines);
   calculator.edge_traverser (struct_defines);
-  
+
   //--
   Traversal::Member member;
   struct_defines.node_traverser (member);
-  
+
   // Layer 5
   //
   Traversal::Belongs belongs;
   member.edge_traverser (belongs);
-  
+
   //--
   belongs.node_traverser (calculator);
 
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
index ca45894b0ce..87d33058ada 100644
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
@@ -315,9 +315,9 @@ ReturnTypeNameEmitter::traverse (SemanticGraph::Struct& s)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   os << s.scoped_name ();
-  
+
   if (var_size)
   {
     os << " *";
@@ -330,9 +330,9 @@ ReturnTypeNameEmitter::traverse (SemanticGraph::Union& u)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   os << u.scoped_name ();
-  
+
   if (var_size)
   {
     os << " *";
@@ -1081,7 +1081,7 @@ NullReturnEmitter::traverse (SemanticGraph::Struct& s)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (var_size)
   {
     os << "return 0;";
@@ -1099,7 +1099,7 @@ NullReturnEmitter::traverse (SemanticGraph::Union& u)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (var_size)
   {
     os << "return 0;";
@@ -1300,7 +1300,7 @@ AceCheckReturnEmitter::traverse (SemanticGraph::Struct& s)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (var_size)
   {
     os << STRS[ACE_CR] << " (0);";
@@ -1319,7 +1319,7 @@ AceCheckReturnEmitter::traverse (SemanticGraph::Union& u)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (var_size)
   {
     os << STRS[ACE_CR] << " (0);";
@@ -1518,7 +1518,7 @@ NullRHSEmitter::traverse (SemanticGraph::Struct& s)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (var_size)
   {
     os << "= 0;";
@@ -1535,7 +1535,7 @@ NullRHSEmitter::traverse (SemanticGraph::Union& u)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (var_size)
   {
     os << "= 0;";
@@ -1599,7 +1599,7 @@ void
 ExtractedTypeDeclEmitter::traverse (Boolean&)
 {
   os << "::CORBA::Boolean " << STRS[EXTRACT_TMP] << " = false;"
-     << "::CORBA::Any::to_boolean " << STRS[EXTRACT] 
+     << "::CORBA::Any::to_boolean " << STRS[EXTRACT]
      << " (" << STRS[EXTRACT_TMP] << ");";
 }
 
@@ -1607,7 +1607,7 @@ void
 ExtractedTypeDeclEmitter::traverse (Octet&)
 {
   os << "::CORBA::Octet " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_octet " << STRS[EXTRACT] 
+     << "::CORBA::Any::to_octet " << STRS[EXTRACT]
      << " (" << STRS[EXTRACT_TMP] << ");";
 }
 
@@ -1615,7 +1615,7 @@ void
 ExtractedTypeDeclEmitter::traverse (Char&)
 {
   os << "::CORBA::Char " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_char " << STRS[EXTRACT] 
+     << "::CORBA::Any::to_char " << STRS[EXTRACT]
      << " (" << STRS[EXTRACT_TMP] << ");";
 }
 
@@ -1623,7 +1623,7 @@ void
 ExtractedTypeDeclEmitter::traverse (Wchar&)
 {
   os << "::CORBA::WChar " << STRS[EXTRACT_TMP] << " = 0;"
-     << "::CORBA::Any::to_wchar " << STRS[EXTRACT] 
+     << "::CORBA::Any::to_wchar " << STRS[EXTRACT]
      << " (" << STRS[EXTRACT_TMP] << ");";
 }
 
@@ -1654,7 +1654,7 @@ ExtractedTypeDeclEmitter::traverse (UnsignedLong&)
 void
 ExtractedTypeDeclEmitter::traverse (LongLong&)
 {
-  os << "::CORBA::LongLong " << STRS[EXTRACT] 
+  os << "::CORBA::LongLong " << STRS[EXTRACT]
      << " = ACE_CDR_LONGLONG_INITIALIZER;";
 }
 
@@ -1703,7 +1703,7 @@ ExtractedTypeDeclEmitter::traverse (SemanticGraph::BoundedWideString&)
 void
 ExtractedTypeDeclEmitter::traverse (Object&)
 {
-  os << "::CORBA::Object_ptr " << STRS[EXTRACT] 
+  os << "::CORBA::Object_ptr " << STRS[EXTRACT]
      << " = ::CORBA::Object::_nil ();";
 }
 
@@ -1927,12 +1927,12 @@ AssignFromExtractedEmitter::traverse (SemanticGraph::Struct& s)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (!var_size)
   {
     os << "*";
   }
-  
+
   os << STRS[EXTRACT];
 }
 
@@ -1942,12 +1942,12 @@ AssignFromExtractedEmitter::traverse (SemanticGraph::Union& u)
   // This should always be in the context, since the SizeTypeCalculator
   // is executed before the servant code generators.
   bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-  
+
   if (!var_size)
   {
     os << "*";
   }
-  
+
   os << STRS[EXTRACT];
 }
 
@@ -2192,16 +2192,16 @@ void
 SetAttributeDelegationEmitter::emit_delegation (void)
 {
   open_if_block ();
-  
+
   Traversal::ReadWriteAttribute::belongs (attr_, extract_belongs_);
 
   os << "descr_value >>= " << STRS[EXTRACT] << ";"
      << "this->" << attr_.name () << " (";
-  
+
   Traversal::ReadWriteAttribute::belongs (attr_, assign_belongs_);
-   
+
   os << ");";
-  
+
   close_if_block ();
 }
 
@@ -2209,13 +2209,13 @@ void
 SetAttributeDelegationEmitter::emit_error (const char *corba_kind)
 {
   open_if_block ();
-  
+
   os << "ACE_ERROR ((" << endl
      << "    LM_ERROR," << endl
      << "    \"Component attributes of " << corba_kind << "\"" << endl
      << "    \"IDL type are not yet supported by CIAO\\n\"" << endl
      << "  ));";
-     
+
   close_if_block ();
 }
 
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
index 9e3be6e5a40..7700520e86f 100644
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
@@ -79,7 +79,7 @@ public:
   virtual void traverse (SemanticGraph::EventType&);
   virtual void traverse (SemanticGraph::Component&);
   virtual void traverse (SemanticGraph::Home&);
-  
+
 protected:
   TypeNameEmitter (std::ostream&);
 
@@ -380,7 +380,7 @@ class ExtractedTypeDeclEmitter : public TypeNameEmitter
 {
 public:
   ExtractedTypeDeclEmitter (std::ostream&);
-  
+
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -420,7 +420,7 @@ class AssignFromExtractedEmitter : public TypeNameEmitter
 {
 public:
   AssignFromExtractedEmitter (std::ostream&);
-  
+
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -459,7 +459,7 @@ class SetAttributeDelegationEmitter : public TypeNameEmitter,
 public:
   SetAttributeDelegationEmitter (std::ostream&,
                                  SemanticGraph::ReadWriteAttribute&);
-  
+
   virtual void traverse (Boolean&);
   virtual void traverse (Octet&);
   virtual void traverse (Char&);
@@ -490,13 +490,13 @@ public:
   virtual void traverse (SemanticGraph::EventType&);
   virtual void traverse (SemanticGraph::Component&);
   virtual void traverse (SemanticGraph::Home&);
-  
-private:  
+
+private:
   void emit_delegation (void);
   void emit_error (const char *);
   void open_if_block (void);
   void close_if_block (void);
-  
+
 private:
   SemanticGraph::ReadWriteAttribute& attr_;
   AssignFromExtractedEmitter assign_emitter_;
diff --git a/TAO/CIAO/CIDLC/Version b/TAO/CIAO/CIDLC/Version
index 99d85ecdbb7..1750564f270 100644
--- a/TAO/CIAO/CIDLC/Version
+++ b/TAO/CIAO/CIDLC/Version
@@ -1 +1 @@
-0.0.6
\ No newline at end of file
+0.0.6
diff --git a/TAO/CIAO/COPYING b/TAO/CIAO/COPYING
index 348e67a580e..3217cd09562 100644
--- a/TAO/CIAO/COPYING
+++ b/TAO/CIAO/COPYING
@@ -1,9 +1,9 @@
 
      _________________________________________________________________
-   
+
   Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
   CoSMIC(TM)
-  
+
    [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
@@ -15,7 +15,7 @@
    and distribute modified versions of this software. You must, however,
    include this copyright statement along with code built using DOC
    software.
-   
+
    You can use DOC software in commercial and/or binary software releases
    and are under no obligation to redistribute any of your source code
    that is built using DOC software. Note, however, that you may not do
@@ -26,7 +26,7 @@
    software in your software, though we encourage you to let [10]us know
    so we can promote your project in the [11]DOC software success
    stories.
-   
+
    The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are
    maintained by the [16]DOC Group at the [17]Institute for Software
    Integrated Systems (ISIS) and the [18]Center for Distributed Object
@@ -44,7 +44,7 @@
    modification of such Submissions is entirely at the discretion of the
    moderators of the open-source DOC software projects or their
    designees.
-   
+
    Submissions are provided by the submitter ``as is'' with no warranties
    whatsoever, including any warranty of merchantability, noninfringement
    of third party intellectual property, or fitness for any particular
@@ -62,13 +62,13 @@
    University, UC Irvine, or Vanderbilt University, their employees, or
    students be liable for any lost revenue or profits or other special,
    indirect and consequential damages.
-   
+
    DOC software is provided with no support and without any obligation on
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
    modification, or enhancement. A [19]number of companies around the
    world provide commercial support for DOC software, however.
-   
+
    DOC software is Y2K-compliant, as long as the underlying OS platform
    is Y2K-compliant. Likewise, DOC software is compliant with the new US
    daylight savings rule passed by Congress as "The Energy Policy Act of
@@ -77,7 +77,7 @@
    obtains time/date and calendaring information from operating systems
    users will not be affected by the new DST rules as long as they
    upgrade their operating systems accordingly.
-   
+
    The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington
    University, UC Irvine, and Vanderbilt University, may not be used to
    endorse or promote products or services derived from this source
@@ -88,13 +88,13 @@
    Vanderbilt University appear in their names, without express written
    permission from Washington University, UC Irvine, and Vanderbilt
    University.
-   
+
    If you have any suggestions, additions, comments, or questions, please
    let [20]me know.
-   
+
    [21]Douglas C. Schmidt
      _________________________________________________________________
-   
+
    Back to the [22]ACE home page.
 
 References
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index d6ae4ef405a..9465042d8bb 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 13 13:43:19 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * First cut integration point.
+
 Wed Feb 08 15:53:31 2006  Wallace Zhang  <zhangw@ociweb.com>
 
         * CIAO version 0.4.9 released.
@@ -5,19 +9,19 @@ Wed Feb 08 15:53:31 2006  Wallace Zhang  <zhangw@ociweb.com>
 Tue Feb  7 16:10:10 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/NodeManager/NodeManager.mpc
-        
+
           Fixed an ordering problem.
 
 Mon Feb  6 19:13:13 UTC 2006  William Otte    <wotte@dre.vanderbilt.edu>
 
         * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-        
+
           Fixed an export problem manifesting in VC8.
-        
+
         * performance-tests/Benchmark/Benchmark.mpc
-        
+
           Added an empty IDL_Files section to the servant to prevent
-          nmake from regenerating from the IDL file. 
+          nmake from regenerating from the IDL file.
 
 Mon Feb  6 13:54:39 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
diff --git a/TAO/CIAO/DAnCE/Deployment.xsd b/TAO/CIAO/DAnCE/Deployment.xsd
index c8a6399730b..7743791b54e 100644
--- a/TAO/CIAO/DAnCE/Deployment.xsd
+++ b/TAO/CIAO/DAnCE/Deployment.xsd
@@ -10,7 +10,7 @@
   <xsd:complexType name="Any">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -28,7 +28,7 @@
       <xsd:element name="alias" type="Deployment:AliasType"/>
       <xsd:element name="struct" type="Deployment:StructType"/>
       <xsd:element name="value" type="Deployment:ValueType"/>
-      <xsd:element name="union" type="Deployment:UnionType"/>      
+      <xsd:element name="union" type="Deployment:UnionType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -58,7 +58,7 @@
       <xsd:element name="discriminator" type="Deployment:DataValue"/>
       <xsd:element name="value" type="Deployment:DataValue"/>
       <xsd:element name="boxedValue" type="Deployment:DataValue"/>
-      <xsd:element name="member" type="Deployment:NamedValue"/>      
+      <xsd:element name="member" type="Deployment:NamedValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -70,7 +70,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="xsd:string"/>      
+      <xsd:element name="member" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -79,7 +79,7 @@
   <xsd:complexType name="ObjrefType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>      
+      <xsd:element name="typeId" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -89,7 +89,7 @@
   <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/>
   <xsd:complexType name="BoundedStringType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>      
+      <xsd:element name="bound" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -98,7 +98,7 @@
   <xsd:complexType name="FixedType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="digits" type="xsd:string"/>
-      <xsd:element name="scale" type="xsd:string"/>      
+      <xsd:element name="scale" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -107,7 +107,7 @@
   <xsd:complexType name="ArrayType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="length" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -116,7 +116,7 @@
   <xsd:complexType name="SequenceType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="bound" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -126,7 +126,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -136,7 +136,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="Deployment:StructMemberType"/>      
+      <xsd:element name="member" type="Deployment:StructMemberType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -145,7 +145,7 @@
   <xsd:complexType name="StructMemberType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -157,7 +157,7 @@
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="modifier" type="xsd:string"/>
       <xsd:element name="baseType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
+      <xsd:element name="member" type="Deployment:ValueMemberType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -167,7 +167,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="visibility" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -179,7 +179,7 @@
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="default" type="Deployment:UnionMemberType"/>
       <xsd:element name="discriminatorType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
+      <xsd:element name="member" type="Deployment:UnionMemberType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -189,7 +189,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="label" type="Deployment:DataValue"/>      
+      <xsd:element name="label" type="Deployment:DataValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -198,7 +198,7 @@
   <xsd:complexType name="NamedValue">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -209,7 +209,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connect" type="Deployment:Interconnect"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -221,7 +221,7 @@
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connection" type="Deployment:Bridge"/>
       <xsd:element name="connect" type="Deployment:Node"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -233,7 +233,7 @@
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connection" type="Deployment:Interconnect"/>
       <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -254,7 +254,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="node" type="Deployment:Node"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -262,13 +262,13 @@
   <xsd:element name="SharedResource" type="Deployment:SharedResource"/>
   <xsd:complexType name="Domain">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="UUID" type="xsd:string"/>  
+      <xsd:element name="UUID" type="xsd:string"/>
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
       <xsd:element name="node" type="Deployment:Node"/>
       <xsd:element name="interconnect" type="Deployment:Interconnect"/>
       <xsd:element name="bridge" type="Deployment:Bridge"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -279,7 +279,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>      
+      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -288,7 +288,7 @@
   <xsd:complexType name="PlanSubcomponentPropertyReference">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -299,7 +299,7 @@
       <xsd:element name="portName" type="xsd:string"/>
       <xsd:element name="provider" type="xsd:string"/>
       <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -313,7 +313,7 @@
       <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
       <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/>
       <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>
-      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/>      
+      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -327,7 +327,7 @@
       <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/>
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/>
-      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/>      
+      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -339,7 +339,7 @@
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
       <xsd:element name="execParameter" type="Deployment:Property"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>      
+      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -353,7 +353,7 @@
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="execParameter" type="Deployment:Property"/>
       <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/>      
+      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -372,7 +372,7 @@
       <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
       <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
       <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -384,7 +384,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -395,7 +395,7 @@
       <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -406,7 +406,7 @@
       <xsd:element name="targetName" type="xsd:string"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -416,7 +416,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -425,7 +425,7 @@
   <xsd:complexType name="ComponentPropertyDescription">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -440,7 +440,7 @@
       <xsd:element name="exclusiveProvider" type="xsd:string"/>
       <xsd:element name="exclusiveUser" type="xsd:string"/>
       <xsd:element name="optional" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>      
+      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -456,7 +456,7 @@
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="port" type="Deployment:ComponentPortDescription"/>
       <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -470,7 +470,7 @@
       <xsd:element name="execParameter" type="Deployment:Property"/>
       <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
       <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -480,7 +480,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="execParameter" type="Deployment:Property"/>
       <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/>
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/>      
+      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -490,7 +490,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>      
+      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -499,7 +499,7 @@
   <xsd:complexType name="SubcomponentPropertyReference">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -508,7 +508,7 @@
   <xsd:complexType name="SubcomponentPortEndpoint">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -520,7 +520,7 @@
       <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
       <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
       <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>      
+      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -532,7 +532,7 @@
       <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>      
+      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -542,7 +542,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
       <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/>
-      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/>      
+      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -558,7 +558,7 @@
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="capability" type="Deployment:Capability"/>
       <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -568,7 +568,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="requiredUUID" type="xsd:string"/>
       <xsd:element name="requiredName" type="xsd:string"/>
-      <xsd:element name="requiredType" type="xsd:string"/>      
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -581,7 +581,7 @@
       <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/>
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -595,7 +595,7 @@
       <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
       <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>
       <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>      
+      <xsd:element name="configProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -604,7 +604,7 @@
   <xsd:complexType name="PackagedComponentImplementation">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>      
+      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -613,7 +613,7 @@
   <xsd:complexType name="NamedImplementationArtifact">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>      
+      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -626,7 +626,7 @@
       <xsd:element name="componentPort" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
+      <xsd:element name="property" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -636,7 +636,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -646,7 +646,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="value" type="Deployment:Any"/>      
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -656,7 +656,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
+      <xsd:element name="property" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -665,7 +665,7 @@
   <xsd:complexType name="Property">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:Any"/>    
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -673,7 +673,7 @@
   <xsd:element name="Property" type="Deployment:Property"/>
   <xsd:complexType name="ExternalReferenceEndpoint">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="location" type="xsd:string"/>      
+      <xsd:element name="location" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -681,7 +681,7 @@
   <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/>
   <xsd:complexType name="ComponentExternalPortEndpoint">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="portName" type="xsd:string"/>      
+      <xsd:element name="portName" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -689,7 +689,7 @@
   <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
   <xsd:complexType name="ImplementationDependency">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="requiredType" type="xsd:string"/>     
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -697,7 +697,7 @@
   <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/>
   <xsd:complexType name="TopLevelPackageDescription">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="package" type="Deployment:PackageConfiguration"/>      
+      <xsd:element name="package" type="Deployment:PackageConfiguration"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
index 394369b12c7..a7123da88b4 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
@@ -23,7 +23,7 @@ CIAO::Deployment_Configuration::init (const char *filename)
 
   if (filename == 0)
     {
-      ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) Deployment_Configuration.cpp"
+      ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp"
                             ": Unable to identify the file name \n"));
       return -1;
     }
@@ -118,14 +118,25 @@ CIAO::Deployment_Configuration::get_node_manager (const char *name
 
   if (CORBA::is_nil (entry->int_id_.node_manager_.in ()))
     {
-      CORBA::Object_var temp = this->orb_->string_to_object
-        (entry->int_id_.IOR_.c_str ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_TRY
+        {
 
-      entry->int_id_.node_manager_ =
-        ::Deployment::NodeManager::_narrow (temp.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+          CORBA::Object_var temp = this->orb_->string_to_object
+                                   (entry->int_id_.IOR_.c_str ()
+                                    ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          entry->int_id_.node_manager_ =
+            ::Deployment::NodeManager::_narrow (temp.in ()
+                                                ACE_ENV_ARG_PARAMETER);
+        }
+      ACE_CATCHANY
+        {
+          ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp: "
+                      "Error while contacting NodeManager %s\n", name));
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
     }
   return ::Deployment::NodeManager::_duplicate
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
index ed69dfe37e9..263fb68e16e 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -6,7 +6,7 @@ project (DomainApplicationManager): ciao_deployment_svnt  {
   after += ExecutionManager_stub
 
   dynamicflags   = DOMAINAPPLICATIONMANAGER_BUILD_DLL
-  
+
   Source_Files {
     DomainApplicationManager_Impl.cpp
     Deployment_Configuration.cpp
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 729c5eab0ac..26b4776290a 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -618,6 +618,12 @@ startLaunch (const ::Deployment::Properties & configProperty,
 
       this->synchronize_shared_components_with_node_managers ();
     }
+  ACE_CATCH (Deployment::StartError,ex)
+    {
+      ACE_DEBUG ((LM_DEBUG, "DAM_Impl:StartError: %s, %s\n",
+      ex.name.in (),
+      ex.reason.in ()));
+    }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
@@ -798,6 +804,12 @@ finishLaunch (CORBA::Boolean start,
       // Establish bindings on external/shared components of this deployment plan.
       this->post_finishLaunch ();
     }
+  ACE_CATCH (Deployment::StartError, ex)
+    {
+      ACE_ERROR ((LM_ERROR, "DAM_Impl::finishLaunch - StartError: %s, %s\n",
+      ex.name.in (),
+      ex.reason.in ()));
+   }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
@@ -1024,7 +1036,7 @@ get_outgoing_connections (const Deployment::DeploymentPlan &plan,
                                      connections.inout (),
                                      is_getting_all_connections,
                                      is_search_new_plan
-                                                             ACE_ENV_ARG_PARAMETER))
+             ACE_ENV_ARG_PARAMETER))
       return 0;
   }
   return connections._retn ();
@@ -1093,9 +1105,12 @@ get_outgoing_connections_i (const char * instname,
             ACE_CString port_name =
               curr_conn.internalEndpoint[index].portName.in ();
 
-            ACE_DEBUG ((LM_ERROR, "Looking: %s,%s \n",
-                        name.c_str (),
-                        port_name.c_str ()));
+            if (CIAO::debug_level () > 10)
+              {
+                ACE_DEBUG ((LM_ERROR, "Looking: %s,%s \n",
+                            name.c_str (),
+                            port_name.c_str ()));
+              }
 
             bool found = false;
             // Now we have to search in the received
@@ -1115,7 +1130,6 @@ get_outgoing_connections_i (const char * instname,
                     ACE_OS::strcmp (curr_rev_conn.portName.in (),
                                     port_name.c_str ()) == 0)
                   {
-                    //ACE_DEBUG ((LM_DEBUG, "step5\n"));
                     retv.length (len+1);
                     retv[len].instanceName = instname;
                     retv[len].portName = endpoint.portName.in ();
@@ -1277,6 +1291,10 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyApplication");
   ACE_TRY
     {
+      // Passivate shared components also, which should delegate to EM to handle
+      this->passivate_shared_components ();
+
+      // Passivate all components associated with the plan
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
@@ -1300,17 +1318,31 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
                    ("DomainApplicationManager_Impl::destroyApplication",
                      error.c_str ()));
             }
+    ACE_DEBUG ((LM_DEBUG, "DAM_Impl: Invoking passivate on %s\n",
+          this->node_manager_names_[i].c_str ()));
 
           // Invoke ciao_passivate () operation on each cached NodeApplication object.
           ::Deployment::NodeApplication_ptr my_na =
               (entry->int_id_).node_application_.in ();
 
           my_na->ciao_passivate ();
+        }
+
+
+      // Remove all connections associated with the plan
+      for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
+        {
+          ACE_DEBUG ((LM_DEBUG, "DAM:DA Second for loop %s\n",
+          this->node_manager_names_[i].c_str ()));
+
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
+
+          this->artifact_map_.find (this->node_manager_names_[i], entry);
 
           Deployment::Connections_var connections =
             this->get_outgoing_connections (
               (entry->int_id_).child_plan_.in (),
-              true, // yes, get *all* the connections
+              true,  // yes, get *all* the connections
               true,  // yes, we search the current plan
               DomainApplicationManager_Impl::External_Connections
                                             ACE_ENV_ARG_PARAMETER);
@@ -1332,35 +1364,36 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
               if (this->is_shared_component (connections[j].instanceName.in ()))
                 {
                   // ask EM to remove the binding for us
+                  ACE_CString inst_name = connections[j].instanceName.in ();
                   CIAO::Component_Binding_Info *
-                      binding = this->populate_binding_info (
-                        connections[j].instanceName.in ());
+                    binding = this->populate_binding_info (inst_name.c_str ());
 
                   this->execution_manager_->finalize_global_binding (
                     *binding, false);
 
-                  // If this element is the last one in the sequence
-                  if (j == connections->length () - 1)
-                    {
-                      connections->length (connections->length () - 1);
-                      break;
-                    }
-
-                  // otherwise, remove this element from the list
-                  for (CORBA::ULong k = j; k < connections->length (); ++k)
-                    {
-                      connections[k] = connections [k + 1];
-                      connections->length (connections->length () - 1);
-                    }
+                  // Remove all the connections whose "source" component
+                  // is this component instance from the <connections> list
+                  this->purge_connections (connections,
+                                           inst_name.c_str ());
                 }
             }
 
-          entry->int_id_.node_application_->finishLaunch
-              (connections.in (),
-               true, // "true" ==> start the components
-               false // "false" => remove connections
-               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          if (connections->length () > 0)
+            {
+              entry->int_id_.node_application_->finishLaunch
+                (connections.in (),
+                 true, // "true" ==> start the components
+                 false // "false" => remove connections
+                 ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+        }
+
+      for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
+        {
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
+
+          this->artifact_map_.find (this->node_manager_names_[i], entry);
 
           // To invoke <destroy> operations on NodeManagers is the way to go.
 
@@ -1377,6 +1410,8 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
       // to clean up all the NodeApplicationManagers associated with this deployment
       // plan (one NodeApplicationManager per Node per plan).
 
+      // We should again activate those shared components
+      this->activate_shared_components ();
     }
   ACE_CATCHANY
     {
@@ -1614,3 +1649,105 @@ subtract_connections (const Deployment::Connections & left,
     }
   return retv._retn ();
 }
+
+void
+CIAO::DomainApplicationManager_Impl::
+purge_connections (Deployment::Connections_var & connections,
+                   const char * inst)
+{
+  CORBA::ULong total_len = connections->length ();
+
+  for (CORBA::ULong i = 0; i < total_len; ++i)
+    {
+      bool found = false;
+
+      // Remove all the connections whose "source" component
+      // name is <inst>
+      if (ACE_OS::strcmp (connections[i].instanceName.in (),
+                          inst) == 0)
+        {
+          found = true;
+
+          for (CORBA::ULong j = i; j < total_len - 1; ++j)
+            {
+              connections[j] = connections[j + 1];
+            }
+          connections->length (total_len - 1);
+        }
+
+      if (found)
+        this->purge_connections (connections, inst);
+    }
+}
+
+void
+CIAO::DomainApplicationManager_Impl::
+passivate_shared_components (void)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StartError))
+{
+  ACE_TRY
+    {
+      // For each "external" component...
+      CORBA::ULong length = this->shared_->length ();
+      for (CORBA::ULong j = 0; j < length; ++j)
+        {
+          // Construct <Component_Binding_Info> struct for the component
+          CIAO::Component_Binding_Info *
+              binding = this->populate_binding_info (
+                this->shared_[j].name.in (),
+                this->shared_[j].plan_uuid.in ());
+
+          // Invoke <finalize_global_binding> on ExecutionManager
+          this->execution_manager_->passivate_shared_components (
+            *binding);
+
+          delete binding;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::passivate_shared_components.\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+
+  ACE_CHECK;
+}
+
+void
+CIAO::DomainApplicationManager_Impl::
+activate_shared_components (void)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StartError))
+{
+  ACE_TRY
+    {
+      // For each "external" component...
+      CORBA::ULong length = this->shared_->length ();
+      for (CORBA::ULong j = 0; j < length; ++j)
+        {
+          // Construct <Component_Binding_Info> struct for the component
+          CIAO::Component_Binding_Info *
+              binding = this->populate_binding_info (
+                this->shared_[j].name.in (),
+                this->shared_[j].plan_uuid.in ());
+
+          // Invoke <finalize_global_binding> on ExecutionManager
+          this->execution_manager_->activate_shared_components (
+            *binding);
+
+          delete binding;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
+                            "DomainApplicationManager_Impl::activate_shared_components.\n");
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+
+  ACE_CHECK;
+}
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index 837c6b4291d..f18e5b6206e 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -58,7 +58,7 @@ namespace CIAO
     // port objrefs of components within this plan
     enum Connection_Search_Type
       {
-        External_Connections, 
+        External_Connections,
         Internal_Connections
       };
 
@@ -183,6 +183,15 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                       Deployment::StartError));
 
+    virtual void passivate_shared_components (void)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+    virtual void activate_shared_components (void)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+
     /**
      * Starts the application. Raises the StartError exception if
      * starting the application fails.
@@ -220,7 +229,7 @@ namespace CIAO
 
     // The input parameter is a *new_plan* which has the
     // same UUID of the existing running plan.
-    virtual void 
+    virtual void
     perform_redeployment (
       const Deployment::DeploymentPlan & plan
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -256,12 +265,12 @@ namespace CIAO
 
     /**
      * Construct <Component_Binding_Info> struct for the component instance.
-     * 
+     *
      * @para name component instance name
      * @para child_uuid child plan uuid string
      */
     CIAO::Component_Binding_Info *
-      populate_binding_info (const ACE_CString& name, 
+      populate_binding_info (const ACE_CString& name,
                              const ACE_CString& child_uuid);
 
     /**
@@ -281,9 +290,9 @@ namespace CIAO
     void synchronize_shared_components_with_node_managers (void);
 
     /**
-     * A helper function to add a list of shared components into 
+     * A helper function to add a list of shared components into
      * the cached shared component list.
-     * 
+     *
      * @para shared A list of shared components to be added.
      */
     void add_shared_components (const Deployment::ComponentPlans & shared);
@@ -291,7 +300,7 @@ namespace CIAO
     /**
      * A private function to check whether a component is in the shared
      * component list.
-     * 
+     *
      * @para name The name of a component instance.
      */
     bool is_shared_component (const char * name);
@@ -313,7 +322,7 @@ namespace CIAO
                               bool is_getting_all_connections = true,
                               bool is_search_new_plan = true,
                               Connection_Search_Type t = Internal_Connections
-			                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /// This is a helper function to find the connection for a component.
     bool
@@ -321,7 +330,7 @@ namespace CIAO
                                 Deployment::Connections & retv,
                                 bool is_ReDAC,
                                 bool is_search_new_plan
-				                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((Deployment::StartError));
 
     /// Dump connections, a static method
@@ -335,6 +344,10 @@ namespace CIAO
     subtract_connections (const Deployment::Connections & left,
                           const Deployment::Connections & right);
 
+    void
+    purge_connections (Deployment::Connections_var & connections,
+                       const char * inst);
+
   protected:
     /// location of the Domainapplication
     CORBA::String_var domainapp_path_;
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
index 2be163c6908..841bd1a437e 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
@@ -52,7 +52,7 @@ namespace CIAO
       get_dams (ACE_ENV_SINGLE_ARG_DECL);
 
       bool unbind_dam (const ACE_CString &str);
-      
+
       size_t size (void);
 
     private:
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 2c62f431071..cfb3b55fc70 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -18,25 +18,30 @@ namespace CIAO
   {
     const char *ior_file_name_ = "executionManager.ior";
     const char *init_file_name = "deployment.dat";
-
-    bool register_with_ns_ = 0;
+    const char *pid_file_name_ = 0;
+    static bool register_with_ns_ = false;
+    static bool write_to_ior_ = false;
 
     bool
     parse_args (int argc, char *argv[])
     {
-      ACE_Get_Opt get_opts (argc, argv, "o:m:i:n");
+      ACE_Get_Opt get_opts (argc, argv, "o:m:i:n:p");
       int c;
       while ((c = get_opts ()) != -1)
         switch (c)
           {
           case 'o':
+            write_to_ior_ = true;
             ior_file_name_ = get_opts.opt_arg ();
             break;
           case 'i':
             init_file_name = get_opts.opt_arg ();
             break;
           case 'n':
-            register_with_ns_ = 1;
+            register_with_ns_ = true;
+            break;
+          case 'p':
+            pid_file_name_ = get_opts.opt_arg ();
             break;
           case '?':  // display help for use of the server.
           default:
@@ -79,6 +84,23 @@ namespace CIAO
       return true;
     }
 
+    void
+    write_pid (void)
+    {
+      if (pid_file_name_ == 0)
+        return;
+
+      FILE* pid_file = ACE_OS::fopen (pid_file_name_, "w");
+
+      if (pid_file)
+        {
+          ACE_OS::fprintf (pid_file,
+                           "%i",
+                           ACE_OS::getpid ());
+          ACE_OS::fclose (pid_file);
+        }
+    }
+
     bool
     register_with_ns (CORBA::ORB_ptr orb,
                       CIAO::ExecutionManagerDaemon_ptr obj
@@ -94,18 +116,23 @@ namespace CIAO
         CosNaming::NamingContext::_narrow (naming_context_object.in ());
 
       // Initialize the Naming Sequence
-      CosNaming::Name name (2);
-      name.length (2);
+      CosNaming::Name name (1);
+      name.length (1);
 
       // String dup required for MSVC6
-      name[0].id = CORBA::string_dup ("CIAO");
-      name[1].id = CORBA::string_dup ("ExecutionManager");
+      name[0].id = CORBA::string_dup ("ExecutionManager");
 
       // Register the servant with the Naming Service
-      naming_context->bind (name,
-                            obj
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      try
+        {
+          // Register the servant with the Naming Service
+          naming_context->bind (name, obj);
+        }
+      catch (CosNaming::NamingContext::AlreadyBound &)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Execution_Manager.cpp: Name already bound, rebinding....\n"));
+          naming_context->rebind (name, obj);
+        }
 
       return true;
     }
@@ -141,9 +168,9 @@ namespace CIAO
 
           if (poa.in () == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
-                              "(%P|%t) CIAO_ExecutionManager: "
+                               "(%P|%t) CIAO_ExecutionManager: "
                                "Nil POA panic error, returning \n"),
-                               -1);
+                              -1);
 
           // Create and install the CIAO Daemon servant
           Execution_Manager_Impl *daemon_servant = 0;
@@ -160,7 +187,7 @@ namespace CIAO
             daemon_servant->_this ();
 
           TAO::Utils::Implicit_Deactivator de (daemon_servant);
-                                               
+
           ACE_TRY_CHECK;
 
           bool retval = false;
@@ -173,7 +200,8 @@ namespace CIAO
                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          else
+
+          if (write_to_ior_)
             {
               retval =
                 write_ior_file (orb.in (),
@@ -194,7 +222,7 @@ namespace CIAO
             ACE_ERROR_RETURN ((LM_ERROR,
                                "(%P|%t) CIAO_ExecutionManager: "
                                "Nil POA Manager error, returning \n"),
-                               -1);
+                              -1);
 
           mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -203,6 +231,8 @@ namespace CIAO
           ACE_DEBUG ((LM_DEBUG,
                       "CIAO_ExecutionManager is running...\n"));
 
+          write_pid ();
+
           // Run the main event loop for the ORB.
           orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -239,5 +269,5 @@ int
 main (int argc, char *argv[])
 {
   return CIAO::Execution_Manager::run_main (argc,
-                                           argv);
+                                            argv);
 }
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
index 4f9ce7f9405..06ba9fb8276 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
@@ -48,8 +48,15 @@ namespace CIAO
       // No need to create a new DAM. Hence pass the
       // reference that is already created.
       //
-      if (this->map_.is_plan_available (plan.UUID.in ()))
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) calling this->man_.is_plan_available()...\n"));
+      if (this->map_.is_plan_available (plan.UUID.in ())) {
+  ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Plan is already available; "
+        "calling this->man_.fetch_dam_reference()...\n"));
+
         return this->map_.fetch_dam_reference (plan.UUID.in ());
+      }
+      else
+  ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Plan wasn't already available\n"));
 
       // We are about to begin working on a new DeploymentPlan.
       // Create a DAM servant, which will be populated
@@ -60,6 +67,7 @@ namespace CIAO
       // Create a new Domain Application Manager servant
       // to be sent back to the Plan Launcher.
       //
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to instantiate CIAO::DomainApplicationManager_Impl\n"));
       ACE_NEW_THROW_EX (
         dam_servant,
         CIAO::DomainApplicationManager_Impl (
@@ -70,6 +78,7 @@ namespace CIAO
           plan,
           this->init_file_.c_str ()),
           CORBA::NO_MEMORY ());
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Instantiated CIAO::DomainApplicationManager_Impl\n"));
 
       // Sanity check for NULL pointer
       // Should we throw an exception here?
@@ -88,6 +97,7 @@ namespace CIAO
       // plans, so that those plans can be sent off to individual
       // Node Application Managers.
       //
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to init...\n"));
       dam_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       // This is a wrong exception to be thrown here.
@@ -97,6 +107,7 @@ namespace CIAO
       //
       ACE_CHECK_RETURN (::Deployment::DomainApplicationManager::_nil ());
 
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to set uuid on DAM...\n"));
       dam_servant->set_uuid (plan.UUID.in ());
 
       Deployment::DomainApplicationManager_var dam =
@@ -107,6 +118,7 @@ namespace CIAO
       this->map_.bind_dam_reference (
         plan.UUID.in (),
         Deployment::DomainApplicationManager::_duplicate (dam.in ()));
+      ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) Bound DAM reference...\n"));
 
       // Return the ApplicationManager instance
       return dam._retn ();
@@ -146,7 +158,7 @@ namespace CIAO
           ACE_TRY_CHECK;
 
           // What if we still have components running within this plan?
-          // 
+          //
           (void) this->map_.unbind_dam (plan->UUID.in ());
 
           // Where does the POA deactivate happen?
@@ -205,7 +217,7 @@ namespace CIAO
           CORBA::ULong inst_lenth = plan->instance.length ();
           for (CORBA::ULong i = 0; i < inst_lenth; ++i)
             {
-              if (this->is_component_running (plan->instance[i].name.in (), 
+              if (this->is_component_running (plan->instance[i].name.in (),
                                               plan_uuid))
                 return;
             }
@@ -249,7 +261,7 @@ namespace CIAO
       ACE_CHECK;
     }
 
-    void 
+    void
     Execution_Manager_Impl::perform_redeployment (
       const Deployment::DeploymentPlan & plan
       ACE_ENV_ARG_DECL)
@@ -263,7 +275,7 @@ namespace CIAO
                        ::Components::RemoveFailure))
     {
       CIAO_TRACE ("CIAO::Execution_Manager_Impl::perform_redeployment");
-    
+
       ACE_DEBUG ((LM_DEBUG,
                   "CIAO (%P|%t) Dynamic Redeployment: "
                   "invoked CIAO::Execution_Manager_Impl::perform_redeployment \n"));
@@ -299,7 +311,7 @@ namespace CIAO
       ACE_CHECK;
     }
 
-    Deployment::DeploymentPlan * 
+    Deployment::DeploymentPlan *
     Execution_Manager_Impl::getPlan (const char * plan_uuid
                                      ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((::CORBA::SystemException))
@@ -339,10 +351,10 @@ namespace CIAO
           ::CORBA::SystemException,
           ::Deployment::InvalidConnection))
     {
-      ACE_DEBUG ((LM_ERROR, 
+      ACE_DEBUG ((LM_ERROR,
                   "Execution_Manage::finalizing  global bindings.\n"));
 
-      // Find the NodeApplication hosting the component, and then call 
+      // Find the NodeApplication hosting the component, and then call
       // <finishLaunch> on it
       ACE_TRY
       {
@@ -376,7 +388,80 @@ namespace CIAO
       ACE_ENDTRY;
     }
 
-    Deployment::NodeApplication_ptr 
+    void
+    Execution_Manager_Impl::passivate_shared_components (
+          const Component_Binding_Info & binding)
+        ACE_THROW_SPEC ((
+          ::CORBA::SystemException,
+          Deployment::StartError))
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "Execution_Manage::passivate shared components.\n"));
+
+      // Find the NodeApplication hosting the component, and then call
+      // <finishLaunch> on it
+      ACE_TRY
+      {
+        Deployment::NodeApplication_var
+          node_app = this->find_node_application (binding);
+
+        if (CORBA::is_nil (node_app.in ()))
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        "Execution_Manager_Impl::passivate_shared_components - "
+                        "nil NodeApplication object reference.\n"));
+            ACE_THROW (Deployment::StartError ());
+          }
+
+        node_app->passivate_component (binding.name_.c_str ());
+      }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::passivate_shared_components\t\n");
+          ACE_THROW (Deployment::StartError ());
+        }
+      ACE_ENDTRY;
+    }
+
+    void
+    Execution_Manager_Impl::activate_shared_components (
+          const Component_Binding_Info & binding)
+        ACE_THROW_SPEC ((
+          ::CORBA::SystemException,
+          Deployment::StartError))
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "Execution_Manage::activate shared components.\n"));
+
+      // Find the NodeApplication hosting the component, and then call
+      // <ciao_activate> on it
+      ACE_TRY
+      {
+        Deployment::NodeApplication_var
+          node_app = this->find_node_application (binding);
+
+        if (CORBA::is_nil (node_app.in ()))
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        "Execution_Manager_Impl::activate_shared_components - "
+                        "nil NodeApplication object reference.\n"));
+            ACE_THROW (Deployment::StartError ());
+          }
+
+        node_app->activate_component (binding.name_.c_str ());
+      }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Execution_Manager_Impl::passivate_shared_components\t\n");
+          ACE_THROW (Deployment::StartError ());
+        }
+      ACE_ENDTRY;
+    }
+
+
+    Deployment::NodeApplication_ptr
     Execution_Manager_Impl::
     find_node_application (const Component_Binding_Info & binding)
       ACE_THROW_SPEC ((
@@ -399,7 +484,7 @@ namespace CIAO
 
       // Find the NA based on the NodeName field of the binding
       // This is a CORBA call on the DAM
-      Deployment::NodeApplication_var 
+      Deployment::NodeApplication_var
         node_app = dam->get_node_app (binding.node_.c_str ());
 
       if (CORBA::is_nil (node_app.in ()))
@@ -414,14 +499,14 @@ namespace CIAO
       return node_app._retn ();
     }
 
-    void 
+    void
     Execution_Manager_Impl::
     add_shared_component (const Component_Binding_Info & comp)
     {
       this->shared_components_.insert (comp);
     }
 
-    void 
+    void
     Execution_Manager_Impl::
     remove_shared_component (const Component_Binding_Info & comp)
     {
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
index 523413e1c91..a64fb545f33 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
@@ -77,7 +77,7 @@ namespace CIAO
 
       // Below method is CIAO specific extension, please see the IDL
       // definition for more details.
-      virtual void 
+      virtual void
       destroyManagerByPlan (const char * plan_uuid
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((::CORBA::SystemException,
@@ -121,25 +121,35 @@ namespace CIAO
         ::CORBA::SystemException,
         ::Deployment::InvalidConnection));
 
+    virtual void passivate_shared_components (
+        const Component_Binding_Info & binding)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
+    virtual void activate_shared_components (
+        const Component_Binding_Info & binding)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                      Deployment::StartError));
+
       /// Add shared component information.
       /// This call will be made by DomainApplicationManager.
-      virtual void 
+      virtual void
         add_shared_component (const Component_Binding_Info & binding);
 
       /// Remove shared component
-      virtual void 
+      virtual void
         remove_shared_component (const Component_Binding_Info & binding);
 
       /// If the input component <name> was found in the internal
       /// cached shared component list, and the plan_uuid also matches,
-      /// then this member function returns <true>, otherwise it 
+      /// then this member function returns <true>, otherwise it
       /// returns <false>.
       virtual bool
         is_component_running (const char * name, const char * plan_uuid);
 
     protected:
       /// Return the NodeApplication hosting the given biding
-      virtual Deployment::NodeApplication_ptr 
+      virtual Deployment::NodeApplication_ptr
         find_node_application (const Component_Binding_Info & binding)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
diff --git a/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc b/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
index 0b42adc33f2..8f8933283a2 100644
--- a/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
+++ b/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
@@ -5,7 +5,7 @@ project (ExecutionManager_stub): ciao_component_dnc {
 
   sharedname = ExecutionManager_stub
 
-  idlflags += -Wb,stub_export_macro=ExecutionManager_stub_Export 
+  idlflags += -Wb,stub_export_macro=ExecutionManager_stub_Export
   idlflags += -Wb,stub_export_include=ExecutionManager_stub_export.h
 
   dynamicflags = EXECUTIONMANAGER_STUB_BUILD_DLL
@@ -22,7 +22,7 @@ project (ExecutionManager_stub): ciao_component_dnc {
 project (NodeManager_stub): ciao_component_dnc {
   sharedname = NodeManager_stub
 
-  idlflags     += -Wb,stub_export_macro=NodeManager_stub_Export 
+  idlflags     += -Wb,stub_export_macro=NodeManager_stub_Export
   idlflags     += -Wb,stub_export_include=NodeManager_stub_export.h
   idlflags     += -Wb,skel_export_macro=NodeManager_svnt_Export
   idlflags     += -Wb,skel_export_include=NodeManager_svnt_export.h
@@ -36,4 +36,4 @@ project (NodeManager_stub): ciao_component_dnc {
   Source_Files {
    NodeManagerC.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/CIAO/DAnCE/Interfaces/NodeManager.idl b/TAO/CIAO/DAnCE/Interfaces/NodeManager.idl
index ea964a4e14b..75f1dc617ea 100644
--- a/TAO/CIAO/DAnCE/Interfaces/NodeManager.idl
+++ b/TAO/CIAO/DAnCE/Interfaces/NodeManager.idl
@@ -19,10 +19,16 @@ module CIAO
    */
   interface NodeManager : Deployment::NodeManager
   {
-    // Canonical name of this daemon
+    /// Canonical name of this daemon
     readonly attribute string name;
 
-    // Shutdown the daemon process.
+    /// Shutdown the daemon process.
     oneway void shutdown ();
+
+    /// RACE specific extension.
+    /// Modify the priority of a node application process.
+    long set_priority (in string plan_id,
+                       in string cid,
+                       in ::Deployment::Sched_Params nm_params);
   };
 };
diff --git a/TAO/CIAO/DAnCE/Interfaces/README b/TAO/CIAO/DAnCE/Interfaces/README
index 5553fdde229..0118689ad70 100644
--- a/TAO/CIAO/DAnCE/Interfaces/README
+++ b/TAO/CIAO/DAnCE/Interfaces/README
@@ -1,2 +1,2 @@
-To resolve the MPC issue of directory dependency, we have to put some IDL 
-files into a separate directory. This directory servers for this purpose.
\ No newline at end of file
+To resolve the MPC issue of directory dependency, we have to put some IDL
+files into a separate directory. This directory servers for this purpose.
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
index 0b54350047a..3facc261b5a 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
@@ -26,6 +26,13 @@ CIAO::NodeApplication_Options::parse_args (int argc, char *argv[])
         this->rt_support_ = 1;
         shifter.consume_arg ();
       }
+    else if (ACE_OS::strncmp (shifter.get_current (),
+                              "-ORB",
+                              ACE_OS::strlen ("-ORB")) == 0)
+      {
+        // Ignore ORB parameter
+        shifter.ignore_arg ();
+      }
     else if ((parm = shifter.get_the_parameter ("-o")) !=0)
       {
         this->ior_output_filename_ = parm;
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
index 30db3d0ba3a..7b459a75bdc 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
@@ -17,6 +17,7 @@ CIAO::Container_Impl::~Container_Impl ()
 PortableServer::POA_ptr
 CIAO::Container_Impl::_default_POA (void)
 {
+  CIAO_TRACE ("CIAO::Container_Impl::_default_POA");
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
@@ -27,6 +28,7 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies
                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::init");
   // @@ Initialize container and create the internal container
   // implementation that actually interacts with installed
   // homes/components.
@@ -47,7 +49,7 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies
   else
     {
       ACE_NEW_THROW_EX (this->container_,
-                        CIAO::Session_Container (this->orb_.in (), this, 1, 
+                        CIAO::Session_Container (this->orb_.in (), this, 1,
                                                  this->static_entrypts_maps_),
                         CORBA::INTERNAL ());
       ACE_CHECK_RETURN (-1);
@@ -70,6 +72,7 @@ CIAO::Container_Impl::install (
                   ::Deployment::InstallationFailure,
                   ::Components::InvalidConfiguration))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::install");
   Deployment::ComponentInfos_var retv;
   ACE_TRY
    {
@@ -78,7 +81,7 @@ CIAO::Container_Impl::install (
                        CORBA::NO_MEMORY ());
      ACE_TRY_CHECK;
 
-     // Get the ComponentImplementationInfos from the 
+     // Get the ComponentImplementationInfos from the
      // ContainerImplementationInfo
      // to avoid too long syntax representation
      const ::Deployment::ComponentImplementationInfos impl_infos =
@@ -111,7 +114,7 @@ CIAO::Container_Impl::install (
          if (CORBA::is_nil (comp.in ()))
            ACE_TRY_THROW (Deployment::InstallationFailure ());
 
-         if (this->component_map_.bind 
+         if (this->component_map_.bind
                 (impl_infos[i].component_instance_name.in (),
                  Components::CCMObject::_duplicate (comp.in ())))
            {
@@ -128,7 +131,7 @@ CIAO::Container_Impl::install (
          (*retv)[i].component_instance_name
            = impl_infos[i].component_instance_name.in ();
 
-         (*retv)[i].component_ref = 
+         (*retv)[i].component_ref =
              Components::CCMObject::_duplicate (comp.in ());
 
          // Deal with Component instance related Properties.
@@ -143,7 +146,7 @@ CIAO::Container_Impl::install (
          for (CORBA::ULong prop_len = 0; prop_len < clen; ++prop_len)
            {
              // Set up the ComponentIOR attribute
-             if (ACE_OS::strcmp 
+             if (ACE_OS::strcmp
                   (impl_infos[i].component_config[prop_len].name.in (),
                    "ComponentIOR") == 0)
                {
@@ -165,7 +168,7 @@ CIAO::Container_Impl::install (
                }
 
              // Set up the naming service attribute
-             if (ACE_OS::strcmp 
+             if (ACE_OS::strcmp
                   (impl_infos[i].component_config[prop_len].name.in (),
                    "RegisterNaming") == 0)
                {
@@ -174,26 +177,29 @@ CIAO::Container_Impl::install (
                     component_config[prop_len].value >>= naming_context;
 
                  // Register the component with the naming service
-                 ACE_DEBUG ((LM_DEBUG, 
+                 ACE_DEBUG ((LM_DEBUG,
                              "Register component with naming service.\n"));
-                 bool result = register_with_ns (naming_context,
-                                                 this->orb_.in (),
-                                                 comp.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+                 bool result =
+                   register_with_ns (
+                           naming_context,
+                           this->orb_.in (),
+                           Components::CCMObject::_duplicate (comp.in ())
+                           ACE_ENV_ARG_PARAMETER
+                         );
                  ACE_TRY_CHECK;
 
                  if (!result)
                    {
-                     ACE_DEBUG ((LM_DEBUG, 
+                     ACE_DEBUG ((LM_DEBUG,
                                  "Failed to register with naming service.\n"));
                    }
 
                }
 
              // Initialize attributes through StandardConfigurator interface
-             // @@Todo: Currently I have to manually map 
-             // the Deployment::Properties to 
-             // Components::ConfigValues, we should use a 
+             // @@Todo: Currently I have to manually map
+             // the Deployment::Properties to
+             // Components::ConfigValues, we should use a
              // common data structure in
              // the future. - Gan
              CORBA::ULong cur_len = comp_attributes.length ();
@@ -206,11 +212,11 @@ CIAO::Container_Impl::install (
 
              comp_attributes[cur_len] = item;
            }
-           
+
          if (comp_attributes.length () != 0)
          {
            //std_configurator.set_configuration
-           ::Components::StandardConfigurator_var std_configurator = 
+           ::Components::StandardConfigurator_var std_configurator =
              comp->get_standard_configurator ();
 
            std_configurator->set_configuration (comp_attributes);
@@ -233,6 +239,7 @@ CIAO::Container_Impl::install (
 CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::properties");
   ::Deployment::Properties *retval;
 
   ACE_NEW_THROW_EX (retval,
@@ -249,6 +256,7 @@ CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
 CIAO::Container_Impl::get_node_application (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::get_node_application");
   return ::Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
 }
 
@@ -262,6 +270,7 @@ CIAO::Container_Impl::install_home (
                    Deployment::InstallationFailure,
                    Components::InvalidConfiguration))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::install_home");
   if (CIAO::debug_level () > 9)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -319,6 +328,8 @@ CIAO::Container_Impl::remove_home (const char * comp_ins_name
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::remove_home");
+
   Components::CCMHome_ptr home;
   ACE_CString str (comp_ins_name);
 
@@ -344,6 +355,7 @@ CIAO::Container_Impl::remove_home (const char * comp_ins_name
 CIAO::Container_Impl::get_homes (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::get_homes");
   Components::CCMHomes * tmp;
   ACE_NEW_THROW_EX (tmp,
                     Components::CCMHomes (),
@@ -374,6 +386,8 @@ CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::remove");
+
   // Remove all components first.
   this->remove_components (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -393,9 +407,8 @@ CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
 
   this->home_map_.unbind_all ();
 
-  //if (CIAO::debug_level () > 1)
-  if (true)
-    ACE_DEBUG ((LM_DEBUG, 
+  if (CIAO::debug_level () > 3)
+    ACE_DEBUG ((LM_DEBUG,
                 "Removed all homes and components from this container!\n"));
 }
 
@@ -408,6 +421,8 @@ CIAO::Container_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::remove_components");
+
   // Remove all the components in the NodeApplication/Container
   // Release all component servant object.
   const Component_Iterator end = this->component_map_.end ();
@@ -442,11 +457,17 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
+  CIAO_TRACE ("CIAO::Container_Impl::remove_component");
+
   Components::CCMObject_var comp;
   Components::CCMHome_ptr home;
 
   ACE_CString str (comp_ins_name);
 
+  if (CIAO::debug_level () > 5)
+    ACE_DEBUG ((LM_DEBUG, "CIAO::COntainer_Impl::remove_component: Removing comp_ins_name:: %s\n",
+                str.c_str ()));
+
   /* Before we do remove component we have to inform the homeservant so
    * Component::ccm_passivate ()
    * constainer::uninstall_component () ->deactivate_object () will be called.
@@ -469,47 +490,77 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
   // @@ Still need to remove the home if the previous operation fails?
   if (this->component_map_.unbind (str) == -1)
     ACE_THROW (::Components::RemoveFailure ());
+
 }
 
 bool
-CIAO::Container_Impl::register_with_ns (const char * obj_name,
+CIAO::Container_Impl::register_with_ns (const char * s,
                                         CORBA::ORB_ptr orb,
                                         Components::CCMObject_ptr obj
                                         ACE_ENV_ARG_DECL)
 {
+  CIAO_TRACE ("CIAO::Container_Impl::register_with_ns");
+
   ACE_TRY
     {
-	  // Obtain the naming service
+    // Obtain the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" 
+        orb->resolve_initial_references ("NameService"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to get the Naming Service.\n"),
-                          false);
+                           "DAnCE: (%P|%t) Unable to get the Naming Service.\n"),
+                           false);
 
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () 
-                                           ACE_ENV_ARG_PARAMETER);
+      CosNaming::NamingContextExt_var root =
+        CosNaming::NamingContextExt::_narrow (naming_obj.in ()
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-  
-      // Create a Naming Sequence
-      CosNaming::Name name (1);
-      name.length (1);
-      name[0].id = CORBA::string_dup (obj_name);
-      name[0].kind = CORBA::string_dup ("");
 
-      // Register with the Name Server
-      naming_context->bind (name, obj ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosNaming::Name name (0);
+      name.length (0);
+
+      // Get the multicomponent naming context from the <naming_context>.
+      // The convention of this <naming_context> input string is that
+      // different naming context is separated by character '/', such as
+      // "create a naming context A/B/C/D".
+      ACE_CString tmp (s);
+      char * naming_string = tmp.rep ();
+      char seps[]   = "/:";
+
+      char *token, *lastToken = NULL;
+      token = ACE_OS::strtok (naming_string, seps);
+
+      for (CORBA::ULong i = 0; token != NULL; ++i)
+        {
+            // While there still are tokens in the "naming_string"
+            name.length (name.length () + 1);
+            name[i].id = CORBA::string_dup (token);
+
+            // Get next naming context
+            lastToken = token;
+            token = ACE_OS::strtok ( NULL, seps );
+        }
+
+      if (name.length() > 1)
+         {
+            // Let's create the context path first
+            name.length(name.length()-1);
+            Utility::NameUtility::CreateContextPath (root.in (), name);
+            name.length(name.length()+1);
+            name[name.length()-1].id = CORBA::string_dup(lastToken);
+         }
+
+      // Bind the actual object
+      Utility::NameUtility::BindObjectPath (root.in (), name, obj);
 
       return true;
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "CIAO (%P|%t) Container_Impl.cpp -"
                            "CIAO::Container_Impl::register_with_ns -"
                            "NodeApplication: failed to register "
@@ -525,11 +576,13 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
                                           CORBA::ORB_ptr orb
                                           ACE_ENV_ARG_DECL)
 {
+  CIAO_TRACE ("CIAO::Container_Impl::unregister_with_ns");
+
   ACE_TRY
     {
-	  // Obtain the naming service
+    // Obtain the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" 
+        orb->resolve_initial_references ("NameService"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -539,10 +592,10 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
                           false);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () 
+        CosNaming::NamingContext::_narrow (naming_obj.in ()
                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-  
+
       // Create a Naming Sequence
       CosNaming::Name name (1);
       name.length (1);
@@ -550,8 +603,8 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
       name[0].kind = CORBA::string_dup ("");
 
       // Register with the Name Server
-      ACE_DEBUG ((LM_DEBUG, 
-                  "Unregister component with the name server : %s!\n", 
+      ACE_DEBUG ((LM_DEBUG,
+                  "Unregister component with the name server : %s!\n",
                   obj_name));
       naming_context->unbind (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -560,7 +613,7 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "CIAO (%P|%t) Container_Impl.cpp -"
                            "CIAO::Container_Impl::unregister_with_ns -"
                            "NodeApplication: failed to unregister "
@@ -570,4 +623,3 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
   ACE_ENDTRY;
   return true;
 }
-
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.h
index 3f3bb550cf0..b877587758f 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -208,7 +208,7 @@ protected:
                                     ACE_Null_Mutex> CCMComponent_Map;
     typedef CCMComponent_Map::iterator Component_Iterator;
     CCMComponent_Map component_map_;
-    
+
     const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
   };
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.inl b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.inl
index b0ee9c6d558..e25d1e7e38e 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.inl
+++ b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.inl
@@ -17,6 +17,8 @@ ACE_INLINE void
 CIAO::Container_Impl::set_objref (Deployment::Container_ptr o
                                   ACE_ENV_ARG_DECL)
 {
+  CIAO_TRACE("CIAO::Container_Imp::set_objref");
+
   if (!CORBA::is_nil (this->objref_.in ()))
     ACE_THROW (CORBA::BAD_INV_ORDER ());
 
@@ -26,6 +28,8 @@ CIAO::Container_Impl::set_objref (Deployment::Container_ptr o
 ACE_INLINE ::Deployment::Container_ptr
 CIAO::Container_Impl::get_objref (ACE_ENV_SINGLE_ARG_DECL)
 {
+  CIAO_TRACE("CIAO::Container_Imp::get_objref");
+
   if (CORBA::is_nil (this->objref_.in ()))
     {
       this->objref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h
index ff536b23cf0..6c32b83ce0d 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h
@@ -24,7 +24,7 @@ namespace CIAO
    *
    * @brief The NoOp_Configurator doesn't do anything.
    */
-  class NoOp_Configurator_Export NoOp_Configurator 
+  class NoOp_Configurator_Export NoOp_Configurator
     : public NodeApp_Configurator
   {
   public:
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index 4ceab08ebdb..27379d47950 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -1,9 +1,31 @@
 // $Id$
 #include "NodeApplication_Core.h"
+#include "ace/Sched_Params.h"
+#include "ace/OS_NS_errno.h"
+#include "ciao/CIAO_common.h"
+
 
 int
 main (int argc, char *argv[])
 {
+   int priority = 20;
+   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_RR,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (errno == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
   ACE_TRY_NEW_ENV
     {
       ACE_DEBUG ((LM_DEBUG, "*** Starting NodeApplication\n"));
@@ -30,6 +52,8 @@ main (int argc, char *argv[])
     }
   ACE_ENDTRY;
 
-  ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) - This NodeApplication is destroyed!\n"));
+  if (CIAO::debug_level () > 1)
+    ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) - This NodeApplication is destroyed!\n"));
+
   return 0;
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index 1d9b07d6cb7..b2769803d9f 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -23,7 +23,7 @@ project(NoOp_Configurator): ciao_component_dnc {
     NoOp_Configurator.cpp
   }
 }
-    
+
 project(RTNA_Configurator): ciao_component_dnc, rt_server {
   sharedname   = CIAO_RTNA_Configurator
   dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
@@ -32,4 +32,4 @@ project(RTNA_Configurator): ciao_component_dnc, rt_server {
     RTNodeApp_Configurator.cpp
     RTConfig_Manager.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
index b50bb12d50e..54d33e52e97 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
@@ -38,6 +38,8 @@ sched_policy_name (int sched_policy)
 int
 check_supported_priorities (CORBA::ORB_ptr orb)
 {
+  CIAO_TRACE ("NodeApplication_Core::check_supported_priorities");
+
   int sched_policy =
     orb->orb_core ()->orb_params ()->ace_sched_policy ();
 
@@ -64,11 +66,13 @@ check_supported_priorities (CORBA::ORB_ptr orb)
 int
 CIAO::NodeApplication_Core::svc ()
 {
+  CIAO_TRACE ("CIAO::NodeApplication_Core::svc");
+
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
@@ -125,11 +129,11 @@ CIAO::NodeApplication_Core::svc ()
       ACE_TRY_CHECK;
 
       if (retval)
-      {
-	ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
+        {
+          ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
                                initializing the session container!"));
-	return 1;
-      }
+          return 1;
+        }
 
       CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()
                                                             ACE_ENV_ARG_PARAMETER);
@@ -157,7 +161,7 @@ CIAO::NodeApplication_Core::svc ()
 
           CIAO::NodeApplication_Callback_var nam_callback
             = CIAO::NodeApplication_Callback::_narrow (object.in ()
-						       ACE_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           Deployment::Properties_out properties_out (prop.out ());
@@ -196,6 +200,8 @@ CIAO::NodeApplication_Core::svc ()
 int
 CIAO::NodeApplication_Core::startup (int argc, char *argv[])
 {
+  CIAO_TRACE ("CIAO::NodeApplication_Core::startup");
+
   // pre-init
   this->configurator_.reset (this->options_.create_nodeapp_configurator ());
 
@@ -215,6 +221,8 @@ CIAO::NodeApplication_Core::startup (int argc, char *argv[])
 int
 CIAO::NodeApplication_Core::run_orb ()
 {
+  CIAO_TRACE ("CIAO::NodeApplication_Core::run_orb");
+
   // check supported priority before running RT
   if (this->options_.rt_support () &&
       check_supported_priorities (this->orb_.in ()) != 0)
@@ -225,7 +233,7 @@ CIAO::NodeApplication_Core::run_orb ()
 
   if (this->options_.rt_support ()) // RT support reuqested
     {
-      
+
 
       // spawn a thread
       // Task activation flags.
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
index 8f8f06772b5..3a8795eccea 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
@@ -48,7 +48,7 @@ namespace CIAO
     virtual int svc (void);
 
     int startup (int argc, char *argv[]);
-    
+
     int run_orb (void);
 
   protected:
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.inl b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.inl
index 563a960f584..85a0add56a7 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.inl
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.inl
@@ -3,6 +3,6 @@
 ACE_INLINE
 CIAO::NodeApplication_Core::NodeApplication_Core (CIAO::NodeApplication_Options &opts)
   : options_ (opts)
-{ 
+{
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 9045e47a136..7c4de13585f 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -76,7 +76,7 @@ void
 CIAO::NodeApplication_Impl::finishLaunch_i (
     const Deployment::Connections & providedReference,
     CORBA::Boolean start,
-    CORBA::Boolean add_connection 
+    CORBA::Boolean add_connection
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError,
@@ -92,6 +92,7 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
       for (CORBA::ULong i = 0; i < length; ++i)
         {
           ACE_CString name = providedReference[i].instanceName.in ();
+
           Components::CCMObject_var comp;
 
           if (this->component_objref_map_.find (name, comp) != 0)
@@ -105,6 +106,12 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
               ACE_TRY_THROW (Deployment::InvalidConnection ());
             }
 
+          if (CORBA::is_nil (comp.in ()))
+            {
+              ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
+              throw Deployment::InvalidConnection ();
+            }
+
           Components::EventConsumerBase_var consumer;
 
           // Since we know CCMObject inherits from
@@ -128,15 +135,33 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
 
               if (add_connection)
                 {
-                  ::Components::Cookie_var cookie =
-                    comp->connect (providedReference[i].portName.in (),
-                                   providedReference[i].endpoint.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  try
+                    {
+                      ::Components::Cookie_var cookie =
+                          comp->connect (providedReference[i].portName.in (),
+                                         providedReference[i].endpoint.in ()
+                                         ACE_ENV_ARG_PARAMETER);
+                      ACE_TRY_CHECK;
 
-                  ACE_CString key = (*create_connection_key (providedReference[i]));
-                  ACE_DEBUG ((LM_ERROR, "[BINGDING KEY]: %s\n", key.c_str ()));
-                  this->cookie_map_.rebind (key, cookie);
+                      ACE_CString key = (*create_connection_key (providedReference[i]));
+
+                      if (CIAO::debug_level () > 10)
+                        ACE_DEBUG ((LM_ERROR, "[BINGDING KEY]: %s\n", key.c_str ()));
+
+                      this->cookie_map_.rebind (key, cookie);
+                    }
+                  catch (...)
+                    {
+                      ACE_ERROR ((LM_ERROR,
+                                  "CIAO (%P|%t) - NodeApplicationImpl.cpp, "
+                                  "CIAO::NodeApplication_Impl::finishLaunch\n"
+                                  "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] connection FAILED.\n",
+                                  providedReference[i].instanceName.in (),
+                                  providedReference[i].portName.in (),
+                                  providedReference[i].endpointInstanceName.in (),
+                                  providedReference[i].endpointPortName.in ()));
+                      throw;
+                    }
 
                   if (CIAO::debug_level () > 6)
                     {
@@ -154,7 +179,10 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
                 {
                   ACE_CString key = (*create_connection_key (providedReference[i]));
                   ::Components::Cookie_var cookie;
-                  ACE_DEBUG ((LM_ERROR, "[FINDING KEY]: %s\n", key.c_str ()));
+
+                  if (CIAO::debug_level () > 10)
+                    ACE_DEBUG ((LM_ERROR, "[FINDING KEY]: %s\n", key.c_str ()));
+
                   if (this->cookie_map_.find (key, cookie) != 0)
                     {
                       ACE_DEBUG ((LM_ERROR, "Error: Cookie Not Found!\n"));
@@ -178,15 +206,17 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
                 }
               break;
 
-	        // @@ (GD) A place holder where the Event Channel connections
-	        //         should be set up.
+                // @@ (GD) A place holder where the Event Channel connections
+                //         should be set up.
 
             case Deployment::EventEmitter:
+        ACE_DEBUG ((LM_DEBUG, "NA_I: EventEmitter\n"));
 
               consumer = Components::EventConsumerBase::
                 _narrow (providedReference[i].endpoint.in ()
                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+
+        ACE_DEBUG ((LM_DEBUG, "Narrow compelted\n"));
 
               if (CORBA::is_nil (consumer.in ()))
                 {
@@ -253,10 +283,17 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
 
             case Deployment::EventPublisher:
 
+        ACE_DEBUG ((LM_DEBUG, "NA_I: EventPublisher - %s:%s\n",
+        providedReference[i].instanceName.in (),
+        providedReference[i].portName.in ()));
+        ACE_DEBUG ((LM_DEBUG, "NA_I: endPoint instance:port %s:%s\n",
+        providedReference[i].endpointInstanceName.in (),
+        providedReference[i].endpointPortName.in ()));
               consumer = Components::EventConsumerBase::
                 _narrow (providedReference[i].endpoint.in ()
                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+
+        ACE_DEBUG ((LM_DEBUG, "NA_I: Narrow completed\n"));
 
               if (CORBA::is_nil (consumer.in ()))
                 {
@@ -290,7 +327,9 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
 
                   ACE_CString key = (*create_connection_key (providedReference[i]));
                   this->cookie_map_.rebind (key, cookie);
-                  ACE_DEBUG ((LM_ERROR, "[BINGDING KEY]: %s\n", key.c_str ()));
+
+                  if (CIAO::debug_level () > 10)
+                    ACE_DEBUG ((LM_ERROR, "[BINGDING KEY]: %s\n", key.c_str ()));
 
                   if (CIAO::debug_level () > 6)
                     {
@@ -308,7 +347,10 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
                 {
                   ACE_CString key = (*create_connection_key (providedReference[i]));
                   ::Components::Cookie_var cookie;
-                  ACE_DEBUG ((LM_ERROR, "[FINDING KEY]: %s\n", key.c_str ()));
+
+                  if (CIAO::debug_level () > 9)
+                    ACE_DEBUG ((LM_ERROR, "[FINDING KEY]: %s\n", key.c_str ()));
+
                   if (this->cookie_map_.find (key, cookie) != 0)
                     {
                       ACE_DEBUG ((LM_ERROR, "Error: Cookie Not Found!\n"));
@@ -405,9 +447,12 @@ CIAO::NodeApplication_Impl::ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
        iter != end;
        ++iter)
   {
+    ACE_DEBUG ((LM_DEBUG, "passivating %s\n",
+    (*iter).ext_id_.c_str ()));
     ((*iter).int_id_)->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
+  ACE_DEBUG ((LM_DEBUG, "exiting passivate\n"));
 }
 
 Deployment::ComponentInfos *
@@ -488,7 +533,7 @@ CIAO::NodeApplication_Impl::install (
       {
         //Since we know the type ahead of time...narrow is omitted here.
         if (this->component_objref_map_.bind (
-        	  retv[len].component_instance_name.in(),
+                  retv[len].component_instance_name.in(),
               Components::CCMObject::_duplicate (retv[len].
                 component_ref.in ())))
           {
@@ -522,6 +567,9 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Components::RemoveFailure))
 {
+  ACE_DEBUG ((LM_DEBUG, "NA_I: removing component %s\n",
+        inst_name));
+
   // Fetch the container object reference from the componet_container_map
   ::Deployment::Container_var container_ref;
   if (this->component_container_map_.find (inst_name, container_ref) != 0)
@@ -542,23 +590,90 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name
 }
 
 void
+CIAO::NodeApplication_Impl::passivate_component (const char * name
+                                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((::CORBA::SystemException,
+                   ::Components::RemoveFailure))
+{
+  Components::CCMObject_var comp;
+
+  if (this->component_objref_map_.find (name, comp) != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
+                  "CIAO::NodeApplication_Impl::passivate_component, "
+                  "invalid instance [%s] \n",
+                   name));
+      ACE_TRY_THROW (Deployment::StartError ());
+    }
+
+  if (CORBA::is_nil (comp.in ()))
+    {
+      ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
+      throw Deployment::StartError ();
+    }
+
+  comp->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+CIAO::NodeApplication_Impl::activate_component (const char * name
+                                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((::CORBA::SystemException,
+                   ::Components::RemoveFailure))
+{
+  Components::CCMObject_var comp;
+
+  if (this->component_objref_map_.find (name, comp) != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
+                  "CIAO::NodeApplication_Impl::passivate_component, "
+                  "invalid instance [%s] \n",
+                   name));
+      ACE_TRY_THROW (Deployment::StartError ());
+    }
+
+  if (CORBA::is_nil (comp.in ()))
+    {
+      ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
+      throw Deployment::StartError ();
+    }
+
+  comp->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  comp->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  comp->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+
+void
 CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we still have components installed, then do nothing
   if (this->component_objref_map_.current_size () != 0)
-    return;
-
+    {
+      ACE_DEBUG ((LM_DEBUG, "NA: remove:  still have components, doing nothing\n"));
+      return;
+    }
   // For each container, invoke <remove> operation to remove home and components.
   const CORBA::ULong set_size = this->container_set_.size ();
   for (CORBA::ULong i = 0; i < set_size; ++i)
     {
+      ACE_DEBUG ((LM_DEBUG, "NA: calling remove on container %i\n"));
       this->container_set_.at(i)->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // Remove all containers
   // Maybe we should also deactivate container object reference.
+  ACE_DEBUG ((LM_DEBUG, "NA: remove all\n"));
   this->container_set_.remove_all ();
 
   if (CIAO::debug_level () > 1)
@@ -566,14 +681,17 @@ CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
 
   //For static deployment, ORB will be shutdown in the Static_NodeManager
   if (this->static_entrypts_maps_ == 0)
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+    {
+      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      ACE_DEBUG ((LM_DEBUG, "NA: shutdown\n"));
+    }
 }
 
 
 // Create a container interface, which will be hosted in this NodeApplication.
 ::Deployment::Container_ptr
 CIAO::NodeApplication_Impl::create_container (
-	const ::Deployment::Properties &properties
+        const ::Deployment::Properties &properties
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   ::Components::CreateFailure,
@@ -694,6 +812,9 @@ create_connection_key (const Deployment::Connection & connection)
   (*retv) += connection.portName.in ();
   (*retv) += connection.endpointInstanceName.in ();
   (*retv) += connection.endpointPortName.in ();
-  ACE_DEBUG ((LM_ERROR, "The key is: %s\n", (*retv).c_str ()));
+
+  if (CIAO::debug_level () > 3)
+    ACE_DEBUG ((LM_ERROR, "The key is: %s\n", (*retv).c_str ()));
+
   return retv;
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index dde2a353750..bcf5813c474 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -158,6 +158,16 @@ namespace CIAO
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Components::RemoveFailure));
 
+    virtual void activate_component (const char * name
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException,
+                       ::Components::RemoveFailure));
+
+    virtual void passivate_component (const char * name
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException,
+                       ::Components::RemoveFailure));
+
     /// Remove everything inside including all components and homes.
     virtual void remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
index f4b8fb42171..9d74fa817c4 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
@@ -368,7 +368,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name
 
   ACE_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name: %s\n",
               name));
-              
+
   POLICY_MAP::ENTRY *entry = 0;
 
   if (this->policy_map_.find (name, entry) != 0)
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp b/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
index 2ea36daf383..5e81e669182 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
@@ -34,7 +34,7 @@ int
 CIAO::RTNodeApp_Configurator::init_resource_manager
 (const ::Deployment::Properties &properties)
 {
-  
+
   //  if (CIAO::debug_level () > 9)
     ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::init_resource_manager\n"));
   // @@ Should we cache the properties that we consumed here?
@@ -57,7 +57,7 @@ CIAO::RTNodeApp_Configurator::init_resource_manager
             ACE_ERROR_RETURN ((LM_ERROR,
                                "ERROR: RTNodeApp_Configurator::init_resource_manager unable to extract CIAOServerResources\n"), -1);
         }
-      
+
       // Ignore other stuff
     }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.h b/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.h
index 37683d04956..c44786195e9 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.h
@@ -6,7 +6,7 @@
  * @Brief  This file contains the implementation of
  *         the RTNodeApp_Configurator, a concrete NodeApp_Configurator for
  *         setting up real-time support for NodeApplication.
- *         
+ *
  *
  * @author Nanbor Wang <nanbor@exothermic.txcorp.com>
  *========================================================*/
@@ -31,7 +31,7 @@ namespace CIAO
   /**
    * @class RTNodeApp_Configurator
    *
-   * @brief This class implements a concrete NodeApp_Configurator for 
+   * @brief This class implements a concrete NodeApp_Configurator for
    * setting up the NodeApplication process for RT support.
    **/
   class CIAO_RTNA_Configurator_Export RTNodeApp_Configurator :
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index 5618e775bc7..24a2349a66c 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -3,6 +3,16 @@
 #include "ciao/CIAO_Config.h"
 #include "ciao/CIAO_common.h"
 
+//Added for HTTP
+#include "URL_Parser.h"              //for parsing the URL
+#include "HTTP_Client.h"             //the HTTP client class to downloading packages
+#include "ace/Message_Block.h"       //for ACE_Message_Block
+#include "ace/OS_NS_fcntl.h"         //for open
+#include "ace/OS_NS_unistd.h"        //for close
+#include "ace/OS_NS_sys_stat.h"      //for filesize and mkdir
+#include "ace/OS_NS_string.h"        //for string functions
+
+
 namespace CIAO
 {
   Containers_Info_Map::
@@ -10,8 +20,29 @@ namespace CIAO
           const Deployment::ComponentPlans & shared_components)
     : map_ (CIAO_DEFAULT_MAP_SIZE),
       plan_ (plan),
-      shared_components_ (shared_components)
+      shared_components_ (shared_components),
+      HTTP_DOWNLOAD_PATH ()
   {
+    char* temp = ACE_OS::getenv ("CIAO_ROOT");
+    HTTP_DOWNLOAD_PATH += temp;
+
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    HTTP_DOWNLOAD_PATH += "\\";
+#else
+    HTTP_DOWNLOAD_PATH += "/";
+#endif
+
+    HTTP_DOWNLOAD_PATH += "HTTP_DOWNLOADED_LIBS";
+
+    ACE_OS::mkdir(HTTP_DOWNLOAD_PATH.c_str ());
+    //if dir already exists a -1 is returned
+    //we ignore this, just need to make sure the directory exists
+
+    //now lets update the loader path to include
+    //the HTTP_DOWNLOAD_PATH
+    this->update_loader_path ();
+
+
     this->initialize_map ();
     this->build_map ();
   }
@@ -60,11 +91,15 @@ namespace CIAO
 
         if (this->plan_.instance[i].deployedResource.length () != 0)
           {
+            /*
             my_resource_id =
               this->plan_.instance[i].deployedResource[0].resourceName.in ();
 
             this->plan_.instance[i].deployedResource[0].resourceValue >>=
               my_policy_set_id;
+            */
+
+            // ACE_ERROR ((LM_ERROR, "ERROR: RT-CCM support has been disabled until code in Containers_Info_Map is updated to reflect IDL changes."));
           }
 
         // If we find a existing policy_set_id, then do nothing.
@@ -162,12 +197,12 @@ namespace CIAO
         const Deployment::InstanceDeploymentDescription & instance =
           this->plan_.instance[i];
 
-        // If this component instance happens to be in the "shared components 
+        // If this component instance happens to be in the "shared components
         // list", then we ignore it, otherwise we shall install it.
         ACE_CString name (instance.name.in ());
         if (this->is_shared_component (name))
           continue;
-            
+
         if (! this->insert_instance_into_map (instance))
           return false;
       }
@@ -184,7 +219,8 @@ namespace CIAO
     const char * policy_set_id = "";
     if (instance.deployedResource.length () != 0)
       {
-        instance.deployedResource[0].resourceValue >>= policy_set_id;
+        //        instance.deployedResource[0].resourceValue >>= policy_set_id;
+        //ACE_ERROR ((LM_ERROR, "ERROR: RT-CCM support has been disabled until code in Containers_Info_Map is updated to reflect IDL changes."));
       }
 
     // Find the ContainerImplementationInfo entry from the map
@@ -234,6 +270,35 @@ namespace CIAO
         const Deployment::ArtifactDeploymentDescription & arti =
           this->plan_.artifact[ impl.artifactRef[j] ];
 
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+        for (size_t loc_num = 0;
+             loc_num < arti.location.length ();
+             ++loc_num)
+          {
+            if (ACE_OS::strstr (arti.location[loc_num], "http://"))
+              {
+                ACE_CString path;
+                if (!this->resolve_http_reference (arti.location[loc_num],
+                                                   path))
+                  {
+                    ACE_ERROR
+                         ((LM_ERROR,
+                         "CIAO (%P|%t) Containers_Info_Map.cpp -"
+                         "Containers_Info_Map::insert_instance_into_container -"
+                         "ERROR: Unable to resolve HTTP ref to location[%d] of %s\n",
+                         loc_num, arti.name.in ()));
+
+                    arti.location[loc_num] = CORBA::string_dup ("HTTP_failure");
+                  }
+                else
+                  {
+                    arti.location[loc_num] = CORBA::string_dup (arti.name.in ());
+                    //enque for cleanup
+                  }
+              }
+          }
+#endif
+
         ACE_CString tmp = arti.name.in ();
         ssize_t pos;
 
@@ -241,6 +306,10 @@ namespace CIAO
         //         the modeling tool should make sure of
         //         uniqueness, i.e., one component implementation
         //         should have only 1 _svnt and 1 _exec libs.
+        if ((pos  = tmp.find ("_stub")) != ACE_CString::npos ||
+            (pos  = tmp.find ("_Stub")) != ACE_CString::npos)
+          continue; // We ignore _stub artifact since it's not used.
+
         if (!svnt_found &&
                 ((pos  = tmp.find ("_svnt")) != ACE_CString::npos ||
                  (pos  = tmp.find ("_Svnt")) != ACE_CString::npos))
@@ -258,7 +327,7 @@ namespace CIAO
               CORBA::string_dup (arti.location[0].in ());
 
             // Get the entry point.
-		        const CORBA::ULong prop_length = arti.execParameter.length ();
+            const CORBA::ULong prop_length = arti.execParameter.length ();
 
             for (CORBA::ULong prop_num = 0;
                  prop_num < prop_length;
@@ -294,7 +363,7 @@ namespace CIAO
               }
 
             exec_found = true;
-            // Cpoy the servant dll/so name.
+            // Copy the servant dll/so name.
             // @@ Note: I ignore all the other locations except the first one.
             exec_found = true;
             impl_infos[i].executor_dll =
@@ -341,3 +410,179 @@ is_shared_component (ACE_CString & name)
 
   return false;
 }
+
+
+/*---------------------------------------------------------------------
+ * functions to support HTTP capabilities of the NodeApplicationManager
+ * @author Stoyan Paunov
+ *
+ * Purpose: Adding the HTTP access code which will resove
+ * any references to HTTP URLs
+ */
+
+  // This function checks if the HTTP_DOWNLOAD_PATH is
+  // in the library load path
+  void
+  CIAO::Containers_Info_Map::update_loader_path (void)
+  {
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    char* path = ACE_OS::getenv ("PATH");
+#else
+    char* path = ACE_OS::getenv ("LD_LIBRARY_PATH");
+#endif
+
+    if (ACE_OS::strstr (path, this->HTTP_DOWNLOAD_PATH.c_str ()))
+       return;
+
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    ACE_CString new_path = "PATH=";
+#else
+    ACE_CString new_path = "LD_LIBRARY_PATH=";
+#endif
+
+    new_path += this->HTTP_DOWNLOAD_PATH;
+
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    new_path += ";";
+#else
+    new_path += ":";
+#endif
+
+    new_path += path;
+
+//turn off the HTTP feature for Linux until
+//I discover what the problem with Linux is
+#if defined (ACE_WIN32) || defined (ACE_WIN64)
+    ACE_OS::putenv (new_path.c_str ());
+#endif
+
+  }
+
+  //This function resolves any http location references
+  //in the name of the implementation artifacts
+  //It returns true on success and false on failure
+
+  bool
+  CIAO::Containers_Info_Map::resolve_http_reference (const char* location,
+                                                     ACE_CString &path)
+  {
+
+    ACE_DEBUG ((LM_INFO,
+               "Attempting to download %s\n",
+               location));
+
+    //figure out the file name
+    char* name = const_cast<char*> (location);
+    char* p = NULL;
+    while (1)
+    {
+      if (p = ACE_OS::strstr (name, "/"))
+      {
+        name = ++p;
+        continue;
+      }
+      else if (p = ACE_OS::strstr (name, "\\"))
+      {
+        name = ++p;
+        continue;
+      }
+      else
+        break;
+    }
+
+    //get the file
+    ACE_Message_Block* mb = 0;
+    ACE_NEW_RETURN (mb, ACE_Message_Block (0,0), false);
+
+    if (!this->retrieve_via_HTTP (location, *mb))
+    {
+      mb->release ();
+      return false;
+    }
+
+    path = HTTP_DOWNLOAD_PATH;
+    path += "/";
+    path += name;
+
+    if (!this->write_to_disk (path.c_str (), *mb))
+    {
+      mb->release ();
+      return false;
+    }
+
+    mb->release ();
+    return true;
+  }
+
+  //function to retvieve a file via HTTP
+  //stores the file in the passed preallocated ACE_Message_Block
+  //returns 1 on success
+  //        0 on error
+
+  bool
+  CIAO::Containers_Info_Map::retrieve_via_HTTP (const char* URL,
+                                                ACE_Message_Block &mb)
+  {
+    URL_Parser *parser = TheURL_Parser::instance ();
+    if (!parser->parseURL (const_cast<char*> (URL)))
+    return false;
+
+    // Create a client
+    HTTP_Client client;
+
+    // Open the client
+    if (client.open (parser->filename_,
+                     parser->hostname_,
+                     parser->port_) == -1)
+    {
+        client.close ();
+        return false;
+    }
+
+    // Read from it
+    if (client.read (&mb) <= 0)
+    {
+        client.close ();
+        return false;
+    }
+
+    return true;
+  }
+
+  //This function attempts to write a sequence of bytes from an
+  //ACE_Message_Block to a specified location. A 0 is returned
+  //in the case of an error and a 1 upon success
+
+  bool
+  CIAO::Containers_Info_Map::write_to_disk (const char* full_path,
+                                            ACE_Message_Block& mb,
+                                            bool replace)
+  {
+    ACE_stat stat;
+
+    if (ACE_OS::stat(full_path, &stat) != -1 && !replace)
+       return false;
+
+    // Open a file handle to the local filesystem
+    ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
+    if (handle == ACE_INVALID_HANDLE)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("[CIAO::Containers_Info_Map::write_to_disk]"),
+                           ACE_TEXT (" file creation error")),
+                           false);
+
+    //write the data to the file
+    for (ACE_Message_Block * curr = &mb; curr != 0; curr = curr->cont ())
+    if (ACE_OS::write_n (handle, curr->rd_ptr(), curr->length()) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("[CIAO::Containers_Info_Map::write_to_disk]"),
+                           ACE_TEXT (" write error")),
+                           false);
+
+    // Close the file handle
+    ACE_OS::close (handle);
+
+    return true;
+  }
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index 33f15ba0362..4fb23a46f19 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * @file Containers_Info_Map.h
  * @author Gan Deng <dengg@dre.vanderbilt.edu>
  *
@@ -15,6 +15,10 @@
 
 #include "ace/Null_Mutex.h"
 #include "ace/Hash_Map_Manager.h"
+
+//added for the HTTP support
+#include "ace/Message_Block.h"      //for ACE_Message_Block
+
 #include "ciao/DeploymentC.h"
 #include "ace/SString.h"
 #include "CIAO_NAM_Export.h"
@@ -59,7 +63,7 @@ namespace CIAO
 
     //Deployment::ContainerImplementationInfos_var containers_info_;
 
-    typedef 
+    typedef
     ACE_Hash_Map_Manager_Ex <ACE_CString,
                             Deployment::ContainerImplementationInfo *,
                             ACE_Hash<ACE_CString>,
@@ -74,6 +78,54 @@ namespace CIAO
     /// shared components list, passed in from NodeImplementationInfoHandler
     /// class.
     Deployment::ComponentPlans shared_components_;
+
+    /**-------------------------------------------------------------------
+     * HTTP capability
+     * @author Stoyan Paunov
+     *
+     * Purpose: Adding the HTTP access code which will resove
+     * any references to HTTP URLs
+     */
+  protected:
+
+    //directory in which to download the libraries obtained via HTTP
+    ACE_CString HTTP_DOWNLOAD_PATH;
+
+    /// This function checks if the HTTP_DOWNLOAD_PATH is
+    /// in the library load path
+    void
+    update_loader_path (void);
+
+    /// This function resolves any http location references
+    /// in the name of the implementation artifacts
+    /// It returns true on success and false on failure
+
+    bool
+    resolve_http_reference (const char* location,
+                            ACE_CString &name);
+
+    /// function to retvieve a file via HTTP
+    /// stores the file in the passed preallocated ACE_Message_Block
+    /// returns 1 on success
+    ///         0 on error
+
+    bool
+    retrieve_via_HTTP (const char* URL,
+                       ACE_Message_Block &mb);
+
+    /// function that writes out a file to a specified location on the hand disk
+    /// returns 1 on success
+    ///         0 on already exists and replace == false
+    ///         0 on error
+
+    bool
+    write_to_disk (const char* full_path,
+                   ACE_Message_Block& mb,
+                   bool replace = true);
+
+    /// TODO: Fuction to remove the downloaded library to ensure
+    ///       consisterncy in future runs
+
   };
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp
new file mode 100644
index 00000000000..73a8071f305
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.cpp
@@ -0,0 +1,59 @@
+// $Id$
+
+// HTTP_Client.cpp, Stoyan
+
+#include "HTTP_Client.h"
+#include "HTTP_Handler.h"
+#include "ace/OS_NS_string.h"
+
+HTTP_Client::HTTP_Client (void)
+{
+}
+
+HTTP_Client::~HTTP_Client (void)
+{
+  this->close ();
+}
+
+// initialize address and filename. No network i/o in open
+int
+HTTP_Client::open (const ACE_TCHAR *filename,
+                   const ACE_TCHAR *hostname,
+                   u_short port)
+{
+  filename_ = ACE_OS::strdup (filename);
+  inet_addr_.set (port, hostname);
+  return 0;
+}
+
+// read from connection length bytes from offset, into Message block
+int
+HTTP_Client::read (ACE_Message_Block *mb)
+{
+
+  // Create a HTTP_Client Reader
+  HTTP_Reader HTTP_reader (mb, filename_);
+  HTTP_Handler *brp = &HTTP_reader;
+
+  // Connect to the server
+  if (connector_.connect (brp, inet_addr_) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Client::read():Connector error"), -1);
+
+  return HTTP_reader.byte_count ();
+
+}
+
+// close down the HTTP_Client
+int
+HTTP_Client::close (void)
+{
+
+  if (filename_)
+    {
+      ACE_OS::free ((void *) filename_);
+      filename_ = 0;
+    }
+  return 0;
+
+}
+
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h
new file mode 100644
index 00000000000..ac0f9cbea92
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Client.h
@@ -0,0 +1,72 @@
+
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    HTTP_Client.h
+ *
+ *  $Id$
+ *
+ *   This is the HTTP_Client class, which is the API for doing file
+ *   uploads/downloads.
+ *
+ *  @author Stoyan Paunov
+ */
+//=============================================================================
+
+
+#ifndef HTTP_Client_H
+#define HTTP_Client_H
+
+
+#include "ace/INET_Addr.h"
+#include "ace/Svc_Handler.h"
+#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
+#include "ace/Message_Block.h"
+#include "HTTP_Handler.h"
+
+/**
+ * @class HTTP_Client
+ *
+ * @brief HTTP_Client is intended to provide application API to
+ * classes that wish to do network i/o at a very
+ * high level of abstraction.
+ *
+ * This class provides the ability to retrieve data from
+ * the network, of specified length and offset, and potentially
+ * use any protocol "under the hood" to do so. It currently
+ * uses HTTP. See HTTP_Handler also.
+ */
+class HTTP_Client
+{
+public:
+  HTTP_Client (void);
+  ~HTTP_Client (void);
+
+  /// Initializes the class with the given filename, hostname and port.
+  /// it should be called with the filename, before any read/write calls
+  int open (const ACE_TCHAR *filename,
+            const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST,
+            u_short port = 80);
+
+  /// Starts a connection, and reads a file from the server into
+  /// Message_Block mb
+  int read (ACE_Message_Block *mb);
+
+  /// Frees memory allocated for filename.
+  int close ();
+
+private:
+  /// Store the internet address of the server
+  ACE_INET_Addr inet_addr_;
+
+  /// The filename
+  ACE_TCHAR *filename_;
+
+  /// The connector endpoint to initiate the client connection
+  ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR> connector_;
+
+};
+
+#endif /* HTTP_Client_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp
new file mode 100644
index 00000000000..ffd85ca1ebf
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.cpp
@@ -0,0 +1,203 @@
+// $Id$
+
+// HTTP_Handler.cpp, Stoyan
+
+#include "HTTP_Handler.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_strings.h"
+
+// Empty constructor for compliance with new Connector behavior.
+HTTP_Handler::HTTP_Handler (void)
+{
+}
+
+// Always use this constructor
+HTTP_Handler::HTTP_Handler (ACE_Message_Block * mb,
+                            ACE_TCHAR *filename) :
+  mb_ (mb),
+  filename_ (ACE_OS::strdup (filename)),
+  bytecount_ (0)
+{
+}
+
+HTTP_Handler::~HTTP_Handler (void)
+{
+  if (filename_)
+    {
+      ACE_OS::free (filename_);
+      filename_ = 0;
+    }
+}
+
+// Called by Connector after connection is established
+int
+HTTP_Handler::open (void *)
+{
+  if (this->send_request () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed\n"), -1);
+
+  if (this->receive_reply () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed\n"), -1);
+  return 0;
+
+}
+
+// No-op
+int
+HTTP_Handler::close (u_long)
+{
+  return 0;
+}
+
+// Always overridden by the derived classes
+int
+HTTP_Handler::send_request (void)
+{
+  return -1;
+}
+
+// Always overridden by the derived classes
+int
+HTTP_Handler::receive_reply (void)
+{
+  return -1;
+}
+
+// used to retrieve the number of bytes read/written by the
+// last operation on the Blob
+size_t
+HTTP_Handler::byte_count (void)
+{
+  return bytecount_;
+}
+
+// Reader **************************************************
+
+HTTP_Reader::HTTP_Reader (ACE_Message_Block * mb,
+                          ACE_TCHAR *filename,
+                          const char *request_prefix,
+                          const char *request_suffix) :
+  HTTP_Handler (mb, filename),
+  request_prefix_ (request_prefix),
+  request_suffix_ (request_suffix)
+{
+}
+
+// Send the HTTP request
+int
+HTTP_Reader::send_request (void)
+{
+  char mesg [MAX_HEADER_SIZE];
+
+  // Check to see if the request is too big
+  if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
+                         + ACE_OS::strlen (filename_)
+                         + ACE_OS::strlen (request_suffix_) + 4))
+    ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
+
+  // Create a message to send to the server requesting retrieval of the file
+  int len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
+
+  // Send the message to server
+  if (peer ().send_n (mesg, len) != len)
+    ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1);
+
+
+  return 0;
+}
+
+// Recieve the HTTP Reply
+int
+HTTP_Reader::receive_reply (void)
+{
+  size_t num_recvd = 0;
+  char buf [MTU+1];
+  char *buf_ptr = 0;
+  size_t bytes_read = 0;
+
+  // Receive the first MTU bytes and strip the header off.
+  // Note that we assume that the header will fit into MTU bytes.
+
+  if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0)
+    {
+      //Make sure that response type is 200 OK
+      if (ACE_OS::strstr (buf,"200 OK") == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                            "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1);
+
+      // Search for the header termination string "\r\n\r\n", or "\n\n". If
+      // found, move past it to get to the data portion.
+      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0)
+        buf_ptr += 4;
+      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0)     //for compatibility with JAWS
+        buf_ptr += 2;
+      else
+        buf_ptr = buf;
+
+      // Determine number of data bytes read. This is equal to the
+      // total bytes read minus number of header bytes.
+      bytes_read = num_recvd - (buf_ptr - buf);
+
+    }
+  else
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
+
+  // ***************************************************************
+  // At this point, we have stripped off the header and are ready to
+  // process data. buf_ptr points to the data
+
+  //set the size of the ACE_Message_Block to the current bytes read
+  //NOTE: this function reallocates if necessary
+  //this->mb_->size (bytes_read);
+
+  ACE_Message_Block* temp;   //pointer used temporarily
+                             //for memory allocations before
+                             //chaining to Message_Block
+
+  ACE_Message_Block* curr = this->mb_;
+
+  ACE_NEW_RETURN (temp, ACE_Message_Block (bytes_read), -1);
+  curr->cont (temp);
+
+  curr = curr->cont ();
+
+  // Copy over all the data bytes into our message buffer.
+  if (curr->copy (buf_ptr, bytes_read) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
+                          "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1);
+
+  //read the rest of the data into a number of ACE_Message_Blocks and
+  //chain them together in a link list fashion
+
+  num_recvd = 0;
+
+  do
+  {
+    if (curr->space () == 0)
+    {
+      ACE_NEW_RETURN (temp, ACE_Message_Block (MTU), -1);
+      curr->cont (temp);
+      curr = curr->cont ();
+    }
+
+  if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0)
+    {
+      //move the write pointer
+      curr->wr_ptr (num_recvd);
+
+      //increment bytes_read
+      bytes_read += num_recvd;
+
+    }
+  else
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
+
+  }while (num_recvd != 0);
+
+  // Set the byte count to number of bytes received
+  this->bytecount_ = bytes_read;
+
+  return 0;
+}
+
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h
new file mode 100644
index 00000000000..d1e9aae2894
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/HTTP_Handler.h
@@ -0,0 +1,86 @@
+
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    HTTP_Handler.h
+ *
+ *  $Id$
+ *
+ *   HTTP_Handler is a base class for HTTP_Reader and
+ *   HTTP_Writer which are created in response to calls to
+ *   read/write, as appropriate
+ *
+ *
+ *  @author Stoyan Paunov
+ */
+//=============================================================================
+
+
+#ifndef HTTP_HANDLER_H
+#define HTTP_HANDLER_H
+
+#include "ace/SOCK_Stream.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Message_Block.h"
+
+/**
+ * @class HTTP_Handler
+ * class to retrieve data via HTTP
+ */
+class HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+public:
+  /// Null constructor, insures that it works properly with Connector
+  HTTP_Handler (void);
+
+  /// Always use this constructor to make HTTP_Handlers
+  HTTP_Handler (ACE_Message_Block *mb,
+                ACE_TCHAR *filename);
+
+  /// returns the number of bytes read/written in the last operation.
+  size_t byte_count (void);
+
+  /// Activate this instance of the <HTTP_Handler>
+  virtual int open (void * = 0);
+
+  /// Close down the Blob
+  virtual int close (u_long flags = 0);
+
+  ~HTTP_Handler (void);
+
+protected:
+  virtual int send_request (void);
+  virtual int receive_reply (void);
+
+  ACE_Message_Block *mb_;
+  ACE_TCHAR *filename_;
+  size_t bytecount_;
+  enum
+  {
+    /// The handler assumes that the first 2048 bytes of a server response
+    /// contains the header
+    MAX_HEADER_SIZE = 2048,
+
+    /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS
+    MTU = BUFSIZ
+  };
+};
+
+class HTTP_Reader : public HTTP_Handler
+{
+public:
+  HTTP_Reader (ACE_Message_Block *mb,
+                   ACE_TCHAR *filename,
+                   const char *request_prefix = "GET",
+                   const char *request_suffix = "HTTP/1.0\r\n\r\n");
+
+private:
+  //NOTE: these functions return -1 on error
+  int send_request (void);
+  int receive_reply (void);
+  const char *request_prefix_;
+  const char *request_suffix_;
+};
+
+#endif /* HTTP_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index 40875a9571f..c4f6b37c963 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -7,7 +7,7 @@
 
 CIAO::NodeImplementationInfoHandler::
 NodeImplementationInfoHandler (::Deployment::DeploymentPlan & plan,
-              const Deployment::ComponentPlans & shared_components) : 
+              const Deployment::ComponentPlans & shared_components) :
   plan_ (plan),
   node_info_ (0),
   containers_info_map_ (plan, shared_components)
@@ -17,17 +17,17 @@ NodeImplementationInfoHandler (::Deployment::DeploymentPlan & plan,
   this->populate_container_impl_infos ();
 }
 
-Deployment::NodeImplementationInfo * 
+Deployment::NodeImplementationInfo *
 CIAO::NodeImplementationInfoHandler::node_impl_info (void) const
 {
   Deployment::NodeImplementationInfo_var retv;
-  ACE_NEW_RETURN (retv, 
+  ACE_NEW_RETURN (retv,
                   Deployment::NodeImplementationInfo (this->node_info_.in ()),
                   0);
   return retv._retn ();
 }
 
-void 
+void
 CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
 {
   const CORBA::ULong instance_len = plan_.instance.length ();
@@ -39,13 +39,13 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
   // has been specified
   // TODO: We shoud do some sanity check here, since all the component
   // instance in this NodeApplication should have the same "server_resource_def"
-  // defined. Since currently we ignored this sanity check, then will allow 
+  // defined. Since currently we ignored this sanity check, then will allow
   // users to specify some self-conflicting configuration in the descriptor.
   for (i = 0; i < instance_len; ++i)
     {
-      if (this->plan_.instance[i].deployedResource.length () != 0)
+      if (false && this->plan_.instance[i].deployedResource.length () != 0)
         {
-          target_resource_id = 
+          target_resource_id =
             this->plan_.instance[i].deployedResource[0].resourceName.in ();
 
           // Some component instance has server resource usage defined, so we
@@ -55,16 +55,16 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
               CIAO::DAnCE::ServerResource *server_resource_def = 0;
               this->plan_.infoProperty[j].value >>= server_resource_def;
 
-              if (ACE_OS::strcmp ((*server_resource_def).Id, 
+              if (ACE_OS::strcmp ((*server_resource_def).Id,
                                   target_resource_id) == 0)
                 {
                   // Found the target server resource def, and store it.
                   this->node_info_->nodeapp_config.length (1);
 
-                  this->node_info_->nodeapp_config[0].name = 
+                  this->node_info_->nodeapp_config[0].name =
                     CORBA::string_dup ("CIAOServerResource");
 
-                  this->node_info_->nodeapp_config[0].value <<= 
+                  this->node_info_->nodeapp_config[0].value <<=
                     *server_resource_def;
                   break;
                 }
@@ -73,15 +73,15 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
     }
 }
 
-void 
+void
 CIAO::NodeImplementationInfoHandler::populate_container_impl_infos (void)
 {
-  CORBA::ULong curr_len = 
+  CORBA::ULong curr_len =
     this->containers_info_map_.containers_info ()->length ();
   ACE_UNUSED_ARG (curr_len);
-  
+
   // assignment operation
-  this->node_info_->impl_infos = 
+  this->node_info_->impl_infos =
     *(this->containers_info_map_.containers_info ());
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index 4f4e2e6478a..9ceae6ca738 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -17,6 +17,9 @@ project(NodeApplicationManager): ciao_component_dnc, ciao_deployment_svnt, dance
     NodeApplicationManager_Impl.cpp
     ImplementationInfo.cpp
     Containers_Info_Map.cpp
+    URL_Parser.cpp
+    HTTP_Handler.cpp
+    HTTP_Client.cpp
     ../NodeApplication/NodeApplication_Core.cpp
     ../NodeApplication/NodeApp_Configurator.cpp
     ../NodeApplication/NodeApplication_Impl.cpp
@@ -29,6 +32,9 @@ project(NodeApplicationManager): ciao_component_dnc, ciao_deployment_svnt, dance
     NodeApplicationManager_Impl.h
     ImplementationInfo.h
     Containers_Info_Map.h
+    URL_Parser.h
+    HTTP_Handler.h
+    HTTP_Client.h
     NodeApplicationManager_Export.h
   }
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 0538f110189..3c5744cd3e6 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -2,9 +2,12 @@
 
 #include "NodeApplicationManager_Impl.h"
 #include "ace/Process.h"
+
 #include "ace/OS_NS_stdio.h"
+#include "ace/Sched_Params.h"
 #include "ciao/Container_Base.h"
 #include "NodeApplication/NodeApplication_Impl.h"
+#include "ace/Reactor.h"
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplicationManager_Impl.inl"
@@ -63,98 +66,112 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
   for (Component_Iterator iter (this->component_map_.begin ());
        iter != end;
        ++iter)
-  {
-    // If this component is in the "shared components list", then we
-    // should just simply fetch the port object references from the
-    // NodeManager.
-    ACE_CString comp_name ((*iter).ext_id_.c_str ());
-
-    // Get all the facets first
-    Components::FacetDescriptions_var facets;
-
-    if (is_shared_component (comp_name))
-      facets = this->node_manager_->get_all_facets (comp_name);
-    else
-      {
-        facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-        this->node_manager_->set_all_facets (comp_name, facets);
-      }
+    {
+      // If this component is in the "shared components list", then we
+      // should just simply fetch the port object references from the
+      // NodeManager.
+      ACE_CString comp_name ((*iter).ext_id_.c_str ());
 
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                  "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                  "CIAO::NodeApplicationManager_Impl::create_connections -"
-                  "success getting facets for the component "
-                  "instance [%s] \n",
-                  comp_name.c_str ()));
-      }
+      // Get all the facets first
+      Components::FacetDescriptions_var facets;
 
-    // Get all the event consumers
-    Components::ConsumerDescriptions_var consumers;
-    
-    if (is_shared_component (comp_name))
-      consumers = this->node_manager_->get_all_consumers (comp_name);
-    else
-      {
-        consumers = 
-          ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-        this->node_manager_->set_all_consumers (comp_name, consumers);
-      }
+      if (is_shared_component (comp_name))
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
+                      comp_name.c_str ()));
+          facets = this->node_manager_->get_all_facets (comp_name);
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting"
+                      "all facets\n",
+                      comp_name.c_str ()));
+          facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->node_manager_->set_all_facets (comp_name, facets);
+        }
 
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                  "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                  "CIAO::NodeApplicationManager_Impl::create_connections -"
-                  "success getting consumers for the component "
-                  "instance [%s] \n",
-                  comp_name.c_str ()));
-      }
+      if (CIAO::debug_level () > 9)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                      "CIAO::NodeApplicationManager_Impl::create_connections -"
+                      "success getting facets for the component "
+                      "instance [%s] \n",
+                      comp_name.c_str ()));
+        }
 
-    CORBA::ULong facet_len = facets->length ();
-    CORBA::ULong consumer_len = consumers->length ();
+      // Get all the event consumers
+      Components::ConsumerDescriptions_var consumers;
 
-    CORBA::ULong curr_len = retv->length ();
-    retv->length (curr_len + facet_len + consumer_len);
+      if (is_shared_component (comp_name))
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
+                      comp_name.c_str ()));
+          consumers = this->node_manager_->get_all_consumers (comp_name);
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting"
+                      "all facets\n",
+                      comp_name.c_str ()));
+          consumers =
+            ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->node_manager_->set_all_consumers (comp_name, consumers);
+        }
 
-    CORBA::ULong i = 0;
-    for (i = 0; i < facet_len; ++i)
-    {
-      Deployment::Connection & conn = retv[len];
-      conn.instanceName = (*iter).ext_id_.c_str ();
-      conn.portName = facets[i]->name ();
       if (CIAO::debug_level () > 9)
         {
           ACE_DEBUG ((LM_DEBUG,
-                    "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                    "CIAO::NodeApplicationManager_Impl::create_connections -"
-                    "adding connection for facet [%s] in instance [%s] \n",
-                    conn.portName.in (), conn.instanceName.in ()));
+                      "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                      "CIAO::NodeApplicationManager_Impl::create_connections -"
+                      "success getting consumers for the component "
+                      "instance [%s] \n",
+                      comp_name.c_str ()));
         }
-      conn.kind = Deployment::Facet;
-      conn.endpoint = CORBA::Object::_duplicate (facets[i]->facet_ref ());
-      ++len;
-    }
 
-    for (i = 0; i < consumer_len; ++i)
-    {
-      Deployment::Connection & conn = retv[len];
-      conn.instanceName = (*iter).ext_id_.c_str ();
-      conn.portName = consumers[i]->name ();
-      if (CIAO::debug_level () > 9)
+      CORBA::ULong facet_len = facets->length ();
+      CORBA::ULong consumer_len = consumers->length ();
+
+      CORBA::ULong curr_len = retv->length ();
+      retv->length (curr_len + facet_len + consumer_len);
+
+      CORBA::ULong i = 0;
+      for (i = 0; i < facet_len; ++i)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                    "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                    "CIAO::NodeApplicationManager_Impl::create_connections -"
-                    "adding connection for consumer [%s] in instance [%s] \n",
-                    conn.portName.in (), conn.instanceName.in ()));
+          Deployment::Connection & conn = retv[len];
+          conn.instanceName = (*iter).ext_id_.c_str ();
+          conn.portName = facets[i]->name ();
+          if (CIAO::debug_level () > 9)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                          "CIAO::NodeApplicationManager_Impl::create_connections -"
+                          "adding connection for facet [%s] in instance [%s] \n",
+                          conn.portName.in (), conn.instanceName.in ()));
+            }
+          conn.kind = Deployment::Facet;
+          conn.endpoint = CORBA::Object::_duplicate (facets[i]->facet_ref ());
+          ++len;
+        }
+
+      for (i = 0; i < consumer_len; ++i)
+        {
+          Deployment::Connection & conn = retv[len];
+          conn.instanceName = (*iter).ext_id_.c_str ();
+          conn.portName = consumers[i]->name ();
+          if (CIAO::debug_level () > 9)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                          "CIAO::NodeApplicationManager_Impl::create_connections -"
+                          "adding connection for consumer [%s] in instance [%s] \n",
+                          conn.portName.in (), conn.instanceName.in ()));
+            }
+          conn.kind = Deployment::EventConsumer;
+          conn.endpoint = CORBA::Object::_duplicate (consumers[i]->consumer ());
+          ++len;
         }
-      conn.kind = Deployment::EventConsumer;
-      conn.endpoint = CORBA::Object::_duplicate (consumers[i]->consumer ());
-      ++len;
     }
-  }
   return retv._retn ();
 }
 
@@ -184,7 +201,7 @@ startLaunch (const Deployment::Properties & configProperty,
       if (this->plan_.instance.length () == this->shared_components_.length ())
         {
           ACE_DEBUG ((LM_DEBUG, "Prespawn a NodeApplication process without "
-                                "installing any components.\n"));
+                      "installing any components.\n"));
         }
 
       /**
@@ -251,6 +268,7 @@ startLaunch (const Deployment::Properties & configProperty,
       comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+
       // Now fill in the map we have for the "newly installed" components.
       const CORBA::ULong comp_len = comp_info->length ();
       for (CORBA::ULong len = 0;
@@ -261,15 +279,15 @@ startLaunch (const Deployment::Properties & configProperty,
           if (this->component_map_.
               bind (comp_info[len].component_instance_name.in(),
                     Components::CCMObject::_duplicate
-                       (comp_info[len].component_ref.in())))
+                    (comp_info[len].component_ref.in())))
             {
               ACE_CString error ("Duplicate component instance name ");
               error += comp_info[len].component_instance_name.in();
 
               ACE_TRY_THROW
                 (Deployment::StartError
-                   ("NodeApplicationManager_Impl::startLaunch",
-                     error.c_str ()));
+                 ("NodeApplicationManager_Impl::startLaunch",
+                  error.c_str ()));
             }
         }
 
@@ -280,16 +298,16 @@ startLaunch (const Deployment::Properties & configProperty,
       for (CORBA::ULong j = 0; j < shared_comp_length; ++j)
         {
           if (this->component_map_.
-                bind (this->shared_components_[j].name.in (),
-                      Components::CCMObject::_nil ()))
+              bind (this->shared_components_[j].name.in (),
+                    Components::CCMObject::_nil ()))
             {
               ACE_CString error ("Duplicate component instance name ");
               error += this->shared_components_[j].name.in();
 
               ACE_TRY_THROW
                 (Deployment::StartError
-                   ("NodeApplicationManager_Impl::startLaunch",
-                     error.c_str ()));
+                 ("NodeApplicationManager_Impl::startLaunch",
+                  error.c_str ()));
             }
         }
 
@@ -302,27 +320,27 @@ startLaunch (const Deployment::Properties & configProperty,
         {
           ACE_TRY_THROW
             (Deployment::StartError
-               ("NodeApplicationManager_Impl::startLaunch",
-                "Error creating connections for components during startLaunch."));
+             ("NodeApplicationManager_Impl::startLaunch",
+              "Error creating connections for components during startLaunch."));
         }
     }
   ACE_CATCH (Deployment::UnknownImplId, e)
     {
       ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
+                                                e.reason.in ()),
+                        Deployment::Application::_nil());
     }
   ACE_CATCH (Deployment::ImplEntryPointNotFound, e)
     {
       ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
+                                                e.reason.in ()),
+                        Deployment::Application::_nil());
     }
   ACE_CATCH (Deployment::InstallationFailure,e)
     {
       ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
+                                                e.reason.in ()),
+                        Deployment::Application::_nil());
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (Deployment::Application::_nil());
@@ -397,7 +415,7 @@ perform_redeployment (const Deployment::Properties & configProperty,
             }
 
           // package the components
-          NodeImplementationInfoHandler handler (tmp_plan, 
+          NodeImplementationInfoHandler handler (tmp_plan,
                                                  this->shared_components_);
           Deployment::NodeImplementationInfo * node_info =
             handler.node_impl_info ();
@@ -423,22 +441,22 @@ perform_redeployment (const Deployment::Properties & configProperty,
           // Now fill in the map we have for the components.
           const CORBA::ULong comp_len = comp_info->length ();
           for (CORBA::ULong len = 0;
-              len < comp_len;
-              ++len)
+               len < comp_len;
+               ++len)
             {
               //Since we know the type ahead of time...narrow is omitted here.
               if (this->component_map_.
                   bind (comp_info[len].component_instance_name.in(),
                         Components::CCMObject::_duplicate
-                          (comp_info[len].component_ref.in())))
+                        (comp_info[len].component_ref.in())))
                 {
                   ACE_CString error ("Duplicate component instance name ");
                   error += comp_info[len].component_instance_name.in();
 
                   ACE_TRY_THROW
                     (Deployment::PlanError
-                      ("NodeApplicationManager_Impl::startLaunch",
-                        error.c_str ()));
+                     ("NodeApplicationManager_Impl::startLaunch",
+                      error.c_str ()));
                 }
             }
 
@@ -451,9 +469,9 @@ perform_redeployment (const Deployment::Properties & configProperty,
           if (providedReference == 0)
             {
               ACE_TRY_THROW
-                (Deployment::InstallationFailure  
-                  ("NodeApplicationManager_Impl::startLaunch",
-                    "Error creating connections during startLaunch."));
+                (Deployment::InstallationFailure
+                 ("NodeApplicationManager_Impl::startLaunch",
+                  "Error creating connections during startLaunch."));
             }
           // @@TODO
           // Do an iteration over the <component_map_>, for those components that
@@ -462,30 +480,30 @@ perform_redeployment (const Deployment::Properties & configProperty,
       else // This is a new NodeApplication process, then we need to install
            // all the components. We should try to reuse much of the above code.
         {
-            this->startLaunch (configProperty,
-                               providedReference,
-                               start
-                               ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+          this->startLaunch (configProperty,
+                             providedReference,
+                             start
+                             ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (Deployment::UnknownImplId, e)
     {
       ACE_THROW_RETURN (Deployment::UnknownImplId (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
+                                                   e.reason.in ()),
+                        Deployment::Application::_nil());
     }
   ACE_CATCH (Deployment::ImplEntryPointNotFound, e)
     {
       ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
+                                                            e.reason.in ()),
+                        Deployment::Application::_nil());
     }
   ACE_CATCH (Deployment::InstallationFailure,e)
     {
       ACE_THROW_RETURN (Deployment::InstallationFailure (e.name.in (),
-						e.reason.in ()),
-			Deployment::Application::_nil());
+                                                         e.reason.in ()),
+                        Deployment::Application::_nil());
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (Deployment::Application::_nil());
@@ -512,8 +530,8 @@ destroyApplication (Deployment::Application_ptr app
 {
   CIAO_TRACE("CIAO::NodeApplicationManager_Impl::destroyApplication");
   ACE_UNUSED_ARG (app);
-  printf("Entering NAM_Impl::destroyApplication\n");
 
+  ACE_DEBUG ((LM_DEBUG, "NAM: entering DA\n"));
   //ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   //@@ Since we know there is only 1 nodeapp so the passed in
   //   parameter is ignored for now.
@@ -525,27 +543,113 @@ destroyApplication (Deployment::Application_ptr app
   // are removed, then we shall kill the NA totally.
   for (CORBA::ULong i = 0; i < this->plan_.instance.length (); ++i)
     {
+      ACE_DEBUG ((LM_DEBUG, "NAM: first for loop: %s\n",
+                  this->plan_.instance[i].name.in ()));
       ACE_CString name = plan_.instance[i].name.in ();
       if (this->is_shared_component (name))
-        continue;
+        {
+          this->component_map_.unbind (name);
+          continue;
+        }
 
       // If this is not a shared component and is installed within
       // this NAM, then remove it. Otherwise, we do nothing.
       // Ideally, we should ask NM to remove this component for
       // us even if this is not within this NAM.
       if (! this->is_external_component (name))
-        this->nodeapp_->remove_component (name.c_str ());
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAM: contacting nodeapp\n"));
+          this->nodeapp_->remove_component (name.c_str ());
+          ACE_DEBUG ((LM_DEBUG, "NAM: nodeapp contacted\n"));
+          this->component_map_.unbind (name);
+        }
     }
-  
+
   // Call remove on NodeApplication, if all the components are removed,
   // then the NodeApplication will kill itself.
+  ACE_DEBUG ((LM_DEBUG, "NAM: calling remove\n"));
   this->nodeapp_->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_DEBUG ((LM_DEBUG, "NAM: remove returned\n"));
   ACE_CHECK;
 
-  printf("Exiting NAM_Impl::destroyApplication\n");
   return;
 }
 
+// The set priority method
+::CORBA::Long
+CIAO::NodeApplicationManager_Impl_Base::set_priority (
+                                                      const char * cid,
+                                                      const ::Deployment::Sched_Params & params
+                                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((::CORBA::SystemException))
+{
+  if (CIAO::debug_level () > 20)
+    {
+      ACE_DEBUG ((LM_DEBUG , "NAM::The component Id received [%s]", cid));
+
+      ACE_DEBUG ((LM_DEBUG ,
+                  "NAM::The params are policy [%d], priority [%d], "
+                  "scope [%d], time [%d]\n",
+                  params.policy_ ,
+                  params.priority_,
+                  params.scope_, params.msec_));
+    }
+
+  // First validate the values coming in ....
+  ACE_Sched_Params::Policy policy = params.policy_;
+
+  if (policy != ACE_SCHED_FIFO &&
+      policy != ACE_SCHED_RR &&
+      policy != ACE_SCHED_OTHER)
+    return -1;
+
+  ACE_Sched_Priority priority = params.priority_;
+
+  // check the scope ..
+  if (params.scope_ != ACE_SCOPE_PROCESS &&
+      params.scope_ != ACE_SCOPE_THREAD &&
+      params.scope_ != ACE_SCOPE_LWP)
+    {
+      return -1;
+    }
+
+  // Here form the ACE_Sched_Params structure and pass it on to the Process
+  // manager with the current process id.
+  // @@ TODO: Right now we are ignoring params.msec_ value since
+  // ACE_OS::sched_params fails setting errno = EINVAL if
+  // scope = ACE_PROCESS_SCOPE and quantun != ACE_Time_Value:zero.
+  ACE_Sched_Params sched_params (policy ,
+                                 priority,
+                                 params.scope_,
+                                 ACE_Time_Value::zero);
+
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+  if (node_app_process_manager_.set_scheduler (sched_params, process_id_) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "User is not superuser, therefore cannot modify the "
+                      "priority of the component\n"));
+        }
+      else if (ACE_OS::last_error () == ESRCH)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "No process with PID: %d was found!\n",
+                      process_id_));
+        }
+      else if (ACE_OS::last_error () == EINVAL)
+        {
+          ACE_DEBUG ((LM_DEBUG, "\nGiven sched_params does not make sence "
+                      "for the current scheduling policy\n"));
+        }
+      ACE_ERROR ((LM_ERROR, "NodeApplicationManager  (%P|%t): sched_params "
+                  "failed\n"));
+      return -1;
+    }
+  return 1;
+}
+
 
 CIAO::NodeApplicationManager_Impl::~NodeApplicationManager_Impl (void)
 {
@@ -560,13 +664,13 @@ NodeApplicationManager_Impl (CORBA::ORB_ptr o,
 
 PortableServer::ObjectId
 CIAO::NodeApplicationManager_Impl::init (
-    const char *nodeapp_location,
-    const char *nodeapp_op,
-    const CORBA::ULong delay,
-    const Deployment::DeploymentPlan & plan,
-    const PortableServer::POA_ptr callback_poa,
-    NodeManager_Impl_Base * nm
-    ACE_ENV_ARG_DECL)
+                                         const char *nodeapp_location,
+                                         const char *nodeapp_op,
+                                         const CORBA::ULong delay,
+                                         const Deployment::DeploymentPlan & plan,
+                                         const PortableServer::POA_ptr callback_poa,
+                                         NodeManager_Impl_Base * nm
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::InvalidProperty))
 {
@@ -619,7 +723,22 @@ CIAO::NodeApplicationManager_Impl::init (
         Deployment::NodeApplicationManager::_narrow (obj.in ()
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      // add the signal handler to the ACE_REACTOR
+
+      /*
+        if (orb_->orb_core ()->reactor ()->
+        register_handler (SIGCHLD,
+        &child_handler_) == -1)
+
+        if (ACE_Reactor::instance ()->register_handler (SIGCHLD,
+        &child_handler_) == -1)
+        {
+        ACE_DEBUG ((LM_DEBUG, "Error in registering Handler\n\n"));
+        }
+      */
     }
+
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
@@ -655,10 +774,10 @@ create_node_application (const ACE_CString & options
   CIAO::NodeApplication_Callback_Impl * callback_servant = 0;
   ACE_NEW_THROW_EX (callback_servant,
                     CIAO::NodeApplication_Callback_Impl (this->orb_.in (),
-                                                    this->callback_poa_.in (),
-                                                    this->objref_.in (),
-                                                    prop.in ()),
-                                                    CORBA::NO_MEMORY ());
+                                                         this->callback_poa_.in (),
+                                                         this->objref_.in (),
+                                                         prop.in ()),
+                    CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
   PortableServer::ServantBase_var servant_var (callback_servant);
@@ -667,7 +786,6 @@ create_node_application (const ACE_CString & options
                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
-  ACE_Process node_application;
   ACE_Process_Options p_options;
 
   ACE_TRY
@@ -694,9 +812,12 @@ create_node_application (const ACE_CString & options
                               cb_ior.in (),
                               options.c_str ());
 
-      p_options.avoid_zombies (1);
+      p_options.avoid_zombies (0);
 
-      if (node_application.spawn (p_options) == -1)
+      process_id_ = node_app_process_manager_.spawn (p_options,
+                                                     &child_handler_);
+
+      if (process_id_ ==  ACE_INVALID_PID)
         {
           if (CIAO::debug_level () > 1)
             {
@@ -706,11 +827,11 @@ create_node_application (const ACE_CString & options
 
           ACE_TRY_THROW
             (Deployment::ResourceNotAvailable
-               ("Failed to spawn process",
-                "NodeApplication",
-                "",
-                "",
-                ""));
+             ("Failed to spawn process",
+              "NodeApplication",
+              "",
+              "",
+              ""));
         }
 
       // wait for nodeApp to pass back its object reference. with a
@@ -746,7 +867,7 @@ create_node_application (const ACE_CString & options
       {
         //ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
         this->nodeapp_ =
-            Deployment::NodeApplication::_duplicate (retval.in ());
+          Deployment::NodeApplication::_duplicate (retval.in ());
       }
     }
   ACE_CATCHANY
@@ -765,20 +886,48 @@ create_node_application (const ACE_CString & options
   if (CIAO::debug_level () > 1)
     {
       ACE_DEBUG ((LM_DEBUG,
-            "CIAO::NodeApplicationManager_Impl::NodeApplication spawned!\n"));
+                  "CIAO::NodeApplicationManager_Impl::NodeApplication spawned!\n"));
     }
 
+  // push the component info and the process id to the
+  // NodeManager
+  push_component_info (process_id_);
+
+
   return retval._retn ();
 }
 
+
+void
+CIAO::NodeApplicationManager_Impl::
+push_component_info (pid_t process_id)
+{
+  CIAO::NodeManager_Impl_Base::Component_Ids comp;
+
+  for (unsigned int i=0;i < plan_.instance.length ();i++)
+    {
+      if (CIAO::debug_level () > 10)
+        {
+          ACE_DEBUG ((LM_DEBUG, "The component id is [%s]",
+                      plan_.instance[i].name.in ()));
+        }
+      comp.cid_seq_.insert (plan_.instance[i].name.in ());
+    }
+
+  comp.process_id_ = process_id;
+
+  node_manager_->push_component_id_info (comp);
+}
+
+
 CIAO::Static_NodeApplicationManager_Impl::~Static_NodeApplicationManager_Impl (void)
 {
 }
 
 CIAO::Static_NodeApplicationManager_Impl::
 Static_NodeApplicationManager_Impl (CORBA::ORB_ptr o,
-                             PortableServer::POA_ptr p,
-                             Static_Config_EntryPoints_Maps* static_config_entrypoints_maps)
+                                    PortableServer::POA_ptr p,
+                                    Static_Config_EntryPoints_Maps* static_config_entrypoints_maps)
   : NodeApplicationManager_Impl_Base (o, p),
     static_config_entrypoints_maps_ (static_config_entrypoints_maps)
 {
@@ -786,13 +935,13 @@ Static_NodeApplicationManager_Impl (CORBA::ORB_ptr o,
 
 PortableServer::ObjectId
 CIAO::Static_NodeApplicationManager_Impl::init (
-    const char *nodeapp_location,
-    const char *nodeapp_op,
-    const CORBA::ULong delay,
-    const Deployment::DeploymentPlan & plan,
-    const PortableServer::POA_ptr callback_poa,
-    NodeManager_Impl_Base * nm
-    ACE_ENV_ARG_DECL)
+                                                const char *nodeapp_location,
+                                                const char *nodeapp_op,
+                                                const CORBA::ULong delay,
+                                                const Deployment::DeploymentPlan & plan,
+                                                const PortableServer::POA_ptr callback_poa,
+                                                NodeManager_Impl_Base * nm
+                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::InvalidProperty))
 {
@@ -854,12 +1003,12 @@ create_node_application (const ACE_CString & options
   ACE_DEBUG ((LM_DEBUG, "create_static_node_application\n"));
 
   ACE_NEW_RETURN (nodeapp_servant,
-                   CIAO::NodeApplication_Impl (orb_.in (),
-                                               poa_.in (),
-                                               configurator_,
-                                               this->static_config_entrypoints_maps_),
+                  CIAO::NodeApplication_Impl (orb_.in (),
+                                              poa_.in (),
+                                              configurator_,
+                                              this->static_config_entrypoints_maps_),
                   Deployment::NodeApplication::_nil ()
-                   );
+                  );
   if (nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER))
     {
       ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
@@ -871,12 +1020,12 @@ create_node_application (const ACE_CString & options
   // CONFIGURING NodeApplication
   PortableServer::ObjectId_var nodeapp_oid
     = poa_->activate_object (nodeapp_servant
-                            ACE_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
 
   CORBA::Object_var
     obj = poa_->id_to_reference (nodeapp_oid.in ()
-                              ACE_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
 
   Deployment::NodeApplication_var nodeapp_obj =
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 96affb146d9..d133ed64fb2 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -26,6 +26,8 @@
 
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
+#include "ace/OS_NS_sys_wait.h"
+#include "ace/Process_Manager.h"
 #include "ciao/NodeApp_CB_Impl.h"
 #include "ciao/DeploymentS.h"
 #include "ciao/CIAO_common.h"
@@ -36,6 +38,7 @@
 
 namespace CIAO
 {
+
   /**
    * @class NodeApplicationManager_Impl_Base
    */
@@ -142,6 +145,13 @@ namespace CIAO
     /// @note This method doesn't do duplicate.
     Deployment::NodeApplicationManager_ptr get_nodeapp_manager (void);
 
+    /// Set the priority of the NodeApplication process which this NAM manages
+    virtual ::CORBA::Long set_priority (
+        const char * cid,
+        const ::Deployment::Sched_Params & params
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException ));
+
   protected:
     /// Destructor
     virtual ~NodeApplicationManager_Impl_Base (void);
@@ -234,10 +244,52 @@ namespace CIAO
 
     /// Synchronize access to the object set.
     TAO_SYNCH_MUTEX lock_;
+
+    /// The Process Manager for this NodeApplicationManager
+    ACE_Process_Manager node_app_process_manager_;
+
+    /// The process id of the NA associated with the NAM,
+    /// Each NAM will only have one NA associated with it,
+    /// so we have only one process associated with it.
+
+    // this is UNIX specific .... not portable
+    pid_t process_id_;
   };
 
 
   /**
+   * @class NAM_Handler
+   * @brief The signal handler class for the SIGCHLD
+   * handling to avoid zombies
+   *
+   */
+  class NAM_Handler : public ACE_Event_Handler
+    {
+    public:
+      virtual int handle_signal (int sig,
+                                 siginfo_t *,
+                                 ucontext_t *)
+        {
+          ACE_UNUSED_ARG (sig);
+
+          // @@ Note that this code is not portable to all OS platforms
+          // since it uses print statements within signal handler context.
+          //ACE_DEBUG ((LM_DEBUG,
+          //            "Executed ACE signal handler for signal %S \n",
+          //            sig));
+
+          ACE_exitcode status;
+          // makes a claal to the underlying os system call
+          // -1 to wait for any child process
+          // and WNOHANG so that it retuurns immediately
+          ACE_OS::waitpid (-1 ,&status, WNOHANG, 0);
+
+          return 0;
+        }
+    };
+
+
+  /**
    * @class NodeApplicationManager_Impl
    */
   class CIAO_NAM_Export NodeApplicationManager_Impl
@@ -272,6 +324,18 @@ namespace CIAO
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
                        Deployment::InvalidProperty));
+
+
+    /**
+     * @operation push_component_info
+     * @brief pushes component info to the NodeManager
+     *
+     * @param process_id The id of the process of NodeApplication
+     */
+    void push_component_info (pid_t process_id);
+
+    /// The signal handler
+    NAM_Handler child_handler_;
   };
 
 
@@ -319,7 +383,6 @@ namespace CIAO
 
     CIAO::NoOp_Configurator configurator_;
   };
-
 }
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp
new file mode 100644
index 00000000000..7eed65dafbb
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/URL_Parser.cpp
@@ -0,0 +1,103 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/ARGV.h"
+#include "URL_Parser.h"
+
+#include "ace/OS_NS_string.h"
+
+bool
+URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("rwu:h:p:f:d"));
+
+  bool success = true;
+  int c;
+
+  while ((c = get_opt ()) != -1)
+    switch (c)
+      {
+      case 'd':
+        this->debug_ = 1;
+        break;
+    case 'u':
+      success = parseURL (get_opt.opt_arg ());
+      break;
+        // Usage fallthrough.
+      default:
+        success = false;
+      }
+  if (this->hostname_ == 0 || this->filename_ == 0)
+  success = false;
+
+  return success;
+}
+
+URL_Parser::URL_Parser (void)
+  : hostname_ ("127.0.0.1"),
+    port_ (ACE_DEFAULT_HTTP_SERVER_PORT),
+    filename_ (0),
+    debug_ (0)
+{
+}
+
+bool URL_Parser::parseURL (char* url)
+{
+  char* ptr;
+  bool success = true;
+
+  if (ptr = ACE_OS::strstr (url, "http://"))
+    url += ACE_OS::strlen ("http://");
+
+  if (url[0] == '/')
+  {
+    this->filename_ = ACE_OS::strdup (url);
+  }
+  else
+  {
+    if (ptr = ACE_OS::strstr (url, ":"))
+      this->port_ = ACE_OS::atoi (ptr + 1);
+    else
+      ptr = ACE_OS::strstr (url, "/");
+
+    if(!ptr)
+      success = false;
+    else
+    {
+      size_t host_len = ptr - url;
+      ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false);
+      ACE_OS::strncpy (this->hostname_, url, host_len);
+      this->hostname_ [host_len] = '\0';
+
+      if (ptr = ACE_OS::strstr (ptr, "/"))
+      {
+        this->filename_ = ACE_OS::strdup(ptr);
+      }
+      else
+        success = false;
+    }
+  }
+  return success;
+}
+
+
+void URL_Parser::Error (void)
+{
+  ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
+
+}
+
+
+  URL_Parser::~URL_Parser()
+  {
+    if(this->hostname_)
+    {
+      delete [] this->hostname_;
+      this->hostname_ =0;
+    }
+    if (this->filename_)
+    {
+      ACE_OS::free (this->filename_);
+      this->filename_ = 0;
+    }
+  }
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h b/TAO/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h
new file mode 100644
index 00000000000..aaaeab4960c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/URL_Parser.h
@@ -0,0 +1,68 @@
+
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    URL_Parser.h
+ *
+ *  $Id$
+ *
+ *  Parses a URL into its logical chunks
+ *
+ *
+ *  @author Stoyan Paunov
+ */
+//=============================================================================
+
+
+#ifndef URL_PARSER_H
+#define URL_PARSER_H
+
+#include "ace/Get_Opt.h"
+#include "ace/ARGV.h"
+#include "ace/Singleton.h"  //for ACE_Singleton
+#include "ace/Null_Mutex.h" //for ACE_Null_Mutex
+
+//forward declaration
+class URL_Parser;
+
+typedef ACE_Singleton <URL_Parser, ACE_Null_Mutex> TheURL_Parser;
+
+
+class URL_Parser
+{
+public:
+
+  friend class ACE_Singleton <URL_Parser, ACE_Null_Mutex>;
+
+  /// parses commandline arguments
+  bool parse_args (int argc, ACE_TCHAR *argv[]);
+
+  //return false on failure
+  bool parseURL (char* url);
+
+  void Error (void);
+
+  /// Hostname to connect to
+  ACE_TCHAR *hostname_;
+
+  /// Port number to use
+  u_short port_;
+
+  /// Filename to upload/download
+  ACE_TCHAR *filename_;
+
+  /// turns on verbosity
+  int debug_;
+
+  //destructor
+  ~URL_Parser (void);
+
+protected:
+  URL_Parser (void);
+  // protected constructor, singleton
+};
+
+
+
+#endif /* URL_PARSER_H */
diff --git a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
index 7c5485adf82..cbd494ac776 100644
--- a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
@@ -56,15 +56,24 @@ int CIAO::CIAO_Monitor::stop ()
 {
   if (CIAO::debug_level () > 9)
     {
-      ACE_DEBUG ((LM_DEBUG , "Inside the get_current_data"));
+      // ACE_DEBUG ((LM_DEBUG ,
+      //            "CIAO_Monitor::Inside the get_current_data of[%s]\n",
+      //            current_domain_->node[0].name.in ()));
     }
 
-  float current_load;
+  CORBA::Double current_load = 0;
+
+  long user_cpu;
+  long user_cpu_low;
+  long sys_cpu;
+  long idle_time;
 
   // get the load average value from the /proc/loadavg
 
-  FILE *load_file = ACE_OS::fopen ("/proc/loadavg", "r");
-  
+  FILE *load_file = 0;
+
+  load_file = ACE_OS::fopen ("/proc/stat", "r");
+
   if (load_file == 0)
     {
       // load file cannot be opened ..
@@ -72,25 +81,90 @@ int CIAO::CIAO_Monitor::stop ()
     }
   else
     {
-      fscanf (load_file, "%f", &current_load);
+      char buffer [99];
+
+      // read in the cpu label
+      fscanf (load_file, "%s", buffer);
+
+      //read the user_cpu
+      fscanf (load_file, "%ld", &user_cpu);
+
+      //read the user cpu low priority
+      fscanf (load_file, "%ld", &user_cpu_low);
+
+      //read the system cpu
+      fscanf (load_file, "%ld", &sys_cpu);
+
+      //read the cpu in idle time ..
+      fscanf (load_file, "%ld", &idle_time);
+
+
       if (CIAO::debug_level () > 9)
       {
-        ACE_DEBUG ((LM_DEBUG , "Current load is %d\n",current_load));
+        //  ACE_DEBUG ((LM_DEBUG , "Current load is %d\n",current_load));
       }
+
+      ACE_OS::fclose (load_file);
+
+
+   // Calculate the percent CPU
+
+      long current_user_cpu = user_cpu - prev_user_cpu_;
+      long total_cpu_usage = user_cpu + user_cpu_low + sys_cpu +
+        idle_time - prev_user_cpu_ - prev_idle_time_ - prev_sys_cpu_
+        - prev_user_cpu_low_;
+
+      current_load = (current_user_cpu * 100)/total_cpu_usage;
+
+      // Save the current cpu values in the previous variables
+
+      prev_user_cpu_ = user_cpu;
+
+      prev_user_cpu_low_ = user_cpu_low;
+
+      prev_sys_cpu_ = sys_cpu;
+
+      prev_idle_time_ = idle_time;
+
     }
 
-  ACE_OS::fclose (load_file);
 
-    CORBA::Any any;
-    any <<= current_load;
+  CORBA::Any any;
+  any <<= current_load;
+
+  // here insert the util value, in the right position
+
+  for (unsigned int i = 0;
+       i < current_domain_->node[0].resource.length ();
+       i++)
+    {
+      if (!strcmp (current_domain_->node[0].resource[i].name, "Processor"))
+        {
+          // ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::The Resource found\n"));
+          for (unsigned int j = 0;
+               j < current_domain_->node[0].resource[i].property.length ();
+               j++)
+            {
+              if (!strcmp (
+                           current_domain_
+                           ->node[0].resource[i].property[j].name.in (),
+                           "LoadAverage"))
+                {
+                  //ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::The property found\n"));
+                  current_domain_->node[0].resource[i].property[j].kind =
+                    ::Deployment::Quantity;
+                  current_domain_->node[0].resource[i].property[j].value =
+                    any;
+                }
+            }
+        }
+    }
 
-    current_domain_->node[0].resource[0].property[0].kind = ::Deployment::Quantity;
-    current_domain_->node[0].resource[0].property[0].value = any;
 
-    if (CIAO::debug_level () > 9)
+  if (CIAO::debug_level () > 9)
     {
-      ACE_DEBUG ((LM_DEBUG , "Exiting from the get_current_data function\n"));
+      //ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::Exiting from the get_current_data function\n"));
     }
 
-    return current_domain_.get ();
+  return current_domain_.get ();
 }
diff --git a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
index d6f15d06802..62fd78da735 100644
--- a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
+++ b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
@@ -100,6 +100,19 @@ namespace CIAO
 
     /// The Domain data structure
     auto_ptr <Deployment::Domain> current_domain_;
+
+    ///The previous user cpu
+    long prev_user_cpu_;
+
+    ///The previous user cpu low priority
+    long prev_user_cpu_low_;
+
+    ///The previous system cpu
+    long prev_sys_cpu_;
+
+    ///The previous idle time
+    long prev_idle_time_;
+
   };
 
 } // CIAO
diff --git a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
index 911b8bc9ce8..d082a5ecd3c 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
@@ -1,12 +1,12 @@
 // $Id$
 
 
-// MPC file for the Monitor 
+// MPC file for the Monitor
 
 project(*monitorlib): ciao_client_dnc{
   after += CIAO_TargetManager_stub
   includes += $(CIAO_ROOT)/DAnCE/TargetManager
-  sharedname = ciaomonlib 
+  sharedname = ciaomonlib
 
   libs += TargetManager_stub CIAO_Deployment_stub
 
@@ -15,7 +15,7 @@ project(*monitorlib): ciao_client_dnc{
 
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.cpp b/TAO/CIAO/DAnCE/NodeManager/MonitorCB.cpp
index 5bd59627d2e..c5333d60a77 100644
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/MonitorCB.cpp
@@ -39,16 +39,20 @@ int CIAO::MonitorCB::update_data (::Deployment::Domain& data)
 
   try
   {
-    if (CIAO::debug_level () > 9)
+    if (CIAO::debug_level () > 20)
       {
-        ACE_DEBUG ((LM_DEBUG , "---Making a call to update\n"));
+        ACE_DEBUG ((LM_DEBUG , "CIAO::NM::MonitorCB::Making a call to update\n"));
       }
     target_mgr_->updateDomain (elements , domain , update_kind);
   }
-  catch (CORBA::Exception&)
+  catch (CORBA::Exception& ex)
     {
-      ACE_DEBUG ((LM_DEBUG, "Unknown Exception"));
+      //ACE_DEBUG ((LM_DEBUG, "CIAO::NM::MonitorCB::Unknown Exception\n"));
+      //ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NM::MonitorCB::updateDomain");
+    }
+  catch (...)
+    {
+      // ignore
     }
-
   return 0;
 }
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp b/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
index fc009f1b3fe..dd1c987a434 100644
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
@@ -16,10 +16,15 @@
 #include "MonitorCB.h"
 #include "CIAO_common.h"
 
+
 #include "ace/Log_Msg.h"
 #include "ace/DLL.h"
 #include "ace/SString.h"
 
+#include "NodeManager_Impl.h"
+
+
+
 namespace CIAO
 {
   typedef MonitorBase* (*MonitorFactory) (void);
@@ -36,18 +41,22 @@ namespace CIAO
 
 CIAO::MonitorController::MonitorController (CORBA::ORB_ptr orb,
                                             ::Deployment::Domain& domain,
-                                            ::Deployment::TargetManager_ptr target
+                                            ::Deployment::TargetManager_ptr target,
+                                            ::CIAO::NodeManager_Impl_Base* node_mgr
                                             )
   : target_facet_i_ (::Deployment::TargetManager::_duplicate (target)),
     terminate_flag_ (0),
     orb_ (orb),
-    initial_domain_ (domain)
+    initial_domain_ (domain),
+    node_mgr_ (node_mgr),
+    monitor_cpu_usage_ (0),
+    add_component_pid_ (1)
 {
 }
 
 int CIAO::MonitorController::svc (void)
 {
-    ACE_DLL dll;
+  ACE_DLL dll;
 
   // forming the library name
   ACE_CString lib_name = ACE_DLL_PREFIX;
@@ -74,6 +83,7 @@ int CIAO::MonitorController::svc (void)
   {
     ACE_TRACE ((LM_DEBUG "Inside the init call\n"));
 
+    // here creating the monitor object
     monitor_.reset ((MonitorBase*) factory ());
     monitor_->initialize_params (initial_domain_,
                                  target_facet_i_.in (),
@@ -83,30 +93,108 @@ int CIAO::MonitorController::svc (void)
     // Start the Monitor
     monitor_->start (orb_);
     auto_ptr <CIAO::MonitorCB> monitor_callback (new CIAO::MonitorCB (orb_,
-                                                                      target_facet_i_.in (),
-                                                                      interval));
+                                                                     target_facet_i_.in (),
+                                                                     interval));
+
+    // check if cpu needs to be monitored or not
+    for (unsigned int i = 0;i < initial_domain_.node[0].resource.length ();i++)
+      {
+        if (!strcmp (initial_domain_.node[0].resource[i].name, "Processor"))
+          monitor_cpu_usage_ = 1;
+      }
+
+    // Wait for system to stabilize itself
+    ACE_OS::sleep (interval);
+
 
     // The loop in which UpdateData is called
     while (!terminating ())
       {
+
+        //ACE_DEBUG ((LM_DEBUG , "=The Terminate is %d\n", terminate_flag_));
+
+
+        // if monitoring of cpu is enable , monitor , else dont do
+        // anything
+        ::Deployment::Domain* domain;
+
+        if (monitor_cpu_usage_)
+          domain = monitor_->get_current_data ();
+        else
+          domain = &initial_domain_;
+
+
+
+        // ****** add component data *******************
+
+        NodeManager_Impl_Base::Component_Ids cids =
+          node_mgr_->get_component_detail ();
+
+        // Here save the old resource length
+        int counter = domain->node[0].resource.length ();
+
+        // if pid is already added , dont add
+        if (add_component_pid_)
+          {
+            // then add more resource element to the
+            // domain structure
+            // ACE_DEBUG ((LM_DEBUG , "Going to add CID/PID data\n"));
+            int new_res_size = domain->node[0].resource.length () +
+              cids.cid_seq_.size ();
+
+            domain->node[0].resource.length (new_res_size);
+
+            ACE_Unbounded_Set_Iterator<ACE_CString> iter (cids.cid_seq_);
+
+            for (iter = cids.cid_seq_.begin ();
+                 iter != cids.cid_seq_.end ();
+                 iter++,counter++)
+              {
+                domain->node[0].resource[counter].name =
+                  CORBA::string_dup ("Component");
+                domain->node[0].resource[counter].resourceType.length (0);
+
+                // Have one property for now
+                domain->node[0].resource[counter].property.length (1);
+                domain->node[0].resource[counter].property[0].name =
+                  CORBA::string_dup ((*iter).c_str ());
+                domain->node[0].resource[counter].property[0].kind =
+                  ::Deployment::Quantity;
+                domain->node[0].resource[counter].property[0].dynamic =
+                  0;
+                domain->node[0].resource[counter].property[0].value <<=
+                  CORBA::Long (cids.process_id_);
+
+                //                ACE_DEBUG ((LM_DEBUG , "The process id is [%d]\n",
+                //                            CORBA::Long (cids.process_id_)));
+              }
+            // set the add_component_pid_ to 0
+            add_component_pid_ = 0;
+          }
+
+        //******add compoennt data
+
+        monitor_callback->update_data (*domain);
+
         // data will be updated in intervals of 10 secs.
         // in the latest version of spec , this value will
         // come from Execution Manager
         ACE_OS::sleep (interval);
-        //      ACE_DEBUG ((LM_DEBUG , "=The Terminate is %d\n", terminate_flag_));
-        ::Deployment::Domain* domain =
-          monitor_->get_current_data ();
 
-        monitor_callback->update_data (*domain);
       }
     monitor_->stop ();
   }
 
+  // here delete the monitor object before
+  // unloading the library
+  monitor_.reset ();
+
+  // unload the library
   dll.close ();
 
   if (CIAO::debug_level () > 9)
     {
-      ACE_DEBUG ((LM_DEBUG , "Terminating Monitor\n"));
+      ACE_DEBUG ((LM_DEBUG , "CIAO::Monitor::Terminating Monitor\n"));
     }
   return 0;
 }
@@ -124,7 +212,7 @@ void CIAO::MonitorController::terminate ()
              guard,
              lock_
              );
-  ACE_DEBUG ((LM_DEBUG , "WITHIN TERMINATE CALL  ......"));
+  //ACE_DEBUG ((LM_DEBUG , "WITHIN TERMINATE CALL  ......\n"));
   terminate_flag_=1;
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h b/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
index 9fc62beed8b..9a02042022b 100644
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
+++ b/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
@@ -15,6 +15,8 @@
 #define MONITOR_CONTROLLER_H
 
 #include "NodeManager_svnt_export.h"
+#include "Deployment_BaseC.h"
+
 #include "TargetManager/TargetManagerC.h"
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
@@ -23,7 +25,6 @@
 #include "ace/Synch.h"
 
 
-
 /**
  * @namespace CIAO
  *
@@ -36,6 +37,8 @@ namespace CIAO
 
   class MonitorBase;
 
+  class NodeManager_Impl_Base;
+
   /**
    *  @class MonitorController
    *
@@ -66,46 +69,56 @@ namespace CIAO
        * thread
        */
       void terminate ();
-      
-      
+
+
       /// The Constructor.
       MonitorController (CORBA::ORB_ptr orb,
                          ::Deployment::Domain& domain,
-                         ::Deployment::TargetManager_ptr target
+                         ::Deployment::TargetManager_ptr target,
+                         ::CIAO::NodeManager_Impl_Base* node_mgr
                          );
-      
+
       ~MonitorController ();
     protected:
-      
+
       /**
        * @function terminating.
        * @brief returns the terminating flag
        * @return bool The terminting state of the thread
        */
       bool terminating ();
-      
+
       /// The monitor object
       auto_ptr <MonitorBase>  monitor_;
-      
+
       /// The TargetManagerImpl object
       CIAO::TargetManagerImpl_var target_impl_cmp_;
-      
+
       /// The TargetManager Facet ....
       Deployment::TargetManager_var target_facet_i_;
-      
+
       /// The terminate flag_
       bool terminate_flag_;
-      
+
       //Thread Mutex for synchronizing call
       ACE_SYNCH_MUTEX lock_;
-      
+
       // the ORB pointer ..
       CORBA::ORB_ptr orb_;
-      
+
       /// The initial domain
       ::Deployment::Domain initial_domain_;
+
+      /// The Node Manager
+      ::CIAO::NodeManager_Impl_Base* node_mgr_;
+
+      /// flag tells ; what to monitor
+      bool monitor_cpu_usage_;
+
+      /// TO add component pid or not ..
+      bool add_component_pid_;
     };
 
 } // CIAO
-  
+
 #endif
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
index ec5eabcca8a..192fe6f31f0 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -8,10 +8,10 @@ project(NodeManager_svnt): ciao_component_dnc, iortable, ifr_client, dance_exten
   libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
   includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/Interfaces $(CIAO_ROOT)/DAnCE/TargetManager
   dynamicflags = NODEMANAGER_SVNT_BUILD_DLL
- 
+
   IDL_Files {
   }
- 
+
   Source_Files {
     ../Interfaces/NodeManagerS.cpp
     NodeManager_Impl.cpp
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index db1c0883454..052b5bdbfc0 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -3,21 +3,22 @@
 #include "NodeManager_Impl.h"
 #include "../NodeApplicationManager/NodeApplicationManager_Impl.h"
 #include "ace/Log_Msg.h"
+#include <errno.h>
 
 CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
-                                          CORBA::ORB_ptr orb,
-                                          PortableServer::POA_ptr poa,
-                                          const char * nodeapp_loc,
-                                          const char * nodeapp_options,
-                                          int spawn_delay)
+                                                    CORBA::ORB_ptr orb,
+                                                    PortableServer::POA_ptr poa,
+                                                    const char * nodeapp_loc,
+                                                    const char * nodeapp_options,
+                                                    int spawn_delay)
   ACE_THROW_SPEC ((CORBA::SystemException))
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    name_ (CORBA::string_dup (name)),
-    nodeapp_location_ (CORBA::string_dup (nodeapp_loc)),
-    nodeapp_options_ (CORBA::string_dup (nodeapp_options)),
-    callback_poa_ (PortableServer::POA::_nil ()),
-    spawn_delay_ (spawn_delay)
+    : orb_ (CORBA::ORB::_duplicate (orb)),
+      poa_ (PortableServer::POA::_duplicate (poa)),
+      name_ (CORBA::string_dup (name)),
+      nodeapp_location_ (CORBA::string_dup (nodeapp_loc)),
+      nodeapp_options_ (CORBA::string_dup (nodeapp_options)),
+      callback_poa_ (PortableServer::POA::_nil ()),
+      spawn_delay_ (spawn_delay)
 {
 }
 
@@ -71,48 +72,88 @@ void
 CIAO::NodeManager_Impl_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
-                                   Deployment::TargetManager_ptr target,
-                                   Deployment::Logger_ptr
-                                   ACE_ENV_ARG_DECL)
+                                         Deployment::TargetManager_ptr target,
+                                         Deployment::Logger_ptr
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-//  ACE_THROW (CORBA::NO_IMPLEMENT ());
-// Here start the Monitor
-   CIAO_TRACE("CIAO::NodeManager_Impl_Base::joinDomain");
-
-   ::Deployment::Domain this_domain = domain;
-//  MonitorController* monitor_controller
-   monitor_controller_.reset (
-      new MonitorController (orb_.in (),
-                             this_domain,
-                             target));
-
-   if (CIAO::debug_level () > 9)
-   {
-      ACE_DEBUG ((LM_DEBUG , "Before Activate"));
-   }
+  //  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  // Here start the Monitor
+  CIAO_TRACE("CIAO::NodeManager_Impl_Base::joinDomain");
+
+  ::Deployment::Domain this_domain = domain;
+
+  monitor_controller_.reset (
+                             new MonitorController (orb_.in (),
+                                                    this_domain,
+                                                    target,
+                                                    this));
+
+  if (CIAO::debug_level () > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG , "Before Activate\n"));
+    }
   /// Activate the Monitor Controller to
   //start the monitoring
-   monitor_controller_->activate ();
+  monitor_controller_->activate ();
 
-   if (CIAO::debug_level () > 9)
-   {
-      ACE_DEBUG ((LM_DEBUG , "After Activate"));
-   }
+  if (CIAO::debug_level () > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG , "Monitor Activated\n"));
+    }
 }
 
 void
 CIAO::NodeManager_Impl_Base::leaveDomain (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  //Implementation undefined.
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  // Delete the monitor , this will also terminate the thread
+  monitor_controller_.reset ();
+}
+
+CORBA::Long
+CIAO::NodeManager_Impl_Base::set_priority (
+                                           const char * plan_id,
+                                           const char * cid,
+                                           const ::Deployment::Sched_Params & nm_params
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS
+                                           )
+  ACE_THROW_SPEC ((::CORBA::SystemException))
+
+{
+  ACE_CString key (plan_id);
+  key += "@";
+  key += this->name_.in ();
+
+  if (CIAO::debug_level () > 10)
+    {
+      ACE_DEBUG ((LM_DEBUG , "Inside the set_priority\n"));
+      ACE_DEBUG ((LM_DEBUG , "pid = [%s] , cid = [%s]\n", key.c_str () , cid));
+    }
+
+  try {
+    CORBA::Object_var obj =
+      this->poa_->id_to_reference (this->map_.get_nam (key));
+
+    Deployment::NodeApplicationManager_var nam =
+      Deployment::NodeApplicationManager::_narrow (obj.in ());
+
+    return nam->set_priority (cid, nm_params);
+  }
+  catch (CORBA::Exception& ex)
+    {
+
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "(%P|%t) NodeManager_Impl::set_priority ()\t\n");
+      ACE_RE_THROW;
+    }
 }
 
 ::Components::FacetDescriptions *
@@ -123,7 +164,7 @@ get_all_facets (ACE_CString & name)
 
   if (this->comp_facets_map_.find (name.c_str (), entry) != 0)
     ACE_DEBUG ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
-      "No component with name [%s] was found in the NodeManager\n", name.c_str ()));
+                "No component with name [%s] was found in the NodeManager\n", name.c_str ()));
 
   CORBA::ULong facet_len = entry->int_id_->length ();
 
@@ -150,7 +191,7 @@ get_all_consumers (ACE_CString & name)
 
   if (this->comp_consumers_map_.find (name.c_str (), entry) != 0)
     ACE_DEBUG ((LM_ERROR, "(%P|%t) - NodeManager_Impl_Base::get_all_facets - "
-      "Component [%s] was not found in the NodeManager\n", name.c_str ()));
+                "Component [%s] was not found in the NodeManager\n", name.c_str ()));
 
   CORBA::ULong consumer_len = entry->int_id_->length ();
 
@@ -197,10 +238,10 @@ CIAO::NodeManager_Impl_Base::preparePlan (const Deployment::DeploymentPlan &plan
   if (! this->validate_plan (plan))
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) NodeManager <%s>:prepare_plan:Plan_Error.\n",
-        plan.instance[0].node.in ()));
+                  plan.instance[0].node.in ()));
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) All component instances hosted in the "
-        "same component server must have the "
-        "same \"resourceName\" defined.\n"));
+                  "same component server must have the "
+                  "same \"resourceName\" defined.\n"));
 
       ACE_THROW_RETURN (Deployment::PlanError (),
                         Deployment::NodeApplicationManager::_nil ());
@@ -329,8 +370,8 @@ CIAO::NodeManager_Impl_Base::preparePlan (const Deployment::DeploymentPlan &plan
 
 void
 CIAO::NodeManager_Impl_Base::destroyManager
-        (Deployment::NodeApplicationManager_ptr manager
-         ACE_ENV_ARG_DECL)
+(Deployment::NodeApplicationManager_ptr manager
+ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError,
                    Deployment::InvalidReference))
@@ -338,7 +379,6 @@ CIAO::NodeManager_Impl_Base::destroyManager
   CIAO_TRACE("CIAO::NodeManager_Impl::destroyManager");
   ACE_TRY
     {
-      printf("Entering NM_Impl::destroyManager\n");
       // Deactivate this object
       PortableServer::ObjectId_var id =
         this->poa_->reference_to_id (manager
@@ -355,7 +395,6 @@ CIAO::NodeManager_Impl_Base::destroyManager
       this->poa_->deactivate_object (id.in ()
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      printf("Exiting NM_Impl::destroyManager\n");
     }
   ACE_CATCH (PortableServer::POA::WrongAdapter, ex)
     {
@@ -398,6 +437,9 @@ destroyPlan (const Deployment::DeploymentPlan & plan
   CORBA::ULong const length = plan.instance.length ();
   for (CORBA::ULong i = 0; i <  length; ++i)
     {
+      ACE_DEBUG ((LM_DEBUG, "NM_DP - forloop instance %s\n",
+                  plan.instance[i].name.in ()));
+
       Reference_Count_Map::ENTRY *entry = 0;
       if (this->ref_count_map_.find (plan.instance[i].name.in (), entry) == 0)
         {
@@ -406,23 +448,25 @@ destroyPlan (const Deployment::DeploymentPlan & plan
           if (entry->int_id_.count_ == 0)
             {
               // Remove this component from the shared set
+              ACE_DEBUG ((LM_DEBUG, "\tremoving shared...\n"));
               this->shared_components_.remove (plan.instance[i].name.in ());
-
+              ACE_DEBUG ((LM_DEBUG, "\tunbinding from the ref count map\n"));
               // Unbind this component from the ref_count_map_
               this->ref_count_map_.unbind (plan.instance[i].name.in ());
 
+              ACE_DEBUG ((LM_DEBUG, "\tunbinding from the facet/consumer maps\n"));
               // Unbind this component from the facet/consumer maps
               if (this->comp_facets_map_.unbind (
-                    plan.instance[i].name.in ()) != 0 ||
+                                                 plan.instance[i].name.in ()) != 0 ||
                   this->comp_consumers_map_.unbind (
-                    plan.instance[i].name.in ()) != 0)
+                                                    plan.instance[i].name.in ()) != 0)
                 {
                   ACE_TRY_THROW
                     (Deployment::StopError ("NodeManager_Impl_Base::destroyPlan ",
                                             "Unable to find component instance"));
                 }
             }
-       }
+        }
     }
 
   // Find the NAM from the map and invoke the destroyPlan() operation on
@@ -434,10 +478,12 @@ destroyPlan (const Deployment::DeploymentPlan & plan
   Deployment::NodeApplicationManager_var nam =
     Deployment::NodeApplicationManager::_narrow (obj.in ());
 
+
   // Reset each NAM about the shared components information
   Deployment::ComponentPlans_var shared = this->get_shared_components_i ();
+  ACE_DEBUG ((LM_DEBUG, "contacting the nams - set shared components\n"));
   nam->set_shared_components (shared.inout ());
-
+  ACE_DEBUG ((LM_DEBUG, "contacting the nams destroyApplication\n"));
   nam->destroyApplication (0);
 
 
@@ -486,8 +532,8 @@ CIAO::NodeManager_Impl_Base::get_shared_components_i (void)
         {
           // should never happen
           ACE_DEBUG ((LM_ERROR, "Component [%s] in the list of shared component, "
-                                "was not found in the NodeManager ref count map.\n",
-                                (*iter).c_str ()));
+                      "was not found in the NodeManager ref count map.\n",
+                      (*iter).c_str ()));
         }
     }
 
@@ -523,6 +569,9 @@ validate_plan (const Deployment::DeploymentPlan &plan)
   const char * resource_id = 0;
   CORBA::ULong i = 0;
 
+  // Update the name of ourself
+  this->name_ = plan.instance[0].node.in ();
+
   for (i = 0; i < plan.instance.length (); ++i)
     {
       if (plan.instance[i].deployedResource.length () != 0)
@@ -531,9 +580,10 @@ validate_plan (const Deployment::DeploymentPlan &plan)
           // the "resourceValue" field represents the policy_set_id, so we
           // are checking to make sure that all component instances have
           // the same server_resource_id.
-          resource_id =
-            plan.instance[i].deployedResource[0].resourceName.in ();
-          break;
+
+          //resource_id =
+          //  plan.instance[i].deployedResource[0].resourceName.in ();
+          //break;
         }
     }
   if (i == plan.instance.length ()) // No server resource id has been set for any instance
@@ -542,7 +592,7 @@ validate_plan (const Deployment::DeploymentPlan &plan)
   for (i = 0; i < plan.instance.length (); ++i)
     {
       const char * my_resource_id;
-      if (plan.instance[i].deployedResource.length () == 0)
+      if (true || plan.instance[i].deployedResource.length () == 0)
         {
           continue;
         }
@@ -560,17 +610,31 @@ validate_plan (const Deployment::DeploymentPlan &plan)
   return true;
 }
 
+
+void CIAO::NodeManager_Impl_Base::
+push_component_id_info (Component_Ids comps)
+{
+  components_ = comps;
+}
+
+CIAO::NodeManager_Impl_Base::Component_Ids
+CIAO::NodeManager_Impl_Base::
+get_component_detail ()
+{
+  return components_;
+}
+
 CIAO::NodeManager_Impl::~NodeManager_Impl ()
 {
 }
 
 CIAO::NodeManager_Impl::
 NodeManager_Impl (const char *name,
-                 CORBA::ORB_ptr orb,
-                 PortableServer::POA_ptr poa,
-                 const char * nodeapp_loc,
-                 const char * nodeapp_options,
-                 int spawn_delay)
+                  CORBA::ORB_ptr orb,
+                  PortableServer::POA_ptr poa,
+                  const char * nodeapp_loc,
+                  const char * nodeapp_options,
+                  int spawn_delay)
   : NodeManager_Impl_Base (name, orb, poa, nodeapp_loc, nodeapp_options, spawn_delay)
 {}
 
@@ -596,12 +660,12 @@ CIAO::Static_NodeManager_Impl::~Static_NodeManager_Impl ()
 
 CIAO::Static_NodeManager_Impl::
 Static_NodeManager_Impl (const char *name,
-                        CORBA::ORB_ptr orb,
-                        PortableServer::POA_ptr poa,
-                        const char * nodeapp_loc,
-                        const char * nodeapp_options,
-                        int spawn_delay,
-                        Static_Config_EntryPoints_Maps* static_config_entrypoints_maps)
+                         CORBA::ORB_ptr orb,
+                         PortableServer::POA_ptr poa,
+                         const char * nodeapp_loc,
+                         const char * nodeapp_options,
+                         int spawn_delay,
+                         Static_Config_EntryPoints_Maps* static_config_entrypoints_maps)
   : NodeManager_Impl_Base (name, orb, poa, nodeapp_loc, nodeapp_options, spawn_delay),
     static_config_entrypoints_maps_ (static_config_entrypoints_maps)
 {}
@@ -613,20 +677,22 @@ create_node_app_manager (CORBA::ORB_ptr orb,
                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG, "creating static_node_app_manager\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "creating static_node_app_manager\n"));
+
   CIAO::NodeApplicationManager_Impl_Base *app_mgr;
   ACE_NEW_THROW_EX (app_mgr,
-    CIAO::Static_NodeApplicationManager_Impl (orb,
-      poa,
-      this->static_config_entrypoints_maps_),
-    CORBA::NO_MEMORY ());
+                    CIAO::Static_NodeApplicationManager_Impl (orb,
+                                                              poa,
+                                                              this->static_config_entrypoints_maps_),
+                    CORBA::NO_MEMORY ());
   return app_mgr;
 }
 
 void
 CIAO::Static_NodeManager_Impl::destroyManager
-        (Deployment::NodeApplicationManager_ptr manager
-         ACE_ENV_ARG_DECL)
+(Deployment::NodeApplicationManager_ptr manager
+ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError,
                    Deployment::InvalidReference))
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
index bae08351a45..1003f18327e 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -123,6 +123,17 @@ namespace CIAO
     get_shared_components (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
+    /// RACE specific extension. Modify the priority of a node application
+    /// process.
+
+    virtual ::CORBA::Long
+    set_priority (
+        const char * plan_id,
+        const char * cid,
+        const ::Deployment::Sched_Params & nm_params
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((::CORBA::SystemException));
+
     // ********* CIAO Specific Helper functions ************
 
     virtual ::Components::FacetDescriptions *
@@ -139,6 +150,19 @@ namespace CIAO
     set_all_consumers (ACE_CString &name,
                        const ::Components::ConsumerDescriptions_var & consumers);
 
+    // ********* Function added for getting component ids...
+
+    struct Component_Ids
+    {
+      ACE_Unbounded_Set <ACE_CString> cid_seq_;
+      pid_t process_id_;
+    };
+
+    virtual void push_component_id_info (Component_Ids comps);
+
+
+    Component_Ids get_component_detail ();
+
   private:
     /// Validate the child deployment plan. In particular, we are
     /// trying to verify that all the component instances within this
@@ -232,6 +256,9 @@ namespace CIAO
 
     /// The MonitorController pointer
     auto_ptr <MonitorController> monitor_controller_;
+
+    /// The set of Components
+    Component_Ids components_;
   };
 
 
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index 7318939fe16..4c3684f5d3c 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -17,6 +17,7 @@ char *default_svcconf_ = 0;
 char *svcconf_config_ = 0;
 char *nodeapp_location_ = 0;
 char *nodeapp_options_ = 0;
+const char *pid_file_name_ = 0;
 int write_to_ior_ = 0;
 int register_with_ns_ = 0;
 int nodeapp_loc_ = 0;
@@ -25,29 +26,33 @@ int spawn_delay = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:c:m:s:d:na:");
+  ACE_Get_Opt get_opts (argc, argv, "o:c:m:s:d:na:p:z:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'z':
+        nodeapp_options_ = "-ORBDebugLevel 10";
+        break;
+
       case 'o':  // get the file name to write to
-       ior_file_name_ = get_opts.opt_arg ();
-       write_to_ior_ = 1;
-      break;
+        ior_file_name_ = get_opts.opt_arg ();
+        write_to_ior_ = 1;
+        break;
 
       case 'c':  // get the default svc.conf filename
         default_svcconf_ = get_opts.opt_arg ();
-      break;
+        break;
 
       case 'm':  // get the svc.conf map configuration filename
         svcconf_config_ = get_opts.opt_arg ();
-      break;
+        break;
 
       case 's': //get the location to spawn the NodeApplication
         nodeapp_location_ = get_opts.opt_arg ();
         nodeapp_loc_ = 1;
-      break;
+        break;
 
       case 'a': // Nodeapplication arguments
         nodeapp_options_ = get_opts.opt_arg ();
@@ -55,11 +60,15 @@ parse_args (int argc, char *argv[])
 
       case 'd': //get the spawn delay argument
         spawn_delay = ACE_OS::atoi (get_opts.opt_arg ());
-      break;
+        break;
 
       case 'n':
         register_with_ns_ = 1;
-      break;
+        break;
+
+      case 'p':
+        pid_file_name_ = get_opts.opt_arg ();
+        break;
 
       case '?':  // display help for use of the server.
       default:
@@ -71,6 +80,7 @@ parse_args (int argc, char *argv[])
                            "-s <NodeApplication executable path>\n"
                            "-a <arguments to NodeApplication>\n"
                            "-d <spawn delay for nodeapplication>\n"
+                           "-p <pid file>\n"
                            "\n",
                            argv [0]),
                           -1);
@@ -96,6 +106,23 @@ write_IOR(const char* ior)
   return 0;
 }
 
+void
+write_pid (void)
+{
+  if (pid_file_name_ == 0)
+    return;
+
+  FILE* pid_file = ACE_OS::fopen (pid_file_name_, "w");
+
+  if (pid_file)
+    {
+      ACE_OS::fprintf (pid_file,
+                       "%i",
+                       ACE_OS::getpid ());
+      ACE_OS::fclose (pid_file);
+    }
+}
+
 bool
 register_with_ns (const char * name_context,
                   CORBA::ORB_ptr orb,
@@ -116,8 +143,16 @@ register_with_ns (const char * name_context,
   name.length (1);
   name[0].id = name_context;
 
-  // Register the servant with the Naming Service
-  naming_context->bind (name, obj);
+  try
+    {
+      // Register the servant with the Naming Service
+      naming_context->bind (name, obj);
+    }
+  catch (CosNaming::NamingContext::AlreadyBound &)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Node_Manager.cpp: Name already bound, rebinding....\n"));
+      naming_context->rebind (name, obj);
+    }
 
   return true;
 }
@@ -170,7 +205,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (adapter.in ()))
-          ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
 
       // Create and install the CIAO NodeManager servant
       CIAO::NodeManager_Impl *node_manager_servant = 0;
@@ -184,9 +219,9 @@ main (int argc, char *argv[])
                       -1);
 
       PortableServer::ServantBase_var safe_daemon (node_manager_servant);
-      
+
       node_manager_servant->init ();
-      
+
       // Implicit activation
       CIAO::NodeManager_var node_manager =
         node_manager_servant->_this ();
@@ -232,19 +267,21 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Here start the Monitor
-/*
-      MonitorController* monitor_controller
-              = new MonitorController (orb);
+      /*
+        MonitorController* monitor_controller
+        = new MonitorController (orb);
 
-      ACE_DEBUG ((LM_DEBUG , "Before Activate"));
-       monitor_controller->activate ();
-      ACE_DEBUG ((LM_DEBUG , "After Activate"));
-*/
+        ACE_DEBUG ((LM_DEBUG , "Before Activate"));
+        monitor_controller->activate ();
+        ACE_DEBUG ((LM_DEBUG , "After Activate"));
+      */
 
       // Finishing Deployment part
       ACE_DEBUG ((LM_DEBUG,
                   "CIAO_NodeManager is running...\n"));
 
+      write_pid ();
+
       // Run the main event loop for the ORB.
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/CIAO/DAnCE/NodeManager/README b/TAO/CIAO/DAnCE/NodeManager/README
index 2b6553863eb..09f407f6a65 100644
--- a/TAO/CIAO/DAnCE/NodeManager/README
+++ b/TAO/CIAO/DAnCE/NodeManager/README
@@ -9,5 +9,5 @@ some port of all the hosts that have NodeApplication install to
 function properly. The port to run this daemon can be set by using the
 TAO ORB options command of -ORBEndpoint <port>. This replaces the
 earlier CIAO_Daemon  implementation of CIAO as defined in the CCM
-specification. 
-*/
\ No newline at end of file
+specification.
+*/
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index ab0ea432153..5d2978c7ce5 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -20,7 +20,7 @@ namespace CIAO
     const char* dap_ior_filename = 0;
     const char* dap_ior = 0;
 
-    enum mode_type { 
+    enum mode_type {
       pl_mode_start,
       pl_mode_interactive,
       pl_mode_stop_by_dam,
@@ -94,15 +94,15 @@ namespace CIAO
             }
         }
 
-      if ((mode != pl_mode_stop_by_dam) && 
+      if ((mode != pl_mode_stop_by_dam) &&
           (mode != pl_mode_stop_by_uuid) &&
-          (package_url == 0) && 
+          (package_url == 0) &&
           (new_package_url ==0))
         {
           usage (argv[0]);
           return false;
         }
-      
+
       return true;
     }
 
@@ -153,32 +153,32 @@ namespace CIAO
 
           if (parse_args (argc, argv) == false)
             return -1;
-          
-          
+
+
           Plan_Launcher_i launcher;
-          
+
           if (!launcher.init (use_naming ? 0 : ior_file,
                               orb.in ()))
             {
               ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error initializing the EM.\n"));
               return -1;
             }
-          
+
           ::Deployment::DomainApplicationManager_var dapp_mgr;
-          
+
           if (mode == pl_mode_start || mode == pl_mode_interactive)  // initial deployment
             {
               const char* uuid = launcher.launch_plan (package_url);
-              
+
               if (uuid == 0)
                 {
                   ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error launching plan\n"));
                   return -1;
                 }
-              
+
               ACE_DEBUG ((LM_DEBUG, "Plan_Launcher returned UUID is %s\n", uuid));
               dapp_mgr = launcher.get_dam (uuid);
-              
+
               // Write out DAM ior if requested
               if (mode == pl_mode_start)
                 write_dap_ior (orb.in (), dapp_mgr.in ());
@@ -203,7 +203,7 @@ namespace CIAO
               ACE_DEBUG ((LM_DEBUG,
                           "Plan_Launcher: reconfigure application assembly....."));
               const char* uuid = launcher.re_launch_plan (new_package_url);
-              
+
               if (uuid == 0)
                 {
                   ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error re-launching plan\n"));
@@ -239,7 +239,7 @@ namespace CIAO
                               "(%P|%t) CIAO_PlanLauncher:tear down assembly failed: "
                               "unkonw plan uuid.\n"));
             }
-          
+
           orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
@@ -276,6 +276,6 @@ ACE_TMAIN (int argc,
            ACE_TCHAR *argv[])
 {
   //ACE_DEBUG ((LM_DEBUG, "NEW PLAN LAUNCHER\n"));
-  
+
   return run_main_implementation (argc, argv);
 }
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index c8522b9b4fb..7f5aa59ceda 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -10,7 +10,7 @@ namespace CIAO
 {
   namespace Plan_Launcher
   {
-    
+
     static CORBA::Object_ptr
     fetch_reference_naming (CORBA::ORB_ptr orb
                             ACE_ENV_ARG_DECL)
@@ -19,19 +19,17 @@ namespace CIAO
         orb->resolve_initial_references ("NameService"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       CosNaming::NamingContext_var pns =
         CosNaming::NamingContext::_narrow (tmp.in ()
                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
-      CosNaming::Name name (2);
-      name.length (2);
+
+      CosNaming::Name name (1);
+      name.length (1);
       name[0].id =
-        CORBA::string_dup ("CIAO");
-      name[1].id =
         CORBA::string_dup ("ExecutionManager");
-      
+
       return pns->resolve (name
                            ACE_ENV_ARG_PARAMETER);
     }
@@ -40,13 +38,13 @@ namespace CIAO
       : em_ ()
     {
     }
-    
+
     bool
     Plan_Launcher_i::init (const char *em_ior,
-                         CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+                           CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     {
       CORBA::Object_var obj;
-            
+
       if (em_ior == 0)
         {
           obj = fetch_reference_naming (orb ACE_ENV_ARG_PARAMETER);
@@ -58,55 +56,63 @@ namespace CIAO
                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      
+
       this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
                                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       if (CORBA::is_nil (this->em_.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) CIAO_PlanLauncher: nil Execution"
-                          " Manager reference, narrow failed\n"));
+                      "(%P|%t) CIAO_PlanLauncher: nil Execution"
+                      " Manager reference, narrow failed\n"));
           return false;
         }
-      
+
       if (CIAO::debug_level () > 9)
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) CIAO_PlanLauncher: Obtained Execution"
                     " Manager ref \n"));
-      
+
       return true;
     }
-    
-    
-    const char * 
+
+
+    const char *
     Plan_Launcher_i::launch_plan (const char *plan_uri ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
+      ACE_DEBUG ((LM_DEBUG, "Parsing plan...\n"));
+
       CIAO::Config_Handlers::XML_File_Intf intf (plan_uri);
-      
+
       ::Deployment::DeploymentPlan_var plan =
           intf.get_plan ();
-      
+      ACE_DEBUG ((LM_DEBUG, "Parsing complete....\n"));
       return this->launch_plan (plan.in ());
     }
 
-    const char * 
+    const char *
     Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
-          
+
       if (CORBA::is_nil (this->em_.in ()))
         {
-          ACE_ERROR ((LM_ERROR, 
+          ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("CIAO::Plan_Launcher_i: ")
-                      ACE_TEXT ("launch_plan called witn an uninitialized EM.\n")));            
+                      ACE_TEXT ("launch_plan called witn an uninitialized EM.\n")));
           return 0;
         }
-      
+
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::Plan_Launcher_i: " )
+                  ACE_TEXT ("about to call this->em_->preparePlan\n")));
       ::Deployment::DomainApplicationManager_var dam (this->em_->preparePlan (plan, 1));
-      
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::Plan_Launcher_i: " )
+                  ACE_TEXT ("after to call this->em_->preparePlan\n")));
+
       if (CORBA::is_nil (dam.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -114,20 +120,20 @@ namespace CIAO
                       "nil DomainApplicationManager reference\n"));
           return 0;
         }
-      
+
       if (CIAO::debug_level () > 9)
         ACE_DEBUG ((LM_DEBUG,
                     "CIAO_PlanLauncher: Obtained DAM ref \n"));
-      
+
       ::Deployment::Properties_var properties;
       ACE_NEW_RETURN (properties,
                       Deployment::Properties,
                       0);
-      
+
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG,
                     "CIAO_PlanLauncher: start Launch application...\n"));
-      
+
       // Dont not start the Application immediately since it vialtes
       // the semantics of component activation sequence
       int start = 0;
@@ -135,33 +141,33 @@ namespace CIAO
         {
 
           dam->startLaunch (properties.in (), 0);
-      
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-      
+
           // Call finish Launch to complete the connections
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
                         "CIAO_PlanLauncher: finish Launch application...\n"));
           dam->finishLaunch (start, false); // is_ReDAC by default is <false>
-      
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-      
+
           // Call start to activate components
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
                         "CIAO_PlanLauncher: start activating components...\n"));
           dam->start ();
-      
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG, "[success]\n"));
-      
+
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("CIAO_PlanLauncher: ")
                         ACE_TEXT ("Application Deployed successfully\n")));
-      
+
           map_.bind_dam_reference (plan.UUID.in (),
                                    Deployment::DomainApplicationManager::_duplicate (dam.in ()));
         }
@@ -177,7 +183,7 @@ namespace CIAO
                       ex.resourceType.in (),
                       ex.propertyName.in (),
                       ex.elementName.in (),
-                      ex.resourceName.in ()));             
+                      ex.resourceName.in ()));
           ACE_THROW (Deployment_Failure ());
         }
       ACE_CATCH (Deployment::StartError, ex)
@@ -204,15 +210,28 @@ namespace CIAO
                       ex.reason.in ()));
           ACE_THROW (Deployment_Failure  ());
         }
+      ACE_CATCHANY
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "CORBA EXCEPTION: %s\n",
+                      ACE_ANY_EXCEPTION._info().fast_rep()));
+          ACE_THROW (Deployment_Failure  ());
+        }
+      ACE_CATCHALL
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "EXCEPTION: non-CORBA exception\n"));
+          ACE_THROW (Deployment_Failure  ());
+        }
       ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
-      
+
       std::string * retv = new std::string (plan.UUID.in ());
-      
-      return (*retv).c_str ();      
+
+      return (*retv).c_str ();
     }
-    
-    ::Deployment::DomainApplicationManager_ptr 
+
+    ::Deployment::DomainApplicationManager_ptr
     Plan_Launcher_i::get_dam (const char *uuid ACE_ENV_ARG_DECL)
     {
       if (!this->map_.is_plan_available (uuid))
@@ -224,7 +243,7 @@ namespace CIAO
         }
       return this->map_.fetch_dam_reference (uuid);
     }
-    
+
     bool
     Plan_Launcher_i::teardown_plan (const char *uuid)
     {
@@ -232,31 +251,31 @@ namespace CIAO
       // executable to tear down a plan, so we could NOT rely on the local
       // DAM_Map to fetch DAM obj reference. Instead, we make a remote call
       // on ExecutionManager to fetch it.
-      ACE_TRY 
+      ACE_TRY
         {
           ::Deployment::DomainApplicationManager_var dapp_mgr =
-            this->em_->getManager (uuid);
+              this->em_->getManager (uuid);
 
-            dapp_mgr->destroyApplication ();
-            if (CIAO::debug_level ())
-              ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+          dapp_mgr->destroyApplication ();
+          if (CIAO::debug_level ())
+            ACE_DEBUG ((LM_DEBUG, "[success]\n"));
 
-            // Note that we should ask the DAM to tell EM whether the DAM should
-            // be destroyed
-            this->destroy_dam_by_plan (uuid);
+          // Note that we should ask the DAM to tell EM whether the DAM should
+          // be destroyed
+          this->destroy_dam_by_plan (uuid);
         }
       ACE_CATCHANY
         {
           ACE_DEBUG ((LM_ERROR, "Unable to find DomainApplicationManager "
-                                "for plan with uuid: %s\n", uuid));
+                      "for plan with uuid: %s\n", uuid));
           return false;
         }
       ACE_ENDTRY;
 
       return true;
     }
-    
-    bool 
+
+    bool
     Plan_Launcher_i::teardown_plan (::Deployment::DomainApplicationManager_ptr dam
                                     ACE_ENV_ARG_DECL)
     {
@@ -265,16 +284,16 @@ namespace CIAO
                     "CIAO_PlanLauncher: destroy the application.....\n"));
 
       dam->destroyApplication ();
-      
+
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG, "[success]\n"));
 
       this->destroy_dam (dam);
-      
+
       return true;
     }
-    
-    void 
+
+    void
     Plan_Launcher_i::destroy_dam (::Deployment::DomainApplicationManager_ptr dam
                                   ACE_ENV_ARG_DECL)
     {
@@ -288,7 +307,7 @@ namespace CIAO
         ACE_DEBUG ((LM_DEBUG, "[success]\n"));
     }
 
-    void 
+    void
     Plan_Launcher_i::destroy_dam_by_plan (const char* plan_uuid
                                           ACE_ENV_ARG_DECL)
     {
@@ -302,40 +321,40 @@ namespace CIAO
         ACE_DEBUG ((LM_DEBUG, "[success]\n"));
     }
 
-    const char * 
+    const char *
     Plan_Launcher_i::re_launch_plan (const char *plan_uri ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
       CIAO::Config_Handlers::XML_File_Intf intf (plan_uri);
-      
+
       ::Deployment::DeploymentPlan_var plan =
           intf.get_plan ();
-      
+
       return this->re_launch_plan (plan.in ());
     }
 
-    const char * 
+    const char *
     Plan_Launcher_i::re_launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
-          
+
       if (CORBA::is_nil (this->em_.in ()))
         {
-          ACE_ERROR ((LM_ERROR, 
+          ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("CIAO::Plan_Launcher_i: ")
-                      ACE_TEXT ("re_launch_plan called witn an uninitialized EM.\n")));            
+                      ACE_TEXT ("re_launch_plan called witn an uninitialized EM.\n")));
           return 0;
         }
-      
+
       this->em_->perform_redeployment (plan);
-      
+
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG,
                     "CIAO_PlanLauncher: new plan redeployed ...\n"));
 
       std::string * retv = new std::string (plan.UUID.in ());
-      
-      return (*retv).c_str (); 
+
+      return (*retv).c_str ();
     }
   }
 }
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
index 8f4f3c7d127..371d7eb2f19 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
@@ -1,8 +1,8 @@
-/** 
+/**
  * $Id$
  * @file Plan_Launcher_Impl.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * Contains the Plan_Launcher_i class, which can be used by
  * applications to launch component assemblies.
  */
@@ -19,7 +19,7 @@ namespace CIAO
 {
   namespace Plan_Launcher
   {
-    
+
     /**
      * @class Plan_Launcher_i
      * @brief This class launches and manages deployment plans.
@@ -28,11 +28,11 @@ namespace CIAO
     {
     public:
       class Deployment_Failure {};
-      
+
       Plan_Launcher_i ();
-      
-      
-      bool init (const char *em_ior, 
+
+
+      bool init (const char *em_ior,
                  CORBA::ORB_ptr orb
                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
@@ -49,7 +49,7 @@ namespace CIAO
       const char * re_launch_plan (const char *plan_uri
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((Deployment_Failure));
-      
+
       /**
        * @fn launch_plan
        * @brief Launch a plan, given an IDL deployment plan
@@ -63,30 +63,30 @@ namespace CIAO
       const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((Deployment_Failure));
-      
+
       /// Returns the DAM associated with a given plan URI
       ::Deployment::DomainApplicationManager_ptr get_dam (const char *uuid
                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-      
+
       /// Tears down a plan given the UUID
       bool teardown_plan (const char *uuid ACE_ENV_ARG_DECL);
-      
+
       bool teardown_plan (::Deployment::DomainApplicationManager_ptr dam
                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-      
+
       void destroy_dam (::Deployment::DomainApplicationManager_ptr dam
                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       void destroy_dam_by_plan (const char * plan_uuid
                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-      
+
     private:
       ::CIAO::ExecutionManagerDaemon_var em_;
-      
+
       /// Local map for DAMs, to save expensive UUID lookups.
       Execution_Manager::DAM_Map map_;
     };
-    
+
   }
 }
 
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
index 4f92f0edbe9..4cba063e6d4 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
@@ -19,7 +19,7 @@ CIAO::NodeApplication_Task::svc ()
     {
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
@@ -29,7 +29,7 @@ CIAO::NodeApplication_Task::svc ()
 
       object =
         this->orb_->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
@@ -84,18 +84,18 @@ CIAO::NodeApplication_Task::svc ()
        */
       bool retval = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (retval)
-      {
-	ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
+        {
+          ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
                                initializing the session container!"));
-	return 1;
-      }
-      
+          return 1;
+        }
+
       CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()
                                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (this->options_.ior_output_filename_.length () != 0)
         CIAO::Utility::write_IOR (this->options_.ior_output_filename_.c_str (),
                                   str.in ());
@@ -118,7 +118,7 @@ CIAO::NodeApplication_Task::svc ()
 
           CIAO::NodeApplication_Callback_var nam_callback
             = CIAO::NodeApplication_Callback::_narrow (object.in ()
-						       ACE_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           Deployment::Properties_out properties_out (prop.out ());
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
index c3ae7a829b5..b2923cde8aa 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.inl
@@ -7,5 +7,5 @@ CIAO::NodeApplication_Task::NodeApplication_Task (ACE_Thread_Manager &tm,
   : ACE_Task_Base (&tm),
     orb_ (CORBA::ORB::_duplicate (o)),
     options_ (opts)
-{ 
+{
 }
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/README b/TAO/CIAO/DAnCE/RTNodeApplication/README
index 1eb382ceaf7..9a0c7e03aaa 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/README
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/README
@@ -22,18 +22,18 @@ implementation.  It will be removed shortly.
   RTNodeApplication.cpp: Main program
 
   NodeApplication_Task.*: ACE_Task class for spawning the thread for
-                          RT-NodeApplication using the right scheduling 
+                          RT-NodeApplication using the right scheduling
                           strategy.
 
-  RTNodeApplication_Impl.* : Actual RTNodeApplication server implementation.  
+  RTNodeApplication_Impl.* : Actual RTNodeApplication server implementation.
 
   senv.sh: A simple shell script for setting up the run-time
-           environment when starting NodeDaemon with sudo.  
+           environment when starting NodeDaemon with sudo.
            This is necessary because the RTNodeApplication needs to
            spawn threads with real-time scheduling class.  This
            operation requires the process to be run by privileged user.
-           You may need to tweak this shell script to suit your need. 
-           Here's an example of how to use the script: 
+           You may need to tweak this shell script to suit your need.
+           Here's an example of how to use the script:
 
             $ sudo senv.sh $CIAO_ROOT/DAnCE/NodeManager/NodeManager \
                 -ORBEndpoint iiop://localhost:10000 \
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp b/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp
index 0e91f073a9c..ffd85ca1ebf 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp
@@ -25,7 +25,7 @@ HTTP_Handler::~HTTP_Handler (void)
 {
   if (filename_)
     {
-      ACE_OS::free ((void *) filename_);
+      ACE_OS::free (filename_);
       filename_ = 0;
     }
 }
@@ -35,10 +35,10 @@ int
 HTTP_Handler::open (void *)
 {
   if (this->send_request () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed\n"), -1);
 
   if (this->receive_reply () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed\n"), -1);
   return 0;
 
 }
@@ -101,7 +101,7 @@ HTTP_Reader::send_request (void)
 
   // Send the message to server
   if (peer ().send_n (mesg, len) != len)
-    ACE_ERROR_RETURN((LM_ERROR,"Error sending request"), -1);
+    ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1);
 
 
   return 0;
@@ -124,7 +124,7 @@ HTTP_Reader::receive_reply (void)
       //Make sure that response type is 200 OK
       if (ACE_OS::strstr (buf,"200 OK") == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                            "HTTP_Reader::receiveReply(): Response is not 200 OK" ), -1);
+                            "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1);
 
       // Search for the header termination string "\r\n\r\n", or "\n\n". If
       // found, move past it to get to the data portion.
@@ -141,7 +141,7 @@ HTTP_Reader::receive_reply (void)
 
     }
   else
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
 
   // ***************************************************************
   // At this point, we have stripped off the header and are ready to
@@ -165,7 +165,7 @@ HTTP_Reader::receive_reply (void)
   // Copy over all the data bytes into our message buffer.
   if (curr->copy (buf_ptr, bytes_read) == -1)
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
-                          "HTTP_Reader::receiveReply():Error copying data into Message_Block" ), -1);
+                          "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1);
 
   //read the rest of the data into a number of ACE_Message_Blocks and
   //chain them together in a link list fashion
@@ -191,7 +191,7 @@ HTTP_Reader::receive_reply (void)
 
     }
   else
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
 
   }while (num_recvd != 0);
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index 9858d39a3c5..2096fccbc6f 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -44,7 +44,7 @@ using namespace PC_Updater_T;
 
 PC_Updater::PC_Updater (const char* server_path, const char* package)
 : server_path_ (server_path),
-  file_list_ (&allocator_),
+  file_list_ (),
   package_ (package),
   success_ (true)
 {
@@ -53,7 +53,7 @@ PC_Updater::PC_Updater (const char* server_path, const char* package)
 
 PC_Updater::PC_Updater (ACE_CString& server_path, ACE_CString& package)
 : server_path_ (server_path),
-  file_list_ (&allocator_),
+  file_list_ (),
   package_ (package),
   success_ (true)
 {
@@ -137,7 +137,7 @@ void PC_Updater::clear_list ()
 
   void PC_Updater::update (const ::Deployment::SubcomponentInstantiationDescription &sid)
   {
-    update_sequence (sid.package, this);
+    update_sequence (sid.basePackage, this);
   }
 
   // SubcomponentPortEndpoint
@@ -185,17 +185,13 @@ void PC_Updater::clear_list ()
       //weird. Need to call next to get current ?!?!
 
       const char* name;
-      const char* ext;
 
       name = ACE_OS::strstr (str, iad.location[0].in ());
 
       if (name)
       {
-        ext = ACE_OS::strstr (name, ".");
-
         ACE_CString loc (this->server_path_);
-        loc += iad.location[0].in ();
-        loc += ext;
+        loc += name;
 
         iad.location[0] = CORBA::string_dup (loc.c_str ());
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.h b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.h
index da254ab97dc..b9d8a1cb7cf 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.h
@@ -26,12 +26,10 @@
 #include "ace/Containers_T.h"        //for ACE_Double_Linked_List
 #include "ace/Malloc_Allocator.h"    //for ACE_New_Allocator needed by the doubly link list
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 /**
   * @class PC_Updater
   *
@@ -103,7 +101,7 @@ private:
   ACE_CString server_path_;
 
   /// create a doubly link list
-  ACE_New_Allocator allocator_;
+  //ACE_New_Allocator allocator_;
   ACE_Double_Linked_List<ZIP_File_Info> file_list_;
 
   ACE_CString package_;
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.cpp b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.cpp
index 2fb6bdb6bd3..f1b53537735 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.cpp
@@ -15,7 +15,6 @@ namespace PC_Updater_T
     for (CORBA::ULong i = 0; i < size; ++i)
       updater->update (seq[i]);
   }
-
 }
 
 #endif /* PC_Updater_C */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/README.txt b/TAO/CIAO/DAnCE/RepositoryManager/README.txt
index e4cd2fa6397..ee8eb6bcdce 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/README.txt
+++ b/TAO/CIAO/DAnCE/RepositoryManager/README.txt
@@ -1,28 +1,28 @@
 This is the README file for the Repository Manager (RM).
 
-In order to be able to compile the RM you need to have ZZIP lib because the Repository 
+In order to be able to compile the RM you need to have ZZIP lib because the Repository
 Manager (RM) uses it to read the contents of CCM packages. ZZIP itself is a C++ wrapper
 around ZLIB, thus you will also need ZLIB. In order to compile the RM successfully
 you will need to do the following:
- 
+
 1. Download ZLIB and ZZIP-LIB
 2. Compile the multi-threaded versions of these libraries
-3. [on Windows] create a separate directory for each library; create an include and a lib 
+3. [on Windows] create a separate directory for each library; create an include and a lib
 subdirectory within them. Then copy the libraries files in the library subdirectory.
-Copy zlib.h in the zlib_path/include and copy zziplib.h, zzip-conf.h and zzip-msvc.h 
+Copy zlib.h in the zlib_path/include and copy zziplib.h, zzip-conf.h and zzip-msvc.h
 (for Windows platforms; Linux might have its own file!!!). This step might be easier if
 you find a binary package of the libraries and just install it.
-4. Set $ZLIB_ROOT and $ZZIP_ROOT to point to the directories where you placed the 
+4. Set $ZLIB_ROOT and $ZZIP_ROOT to point to the directories where you placed the
 libraries and the include files.
 5. Turn on zzip and zlib in default.features for MPC.
 6. MPC will handle the rest.
 
 
-Things to watch out for: 
-On Windows make sure that you are linking the right ZIP libraries 
-together with the rest of the libraries, i.e. if you are building the debug version of ACE, 
+Things to watch out for:
+On Windows make sure that you are linking the right ZIP libraries
+together with the rest of the libraries, i.e. if you are building the debug version of ACE,
 TAO and CIAO, then use the debug version of the ZIP libraries. Otherwise the RM will compile
-but it will not work properly. 
+but it will not work properly.
 
 to compile the idl with the tao_idl compiler:
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
index f2af0de45b5..9c14b6b9608 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
@@ -2,11 +2,11 @@
 
 #include "RM_Helper.h"
 #include "ciao/Packaging_DataC.h"    //for the PackageConfiguration declaration
-#include "tao/CDR.h"          //for TAO CDR classes
-#include "ace/Message_Block.h"      //for ACE_Message_Block
-#include "ace/Auto_Ptr.h"        //for Auto_Ptr
-#include "ace/OS_NS_fcntl.h"      //for open
-#include "ace/OS_NS_unistd.h"      //for close
+#include "tao/CDR.h"                 //for TAO CDR classes
+#include "ace/Message_Block.h"       //for ACE_Message_Block
+#include "ace/Auto_Ptr.h"            //for Auto_Ptr
+#include "ace/OS_NS_fcntl.h"         //for open
+#include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"      //for filesize and mkdir
 
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.h b/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.h
index 241ae507078..fb2f8a61db0 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.h
@@ -21,6 +21,7 @@
 
 #include "ciao/Packaging_DataC.h"    //for the PackageConfiguration declaration
 #include "tao/CDR.h"                 //for TAO CDR classes
+#include "ace/Message_Block.h"      //for ACE_Message_Block
 
 //int operator<< (ACE_OutputCDR& cdr, const Deployment::PackageConfiguration& pc);
 //int operator>> (ACE_InputCDR& cdr, Deployment::PackageConfiguration& pc);
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
index 0840a02dfb8..705af70b8d3 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
@@ -14,7 +14,6 @@
 #include "RepositoryManagerC.h"
 #include "Options.h"
 
-//#include "Config_Handlers/pcd.hpp"  //for the PackageConfiguration data struct
 #include "ace/OS_NS_fcntl.h"      //for open
 #include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"        //for filesize and fstat and mkdir
@@ -228,10 +227,10 @@ CORBA::Octet* read_from_disk (
 
   ACE_OS::fstat (handle, &file_info);
 
-  CORBA::Octet* buffer;
+  CORBA::Octet* buffer = 0;
   ACE_NEW_RETURN (buffer, CORBA::Octet[file_info.st_size], 0);
 
-  //read the contents of the file into the buffer
+  // read the contents of the file into the buffer
   if (ACE_OS::read_n (handle, buffer, file_info.st_size) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
@@ -252,7 +251,6 @@ int write_to_disk (
   size_t length
   )
 {
-
   // Open a file handle to the local filesystem
     ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
     if (handle == ACE_INVALID_HANDLE)
@@ -265,7 +263,7 @@ int write_to_disk (
   if (ACE_OS::write (handle, buffer, length) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
-               ACE_TEXT ("[RM::write_to_disk] file write error")),
+                           ACE_TEXT ("[RM::write_to_disk] file write error")),
                            -1);
 
   // Close the file handle
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
index 744f5df5a02..b8a94492920 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
@@ -25,35 +25,32 @@ using namespace std;
 
 namespace
 {
-///name of the file holding the IOR of the RM
+/// Name of the file holding the IOR of the RM
 const char * rm_ior = "RepositoryManagerDeamon.ior";
 
-///default number of worker threads to run in the multi-threaded RM
+/// Default number of worker threads to run in the multi-threaded RM
 unsigned int nthreads = 3;
 }
 
 
-///Class that implements the service routine of the worker threads
-///of the repository manager
-
+/**
+ * @class Worker
+ *
+ * Class that implements the service routine of the worker threads
+ * of the repository manager
+ */
 class Worker : public ACE_Task_Base
 {
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
 public:
+  /// ctor
   Worker (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// The thread entry point.
   virtual int svc (void);
-  // The thread entry point.
 
 private:
+  /// The orb
   CORBA::ORB_var orb_;
-  // The orb
 };
 
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index 6ab070bc72a..d558e6fbb46 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -6,8 +6,11 @@
 
 project (RepositoryManager) : ciao_component_dnc, taoexe, ciao_config_handlers, zzip, zlib {
 
+  includes += $(CIAO_ROOT)/tools/Config_Handlers  //to circumvent an improper include resolution
+                                                  //in the Package_Handlers/PC_Intf.h
   exename = RepositoryManagerDeamon
   requires += zzip zlib
+  libs += Package_Config_Handlers
 
   IDL_Files {
     RepositoryManager.idl
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index 476df857146..0def3f8ff68 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -30,11 +30,12 @@
 #include "ace/Malloc_Allocator.h"       //for ACE_New_Allocator
 
 //for the PackageConfiguration parsing
-#include "Config_Handlers/STD_PC_Intf.h"
+//#include "Config_Handlers/Package_Handlers/PC_Intf.h"
 #include "ciao/Deployment_DataC.h"
 #include "ciao/Packaging_DataC.h"
 #include "Config_Handlers/Utils/XML_Helper.h"
-#include "xercesc/dom/DOM.hpp"
+#include "Config_Handlers/Package_Handlers/PCD_Handler.h"
+//#include "xercesc/dom/DOM.hpp"
 
 #include "RM_Helper.h"            //to be able to externalize/internalize a PackageConfiguration
 #include "ace/Message_Block.h"    //for ACE_Message_Block
@@ -153,7 +154,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
 
       //TODO: how can I incorporate a Auto_Ptr is explicit release is needed
       ACE_Message_Block* mb;
-      ACE_NEW_THROW_EX (mb, ACE_Message_Block (0,0), CORBA::INTERNAL ());
+      ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::INTERNAL ());
       ACE_CHECK_RETURN (0);
 
       //get the remote file
@@ -169,6 +170,8 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
           mb->release ();
           ACE_THROW (CORBA::INTERNAL ());
         }
+
+      mb->release ();
     }
   else
     {
@@ -710,9 +713,8 @@ CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_package (char* package)
   //parse the PCD to make sure that there are no package errors
   ACE_TRY
     {
-      CIAO::Config_Handlers::STD_PC_Intf intf (pcd_name.c_str ());
-
-      pc = intf.get_PC ();
+      //CIAO::Config_Handlers::STD_PC_Intf intf (pcd_name.c_str ());
+      //pc = intf.get_PC ();
     }
   ACE_CATCHALL
     {
@@ -789,9 +791,21 @@ CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_descriptors (const char* pc_nam
   //parse the PCD to make sure that there are no package errors
   ACE_TRY
     {
-      CIAO::Config_Handlers::STD_PC_Intf intf (pc_name);
+      //CIAO::Config_Handlers::STD_PC_Intf intf (pc_name);
+      //pc = intf.get_PC ();
+      if (xercesc::DOMDocument *doc = CIAO::Config_Handlers::XML_HELPER->create_dom (pc_name))
+      {
+        {
+          //Read in the XSC type structure from the DOMDocument
 
-      pc = intf.get_PC ();
+          //Convert the XSC to an IDL datatype
+          CIAO::Config_Handlers::Packaging::PCD_Handler::package_config (pc_name, pc);
+          std::cout << "Instance document import succeeded.  Dumping contents to file\n";
+        }
+
+        //Cleanliness is next to Godliness
+        delete doc;
+      }
     }
   ACE_CATCHALL
     {
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index 7023b12fa25..a3d9557aa35 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -33,7 +33,6 @@
 
 
 #include "RepositoryManagerS.h"
-#include "DeploymentS.h"          //added for the deployment stuff
 
 #include "ace/Hash_Map_Manager.h"      //for the ACE_Hash_Map_Manager
 #include "ace/Null_Mutex.h"          //for ACE_Null_Mutex
@@ -41,30 +40,29 @@
 #include "ace/OS_NS_string.h"        //for ACE_CString
 #include "ace/SString.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 namespace
 {
-///DIRECTORY WHERE THE PACKAGES WILL BE STORED LOCALLY
-const static char* INSTALL_PATH = "RepositoryDir";
+  /// Directory where the packages will be stored locally
+  const static char* INSTALL_PATH = "RepositoryDir";
 
-const static size_t TEMP_LEN = 512;
+  const static size_t TEMP_LEN = 512;
 
-const static char* PC_EXTENSION = ".epc";
+  const static char* PC_EXTENSION = ".epc";
 }
 
-class  CIAO_RepositoryManagerDaemon_i : public virtual POA_CIAO::RepositoryManagerDaemon
+class  CIAO_RepositoryManagerDaemon_i :
+  public virtual POA_CIAO::RepositoryManagerDaemon
 {
 public:
-  //Constructor
+  /// Constructor
   CIAO_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb,
                   const char* server = "http://localhost:5432/");
 
-  //Destructor
+  /// Destructor
   virtual ~CIAO_RepositoryManagerDaemon_i (void);
 
   virtual
@@ -152,34 +150,35 @@ public:
 
   protected:
 
-    ///function to parse and return the PackageConfiguration from a specified package
+    /// Function to parse and return the PackageConfiguration from a specified
+    /// package
     Deployment::PackageConfiguration* retrieve_PC_from_package (char* package);
 
-    ///find out what the name of the PackageConfiguration file is
+    /// Find out what the name of the PackageConfiguration file is
     void find_PC_name (char* package, ACE_CString& pcd_name);
 
-    ///function to parse and return the PackageConfiguration from the already
-    ///extracted descriptor files
+    /// Function to parse and return the PackageConfiguration from the already
+    /// extracted descriptor files
     Deployment::PackageConfiguration* retrieve_PC_from_descriptors (const char* pc_name,
                                     const char* descriptor_dir);
 
 
-    ///function to retvieve a file via HTTP
-    ///stores the file in the passed preallocated ACE_Message_Block
-    ///returns 1 on success
-    ///     0 on error
+    /// Function to retrieve a file via HTTP
+    /// stores the file in the passed preallocated ACE_Message_Block
+    /// @retval 1 success
+    /// @retval 0 error
 
     int HTTP_Get (const char* URL, ACE_Message_Block &mb);
 
-    ///function to extract all necessary files for parsing the PackageConfiguration
-    ///descriptor and populating the idl struct.
-    ///return 1 on success
-    ///       0 on error
+    /// Function to extract all necessary files for parsing the
+    /// PackageConfiguration descriptor and populating the idl struct.
+    /// @retval 1 success
+    /// @retval 0 error
     ///
-    ///NOTE: ACE_CString& pcd_name is an out parameter
+    /// @note ACE_CString& pcd_name is an out parameter
 
     int extract_descriptor_files (char* package,
-                   ACE_CString& pcd_name);
+                                  ACE_CString& pcd_name);
 
 
     ///function to remove the files extracted for parsing the PackageConfiguration
@@ -270,10 +269,10 @@ public:
 
   //a hash map that associates the names of
   //PackageConfigurations with their location
-    PCMap names_;
+  PCMap names_;
 
-  //a hash map that associates the UUIDs of
-  //PackageConfigurations with their location
+  /// a hash map that associates the UUIDs of
+  /// PackageConfigurations with their location
   PCMap uuids_;
 
 #if defined ASSEMBLY_INTERFACE_SUPPORT
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
index 2ab483823b6..7eed65dafbb 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
@@ -50,7 +50,9 @@ bool URL_Parser::parseURL (char* url)
     url += ACE_OS::strlen ("http://");
 
   if (url[0] == '/')
-    this->filename_ = url;
+  {
+    this->filename_ = ACE_OS::strdup (url);
+  }
   else
   {
     if (ptr = ACE_OS::strstr (url, ":"))
@@ -63,13 +65,13 @@ bool URL_Parser::parseURL (char* url)
     else
     {
       size_t host_len = ptr - url;
-      ACE_NEW_RETURN (this->hostname_, char [host_len], false);
+      ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false);
       ACE_OS::strncpy (this->hostname_, url, host_len);
       this->hostname_ [host_len] = '\0';
 
       if (ptr = ACE_OS::strstr (ptr, "/"))
       {
-        this->filename_ = ptr;
+        this->filename_ = ACE_OS::strdup(ptr);
       }
       else
         success = false;
@@ -89,5 +91,13 @@ void URL_Parser::Error (void)
   URL_Parser::~URL_Parser()
   {
     if(this->hostname_)
+    {
       delete [] this->hostname_;
+      this->hostname_ =0;
+    }
+    if (this->filename_)
+    {
+      ACE_OS::free (this->filename_);
+      this->filename_ = 0;
+    }
   }
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.h b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.h
index 54f9db42877..aaaeab4960c 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.h
@@ -33,6 +33,8 @@ class URL_Parser
 {
 public:
 
+  friend class ACE_Singleton <URL_Parser, ACE_Null_Mutex>;
+
   /// parses commandline arguments
   bool parse_args (int argc, ACE_TCHAR *argv[]);
 
@@ -53,11 +55,12 @@ public:
   /// turns on verbosity
   int debug_;
 
-  URL_Parser (void);
-  // protected constructor, singleton
-
   //destructor
   ~URL_Parser (void);
+
+protected:
+  URL_Parser (void);
+  // protected constructor, singleton
 };
 
 
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/README b/TAO/CIAO/DAnCE/StaticConfigurator/README
index 76d3c83f48f..e42c1099cfd 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/README
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/README
@@ -3,7 +3,7 @@ Please see $CIAO_ROOT/docs/static_dance.html for details.
 To run the static version of Hello example, do the following,
 
 1. Build ACE+TAO+CIAO statically
-2. Build $CIAO_ROOT/examples/Hello 
+2. Build $CIAO_ROOT/examples/Hello
 3. Generate the static function entrypoints (plan.h)
    > cd $CIAO_ROOT/examples/Hello/descriptors
    > $CIAO_ROOT/DAnCE/StaticConfigurator/StaticDAnCEParser -p flattened_deploymentplan_without_ns.cdp
@@ -14,15 +14,15 @@ To run the static version of Hello example, do the following,
    > cp StaticDAnCEApp.mpc.tmpl StaticDAnCEApp.mpc
    > $ACE_ROOT/bin/mwc.pl
    > make
-5. Run the static node managers. Note that the ORBEndpoint values should 
+5. Run the static node managers. Note that the ORBEndpoint values should
    correspond to the ones in  $CIAO_ROOT/examples/Hello/descriptors/TestNodeManagerMap.dat
    > cd $CIAO_ROOT/DAnCE/StaticConfigurator
    > ./StaticDAnCEApp -ORBEndpoint iiop://localhost:60001 &
    > ./StaticDAnCEApp -ORBEndpoint iiop://localhost:60002 &
-6. Do the deployment. This is just the same as the non-static version of DAnCE 
-   except that we have the NodeManagers already running and need not spawn node 
-   managers. To accomplish this, change  
-   $CIAO_ROOT/examples/Hello/descriptors/run_test_without_ns.pl 
+6. Do the deployment. This is just the same as the non-static version of DAnCE
+   except that we have the NodeManagers already running and need not spawn node
+   managers. To accomplish this, change
+   $CIAO_ROOT/examples/Hello/descriptors/run_test_without_ns.pl
    to *not* run the node manager daemons and do the following.
    > cd $CIAO_ROOT/examples/Hello/descriptors
    > ./run_test_without_ns.pl
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
index 3b230c3c843..370444d528f 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
@@ -56,13 +56,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
           homesvnt_creator_fptr_map.bind (homes_table[i].servant_entrypt_,
                                           homes_table[i].servant_fptr_);
-        }      
+        }
 
       CIAO::Static_NodeManager_Impl *static_node_manager_impl;
       // Create and install the CIAO Daemon servant
-      
+
       ACE_DEBUG ((LM_DEBUG, "creating static_node_manager\n"));
-      
+
       static_node_manager_impl =
         new CIAO::Static_NodeManager_Impl("NodeManager",
                                           orb.in (),
@@ -70,7 +70,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                           "", //exe location
                                           "", //exe options
                                           0, //spawn delay
-                                          &static_config_entrypoints_maps);    
+                                          &static_config_entrypoints_maps);
 
       static_node_manager_impl->init ();
 
@@ -98,11 +98,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                      str.in ()
                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // Run the main event loop for the ORB.
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
index c9790a28bc3..d237d09ac20 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
@@ -5,8 +5,8 @@ project(StaticDAnCEApp): ciao_component_dnc, iortable {
   exename   = StaticDAnCEApp
   requires += exceptions
   includes += ../NodeApplicationManager ../NodeManager
-  libs     += NodeManager NodeManager_stub NodeApplicationManager  
-  after    += NodeManager NodeManager_stub NodeApplicationManager 
+  libs     += NodeManager NodeManager_stub NodeApplicationManager
+  after    += NodeManager NodeManager_stub NodeApplicationManager
 
   libs     += Hello_Base_DnC_stub
   libs     += Hello_Base_DnC_svnt
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
index bce83577955..b5a496291d8 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
@@ -70,7 +70,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   }
 
   CIAO::Config_Handlers::XML_File_Intf intf (package_url);
-      
+
   ::Deployment::DeploymentPlan_var plan =
       intf.get_plan ();
 
@@ -78,16 +78,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   dummy.length (0);
 
   NodeImplementationInfoHandler handler (plan, dummy);
-  
+
   Deployment::NodeImplementationInfo * node_impl_info =
     handler.node_impl_info ();
-  
+
   if (!node_impl_info)
     {
-      ACE_ERROR_RETURN ((LM_ERROR, 
+      ACE_ERROR_RETURN ((LM_ERROR,
                   "DAnCE (%P|%t) StaticParser -"
                   "Failed to create Node Implementation Infos!\n"), 1);
-      
+
     }
 
   Deployment::ContainerImplementationInfos& impl_infos = node_impl_info[0].impl_infos;
@@ -123,7 +123,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "\t\tACE_ENV_ARG_DECL_WITH_DEFAULTS);\n");
         }
     }
-      
+
   ACE_OS::fprintf (fp, "struct HomeAttributes\n");
   ACE_OS::fprintf (fp, "{\n");
   ACE_OS::fprintf (fp, "  ACE_TString component_instance_name_;\n");
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
index a44a4039749..903d754f7fa 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
@@ -3,10 +3,10 @@
 
 project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers {
   exename   = StaticDAnCEParser
-  requires += exceptions
+  requires += exceptions dummy_label
   includes += ..
   libs     += TAO_IORTable NodeApplicationManager DomainApplicationManager
-  after    += TAO_IORTable NodeApplicationManager DomainApplicationManager NodeManager 
+  after    += TAO_IORTable NodeApplicationManager DomainApplicationManager NodeManager
 
   Source_Files {
     StaticDAnCEParser.cpp
diff --git a/TAO/CIAO/DAnCE/TargetManager/CmpClient.cpp b/TAO/CIAO/DAnCE/TargetManager/CmpClient.cpp
index d695ab38062..b10bf6fd51d 100644
--- a/TAO/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/TAO/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -9,6 +9,7 @@
  * TM to getAllResources and getAvailable resources
  */
 
+#include "Deployment_DataC.h"
 #include "TargetManagerC.h"
 #include "ace/streams.h"
 #include "Config_Handlers/DnC_Dump.h"
@@ -63,6 +64,88 @@ int main (int argc, char* argv[])
       ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:Exception in TargetManager call\n"));
     }
 
+
+    // make a call to the commit resources .....
+
+
+    Deployment::DeploymentPlan plan;
+
+    plan.instance.length (1);
+
+    ::Deployment::InstanceDeploymentDescription instance_;
+    instance_.node = CORBA::string_dup ("Delta");
+    instance_.deployedResource.length (1);
+    instance_.deployedResource[0].requirementName =
+      CORBA::string_dup ("Processor");
+    instance_.deployedResource[0].resourceName =
+      CORBA::string_dup ("CPULoad");
+
+    instance_.deployedResource[0].property.length (1);
+    instance_.deployedResource[0].property[0].name =
+      CORBA::string_dup ("LoadAverage");
+    CORBA::Double d = 20;
+    instance_.deployedResource[0].property[0].value <<= d;
+
+    plan.instance[0] = instance_;
+
+    bool resource_available = 1;
+
+    try
+    {
+      targetI->commitResources(plan);
+      ACE_DEBUG ((LM_DEBUG , "\n\ncommitResources Returned \n"));
+    }
+    catch(CORBA::NO_IMPLEMENT &)
+    {
+      cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
+    }
+    catch (Deployment::ResourceNotAvailable & e)
+      {
+        resource_available = 0;
+        cout << "TargetManager commitResources ResourceNotAvailable Exception" <<endl;
+
+        ACE_DEBUG ((LM_DEBUG ,
+        "ResourceNotAvailable\n name=[%s]\n elementName=[%s]\n resourceName=[%s]\n \
+         resourceType= [%s]\n propertyName=[%s]\n",
+                    e.name.in (),
+                    e.elementName.in (),
+                    e.resourceName.in (),
+                    e.resourceType.in (),
+                    e.propertyName.in ()));
+      }
+    catch(CORBA::Exception & ex)
+    {
+      cout << "Error:TargetManager:commitResources Exception" <<endl;
+      cout << "Error:TargetManager:CORBA Generic Exception " << endl;
+      cerr << "Error:TargetManager:Exception in TargetManager call" << ex << endl;
+    }
+
+
+    // Make a call to release resources , if resource < 0
+    try
+    {
+      if (resource_available == 0)
+        {
+          targetI->releaseResources(plan);
+          ACE_DEBUG ((LM_DEBUG , "\n\nreleaseResources Returned \n"));
+        }
+    }
+    catch(CORBA::NO_IMPLEMENT &)
+    {
+      cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
+    }
+    catch (Deployment::ResourceNotAvailable & e)
+      {
+        cout << "Error:TargetManager releaseResources ResourceNotAvailable Exception" <<endl;
+      }
+    catch(CORBA::Exception & ex)
+    {
+      cout << "Error:TargetManager:releaseResources Exception" <<endl;
+      cout << "Error:TargetManager:CORBA Generic Exception " << endl;
+      cerr << "Error:TargetManager:Exception in TargetManager call" << ex << endl;
+    }
+
+
     // Now make a call of getAvailableResources on the TargetManager ...
     try
     {
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 57130b90fa4..8ed23efe863 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -19,9 +19,37 @@
 
 const char * domain_file_name = "Domain.cdd";
 
+CIAO::DomainDataManager* CIAO::DomainDataManager::global_data_manager_ = 0;
+
+CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
+                            ::Deployment::TargetManager_ptr target
+                            )
+{
+  if (global_data_manager_ == 0)
+    {
+      global_data_manager_ = new DomainDataManager (orb , target);
+    }
+  return global_data_manager_;
+}
+
+
+CIAO::DomainDataManager* CIAO::DomainDataManager::get_data_manager ()
+{
+  return global_data_manager_;
+}
+
+
+void CIAO::DomainDataManager::delete_data_manger ()
+{
+  if (global_data_manager_)
+    delete global_data_manager_;
+}
+
+
+
 int CIAO::DomainDataManager::update_domain (const ::CORBA::StringSeq &,
-                                      const ::Deployment::Domain & domainSubset,
-                                      ::Deployment::DomainUpdateKind )
+                                            const ::Deployment::Domain & domainSubset,
+                                            ::Deployment::DomainUpdateKind )
 {
   // Update the subset of the domain which the above
   // parameter corresponds to
@@ -29,16 +57,23 @@ int CIAO::DomainDataManager::update_domain (const ::CORBA::StringSeq &,
   // for now consider only nodes
   if (CIAO::debug_level () > 9)
     {
-      ACE_DEBUG ((LM_DEBUG , "Inside The update Domain of Manager\n"));
-      ACE_DEBUG ((LM_DEBUG , "the length of domain is [%d]",
-                  current_domain_.node.length ()));
-      ACE_DEBUG ((LM_DEBUG , "domainSubsetNode is \n" ));
+      /*
+      ACE_DEBUG ((LM_DEBUG ,
+          "TM::update_domain::Inside The update Domain of Manager\n"));
+      ACE_DEBUG ((LM_DEBUG ,
+          "TM::update_domain_::The length of domain is [%d]",
+           current_domain_.node.length ()));
+      ACE_DEBUG ((LM_DEBUG ,
+                  "TM::update_domain::domainSubsetNode is \n" ));
+      */
     }
   int size = current_domain_.node.length ();
+
   int i;
   for (i=0;i < size;i++)
     {
-      if (!strcmp (domainSubset.node[0].name , current_domain_.node[i].name))
+      if (!strcmp (domainSubset.node[0].name ,
+                   current_domain_.node[i].name))
         {
           // found a match
           // for now overwrite the entire Node info ...
@@ -46,7 +81,7 @@ int CIAO::DomainDataManager::update_domain (const ::CORBA::StringSeq &,
           // only the specific part ...
           if (CIAO::debug_level () > 9)
             {
-              ACE_DEBUG ((LM_DEBUG , "Changed the memory Value\n"));
+              ACE_DEBUG ((LM_DEBUG , "TM::Changed the cpu Value\n"));
             }
           current_domain_.node[i] = domainSubset.node[0];
           break; // finished job ...break
@@ -62,7 +97,8 @@ int CIAO::DomainDataManager::update_domain (const ::CORBA::StringSeq &,
     }
   if (CIAO::debug_level () > 9)
     {
-      ACE_DEBUG ((LM_DEBUG , "Inside The update Domain of Manager\n"));
+      ACE_DEBUG ((LM_DEBUG ,
+          "TM::Inside The update Domain of Manager\n"));
     }
   return 0;
 }
@@ -74,25 +110,33 @@ DomainDataManager (CORBA::ORB_ptr orb,
     deployment_config_ (orb_.in()),
     target_mgr_ (::Deployment::TargetManager::_duplicate(target))
 {
+  //  ACE_DEBUG((LM_DEBUG , "Calling DD_HANDLER\n"));
   CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
+  //  ACE_DEBUG((LM_DEBUG , "After DD_HANDLER Constructor\n"));
   ::Deployment::Domain* dmn = dd.domain_idl ();
-  ::Deployment::DnC_Dump::dump (*dmn);
+  //  ACE_DEBUG((LM_DEBUG , "After DD_HANDLER domain_idl\n"));
+
+  if (CIAO::debug_level () > 9)
+    ::Deployment::DnC_Dump::dump (*dmn);
+
   current_domain_ = *dmn;
   initial_domain_ = current_domain_;
 
+  // initialize the provisioning domain
+  provisioned_data_ = initial_domain_;
+
   call_all_node_managers ();
+
 }
 
 ::Deployment::Domain* CIAO::DomainDataManager::get_current_domain ()
 {
-  ::Deployment::Domain * retval = new ::Deployment::Domain (current_domain_);
-  return retval;
+  return new ::Deployment::Domain (provisioned_data_);
 }
 
 ::Deployment::Domain* CIAO::DomainDataManager::get_initial_domain ()
 {
-  ::Deployment::Domain * retval = new ::Deployment::Domain (initial_domain_);
-  return retval;
+  return new ::Deployment::Domain (initial_domain_);
 }
 
 int CIAO::DomainDataManager::readin_domain_data ()
@@ -115,12 +159,39 @@ int CIAO::DomainDataManager::call_all_node_managers ()
     }
 
   int length = initial_domain_.node.length ();
+  if (CIAO::debug_level () > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length));
+    }
+
   for (int i=0;i < length;i++)
     {
-      ::Deployment::NodeManager_var node_manager =
-          deployment_config_.get_node_manager (initial_domain_.node[i].name);
-      if (node_manager.in () != 0)
+
+      ::Deployment::NodeManager_var node_manager;
+
+
+      try
+        {
+          node_manager =
+            deployment_config_.get_node_manager
+            (initial_domain_.node[i].name.in ());
+        }
+      catch (CORBA::Exception& ex)
+        {
+          ACE_ERROR ((LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
+                      "Error trying to contact NodeManager %s\n",
+                      initial_domain_.node[i].name.in ()));
+          continue;
+        }
+
+
+      if (!CORBA::is_nil (node_manager.in ()))
         {
+          if (CIAO::debug_level () > 9)
+            {
+              ACE_DEBUG ((LM_DEBUG, "Trying to contact nodemanager on %s\n",
+                          initial_domain_.node[i].name.in ()));
+            }
           Deployment::Logger_ptr log =
             Deployment::Logger::_nil ();
           ::Deployment::Domain sub_domain;
@@ -134,14 +205,370 @@ int CIAO::DomainDataManager::call_all_node_managers ()
           sub_domain.node[0] = initial_domain_.node[i];
           try
             {
-              node_manager->joinDomain (sub_domain , target_mgr_.in (), log);
+              node_manager->joinDomain (sub_domain,
+                                        target_mgr_.in (),
+                                        log);
             }
-          catch (CORBA::Exception&)
+          catch (CORBA::Exception& ex)
             {
-              ACE_DEBUG ((LM_DEBUG , "Error in calling Join Domain==\n"));
+              ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Join Domain==\n"));
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in "
+                                   "DomainDataManager::joinDomain");
             }
         }
     }
   return 0;
 
 }
+
+CIAO::Host_NodeManager_seq * CIAO::DomainDataManager::get_node_managers ()
+{
+  ::CIAO::Host_NodeManager_seq* node_mgr_seq =
+      new ::CIAO::Host_NodeManager_seq ();
+  node_mgr_seq->length (initial_domain_.node.length ());
+  for (unsigned int i=0;i < initial_domain_.node.length ();i++)
+    {
+      (*node_mgr_seq)[i].host_ =
+        CORBA::string_dup (initial_domain_.node[i].name);
+      ::Deployment::NodeManager_var node_manager =
+          deployment_config_.get_node_manager (initial_domain_.node[i].name);
+      //      if (node_manager.in () != 0)
+        {
+          (*node_mgr_seq)[i].node_mgr_ = ::CIAO::NodeManager::_narrow (node_manager.in ());
+        }
+    }
+  return node_mgr_seq;
+}
+
+CIAO::Host_Infos*  CIAO::DomainDataManager::get_cpu_info ()
+{
+  CIAO::Host_Infos* host_info_seq = new CIAO::Host_Infos ();
+  host_info_seq->length (current_domain_.node.length ());
+
+  if (CIAO::debug_level () > 9)
+    ACE_DEBUG ((LM_DEBUG , "TM:: The node length is [%d]",
+                current_domain_.node.length ()));
+
+  for (unsigned int i=0;i < current_domain_.node.length ();i++)
+    {
+      (*host_info_seq)[i].hostname =
+        CORBA::string_dup (current_domain_.node[i].name);
+      //      ACE_DEBUG ((LM_DEBUG , "The resource length is [%d]",
+      //          current_domain_.node[i].resource.length ()));
+
+      for (unsigned int j = 0;j < current_domain_.node[i].resource.length ();j++)
+        {
+          if (!strcmp(
+                      current_domain_.node[i].resource[j].name,
+                      "Processor"))
+            {
+              current_domain_.node[i].resource[j].property[0].value
+                >>= (*host_info_seq)[i].cpu_util;
+              CORBA::Double d;
+              current_domain_.node[i].resource[j].property[0].value
+                >>= d;
+              //      ACE_DEBUG ((LM_DEBUG, "TM::The current cpu util is [%f]\n", d));
+            }
+        }
+    }
+
+  if (CIAO::debug_level () > 9)
+    ACE_DEBUG ((LM_DEBUG , "TM::Returning from get_cpu_info"));
+
+  return host_info_seq;
+}
+
+CORBA::Long CIAO::DomainDataManager::get_pid (ACE_CString cmp)
+{
+  CORBA::Long pid;
+
+  // This is really ineffiecient this is O(n) ; searching all the nodes
+  // all the resources for a particular component.
+  // It needs to be stored in some other data structure
+
+  for (unsigned int i=0;i < current_domain_.node.length ();i++)
+    {
+      if (CIAO::debug_level () > 9)
+        ACE_DEBUG ((LM_DEBUG , "TM::The resource length is [%d]",
+                    current_domain_.node[i].resource.length ()));
+
+      for (unsigned int j = 0;j < current_domain_.node[i].resource.length ();j++)
+        {
+          // The resource
+          if (!strcmp(
+                      current_domain_.node[i].resource[j].name,
+                      "Component") &&
+              ACE_CString (current_domain_.node[i].resource[j].property[0].name) ==
+              cmp)
+            {
+              current_domain_.node[i].resource[j].property[0].value
+                >>= pid;
+              if (CIAO::debug_level () > 9)
+                ACE_DEBUG ((LM_DEBUG,
+                            "TM::getpid::The current pid is [%d]\n", pid));
+
+            }
+        } // resources
+    }// nodes
+
+  return pid;
+}
+
+void CIAO::DomainDataManager
+::commitResources (
+                   const ::Deployment::DeploymentPlan & plan)
+{
+  // commit the resources
+  // parse into the plan and commit resources ...
+
+  // set the action value
+  current_action_ = commit;
+
+  for (unsigned int i = 0;i < plan.instance.length ();i++)
+    {
+      for (unsigned int j = 0;j < provisioned_data_.node.length ();j++)
+        {
+          if (!strcmp (plan.instance[i].node.in () ,
+                       provisioned_data_.node[j].name.in ()))
+          {
+            if (CIAO::debug_level () > 9)
+              ACE_DEBUG ((LM_DEBUG ,
+                  "TM::commitResource::Host name matched\n"));
+            try {
+              match_requirement_resource (
+                                          plan.instance[i].deployedResource,
+                                          provisioned_data_.node[j].resource);
+            }
+            catch (::Deployment::ResourceNotAvailable& ex)
+              {
+                // catch the exception and add parameters
+                ex.elementName =
+                  CORBA::string_dup (provisioned_data_.node[j].name);
+
+                throw ex;
+              }
+          }
+        }
+    }
+}
+
+
+void CIAO::DomainDataManager::
+releaseResources (
+                  const ::Deployment::DeploymentPlan& plan)
+{
+  // release the resources
+
+
+  // set the action value
+  current_action_ = release;
+
+  for (unsigned int i = 0;i < plan.instance.length ();i++)
+    {
+      for (unsigned int j = 0;j < provisioned_data_.node.length ();j++)
+        {
+          if (!strcmp (plan.instance[i].node.in () ,
+                       provisioned_data_.node[j].name.in ()))
+          {
+            if (CIAO::debug_level () > 9)
+              ACE_DEBUG ((LM_DEBUG ,
+                  "TM::commitResource::Host name matched\n"));
+
+            match_requirement_resource (
+                                        plan.instance[i].deployedResource,
+                                        provisioned_data_.node[j].resource);
+
+          }
+        }
+    }
+
+}
+
+
+void CIAO::DomainDataManager::
+match_requirement_resource (
+      ::Deployment::InstanceResourceDeploymentDescriptions deployed,
+      ::Deployment::Resources & available
+         )
+{
+  // here match the deployed to the available
+
+  for (unsigned int i = 0;i < deployed.length ();i++)
+    {
+      // for each deployed resource ....search the corresponding
+      // available resource
+      for (unsigned int j = 0;j < available.length ();j++)
+        {
+          if (!strcmp (deployed[i].requirementName, available[j].name))
+            {
+              if (CIAO::debug_level () > 9)
+                ACE_DEBUG ((LM_DEBUG ,
+                    "TM::commitResource::Requirement name matched\n"));
+              // search for the resourcename in the resourceType
+              for (unsigned int k = 0;k < available[j].resourceType.length ();k++)
+                {
+                  if (!strcmp (deployed[i].resourceName,
+                               available[j].resourceType[k]))
+                    {
+                      if (CIAO::debug_level () > 9)
+                        ACE_DEBUG ((LM_DEBUG ,
+                           "TM::commitResource::Resource name matched\n"));
+
+                      try {
+                        match_properties (deployed[i].property,
+                                          available[j].property);
+                      }
+                      catch (::Deployment::ResourceNotAvailable& ex)
+                        {
+                          // catch the exception and add parameters
+                          ex.resourceType =
+                            CORBA::string_dup (available[j].resourceType[k]);
+                          ex.resourceName =
+                            CORBA::string_dup (available[j].name);
+                          throw ex;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}
+
+void CIAO::DomainDataManager::
+match_properties (
+      ::Deployment::Properties deployed,
+      ::Deployment::SatisfierProperties & available)
+{
+  for (unsigned int i = 0;i < deployed.length ();i++)
+    {
+      for (unsigned int j = 0;j < available.length ();j++)
+        if (!strcmp (deployed[i].name , available[j].name))
+          {
+            // check kind here ....and then subtract ....
+            // accordingly , ..this is complex ... better to write
+            // some specialised algo
+            // for now assuming Capacity ....
+            // and tk_double ....
+            if (CIAO::debug_level () > 9)
+              ACE_DEBUG ((LM_DEBUG ,
+                          "TM::commitResource::Property name matched\n"));
+
+              commit_release_resource (deployed[i] , available[j]);
+
+          }
+    }
+}
+
+void CIAO::DomainDataManager::commit_release_resource (
+           ::Deployment::Property & deployed,
+           ::Deployment::SatisfierProperty & available)
+{
+  if (current_action_ == commit)
+    {
+
+      CORBA::Double required_d;
+
+      if ((deployed.value >>= required_d) == false)
+        ACE_ERROR ((LM_ERROR, "Failed to extract required amount\n"));
+
+      CORBA::Double available_d;
+
+      if ((available.value >>= available_d) == false)
+        ACE_ERROR ((LM_ERROR, "failed to extract available amount\n"));
+
+      if (available_d >= required_d)
+        {
+          available_d = available_d - required_d;
+          if (CIAO::debug_level () > 9)
+            ACE_DEBUG ((LM_DEBUG, "TM::The available is [%f]",
+                        available_d));
+
+          available.value <<= available_d;
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "Insufficient resources! Available: %d, Required %d\n",
+                      available_d, required_d));
+          throw ::Deployment::ResourceNotAvailable ("",
+                                                    "",
+                                                    deployed.name.in (),
+                                                    "",
+                                                    "");
+        }
+
+
+    }
+  else
+    {
+      //must be release
+      CORBA::Double required_d;
+      deployed.value >>= required_d;
+      CORBA::Double available_d;
+      available.value >>= available_d;
+
+      available_d = available_d + required_d;
+
+
+      // Should we check for bin > 100 ??????
+
+      if (CIAO::debug_level () > 9)
+        ACE_DEBUG ((LM_DEBUG, "TM::The available is [%f]",
+                    available_d));
+
+      available.value <<= available_d;
+    }
+}
+
+void CIAO::DomainDataManager::stop_monitors ()
+{
+
+  int length = initial_domain_.node.length ();
+  if (CIAO::debug_level () > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length));
+    }
+
+  for (int i=0;i < length;i++)
+    {
+
+      ::Deployment::NodeManager_var node_manager;
+
+
+      try
+        {
+          node_manager =
+            deployment_config_.get_node_manager
+            (initial_domain_.node[i].name.in ());
+        }
+      catch (CORBA::Exception& ex)
+        {
+          ACE_ERROR ((LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
+                      "Error in get Node Manager from Deployment Config %s\n",
+                      initial_domain_.node[i].name.in ()));
+          continue;
+        }
+
+
+      if (!CORBA::is_nil (node_manager.in ()))
+        {
+          if (CIAO::debug_level () > 9)
+            {
+              ACE_DEBUG ((LM_DEBUG, "Trying to contact nodemanager on %s\n",
+                          initial_domain_.node[i].name.in ()));
+            }
+          try
+            {
+              node_manager->leaveDomain ();
+            }
+          catch (CORBA::Exception& ex)
+            {
+              ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Leave Domain\n"));
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in "
+                                   "DomainDataManager::leaveDomain");
+            }
+        }
+    }
+  return;
+
+}
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
index 6d3e8772c87..84e50a5fabf 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -70,16 +70,112 @@ namespace CIAO
 
 
       /**
+       * @operation create
+       * @brief     This function is called to create the Datamanager
+       * @param orb The orb pointer
+       * @param target The Target Manager Object Reference
+       *
+       * @description This function calls the constructor of the
+       *              class Domain Data Manager
+       */
+      static DomainDataManager * create (CORBA::ORB_ptr orb,
+                                  ::Deployment::TargetManager_ptr target
+                                  );
+
+      /**
+       * @operation get_data_manager
+       * @brief Returns the static pointer to the
+       *        data manager.
+       * @return DomainDataManager*
+       * @description The staic get_data_manger function returning
+       *              the data_manager pointer
+       */
+      static DomainDataManager* get_data_manager ();
+
+      /**
+       * @operation delete_data_manager
+       * @brief deletes the data manager
+       */
+
+      static void delete_data_manger ();
+
+      /**
+       * @operation get_node_managers
+       * @brief returns the sequence of node managers
+       * object reference
+       */
+
+      CIAO::Host_NodeManager_seq *
+        get_node_managers ();
+
+      /**
+       * @operation get_cpu_info
+       * @brief returns the node specific cpu utilization
+       *
+       * @return CIAO::Host_Infos*
+       */
+
+       CIAO::Host_Infos* get_cpu_info ();
+
+       /**
+        * @operation get_pid
+        * @brief returns the pid of the component id submitted
+        * @param cmp The component id
+        *
+        * @return process id
+        */
+       CORBA::Long get_pid (ACE_CString cmp);
+
+       /**
+        * @operation commitResources
+        * @brief commits the resources that are specified
+        * in the plan.
+        * @param plan ::Deployment::DeploymentPlan
+        * @exception  ::Deployment::ResourceNotAvailable thrown
+        *             when the resources mentioned in the plan exceeds
+        *             the current resource.
+        * @exception  ::Deployment::PlanError thrown if the plan has any
+        *              error
+        *
+        */
+       void commitResources (
+       const ::Deployment::DeploymentPlan & plan);
+
+       /**
+        * @operation releaseResources
+        * @brief The function releases the resources held by a plan
+        *
+        * @param argname ::Deployment::DeploymentPlan the plan whose
+        *                resources are to be released
+        */
+       void releaseResources (
+       const ::Deployment::DeploymentPlan& plan);
+
+       /**
+        * @operation stop_monitors
+        * @brief The function makes a call on the leaveDomain on the
+        *        NodeManager
+        *
+        * @description The node manager in turn stops the monitor
+        *
+        */
+
+       void stop_monitors ();
+
+    protected:
+
+
+      /**
        * @operation   Constructor
        * @param orb The orb pointer
        * @param target The Target Manager Object Reference
+       * @description The constructor made proteccted so that no one can create
+       *              it.
        */
       DomainDataManager (CORBA::ORB_ptr orb,
                          ::Deployment::TargetManager_ptr target
                          );
 
-    protected:
-
       /**
        * @operation readinDomainData
        * @brief   It will read the initial Domain data from
@@ -88,6 +184,49 @@ namespace CIAO
       int readin_domain_data ();
 
       /**
+       * @operation match_requirement_resource
+       * @brief Match the deployed resources to the
+       * available resource
+       */
+      void match_requirement_resource (
+         ::Deployment::InstanceResourceDeploymentDescriptions deployed,
+         ::Deployment::Resources& available
+         );
+
+      /**
+       * @operation match_properties
+       * @brief Match the properties of a Requirement to the
+       * properties of available resource
+       * @param deployed The deployed Properties
+       * @param available The available Properties
+       */
+
+        void CIAO::DomainDataManager::
+        match_properties (
+                          ::Deployment::Properties deployed,
+                          ::Deployment::SatisfierProperties& available);
+
+
+        /// The different actiona that can take place
+        enum  Action {commit , release};
+
+      /**
+       * @operation commit_release_resource
+       * @brief Either commits or releases the given resource
+       * based on the current Action set.
+       * @param deployed ::Deployment::Property is the resource
+       * to be commited/released
+       * @param available ::Deployment::SatisfierProperty is the
+       * available resource from which committed/released.
+       * @exception  ::Deployment::ResourceNotAvailable thrown
+       *             when the deployed resources exceeds
+       *             the available resource.
+       */
+
+        void commit_release_resource (  ::Deployment::Property & deployed,
+                          ::Deployment::SatisfierProperty & available);
+
+      /**
        * @operation call_all_node_managers
        * @brief This function calls all NM and gives them
        * the sub-domain
@@ -111,6 +250,20 @@ namespace CIAO
 
       /// The Target Manager Context
       ::Deployment::TargetManager_var target_mgr_;
+
+      /**
+       * The staic data manager pointer implementing
+       * singleton pattern
+       */
+      static DomainDataManager* global_data_manager_;
+
+      /**
+       * The static provisioned Domain data
+       */
+      ::Deployment::Domain provisioned_data_;
+
+      ///The current action
+      Action current_action_;
     };
 
 } // CIAO
diff --git a/TAO/CIAO/DAnCE/TargetManager/TM_Client.mpc b/TAO/CIAO/DAnCE/TargetManager/TM_Client.mpc
index 40904b1585d..aba5c8737d3 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TM_Client.mpc
+++ b/TAO/CIAO/DAnCE/TargetManager/TM_Client.mpc
@@ -5,7 +5,7 @@
 
 project(TMClient): ciao_client_dnc,ciao_deployment_stub, ciao_config_handlers {
   after += CIAO_TargetManager_stub
-  includes += $(CIAO_ROOT)/DAnCE $(TAO_ROOT)/orbsvcs 
+  includes += $(CIAO_ROOT)/DAnCE $(TAO_ROOT)/orbsvcs
   includes += $(CIAO_ROOT)/DAnCE/TargetManager
   libs += TargetManager_stub
 
@@ -14,12 +14,12 @@ project(TMClient): ciao_client_dnc,ciao_deployment_stub, ciao_config_handlers {
   }
 
   Source_Files {
-    CmpClient.cpp 
+    CmpClient.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 2add70e94e3..ef22db4924f 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -1,11 +1,14 @@
 // $Id$
 
-// generate_component_mpc.pl,v 
+// generate_component_mpc.pl,v
 project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub {
+  after += NodeManager_stub
   sharedname = TargetManager_stub
   idlflags += -Wb,stub_export_macro=TARGETMANAGER_STUB_Export -Wb,stub_export_include=TargetManager_stub_export.h -Wb,skel_export_macro=TARGETMANAGER_SVNT_Export -Wb,skel_export_include=TargetManager_svnt_export.h
   dynamicflags   = TARGETMANAGER_STUB_BUILD_DLL
 
+  libs +=  NodeManager_stub
+
   IDL_Files {
     TargetManager.idl
     TargetManagerExt.idl
@@ -20,8 +23,8 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub {
 project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
   after += CIAO_TargetManager_stub
   sharedname  = TargetManager_svnt
-  libs    += TargetManager_stub 
-  
+  libs    += TargetManager_stub
+
   idlflags  +=  -Wb,export_macro=TARGETMANAGER_SVNT_Export -Wb,export_include=TargetManager_svnt_export.h
   dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
 
@@ -45,15 +48,19 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
 project(CIAO_TargetManager_exec) : namingexe, ciao_component_dnc , ciao_config_handlers {
   after   += CIAO_TargetManager_svnt DomainApplicationManager
   sharedname = TargetManager_exec
-  libs      += TargetManager_stub TargetManager_svnt DomainApplicationManager
-  
+  libs      += TargetManager_stub \
+               TargetManager_svnt \
+               DomainApplicationManager \
+               NodeManager_stub
+
+
   includes += $(CIAO_ROOT)/DomainApplicationManager
-  
+
   idlflags  +=  -Wb,export_macro=TARGETMANAGER_EXEC_Export -Wb,export_include=TargetManager_exec_export.h
   dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
 
   Source_Files {
-    DomainDataManager.cpp    
+    DomainDataManager.cpp
     TargetManager_exec.cpp
   }
 
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
index cc9443b3c51..17311a60120 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
@@ -1,20 +1,26 @@
 // $Id$
 
-/** 
+/**
  * @file TargetManagerExt.idl
  *
  * @brief The Extensions to the TM interface for ARMS demo
  *
+ * @author Nilabja R <nilabjar@dre.vanderbilt.edu>
+ * @author Nishanth Shankaran <nshankar@dre.vanderbilt.edu>
+ *
  * This file declares a interface which will be implemented as
  * a facet by the TargetManager component
  */
 
 /**
  * @module CIAO
- * 
+ *
  * @brief The CIAO module
  */
 
+//#include <ciao/Deployment.idl>
+#include <DAnCE/Interfaces/NodeManager.idl>
+
 module CIAO
 {
   /**
@@ -43,6 +49,20 @@ module CIAO
   /// The sequence of component cpu utilization
   typedef sequence <Component_Info> Component_Infos;
 
+
+  /**
+   * @struct Host_NodeManager
+   * @brief Contains the node manager to host reference
+   */
+  struct Host_NodeManager
+  {
+    string host_;
+    ::CIAO::NodeManager node_mgr_;
+  };
+
+  /// Sequence of NodeManager.
+  typedef sequence <Host_NodeManager> Host_NodeManager_seq;
+
   /**
    * @interface TargetManagerExt
    * @brief The Target Manager Extension
@@ -55,5 +75,6 @@ module CIAO
     long get_pid (in string component_uuid);
     Host_Infos get_host_cpu ();
     Component_Infos get_component_cpu ();
+    Host_NodeManager_seq get_all_node_managers ();
   };
 };
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
index 552197adf0e..7fe8f24a707 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
@@ -41,7 +41,8 @@ namespace CIDL_TargetManager_i
             CIAO::TargetManagerImpl::_narrow (object.in ());
     ::Deployment::TargetManager_var target =
             target_impl->provide_targetMgr ();
-    dataManager_.reset (new CIAO::DomainDataManager (orb, target.in ()));
+    //    dataManager_.reset (new CIAO::DomainDataManager (orb, target.in ()));
+    CIAO::DomainDataManager::create (orb, target.in());
   }
 
   TargetManager_exec_i::~TargetManager_exec_i (void)
@@ -55,7 +56,8 @@ namespace CIDL_TargetManager_i
   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return  dataManager_->get_initial_domain ();
+    return  CIAO::DomainDataManager::
+      get_data_manager ()->get_initial_domain ();
   }
 
   ::Deployment::Domain *
@@ -63,28 +65,31 @@ namespace CIDL_TargetManager_i
   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return dataManager_->get_current_domain ();
+    return CIAO::DomainDataManager::
+      get_data_manager ()->get_current_domain ();
   }
 
   void
   TargetManager_exec_i::commitResources (
-  const ::Deployment::DeploymentPlan & /* plan */
+  const ::Deployment::DeploymentPlan & plan
   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Deployment::ResourceNotAvailable,
   ::Deployment::PlanError))
   {
-    throw CORBA::NO_IMPLEMENT ();
+    return CIAO::DomainDataManager::
+      get_data_manager ()->commitResources (plan);
   }
 
   void
   TargetManager_exec_i::releaseResources (
-  const ::Deployment::DeploymentPlan & /* argname */
+  const ::Deployment::DeploymentPlan &  plan
   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    throw CORBA::NO_IMPLEMENT ();
+    return CIAO::DomainDataManager::
+      get_data_manager ()->releaseResources (plan);
   }
 
   void
@@ -100,7 +105,8 @@ namespace CIDL_TargetManager_i
     {
       ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n"));
     }
-    dataManager_->update_domain (
+    CIAO::DomainDataManager::
+      get_data_manager ()->update_domain (
                     elements,
                     domainSubset,
                     updateKind
@@ -124,13 +130,14 @@ namespace CIDL_TargetManager_i
 
   ::CORBA::Long
   TargetManagerExt_exec_i::get_pid (
-                                    const char * /* component_uuid */
+                                    const char * component_uuid
                                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
     ACE_DEBUG ((LM_DEBUG, "Get PID :: Skeleton Impl"));
-    return 0;
+    return CIAO::DomainDataManager::
+      get_data_manager ()->get_pid (component_uuid);
   }
 
   ::CIAO::Host_Infos *
@@ -139,8 +146,9 @@ namespace CIDL_TargetManager_i
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get host cpu :: Skeleton Impl"));
-    return 0;
+    ACE_DEBUG ((LM_DEBUG, "Get host cpu :: Skeleton Impl entering\n"));
+    return CIAO::DomainDataManager::
+      get_data_manager ()->get_cpu_info ();
   }
 
   ::CIAO::Component_Infos *
@@ -153,6 +161,15 @@ namespace CIDL_TargetManager_i
     return 0;
   }
 
+  ::CIAO::Host_NodeManager_seq *
+  TargetManagerExt_exec_i::get_all_node_managers
+  (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    return CIAO::DomainDataManager::
+      get_data_manager ()->get_node_managers ();
+  }
+
   //==================================================================
   // Component Executor Implementation Class:   TargetManagerImpl_exec_i
   //==================================================================
@@ -198,7 +215,11 @@ namespace CIDL_TargetManager_i
                             ACE_ENV_SINGLE_ARG_DECL_NOT_USED
                             ) ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return new  TargetManagerExt_exec_i ();
+    if (this->exec_ext_object_.in () == 0)
+    {
+      this->exec_ext_object_ = new TargetManagerExt_exec_i();
+    }
+    return this->exec_ext_object_.in ();
   }
 
   // Operations from Components::SessionComponent
@@ -277,6 +298,10 @@ namespace CIDL_TargetManager_i
   ::Components::CCMException))
   {
     // Your code here.
+    ACE_DEBUG ((LM_DEBUG , "TM::ccm_remove , calling LeaveDomain\n"));
+        return CIAO::DomainDataManager::
+          get_data_manager ()->stop_monitors ();
+    ACE_DEBUG ((LM_DEBUG , "TM::ccm_remove , After calling LeaveDomain\n"));
   }
 
 
@@ -322,7 +347,7 @@ namespace CIDL_TargetManager_i
   }
 
   extern "C" TARGETMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  createTargetManagerHome_Impl (void)
+  create_CIAO_TargetManagerHome_Impl (void)
   {
     ::Components::HomeExecutorBase_ptr retval =
     ::Components::HomeExecutorBase::_nil ();
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.h
index a756f67ec5e..1b3b7b0e470 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.h
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.h
@@ -47,7 +47,7 @@ namespace CIDL_TargetManager_i
     ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual ::CIAO::CCM_TargetManagerExt_ptr 
+    virtual ::CIAO::CCM_TargetManagerExt_ptr
       get_target_manager_ext (
                               ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
                               )
@@ -104,6 +104,8 @@ namespace CIDL_TargetManager_i
 
     /// The exec Object
     ::Deployment::CCM_TargetManager_var exec_object_;
+
+    ::CIAO::CCM_TargetManagerExt_var exec_ext_object_;
   };
 
   class TARGETMANAGER_EXEC_Export TargetManagerExt_exec_i
@@ -131,6 +133,11 @@ namespace CIDL_TargetManager_i
         get_component_cpu (
                            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException));
+
+      virtual ::CIAO::Host_NodeManager_seq *
+        get_all_node_managers (
+                           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
     };
 
  class TARGETMANAGER_EXEC_Export TargetManager_exec_i
@@ -221,7 +228,7 @@ namespace CIDL_TargetManager_i
   };
 
   extern "C" TARGETMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
-    createTargetManagerHome_Impl (void);
+    create_CIAO_TargetManagerHome_Impl (void);
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/DAnCE/TargetManager/descriptors/Domain.cdd b/TAO/CIAO/DAnCE/TargetManager/descriptors/Domain.cdd
index 382f7f6b83b..fe21a4b48f5 100644
--- a/TAO/CIAO/DAnCE/TargetManager/descriptors/Domain.cdd
+++ b/TAO/CIAO/DAnCE/TargetManager/descriptors/Domain.cdd
@@ -18,6 +18,7 @@
     <property>
       <name>LoadAverage</name>
       <kind>Quantity</kind>
+      <dynamic>true</dynamic>
       <value>
         <type>
 	  <kind>tk_long</kind>
@@ -36,6 +37,7 @@
     <property>
       <name>LoadAverage</name>
       <kind>Quantity</kind>
+      <dynamic>true</dynamic>
       <value>
         <type>
 	  <kind>tk_long</kind>
@@ -57,6 +59,7 @@
       <property>
         <name>LoadAverage</name>
         <kind>Quantity</kind>
+        <dynamic>true</dynamic>
         <value>
           <type>
 	    <kind>tk_long</kind>
@@ -81,6 +84,7 @@
         <property>
           <name>LoadAverage</name>
           <kind>Quantity</kind>
+          <dynamic>true</dynamic>
           <value>
             <type>
 	      <kind>tk_long</kind>
diff --git a/TAO/CIAO/DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp
index be10e2254bf..fae71c39fa1 100644
--- a/TAO/CIAO/DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp
@@ -10,7 +10,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -53,7 +53,7 @@
   </instance>
 
   <!-- @@ Runtime library name must match exactly in "location" tag -->
-  
+
   <artifact id="TargetManager_exec">
     <name>TargetManager_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -66,12 +66,12 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createTargetManagerHome_Impl</string>
+          <string>create_CIAO_TargetManagerHome_Impl</string>
         </value>
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="TargetManager_svnt">
     <name>TargetManager_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -89,4 +89,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl
index f620ec569d0..3063a673d5a 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip.cidl
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #ifndef NODEAPPTEST_ROUNDTRIP_CIDL
 #define NODEAPPTEST_ROUNDTRIP_CIDL
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
index 9807170cc79..33f74f55976 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
         CORBA::string_dup ("NodeAppTest_RoundTrip_2");
       Deployment::ComponentInfos_var comp_info_new =
         node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;      
+      ACE_TRY_CHECK;
 
       assert (comp_info_new->length () == 1); //return 1 component objeref
 
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index 7792de3eed2..d984de8860b 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -81,8 +81,8 @@ main (int argc, char *argv[])
         CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
       info.servant_entrypt =
         CORBA::string_dup (
-            "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
-          );
+                           "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
+                           );
 
       // Create a ContainerImplementationInfo sequence
       Deployment::ContainerImplementationInfo container_info;
@@ -110,11 +110,11 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip_var.in ()))
-       {
-         ACE_ERROR_RETURN ((LM_DEBUG,
-                            "Nil RoundTrip reference\n"),
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil RoundTrip reference\n"),
                             1);
-       }
+        }
 
       // initialize the component
       roundtrip_var->ciao_postactivate ();
@@ -122,45 +122,45 @@ main (int argc, char *argv[])
 
       //get the provided facets info.
       Components::FacetDescriptions_var facets_info =
-      	roundtrip_var->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER) ;
+        roundtrip_var->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
 
       if ( facets_info->length () != 2 )
-      {
-	      ACE_DEBUG((LM_DEBUG, "Didn't get 2 facet back! but only %d\n",
-		               facets_info->length ()));
-	      return 1;
-      }
+        {
+          ACE_DEBUG((LM_DEBUG, "Didn't get 2 facet back! but only %d\n",
+                     facets_info->length ()));
+          return 1;
+        }
 
       // Invoke Operation on the Interface
       ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n"));
 
       for (i = 0; i < 2; ++i )
         {
-	        NodeAppTest::LatencyTest_var latency_var
-	          = NodeAppTest::LatencyTest::_narrow ( (facets_info[i]->facet_ref ()));
-	        ACE_DEBUG((LM_DEBUG, "Calling on facet %s\n", (facets_info[i]->name ())));
-
-	        ACE_TRY_CHECK;
-
-	        if ( CORBA::is_nil (latency_var.in ()) )
-	        {
-	          ACE_DEBUG((LM_DEBUG, "get nil latency ref for facet%d\n", i));
-	          return 1;
-	        }
-
-	        CORBA::Long input = 1L;
-	        CORBA::Long output =
-	          latency_var->cube_long (input ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
-                
-	        if (input == output)
-	          ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n"));
-	        else
-	          {
-	            ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n"));
-	            exit (1);
-	          }
+          NodeAppTest::LatencyTest_var latency_var
+            = NodeAppTest::LatencyTest::_narrow ( (facets_info[i]->facet_ref ()));
+          ACE_DEBUG((LM_DEBUG, "Calling on facet %s\n", (facets_info[i]->name ())));
+
+          ACE_TRY_CHECK;
+
+          if ( CORBA::is_nil (latency_var.in ()) )
+            {
+              ACE_DEBUG((LM_DEBUG, "get nil latency ref for facet%d\n", i));
+              return 1;
+            }
+
+          CORBA::Long input = 1L;
+          CORBA::Long output =
+            latency_var->cube_long (input ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (input == output)
+            ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n"));
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG, "Return values did not match: failure\n"));
+              exit (1);
+            }
         }
 
       ACE_DEBUG ((LM_DEBUG, "Try removing test component and its home\n"));
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
index c235a794806..042840f4679 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
@@ -38,54 +38,54 @@ namespace CIDL_RoundTrip_Impl
     RoundTrip_exec_i ();
 
     /// Operation to test the data
-      virtual CORBA::Long cube_long (CORBA::Long data
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long cube_long (CORBA::Long data
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     /*
-    virtual ::NodeAppTest::CCM_LatencyTest*
-                        get_latency (ACE_ENV_SINGLE_ARG_DECL)
-                ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual ::NodeAppTest::CCM_LatencyTest*
+      get_latency (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
     */
 
-      NodeAppTest::CCM_LatencyTest_ptr
-      get_facet_1(ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    NodeAppTest::CCM_LatencyTest_ptr
+    get_facet_1(ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-      NodeAppTest::CCM_LatencyTest_ptr
-      get_facet_2(ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    NodeAppTest::CCM_LatencyTest_ptr
+    get_facet_2(ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-      virtual void set_session_context (Components::SessionContext_ptr ctx
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void set_session_context (Components::SessionContext_ptr ctx
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
     /// Helper function to be called back by timeout_Handler
-      void pulse (void);
+    void pulse (void);
 
     // CIAO defined methods
-      virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
-      virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         Components::CCMException));
+    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
 
   protected:
 
@@ -109,9 +109,9 @@ namespace CIDL_RoundTrip_Impl
     {
     }
 
-    virtual CORBA::Long cube_long (CORBA::Long data 
-		    	                         ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long cube_long (CORBA::Long data
+                                   ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
   /**
diff --git a/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl b/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
index 361c6950fe8..d5521d0554f 100755
--- a/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
+++ b/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
@@ -49,10 +49,10 @@ $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000  -s
 $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
-                             
+
 $SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
                              "-ORBEndpoint iiop://localhost:50000  -s
-$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
+$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV1->Spawn ();
 $SV2->Spawn ();
 $SV3->Spawn ();
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index 5da48f1e2c4..cbc0f71823c 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -52,7 +52,7 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . Add support for querying for interface types to the
   RepositoryManager.
- 
+
 . Implement a planner to query the TargetManager and RepositoryManager
   and generate deployment plans on the fly.
 
@@ -71,7 +71,7 @@ PLANNED MAJOR CHANGES FOR THE NEXT RELEASE
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.8 and CIAO-0.4.9
 ======================================================
 . RTTI enabled versions of the Xerces library are no longer needed on
-  Windows platforms.  
+  Windows platforms.
 
 . The CIDLC compiler now supports basic preprocessor directives:
   #ifdef, #ifndef, #else, and #endif as well as the -D command-
@@ -79,7 +79,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.8 and CIAO-0.4.9
 
 . The CIDLC compiler now supports incomplete struct and union
   semantics which will appear in CORBA 3.1.
-  
+
 . DAnCE now supports dynamically adding/removing components
   to/from the existing running assembly without shutting down the
   running appliation.  This will allow the application developers to
@@ -101,8 +101,8 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.8 and CIAO-0.4.9
      the same physical node.
   6) Install new component instances into another component server
      into a remote host.
-  
-  To see how to use this feature, please see the ReDaC-Usage.html 
+
+  To see how to use this feature, please see the ReDaC-Usage.html
   under the $CIAO_ROOT/examples/Hello/ directory.
 
 . Removed the Old Config Handlers, which have been deprecated for some
@@ -139,10 +139,10 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.8 and CIAO-0.4.9
 
 . The RepositoryManager has been enhanced to support standards based
   interfaces. A number of techniques have been used to ensure high
-  performance and scalability. 
+  performance and scalability.
 
 . The RepositoryManager can now retrieve packages from remote locations via
-  HTTP. 
+  HTTP.
 
 . The Target Manager is released with this CIAO release. It is an
   infrastructure component which keeps track of resource usage in the
@@ -155,7 +155,7 @@ USER VISIBLE CHANGES BETWEEN CIAO-0.4.8 and CIAO-0.4.9
   new monitors which can monitor different resources in the domain. The
   Target manager is a component thus it needs to be started using a
   deployment plan. It is right now a optional component in the DAnCE
-  tool chain. 
+  tool chain.
 
 . We added a skeleton implementation of the Resource Allocation and
   Control Engine (RACE) which is a middleware framework built atop
diff --git a/TAO/CIAO/PROBLEM-REPORT-FORM b/TAO/CIAO/PROBLEM-REPORT-FORM
index 25700ef490d..4375a78d20e 100644
--- a/TAO/CIAO/PROBLEM-REPORT-FORM
+++ b/TAO/CIAO/PROBLEM-REPORT-FORM
@@ -60,7 +60,7 @@ Subject: [area]: [synopsis]
     THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you
     use a link to a platform-specific file, simply state which one
     (unless this isn't used in this case, e.g., with Microsoft Visual
-    C++)]: 
+    C++)]:
 
     CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
     (used by MPC when you generate your own makefiles):
diff --git a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
index 6258cad826b..0da6e7b7ed5 100644
--- a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
+++ b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 // This file is generated with "generate_component_mpc.pl -n Input_Adapter"
 
 project(Input_Adapter_stub): ciao_deployment_stub {
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
index d027b608c8b..e04bae9d80e 100644
--- a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
@@ -12,7 +12,7 @@ module CIAO
     component Interactive_Input_Adapter : Input_Adapter
     {
     };
-    
+
     home Interactive_Input_Adapter_Home manages Interactive_Input_Adapter
     {
     };
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
index 5870d40d6b4..b675084bb96 100644
--- a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
@@ -82,14 +82,14 @@ project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handle
              Input_Adapter_svnt \
              Plan_Analyzer_Interface_stub \
              XSC_Config_Handlers
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \
                 -Wb,export_include=Interactive_Input_Adapter_exec_export.h
   dynamicflags   = INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
diff --git a/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl b/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl
index 6f0199494f5..7e672014026 100644
--- a/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl
+++ b/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl
@@ -13,6 +13,6 @@ module CIAO
       provides PlanEgress output;
       uses multiple PlanEgress adapters;
     };
-    
+
   };
 };
diff --git a/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl b/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
index cd42287f4d2..ce75aa0bc05 100644
--- a/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
+++ b/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
@@ -9,7 +9,7 @@
 
 module CIAO
 {
-  
+
   module RACE
   {
     interface PlanEgress
diff --git a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
index 818e1626111..20f29bcc1c8 100644
--- a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
@@ -11,7 +11,7 @@ module CIAO
     component XML_Output_Adapter : Output_Adapter
     {
     };
-    
+
     home XML_Output_Adapter_Home manages XML_Output_Adapter
     {
     };
diff --git a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
index fca465a75fd..981cd3d76f0 100644
--- a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
@@ -30,7 +30,7 @@ project(XML_Output_Adapter_svnt) : ciao_servant_dnc {
              Output_Adapter_svnt \
              Output_Adapter_Interface_stub \
              Output_Adapter_Interface_svnt
-  
+
   idlflags  +=  -Wb,export_macro=XML_OUTPUT_ADAPTER_SVNT_Export \
                 -Wb,export_include=XML_Output_Adapter_svnt_export.h
   dynamicflags = XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL
@@ -60,17 +60,17 @@ project(XML_Output_Adapter_exec) : ciao_component_dnc {
              Output_Adapter_svnt \
              Output_Adapter_Interface_stub \
              Output_Adapter_Interface_svnt
-  
+
   idlflags  +=  -Wb,export_macro=XML_OUTPUT_ADAPTER_EXEC_Export \
                 -Wb,export_include=XML_Output_Adapter_exec_export.h
   dynamicflags   = XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
-    
+
     XML_Output_Adapter_exec.cpp
   }
 }
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl
index 9f4fdd4668d..f2e3ab26f66 100644
--- a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl
@@ -8,7 +8,7 @@
 
 module CIAO
 {
-  
+
   module RACE
   {
     component Plan_Analyzer
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
index 3ea12c0608e..7cb588e74c0 100644
--- a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
@@ -94,7 +94,7 @@ project(Plan_Analyzer_exec) : ciao_component_dnc {
   dynamicflags   = PLAN_ANALYZER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl
index dcf42d8218c..98b02691a32 100644
--- a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl
@@ -13,7 +13,7 @@ module CIAO
 {
   module RACE
   {
-    
+
     composition session Planner_Manager_Impl
     {
       home executor Planner_Manager_Home_Exec
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
index 673c8647431..46dee1a6480 100644
--- a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
@@ -90,14 +90,14 @@ project(Planner_Manager_exec) : ciao_component_dnc {
              Planner_Interface_stub \
              Planner_stub \
              Output_Adapter_Interface_stub
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \
                 -Wb,export_include=Planner_Manager_exec_export.h
   dynamicflags   = PLANNER_MANAGER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
diff --git a/TAO/CIAO/RACE/Planners/Base/Planner.idl b/TAO/CIAO/RACE/Planners/Base/Planner.idl
index ae81074d5e7..5fc58c5cc1c 100644
--- a/TAO/CIAO/RACE/Planners/Base/Planner.idl
+++ b/TAO/CIAO/RACE/Planners/Base/Planner.idl
@@ -8,7 +8,7 @@
 
 module CIAO
 {
-  
+
   module RACE
   {
     component Planner
@@ -18,7 +18,7 @@ module CIAO
       attribute RACE_Classification type;
     };
   };
-  
+
 };
 
 #endif /* RACE_PLANNER_IDL */
diff --git a/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl b/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl
index b947c132540..8c8fc9a6194 100644
--- a/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl
+++ b/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl
@@ -9,7 +9,7 @@
 
 module CIAO
 {
-  
+
   module RACE
   {
     interface Planner_I
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl
index bb1a67e4a79..5678d1d21fc 100644
--- a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl
@@ -13,7 +13,7 @@ module CIAO
     component SimpleBinPacker : Planner
     {
     };
-    
+
     home SimpleBinPacker_Home manages SimpleBinPacker
     {
     };
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
index 8e69a6d96a7..8d504bad06f 100644
--- a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
@@ -83,16 +83,16 @@ project(SimpleBinPacker_exec) : ciao_component_dnc {
                Planner_Interface_stub \
                Planner_Interface_svnt \
                Planner_stub \
-               Planner_svnt \ 
+               Planner_svnt \
                RACE_common_stub
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \
                 -Wb,export_include=SimpleBinPacker_exec_export.h
   dynamicflags   = SIMPLEBINPACKER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
diff --git a/TAO/CIAO/RACE/common/RACE_common.idl b/TAO/CIAO/RACE/common/RACE_common.idl
index f5b1d9e59d8..3aa05fb6681 100644
--- a/TAO/CIAO/RACE/common/RACE_common.idl
+++ b/TAO/CIAO/RACE/common/RACE_common.idl
@@ -3,7 +3,7 @@
 #define RACE_COMMON_IDL
 
 module CIAO
-{  
+{
   module RACE
     {
       typedef string RACE_Classification;
diff --git a/TAO/CIAO/RACE/descriptors/Deployment.xsd b/TAO/CIAO/RACE/descriptors/Deployment.xsd
index c8a6399730b..7743791b54e 100644
--- a/TAO/CIAO/RACE/descriptors/Deployment.xsd
+++ b/TAO/CIAO/RACE/descriptors/Deployment.xsd
@@ -10,7 +10,7 @@
   <xsd:complexType name="Any">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -28,7 +28,7 @@
       <xsd:element name="alias" type="Deployment:AliasType"/>
       <xsd:element name="struct" type="Deployment:StructType"/>
       <xsd:element name="value" type="Deployment:ValueType"/>
-      <xsd:element name="union" type="Deployment:UnionType"/>      
+      <xsd:element name="union" type="Deployment:UnionType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -58,7 +58,7 @@
       <xsd:element name="discriminator" type="Deployment:DataValue"/>
       <xsd:element name="value" type="Deployment:DataValue"/>
       <xsd:element name="boxedValue" type="Deployment:DataValue"/>
-      <xsd:element name="member" type="Deployment:NamedValue"/>      
+      <xsd:element name="member" type="Deployment:NamedValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -70,7 +70,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="xsd:string"/>      
+      <xsd:element name="member" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -79,7 +79,7 @@
   <xsd:complexType name="ObjrefType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>      
+      <xsd:element name="typeId" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -89,7 +89,7 @@
   <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/>
   <xsd:complexType name="BoundedStringType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>      
+      <xsd:element name="bound" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -98,7 +98,7 @@
   <xsd:complexType name="FixedType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="digits" type="xsd:string"/>
-      <xsd:element name="scale" type="xsd:string"/>      
+      <xsd:element name="scale" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -107,7 +107,7 @@
   <xsd:complexType name="ArrayType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="length" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -116,7 +116,7 @@
   <xsd:complexType name="SequenceType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="bound" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -126,7 +126,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -136,7 +136,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="Deployment:StructMemberType"/>      
+      <xsd:element name="member" type="Deployment:StructMemberType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -145,7 +145,7 @@
   <xsd:complexType name="StructMemberType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -157,7 +157,7 @@
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="modifier" type="xsd:string"/>
       <xsd:element name="baseType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
+      <xsd:element name="member" type="Deployment:ValueMemberType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -167,7 +167,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="visibility" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -179,7 +179,7 @@
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="default" type="Deployment:UnionMemberType"/>
       <xsd:element name="discriminatorType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
+      <xsd:element name="member" type="Deployment:UnionMemberType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -189,7 +189,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="label" type="Deployment:DataValue"/>      
+      <xsd:element name="label" type="Deployment:DataValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -198,7 +198,7 @@
   <xsd:complexType name="NamedValue">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -209,7 +209,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connect" type="Deployment:Interconnect"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -221,7 +221,7 @@
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connection" type="Deployment:Bridge"/>
       <xsd:element name="connect" type="Deployment:Node"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -233,7 +233,7 @@
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connection" type="Deployment:Interconnect"/>
       <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -254,7 +254,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="node" type="Deployment:Node"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -262,13 +262,13 @@
   <xsd:element name="SharedResource" type="Deployment:SharedResource"/>
   <xsd:complexType name="Domain">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="UUID" type="xsd:string"/>  
+      <xsd:element name="UUID" type="xsd:string"/>
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
       <xsd:element name="node" type="Deployment:Node"/>
       <xsd:element name="interconnect" type="Deployment:Interconnect"/>
       <xsd:element name="bridge" type="Deployment:Bridge"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -279,7 +279,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>      
+      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -288,7 +288,7 @@
   <xsd:complexType name="PlanSubcomponentPropertyReference">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -299,7 +299,7 @@
       <xsd:element name="portName" type="xsd:string"/>
       <xsd:element name="provider" type="xsd:string"/>
       <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
-      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -313,7 +313,7 @@
       <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
       <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/>
       <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>
-      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/>      
+      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -327,7 +327,7 @@
       <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/>
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/>
-      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/>      
+      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -339,7 +339,7 @@
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
       <xsd:element name="execParameter" type="Deployment:Property"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>      
+      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -353,7 +353,7 @@
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="execParameter" type="Deployment:Property"/>
       <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/>      
+      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -372,7 +372,7 @@
       <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
       <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
       <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -384,7 +384,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -395,7 +395,7 @@
       <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -406,7 +406,7 @@
       <xsd:element name="targetName" type="xsd:string"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -416,7 +416,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -425,7 +425,7 @@
   <xsd:complexType name="ComponentPropertyDescription">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -440,7 +440,7 @@
       <xsd:element name="exclusiveProvider" type="xsd:string"/>
       <xsd:element name="exclusiveUser" type="xsd:string"/>
       <xsd:element name="optional" type="xsd:string"/>
-      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>      
+      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -456,7 +456,7 @@
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="port" type="Deployment:ComponentPortDescription"/>
       <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -470,7 +470,7 @@
       <xsd:element name="execParameter" type="Deployment:Property"/>
       <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
       <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -480,7 +480,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="execParameter" type="Deployment:Property"/>
       <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/>
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/>      
+      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -490,7 +490,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>      
+      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -499,7 +499,7 @@
   <xsd:complexType name="SubcomponentPropertyReference">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -508,7 +508,7 @@
   <xsd:complexType name="SubcomponentPortEndpoint">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="portName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -520,7 +520,7 @@
       <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
       <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
       <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/>
-      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>      
+      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -532,7 +532,7 @@
       <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>      
+      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -542,7 +542,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
       <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/>
-      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/>      
+      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -558,7 +558,7 @@
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="capability" type="Deployment:Capability"/>
       <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -568,7 +568,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="requiredUUID" type="xsd:string"/>
       <xsd:element name="requiredName" type="xsd:string"/>
-      <xsd:element name="requiredType" type="xsd:string"/>      
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -581,7 +581,7 @@
       <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/>
       <xsd:element name="configProperty" type="Deployment:Property"/>
       <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
-      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+      <xsd:element name="infoProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -595,7 +595,7 @@
       <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
       <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>
       <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
-      <xsd:element name="configProperty" type="Deployment:Property"/>      
+      <xsd:element name="configProperty" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -604,7 +604,7 @@
   <xsd:complexType name="PackagedComponentImplementation">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>      
+      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -613,7 +613,7 @@
   <xsd:complexType name="NamedImplementationArtifact">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>      
+      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -626,7 +626,7 @@
       <xsd:element name="componentPort" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
+      <xsd:element name="property" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -636,7 +636,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -646,7 +646,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="value" type="Deployment:Any"/>      
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -656,7 +656,7 @@
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
+      <xsd:element name="property" type="Deployment:Property"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -665,7 +665,7 @@
   <xsd:complexType name="Property">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:Any"/>    
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -673,7 +673,7 @@
   <xsd:element name="Property" type="Deployment:Property"/>
   <xsd:complexType name="ExternalReferenceEndpoint">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="location" type="xsd:string"/>      
+      <xsd:element name="location" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -681,7 +681,7 @@
   <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/>
   <xsd:complexType name="ComponentExternalPortEndpoint">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="portName" type="xsd:string"/>      
+      <xsd:element name="portName" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -689,7 +689,7 @@
   <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
   <xsd:complexType name="ImplementationDependency">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="requiredType" type="xsd:string"/>     
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
@@ -697,7 +697,7 @@
   <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/>
   <xsd:complexType name="TopLevelPackageDescription">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="package" type="Deployment:PackageConfiguration"/>      
+      <xsd:element name="package" type="Deployment:PackageConfiguration"/>
     </xsd:choice>
     <xsd:attribute ref="xmi:id" use="optional"/>
     <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
diff --git a/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd b/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd
index b73077b0980..5c35bd669db 100644
--- a/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd
+++ b/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd
@@ -50,7 +50,7 @@
   <xsd:complexType name="DataType">
     <xsd:choice>
       <xsd:element name="kind" type="Deployment:TCKind"/>
-<!--      
+<!--
 @@ not used, what for?
 
       <xsd:element name="enum" type="Deployment:EnumType"/>
@@ -109,7 +109,7 @@
   <xsd:complexType name="Any">
     <xsd:sequence>
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -117,13 +117,13 @@
   <xsd:complexType name="Property">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:Any"/>    
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:sequence>
   </xsd:complexType>
 
 
 <!-- End of base definitions. -->
-  
+
   <xsd:complexType name="Node">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
@@ -132,7 +132,7 @@
 @@ recursive, not used
       <xsd:element name="connection" type="Deployment:Interconnect"/>
       <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
 -->
     </xsd:sequence>
   </xsd:complexType>
@@ -154,7 +154,7 @@
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="value" type="Deployment:Any"/>      
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -173,7 +173,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="node" type="Deployment:Node"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -181,7 +181,7 @@
   <xsd:complexType name="Domain">
     <xsd:sequence>
       <xsd:element name="label" type="xsd:string"/>
-      <xsd:element name="UUID" type="xsd:string"/>       
+      <xsd:element name="UUID" type="xsd:string"/>
       <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0"/>
       <xsd:element name="node" type="Deployment:Node" maxOccurs="unbounded"/>
 <!--
@@ -198,7 +198,7 @@
     <xsd:sequence>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
+      <xsd:element name="property" type="Deployment:Property"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -209,7 +209,7 @@
     <xsd:sequence>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -255,7 +255,7 @@
       <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -328,7 +328,7 @@
 
   <xsd:complexType name="ComponentExternalPortEndpoint">
     <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>      
+      <xsd:element name="portName" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -345,7 +345,7 @@
 
   <xsd:complexType name="ExternalReferenceEndpoint">
     <xsd:sequence>
-      <xsd:element name="location" type="xsd:string"/>      
+      <xsd:element name="location" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -355,7 +355,7 @@
       <xsd:element name="targetName" type="xsd:string"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="resourceValue" type="Deployment:Any"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -375,7 +375,7 @@
 
   <xsd:complexType name="ImplementationDependency">
     <xsd:sequence>
-      <xsd:element name="requiredType" type="xsd:string"/>     
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -383,8 +383,8 @@
   <xsd:complexType name="DeploymentPlan">
    <xsd:sequence>
      <xsd:element name="label" type="xsd:string" minOccurs="0"/>
-     <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-     <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" maxOccurs="1"/>     
+     <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>
+     <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" />
      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
      <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
@@ -396,7 +396,7 @@
      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
-  
+
 
 
 
@@ -407,14 +407,14 @@
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:sequence>
   </xsd:complexType>
 
 
   <xsd:complexType name="NamedImplementationArtifact">
     <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>     
+      <xsd:element name="name" type="xsd:string"/>
       <!-- @@ recursive NIA->IAD->NIA -->
       <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>
     </xsd:sequence>
@@ -432,7 +432,7 @@
         <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
         <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
         <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
@@ -446,7 +446,7 @@
       <xsd:element name="componentPort" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
+      <xsd:element name="property" type="Deployment:Property"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -463,7 +463,7 @@
   <xsd:complexType name="PackagedComponentImplementation">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD -->   
+      <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD -->
       <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>
     </xsd:sequence>
   </xsd:complexType>
@@ -477,7 +477,7 @@
         <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
         <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
         <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
@@ -488,7 +488,7 @@
     <xsd:sequence>
       <xsd:element name="requiredUUID" type="xsd:string"/>
       <xsd:element name="requiredName" type="xsd:string"/>
-      <xsd:element name="requiredType" type="xsd:string"/>      
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -536,7 +536,7 @@
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>      
+      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -545,7 +545,7 @@
     <xsd:sequence>
       <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" maxOccurs="unbounded"/>
       <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" maxOccurs="unbounded"/>
-      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/> 
+      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -563,7 +563,7 @@
         <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
         <xsd:element name="capability" type="Deployment:Capability" minOccurs="0"/>
         <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
@@ -614,7 +614,7 @@
 
 
 
-<!-- VAULT 
+<!-- VAULT
 
 Place for strange things. Nobody knows what they are for...
 
@@ -633,14 +633,14 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="ObjrefType">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>      
+      <xsd:element name="typeId" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
 
   <xsd:complexType name="BoundedStringType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>      
+      <xsd:element name="bound" type="xsd:string"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -648,7 +648,7 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="FixedType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="digits" type="xsd:string"/>
-      <xsd:element name="scale" type="xsd:string"/>      
+      <xsd:element name="scale" type="xsd:string"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -656,14 +656,14 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="ArrayType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="length" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
   <xsd:complexType name="SequenceType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="bound" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -671,7 +671,7 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -679,14 +679,14 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="Deployment:StructMemberType"/>      
+      <xsd:element name="member" type="Deployment:StructMemberType"/>
     </xsd:choice>
   </xsd:complexType>
 
   <xsd:complexType name="StructMemberType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -696,7 +696,7 @@ Place for strange things. Nobody knows what they are for...
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="modifier" type="xsd:string"/>
       <xsd:element name="baseType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
+      <xsd:element name="member" type="Deployment:ValueMemberType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -704,7 +704,7 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="visibility" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -714,7 +714,7 @@ Place for strange things. Nobody knows what they are for...
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="default" type="Deployment:UnionMemberType"/>
       <xsd:element name="discriminatorType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
+      <xsd:element name="member" type="Deployment:UnionMemberType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -722,7 +722,7 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="label" type="Deployment:DataValue"/>      
+      <xsd:element name="label" type="Deployment:DataValue"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -730,7 +730,7 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="NamedValue">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -740,7 +740,7 @@ Place for strange things. Nobody knows what they are for...
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connect" type="Deployment:Interconnect"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -750,7 +750,7 @@ Place for strange things. Nobody knows what they are for...
       <xsd:element name="label" type="xsd:string"/>
       <xsd:element name="connection" type="Deployment:Bridge"/>
       <xsd:element name="connect" type="Deployment:Node"/>
-      <xsd:element name="resource" type="Deployment:Resource"/>      
+      <xsd:element name="resource" type="Deployment:Resource"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -775,13 +775,13 @@ Place for strange things. Nobody knows what they are for...
 
 <!--
 
-  This type is not referenced anywhere. 
+  This type is not referenced anywhere.
 
   <xsd:complexType name="RequirementSatisfier">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
   </xsd:complexType>
 
diff --git a/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp
index 0648c10eab8..aedb507930e 100644
--- a/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp
@@ -10,7 +10,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>deployment_stage_port</name>
       <specificType>IDL:RACE/deployment_stage:1.0</specificType>
@@ -22,7 +22,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="RACE-Interactive_Input_Adapter-mdd">
     <name>RACE-Interactive_Input_Adapter-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -191,7 +191,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="RACE-Interactive_Input_Adapter_svnt">
     <name>Interactive_Input_Adapter_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -228,7 +228,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="RACE-Plan_Analyzer_svnt">
     <name>Plan_Analyzer_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -265,7 +265,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="RACE-Planner_Manager_svnt">
     <name>Planner_Manager_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -302,7 +302,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="RACE-SimpleBinPacker_svnt">
     <name>SimpleBinPacker_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -339,7 +339,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="RACE-XML_Output_Adapter_svnt">
     <name>XML_Output_Adapter_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -358,4 +358,4 @@
     </execParameter>
   </artifact>
 
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/README b/TAO/CIAO/README
index 1ec960c4268..597927d76e4 100644
--- a/TAO/CIAO/README
+++ b/TAO/CIAO/README
@@ -102,7 +102,7 @@ and also the libraries they depends on.
   developing and deploying components. Pleas see
   $CIAO_ROOT/CIDLC/README.html for instructions on how to build and
   use CIDLC.
-  
+
 * Now you can play with the examples:
 
   - $CIAO_ROOT/examples/Hello
diff --git a/TAO/CIAO/bin/valgrind_nodedaemon.py b/TAO/CIAO/bin/valgrind_nodedaemon.py
index a0845864370..23c365c0ede 100755
--- a/TAO/CIAO/bin/valgrind_nodedaemon.py
+++ b/TAO/CIAO/bin/valgrind_nodedaemon.py
@@ -8,7 +8,7 @@ from os import system
 from os import environ
 
 def parse_args ():
-    
+
     parser = OptionParser (usage="usage: valgrind_nodemanager [options] <port_number>")
 
     parser.add_option ("-v", "--verbose", dest="verbose", action="store_true",
@@ -38,7 +38,7 @@ def parse_args ():
     parser.add_option ("--lc", dest="leak_check", action="store_true",
                        help="Perform a full leak check",
                        default=False)
-    
+
     return parser.parse_args ()
 
 import os
@@ -47,7 +47,7 @@ def main ():
     (option, args) = parse_args ()
 
     ciao_root = environ['CIAO_ROOT']
-    
+
     # Build the valgrind command
     valgrind_command = "valgrind --tool=" + option.valgrind_tool + ' ' +\
                        option.valgrind_args + ' '
@@ -63,7 +63,7 @@ def main ():
 
     # Build the actual command
     command = ""
-    
+
     if option.node_manager:
         command += valgrind_command
 
@@ -74,7 +74,7 @@ def main ():
         command += "-d 60 -s\"" + valgrind_command
     else:
         command += " -s \""
-    
+
     command += ciao_root + "/DAnCE/NodeApplication/NodeApplication" + '"'
 
     print command
@@ -83,5 +83,5 @@ def main ():
 
 if __name__ == "__main__":
     main ()
-    
-    
+
+
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 4667e2cbaef..d291aaa5f1a 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -10,7 +10,7 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
 
   // This is necessary for MPC to pull in rules.ciao.GNU
   includes += $(CIAO_ROOT)/DAnCE
-    
+
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/ciao/CCM_Event.idl b/TAO/CIAO/ciao/CCM_Event.idl
index 575220a0283..59fa878f97f 100644
--- a/TAO/CIAO/ciao/CCM_Event.idl
+++ b/TAO/CIAO/ciao/CCM_Event.idl
@@ -27,7 +27,7 @@ module Components
   interface EventConsumerBase
   {
     void push_event (in EventBase evt) raises (BadEventType);
-    
+
     // CIAO-specific operation to help support the capability
     // to subscribe to eventtypes more derived than the type
     // consumed.
diff --git a/TAO/CIAO/ciao/CIAO_common.h b/TAO/CIAO/ciao/CIAO_common.h
index 56796f04a13..21d96a2658f 100644
--- a/TAO/CIAO/ciao/CIAO_common.h
+++ b/TAO/CIAO/ciao/CIAO_common.h
@@ -56,6 +56,29 @@
 #  include "ace/Trace.h"
 #endif /* CIAO_NTRACE */
 
+#if defined (CIAO_NDEBUG)
+#define CIAO_DEBUG(X, ...) do {} while (0)
+#define CIAO_ERROR(X, ...) do {} while (0)
+#else
+#define CIAO_DEBUG(X, ...) \
+  do { \
+     if (CIAO::debug_level () > X) { \
+       int __ace_error = ACE_Log_Msg::last_error_adapter (); \
+       ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
+       ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
+       ace___->log (LM_DEBUG, __VA_ARGS__); \
+     } \
+  } while (0)
+#define CIAO_ERROR(X, ...) \
+  do { \
+     if (CIAO::debug_level () > X) { \
+       int __ace_error = ACE_Log_Msg::last_error_adapter (); \
+       ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
+       ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
+       ace___->log (LM_ERROR, __VA_ARGS__); \
+     } \
+  } while (0)
+#endif
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index 22ce67cd3c9..5917fe94934 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -15,7 +15,7 @@
 namespace CIAO
 {
 
-////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////
 
   Container::Container (CORBA::ORB_ptr o)
     : orb_ (CORBA::ORB::_duplicate (o)),
@@ -53,18 +53,18 @@ namespace CIAO
 
   ///////////////////////////////////////////////////////////////
 
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
+  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
   Session_Container::serial_number_ (0);
 
   Session_Container::Session_Container (CORBA::ORB_ptr o,
                                         Container_Impl *container_impl,
                                         bool static_config_flag,
-                                    const Static_Config_EntryPoints_Maps* maps)
-  : Container (o, container_impl),
-    number_ (0),
-    static_config_flag_ (static_config_flag),
-    static_entrypts_maps_ (maps),
-    sa_ (0)
+                                        const Static_Config_EntryPoints_Maps* maps)
+    : Container (o, container_impl),
+      number_ (0),
+      static_config_flag_ (static_config_flag),
+      static_entrypts_maps_ (maps),
+      sa_ (0)
   {
   }
 
@@ -79,6 +79,8 @@ namespace CIAO
                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::init");
+
     char buffer[MAXPATHLEN];
 
     if (name == 0)
@@ -98,7 +100,7 @@ namespace CIAO
     if (CORBA::is_nil (poa_object.in ()))
       {
         ACE_ERROR_RETURN ((LM_ERROR,
-                          " (%P|%t) Unable to initialize the POA.\n"),
+                           " (%P|%t) Unable to initialize the POA.\n"),
                           -1);
       }
 
@@ -137,6 +139,8 @@ namespace CIAO
                                            PortableServer::POA_ptr root
                                            ACE_ENV_ARG_DECL)
   {
+    CIAO_TRACE ("Session_Container::create_component_POA");
+
     // Set up proper poa policies here.  Default policies seems to be
     // fine for session container.  If you add some other default
     // policies here, then you need to "add" more_policies below
@@ -163,11 +167,13 @@ namespace CIAO
 
   void
   Session_Container::create_facet_consumer_POA (
-      const char *name,
-      const CORBA::PolicyList *p,
-      PortableServer::POA_ptr root
-      ACE_ENV_ARG_DECL)
+                                                const char *name,
+                                                const CORBA::PolicyList *p,
+                                                PortableServer::POA_ptr root
+                                                ACE_ENV_ARG_DECL)
   {
+    CIAO_TRACE ("Session_Container::create_facet_consumer_POA");
+
     PortableServer::POAManager_var poa_manager =
       root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
@@ -193,8 +199,8 @@ namespace CIAO
     // Servant Manager Policy
     policies[1] =
       root->create_request_processing_policy
-          (PortableServer::USE_SERVANT_MANAGER
-           ACE_ENV_ARG_PARAMETER);
+      (PortableServer::USE_SERVANT_MANAGER
+       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     // Servant Retention Policy
@@ -220,9 +226,9 @@ namespace CIAO
                       CORBA::NO_MEMORY ());
 
     this->facet_cons_poa_->set_servant_manager (
-        this->sa_
-        ACE_ENV_ARG_PARAMETER
-      );
+                                                this->sa_
+                                                ACE_ENV_ARG_PARAMETER
+                                                );
     ACE_CHECK;
   }
 
@@ -232,6 +238,8 @@ namespace CIAO
                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::install_servant");
+
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -262,6 +270,7 @@ namespace CIAO
                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::install_component");
     PortableServer::ObjectId_var id =
       this->component_poa_->activate_object (p
                                              ACE_ENV_ARG_PARAMETER);
@@ -295,16 +304,18 @@ namespace CIAO
                      Deployment::ImplEntryPointNotFound,
                      Deployment::InstallationFailure))
   {
+    CIAO_TRACE ("Session_Container::ciao_install_home");
+
     HomeFactory hcreator = 0;
     ServantFactory screator = 0;
 
-    if (this->static_config_flag_ == 0)
+    if (this->static_config_flag_ == false)
       {
         ACE_DLL executor_dll, servant_dll;
 
         if (exe_dll_name == 0 || sv_dll_name == 0)
           {
-	    ACE_CString exception;
+            ACE_CString exception;
 
             if (exe_dll_name == 0)
               {
@@ -324,9 +335,9 @@ namespace CIAO
 
             ACE_THROW_RETURN
               (Deployment::UnknownImplId (
-                 "Session_Container::ciao_install_home",
-	          exception.c_str ()),
-                  Components::CCMHome::_nil ());
+                                          "Session_Container::ciao_install_home",
+                                          exception.c_str ()),
+               Components::CCMHome::_nil ());
           }
 
         if (executor_dll.open (exe_dll_name,
@@ -344,8 +355,8 @@ namespace CIAO
 
             ACE_THROW_RETURN
               (Deployment::UnknownImplId
-                 ("Session_Container::ciao_install_home",
-                  error.c_str ()), Components::CCMHome::_nil ());
+               ("Session_Container::ciao_install_home",
+                error.c_str ()), Components::CCMHome::_nil ());
           }
 
         if (servant_dll.open (sv_dll_name,
@@ -362,9 +373,9 @@ namespace CIAO
                         sv_dll_name));
 
             ACE_THROW_RETURN
-               (Deployment::UnknownImplId
-                 ("Session_Container::ciao_install_home",
-                  error.c_str ()), Components::CCMHome::_nil ());
+              (Deployment::UnknownImplId
+               ("Session_Container::ciao_install_home",
+                error.c_str ()), Components::CCMHome::_nil ());
           }
 
         if (exe_entrypt == 0 || sv_entrypt == 0)
@@ -394,8 +405,8 @@ namespace CIAO
 
             ACE_THROW_RETURN
               (Deployment::ImplEntryPointNotFound
-                 ("Session_Container::ciao_install_home",
-                  error.c_str ()), Components::CCMHome::_nil ());
+               ("Session_Container::ciao_install_home",
+                error.c_str ()), Components::CCMHome::_nil ());
           }
 
         // @@ (OO) Please use a static_cast<> here instead of a C-style
@@ -403,7 +414,7 @@ namespace CIAO
         //         way of casting in ACE/TAO/CIAO.
         hcreator = (HomeFactory) executor_dll.symbol (exe_entrypt);
         screator = (ServantFactory) servant_dll.symbol (sv_entrypt);
-    }
+      }
     else
       {
         if (static_entrypts_maps_ == 0
@@ -416,15 +427,15 @@ namespace CIAO
 
         ACE_CString exe_entrypt_str (exe_entrypt);
         static_entrypts_maps_->home_creator_funcptr_map_->find (
-            exe_entrypt_str,
-            hcreator
-          );
+                                                                exe_entrypt_str,
+                                                                hcreator
+                                                                );
 
         ACE_CString sv_entrypt_str (sv_entrypt);
         static_entrypts_maps_->home_servant_creator_funcptr_map_->find (
-            sv_entrypt_str,
-            screator
-          );
+                                                                        sv_entrypt_str,
+                                                                        screator
+                                                                        );
       }
 
     if (hcreator == 0 || screator == 0)
@@ -445,9 +456,9 @@ namespace CIAO
           }
 
         ACE_THROW_RETURN
-           (Deployment::ImplEntryPointNotFound
-              ("SessionContainer::ciao_install_home",
-               error.c_str ()), Components::CCMHome::_nil ());
+          (Deployment::ImplEntryPointNotFound
+           ("SessionContainer::ciao_install_home",
+            error.c_str ()), Components::CCMHome::_nil ());
       }
 
     Components::HomeExecutorBase_var home_executor = hcreator ();
@@ -456,9 +467,9 @@ namespace CIAO
       {
         ACE_THROW_RETURN
           (Deployment::InstallationFailure
-             ("SessionContainer::ciao_install_home",
-              "Executor entrypoint failed to create a home."),
-              Components::CCMHome::_nil ());
+           ("SessionContainer::ciao_install_home",
+            "Executor entrypoint failed to create a home."),
+           Components::CCMHome::_nil ());
       }
 
     PortableServer::Servant home_servant = screator (home_executor.in (),
@@ -471,9 +482,9 @@ namespace CIAO
       {
         ACE_THROW_RETURN
           (Deployment::InstallationFailure
-             ("SessionContainer::ciao_install_home",
-              "Servant entrypoing failed to create a home."),
-              Components::CCMHome::_nil ());
+           ("SessionContainer::ciao_install_home",
+            "Servant entrypoing failed to create a home."),
+           Components::CCMHome::_nil ());
       }
 
     PortableServer::ServantBase_var safe (home_servant);
@@ -497,6 +508,8 @@ namespace CIAO
                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::ciao_uninstall_home");
+
     this->uninstall (homeref,
                      Container::Component
                      ACE_ENV_ARG_PARAMETER);
@@ -509,6 +522,8 @@ namespace CIAO
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::uninstall");
+
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -536,6 +551,7 @@ namespace CIAO
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::uninstall");
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -549,7 +565,7 @@ namespace CIAO
 
     PortableServer::ObjectId_var oid
       = tmp->servant_to_id (svt
-                                 ACE_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     tmp->deactivate_object (oid.in ()
@@ -563,6 +579,8 @@ namespace CIAO
                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::uninstall_component");
+
     PortableServer::ObjectId_var id =
       this->component_poa_->reference_to_id (objref
                                              ACE_ENV_ARG_PARAMETER);
@@ -577,11 +595,12 @@ namespace CIAO
 
   void
   Session_Container::add_servant_map (
-      PortableServer::ObjectId &,
-      Dynamic_Component_Servant_Base*
-      ACE_ENV_ARG_DECL_NOT_USED
-    )
+                                      PortableServer::ObjectId &,
+                                      Dynamic_Component_Servant_Base*
+                                      ACE_ENV_ARG_DECL_NOT_USED
+                                      )
   {
+    CIAO_TRACE ("Session_Container::add_servant_map");
   }
 
   void
@@ -589,14 +608,16 @@ namespace CIAO
                                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::deactivate_facet");
   }
 
   void
   Session_Container::delete_servant_map (
-      PortableServer::ObjectId &
-      ACE_ENV_ARG_DECL_NOT_USED
-    )
+                                         PortableServer::ObjectId &
+                                         ACE_ENV_ARG_DECL_NOT_USED
+                                         )
   {
+    CIAO_TRACE ("Session_Container::delete_servant_map");
   }
 
   CORBA::Object_ptr
@@ -604,6 +625,7 @@ namespace CIAO
                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Session_Container::get_home_objref");
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
   }
 
@@ -613,6 +635,8 @@ namespace CIAO
                                          Container::OA_Type t
                                          ACE_ENV_ARG_DECL)
   {
+    CIAO_TRACE ("Session_Container::generate_reference");
+
     PortableServer::POA_ptr tmp = 0;
 
     if (t == Container::Component)
@@ -631,11 +655,11 @@ namespace CIAO
       PortableServer::ObjectId_to_string (oid.in ());
 
     if (t == Container::Facet_Consumer)
-    {
-      //if (CIAO::debug_level () > 9)
-      //  ACE_DEBUG ((LM_DEBUG, "STRING in container is %s\n",
-      //              str.in ()));
-    }
+      {
+        //if (CIAO::debug_level () > 9)
+        //  ACE_DEBUG ((LM_DEBUG, "STRING in container is %s\n",
+        //              str.in ()));
+      }
 
     CORBA::Object_var objref =
       tmp->create_reference_with_id (oid.in (),
diff --git a/TAO/CIAO/ciao/Container_Base.h b/TAO/CIAO/ciao/Container_Base.h
index 943eab3ddf6..4753c1d6f23 100644
--- a/TAO/CIAO/ciao/Container_Base.h
+++ b/TAO/CIAO/ciao/Container_Base.h
@@ -318,7 +318,7 @@ namespace CIAO
   protected:
     long number_;
 
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, long> serial_number_;
+    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> serial_number_;
 
     // @@ (OO) Does this really need to be an int?  It appears to be a
     //         boolean value.  Please use bool instead.
diff --git a/TAO/CIAO/ciao/Context_Impl_Base.cpp b/TAO/CIAO/ciao/Context_Impl_Base.cpp
index 71581293d8c..6b31dedf392 100644
--- a/TAO/CIAO/ciao/Context_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Context_Impl_Base.cpp
@@ -89,4 +89,16 @@ namespace CIAO
   {
     return this->container_;
   }
+
+  const char *
+  Context_Impl_Base::_ciao_instance_id (void) const
+  {
+    return this->ciao_instance_id_.in ();
+  }
+
+  void
+  Context_Impl_Base::_ciao_instance_id (const char *instance_id)
+  {
+    this->ciao_instance_id_ = instance_id;
+  }
 }
diff --git a/TAO/CIAO/ciao/Context_Impl_Base.h b/TAO/CIAO/ciao/Context_Impl_Base.h
index 9a86e3bfd7d..62df2bba097 100644
--- a/TAO/CIAO/ciao/Context_Impl_Base.h
+++ b/TAO/CIAO/ciao/Context_Impl_Base.h
@@ -99,9 +99,16 @@ namespace CIAO
 
     CIAO::Session_Container *_ciao_the_Container (void) const;
 
+    const char *_ciao_instance_id (void) const;
+    void _ciao_instance_id (const char *instance_id);
+    // Accessors for the private member.
+
   protected:
     Components::CCMHome_var home_;
     Session_Container *container_;
+
+  private:
+    CORBA::String_var ciao_instance_id_;
   };
 }
 
diff --git a/TAO/CIAO/ciao/Context_Impl_T.cpp b/TAO/CIAO/ciao/Context_Impl_T.cpp
index 9dca7821824..0ef58a1b735 100644
--- a/TAO/CIAO/ciao/Context_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Context_Impl_T.cpp
@@ -7,9 +7,9 @@
 
 namespace CIAO
 {
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::Context_Impl (
       Components::CCMHome_ptr home,
@@ -20,9 +20,9 @@ namespace CIAO
   {
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::~Context_Impl (void)
   {
@@ -30,9 +30,9 @@ namespace CIAO
 
   // Operations from ::Components::SessionContext.
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   CORBA::Object_ptr
   Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::get_CCM_object (
@@ -45,22 +45,22 @@ namespace CIAO
     {
       CORBA::Object_var obj;
 
-      ACE_TRY 
+      ACE_TRY
         {
           obj =
             this->container_->get_objref (this->servant_
                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK; 
+          ACE_TRY_CHECK;
         }
-      ACE_CATCHANY 
-        { 
+      ACE_CATCHANY
+        {
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught Exception \n"); 
+                               "Caught Exception \n");
           return CORBA::Object::_nil ();
         }
       ACE_ENDTRY;
-      
-      
+
+
       this->component_ = COMP::_narrow (obj.in ()
                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
diff --git a/TAO/CIAO/ciao/Context_Impl_T.h b/TAO/CIAO/ciao/Context_Impl_T.h
index a2cdc0b8fc8..cc09becfd35 100644
--- a/TAO/CIAO/ciao/Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Context_Impl_T.h
@@ -42,9 +42,9 @@ namespace Components
 {
   typedef SecurityLevel2::Credentials Principal;
   typedef Principal *Principal_ptr;
-  
+
   class IllegalState;
-  
+
   namespace Transaction
   {
     class UserTransaction;
@@ -64,9 +64,9 @@ namespace CIAO
    * This class implements operations and contains parameterized
    * members common to all generated servants.
    */
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   class Context_Impl : public virtual BASE_CTX,
                        public virtual Context_Impl_Base,
@@ -85,7 +85,7 @@ namespace CIAO
     get_CCM_object (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
-                       
+
   protected:
     SVNT *servant_;
     COMP_VAR component_;
diff --git a/TAO/CIAO/ciao/Deployment.idl b/TAO/CIAO/ciao/Deployment.idl
index 089bc145c9d..032f1e10dd6 100644
--- a/TAO/CIAO/ciao/Deployment.idl
+++ b/TAO/CIAO/ciao/Deployment.idl
@@ -147,6 +147,21 @@ module Deployment {
   interface Logger {
   };
 
+  /**
+   * @struct Sched_Params
+   * @brief Carries Scheduling Params
+   * @description  CIAO specific structure to carry the scheduling params
+   *  to set the process, required by RACE
+   */
+
+  struct Sched_Params
+  {
+    long policy_;
+    long priority_;
+    long scope_;
+    long msec_;
+  };
+
   interface NodeApplicationManager :
     ApplicationManager
   {
@@ -171,6 +186,11 @@ module Deployment {
     /// CIAO speicfic operation to set the information of
     /// "shared components" (through NodeManager)
     void set_shared_components (in ComponentPlans components);
+
+    /// CIAO specific function to set priority
+    /// o component , required by RACE
+
+    long set_priority (in string cid , in Sched_Params params);
   };
 
   interface NodeManager {
diff --git a/TAO/CIAO/ciao/Deployment_Base.idl b/TAO/CIAO/ciao/Deployment_Base.idl
index 4c769c61aed..82f97aa4a1f 100644
--- a/TAO/CIAO/ciao/Deployment_Base.idl
+++ b/TAO/CIAO/ciao/Deployment_Base.idl
@@ -20,6 +20,7 @@ module Deployment {
   struct SatisfierProperty {
     string name;
     SatisfierPropertyKind kind;
+    boolean dynamic;
     any value;
   };
 
diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl
index 831b41752cd..6c09f62828d 100644
--- a/TAO/CIAO/ciao/Deployment_Core.idl
+++ b/TAO/CIAO/ciao/Deployment_Core.idl
@@ -251,6 +251,16 @@ module Deployment
       raises (::Components::RemoveFailure);
 
     /// CIAO specific extensions
+    /// Activate a component instance from the NodeApplication
+    void activate_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extensions
+    /// Passivate a component instance from the NodeApplication
+    void passivate_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extensions
     /// Remove all containers, components and component homes.
     /// Shuts down the ORB of the NodeApplication to terminate the process.
     oneway void remove ();
diff --git a/TAO/CIAO/ciao/Deployment_Data.idl b/TAO/CIAO/ciao/Deployment_Data.idl
index 62b5c7a2ce6..d4e0628ebce 100644
--- a/TAO/CIAO/ciao/Deployment_Data.idl
+++ b/TAO/CIAO/ciao/Deployment_Data.idl
@@ -68,7 +68,7 @@ module Deployment {
     ResourceUsageKind resourceUsage;
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
@@ -110,7 +110,7 @@ module Deployment {
     string targetName;
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
@@ -152,7 +152,7 @@ module Deployment {
   struct ResourceDeploymentDescription {
     string requirementName;
     string resourceName;
-    any resourceValue;
+    Properties property;
   };
 
   typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
@@ -176,7 +176,7 @@ module Deployment {
     MonolithicDeploymentDescriptions implementation;
     InstanceDeploymentDescriptions instance;
     PlanConnectionDescriptions connection;
-    PlanPropertyMappings externalProperty;
+            PlanPropertyMappings externalProperty;
     ImplementationDependencies dependsOn;
     ArtifactDeploymentDescriptions artifact;
     Properties infoProperty;
@@ -197,38 +197,6 @@ module Deployment {
 
   typedef sequence < ComponentPackageReference > ComponentPackageReferences;
 
-  struct SubcomponentPortEndpoint {
-    string portName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
-
-  struct AssemblyConnectionDescription {
-    string name;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    SubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-  };
-
-  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
-
-  struct SubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
-
-  struct AssemblyPropertyMapping {
-    string name;
-    string externalName;
-    SubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
-
   typedef sequence < ResourceUsageKind > ResourceUsageKinds;
 
   struct ImplementationRequirement {
diff --git a/TAO/CIAO/ciao/Deployment_common.h b/TAO/CIAO/ciao/Deployment_common.h
index 4e15401d7d8..725b6afd953 100644
--- a/TAO/CIAO/ciao/Deployment_common.h
+++ b/TAO/CIAO/ciao/Deployment_common.h
@@ -7,7 +7,7 @@
  * objects of DAnCE toolchain.
  *
  * @author Gan Deng <dengg@dre.vanderbilt.edu>
- */  
+ */
 
 #ifndef DANCE_COMMON_H
 #define DANCE_COMMON_H
@@ -40,7 +40,7 @@ namespace CIAO
 
     bool operator==(const struct _component_binding & comp)
     {
-      if (this->name_ == comp.name_ && 
+      if (this->name_ == comp.name_ &&
           this->plan_uuid_ == comp.plan_uuid_ &&
           this->node_ == comp.node_)
         return true;
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
index adebb4ffee1..404b1c94a7d 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -4,6 +4,7 @@
 #define CIAO_HOME_SERVANT_IMPL_T_C
 
 #include "Home_Servant_Impl_T.h"
+#include "CIAO_common.h"
 
 
 namespace CIAO
@@ -51,6 +52,8 @@ namespace CIAO
                     COMP_EXEC_VAR,
                     COMP_SVNT>::~Home_Servant_Impl (void)
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::destructor");
+
     const OBJ_ITERATOR end =
       this->objref_map_.end ();
 
@@ -87,6 +90,8 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::remove_component");
+
     PortableServer::ObjectId_var oid =
       this->container_->the_POA ()->reference_to_id (comp
                                                      ACE_ENV_ARG_PARAMETER);
@@ -112,7 +117,8 @@ namespace CIAO
     _ciao_comp->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
+    if (CIAO::debug_level () > 3)
+      ACE_DEBUG ((LM_DEBUG, "removed the component\n"));
   }
 
   template <typename BASE_SKEL,
@@ -134,6 +140,8 @@ namespace CIAO
                     COMP_SVNT>::update_component_map (
       PortableServer::ObjectId &oid)
   {
+    CIAO_TRACE ("update_component_map");
+
     Components::CCMObject_var ccm_obj_ptr;
     if (objref_map_.unbind (oid, ccm_obj_ptr) != 0)
       {
@@ -167,6 +175,8 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::create_component");
+
     return this->create (ACE_ENV_SINGLE_ARG_PARAMETER);
   }
 
@@ -194,6 +204,8 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::create");
+
     if (this->executor_.in () == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),
@@ -237,6 +249,8 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component");
+
     CORBA::Object_var hobj =
       this->container_->get_objref (this
                                     ACE_ENV_ARG_PARAMETER);
@@ -302,6 +316,8 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component");
+
     PortableServer::ObjectId_var oid;
     this->container_->uninstall_component (comp,
                                            oid.out ()
diff --git a/TAO/CIAO/ciao/Object_Set_T.h b/TAO/CIAO/ciao/Object_Set_T.h
index d21ff724faf..b11632a5e1b 100644
--- a/TAO/CIAO/ciao/Object_Set_T.h
+++ b/TAO/CIAO/ciao/Object_Set_T.h
@@ -60,7 +60,7 @@ namespace CIAO
 
     /// Removing all objects from the set. Return -1 if error occurred.
     CORBA::Long remove_all (void);
-    
+
     /// Access the underlying T_var array directly.  This is added to
     /// get around a bug in TAO's sequence of object C++ mapping.
     T_var &at (CORBA::ULong index);
diff --git a/TAO/CIAO/ciao/Packaging_Data.idl b/TAO/CIAO/ciao/Packaging_Data.idl
index 59f8420fd16..533116196eb 100644
--- a/TAO/CIAO/ciao/Packaging_Data.idl
+++ b/TAO/CIAO/ciao/Packaging_Data.idl
@@ -7,10 +7,39 @@
 
 module Deployment
 {
+  struct ComponentPackageImport {
+    ::CORBA::StringSeq location;
+  };
+
+  typedef sequence < ComponentPackageImport > ComponentPackageImports;
+
+  struct SubcomponentPropertyReference {
+    string propertyName;
+    unsigned long instanceRef;
+  };
+
+  struct SubcomponentPortEndpoint {
+    string portName;
+    unsigned long instanceRef;
+  };
+
+  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
+
+  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
+
+  struct AssemblyPropertyMapping {
+    string name;
+    string externalName;
+    SubcomponentPropertyReferences delegatesTo;
+  };
 
+  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
+
+#ifndef AVOID_IFR_CRASH
   struct NamedImplementationArtifact;
 
   typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
+#endif /* AVOID_IFR_CRASH */
 
   struct ImplementationArtifactDescription {
     string label;
@@ -18,7 +47,9 @@ module Deployment
     ::CORBA::StringSeq location;
     Properties execParameter;
     Requirements deployRequirement;
+#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts dependsOn;
+#endif /* AVOID_IFR_CRASH */
     Properties infoProperty;
   };
 
@@ -28,13 +59,17 @@ module Deployment
   };
 
   struct MonolithicImplementationDescription {
-    Properties execParameter;
+    Properties nodeExecParameter;
+    Properties componentExecParameter;
+#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts primaryArtifact;
+#endif /* AVOID_IFR_CRASH */
     ImplementationRequirements deployRequirement;
   };
 
   typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
 
+#ifndef AVOID_IFR_CRASH
   struct PackageConfiguration;
 
   typedef sequence < PackageConfiguration > PackageConfigurations;
@@ -42,17 +77,31 @@ module Deployment
   struct ComponentPackageDescription;
 
   typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
+#endif /* AVOID_IFR_CRASH */
 
   struct SubcomponentInstantiationDescription {
     string name;
-    ComponentPackageDescriptions package;
-    Properties configProperty;
+#ifndef AVOID_IFR_CRASH
+    ComponentPackageDescriptions basePackage;
+    PackageConfigurations specializedConfig;
+#endif /* AVOID_IFR_CRASH */
     Requirements selectRequirement;
-    ComponentPackageReferences reference;
+    Properties configProperty;
+    ComponentPackageReferences referencedPackage;
+    ComponentPackageImports importedPackage;
   };
 
   typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions;
 
+  struct AssemblyConnectionDescription {
+    string name;
+    Requirements deployRequirement;
+    ComponentExternalPortEndpoints externalEndpoint;
+    SubcomponentPortEndpoints internalEndpoint;
+    ExternalReferenceEndpoints externalReference;
+  };
+
+  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
 
   struct ComponentAssemblyDescription {
     SubcomponentInstantiationDescriptions instance;
@@ -96,8 +145,10 @@ module Deployment
   struct PackageConfiguration {
     string label;
     string UUID;
+#ifndef AVOID_IFR_CRASH
     PackageConfigurations specializedConfig;
     ComponentPackageDescriptions basePackage;
+#endif /* AVOID_IFR_CRASH */
     ComponentPackageReferences reference;
     Requirements selectRequirement;
     Properties configProperty;
diff --git a/TAO/CIAO/ciao/Servant_Activator.cpp b/TAO/CIAO/ciao/Servant_Activator.cpp
index 6830454ac35..cf194524ec7 100644
--- a/TAO/CIAO/ciao/Servant_Activator.cpp
+++ b/TAO/CIAO/ciao/Servant_Activator.cpp
@@ -110,8 +110,10 @@ namespace CIAO
               // We should try avoiding making outbound calls with the
               // lock held. Oh well, let us get some sense of sanity in
               // CIAO to do think about these.
-              ACE_DEBUG ((LM_DEBUG, "Activating Port %s\n",
-                          str.in ()));
+              if (CIAO::debug_level () > 5)
+                ACE_DEBUG ((LM_DEBUG, "Activating Port %s\n",
+                            str.in ()));
+
               return this->pa_[t]->activate (oid
                                              ACE_ENV_ARG_PARAMETER);
             }
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
index 51c1ae27867..5cefb47882b 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
@@ -410,7 +410,32 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+    ACE_DEBUG ((LM_DEBUG, "In Servant_Impl_Base::get_all_receptacles\n"));
+
+    ::Components::ReceptacleDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::ReceptacleDescriptions,
+                    0);
+
+    ::Components::ReceptacleDescriptions_var retval = tmp;
+
+    retval->length (this->receptacle_table_.current_size ());
+    CORBA::ULong i = 0;
+
+    ACE_DEBUG ((LM_DEBUG, "Building sequence of length %d\n", retval->length()));
+
+    for (ReceptacleTable::iterator iter = this->receptacle_table_.begin ();
+         iter != this->receptacle_table_.end ();
+         ++iter, ++i)
+      {
+        ACE_DEBUG ((LM_DEBUG, "Starting loop iteration...\n", retval->length()));
+
+        ReceptacleTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
+      }
+
+    ACE_DEBUG ((LM_DEBUG, "Escaped loop.\n"));
+    return retval._retn ();
   }
 
   ::Components::ReceptacleDescriptions *
@@ -492,6 +517,73 @@ namespace CIAO
   }
 
   void
+  Servant_Impl_Base::add_receptacle (const char *receptacle_name,
+                                     CORBA::Object_ptr recept_ref,
+                                     ::Components::Cookie * cookie)
+  {
+    ACE_DEBUG ((LM_DEBUG, "In Servant_Impl_Base::add_receptacle (%s)\n", receptacle_name));
+
+    ::Components::ReceptacleDescription_var safe;
+    ::Components::ReceptacleDescription *rd = 0;
+
+    if (this->receptacle_table_.find (receptacle_name,
+                                      safe) == -1)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Found no receptacle named (%s)\n", receptacle_name));
+
+      ACE_NEW (rd,
+               OBV_Components::ReceptacleDescription);
+      safe = rd;
+
+      rd->name (receptacle_name);
+      rd->type_id (recept_ref->_interface_repository_id ());
+      // The receptacle is a multiplex receptacle if and only if a
+      // cookie was given.
+      rd->is_multiple (cookie != 0);
+
+      ::Components::ConnectionDescription *cd = 0;
+      ACE_NEW (cd,
+               OBV_Components::ConnectionDescription);
+      ::Components::ConnectionDescription_var cd_safe = cd;
+
+      cd->ck (cookie);
+      cd->objref (recept_ref);
+
+      ::Components::ConnectionDescriptions cds (1);
+
+      cds.length (1);
+      cds[0] = cd_safe;
+      rd->connections (cds);
+    }
+    else
+    {
+      ACE_DEBUG ((LM_DEBUG, "Found a receptacle named (%s)\n", receptacle_name));
+      rd = safe.inout ();
+
+      ::Components::ConnectionDescription *cd = 0;
+      ACE_NEW (cd,
+               OBV_Components::ConnectionDescription);
+      ::Components::ConnectionDescription_var cd_safe = cd;
+
+      cd->ck (cookie);
+      cd->objref (recept_ref);
+
+      ::Components::ConnectionDescriptions & cds = rd->connections ();
+      CORBA::ULong old_length = cds.length ();
+      ACE_DEBUG ((LM_DEBUG, "Old length was %d\n", old_length));
+      cds.length (old_length + 1);
+      ACE_DEBUG ((LM_DEBUG, "New length  %d\n", cds.length ()));
+      cds [old_length] = cd_safe;
+      ACE_DEBUG ((LM_DEBUG, "Added new connection to receptacle named  (%s)\n", receptacle_name));
+    }
+
+    if (this->receptacle_table_.bind (receptacle_name, safe) == 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, "Successfully added new receptacle named (%s)\n", receptacle_name));
+      }
+  }
+
+  void
   Servant_Impl_Base::add_consumer (
       const char *port_name,
       ::Components::EventConsumerBase_ptr port_ref
@@ -540,8 +632,8 @@ namespace CIAO
 
     return cd._retn ();
   }
-  
-  ::Components::StandardConfigurator_ptr 
+
+  ::Components::StandardConfigurator_ptr
   Servant_Impl_Base::get_standard_configurator (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.h b/TAO/CIAO/ciao/Servant_Impl_Base.h
index abbc73091a8..90eac8b8585 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.h
@@ -186,6 +186,10 @@ namespace CIAO
         const char *port_name
       );
 
+    void add_receptacle (const char *receptacle_name,
+                         CORBA::Object_ptr recept_ref,
+                         ::Components::Cookie * cookie);
+
     void add_consumer (const char *port_name,
                        ::Components::EventConsumerBase_ptr port_ref);
 
@@ -212,8 +216,16 @@ namespace CIAO
                                     ACE_Null_Mutex>
        ConsumerTable;
 
+    typedef ACE_Hash_Map_Manager_Ex<const char *,
+                                    ::Components::ReceptacleDescription_var,
+                                    ACE_Hash<const char *>,
+                                    ACE_Equal_To<const char *>,
+                                    ACE_Null_Mutex>
+       ReceptacleTable;
+
     FacetTable facet_table_;
     ConsumerTable consumer_table_;
+    ReceptacleTable receptacle_table_;
     Components::CCMHome_var home_;
     Home_Servant_Impl_Base *home_servant_;
     Session_Container * container_;
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.cpp b/TAO/CIAO/ciao/Servant_Impl_T.cpp
index 4d1d15b4823..01ee28df790 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_T.cpp
@@ -301,6 +301,10 @@ namespace CIAO
     if (! ::CORBA::is_nil (temp.in ()))
       temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
+
+    this->pre_activated_ = 0;
+    this->activated_ = 0;
+    this->post_activated_ = 0;
   }
 }
 
diff --git a/TAO/CIAO/ciao/Server_init.cpp b/TAO/CIAO/ciao/Server_init.cpp
index 43eaabcd598..27c4d035cdc 100644
--- a/TAO/CIAO/ciao/Server_init.cpp
+++ b/TAO/CIAO/ciao/Server_init.cpp
@@ -6,52 +6,235 @@
 #include "Cookies.h"
 
 #include "ace/OS_NS_stdio.h"
-
-int
-CIAO::Server_init (CORBA::ORB_ptr o)
-{
-  CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
-                               Components::Cookie);
-  CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
-                               CIAO::Cookie);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init,
-                               Components::PortDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init,
-                               Components::FacetDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init,
-                               Components::ConnectionDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init,
-                               Components::ReceptacleDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init,
-                               Components::ConsumerDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init,
-                               Components::EmitterDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init,
-                               Components::SubscriberDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init,
-                               Components::PublisherDescription);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init,
-                               Components::ConfigValue);
-  CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init,
-                               Components::ComponentPortDescription);
-  return 0;
-}
-
-int
-CIAO::Utility::write_IOR (const char *pathname,
-                          const char *ior)
+namespace CIAO
 {
-  FILE* ior_output_file_ =
-    ACE_OS::fopen (pathname, "w");
+  int
+  Server_init (CORBA::ORB_ptr o)
+  {
+    CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
+                                Components::Cookie);
+    CIAO_REGISTER_VALUE_FACTORY (o, CIAO::Map_Key_Cookie_init,
+                                CIAO::Cookie);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init,
+                                Components::PortDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init,
+                                Components::FacetDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init,
+                                Components::ConnectionDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init,
+                                Components::ReceptacleDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init,
+                                Components::ConsumerDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init,
+                                Components::EmitterDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init,
+                                Components::SubscriberDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init,
+                                Components::PublisherDescription);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init,
+                                Components::ConfigValue);
+    CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init,
+                                Components::ComponentPortDescription);
+    return 0;
+  }
+
+  namespace Utility
+  {
+    int write_IOR (const char *pathname,
+                   const char *ior)
+    {
+      FILE* ior_output_file_ =
+        ACE_OS::fopen (pathname, "w");
+
+      if (ior_output_file_)
+        {
+          ACE_OS::fprintf (ior_output_file_,
+                          "%s",
+                          ior);
+          ACE_OS::fclose (ior_output_file_);
+          return 0;
+        }
+
+      return -1;
+    }
+
+    // --------------------------------------------------------------
+    //             Implementation of NameUtility class
+    // --------------------------------------------------------------
+
+    void NameUtility::CreateContextPath (const CosNaming::NamingContextExt_ptr nc,
+                                         const CosNaming::Name& name)
+    {
+      bool isNotFound = false;
+      CORBA::ULong lengthMissing = 0;
+      CORBA::ULong OriginalLength = name.length();
+      CosNaming::Name tmpName;
 
-  if (ior_output_file_)
+      CosNaming::NamingContext_var tmpCtxVar;
+
+      ACE_TRY
+        {
+          tmpCtxVar = nc->bind_new_context(name);
+          ACE_DEBUG ((LM_DEBUG, "Bound Context.\n\n"));
+        }
+      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Context Already Bound.\n\n"));
+        }
+      ACE_CATCH (CosNaming::NamingContext::NotFound, nf)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Context not found.\n\n"));
+          isNotFound = true;
+          lengthMissing = nf.rest_of_name.length();
+        }
+      ACE_ENDTRY;
+
+      if (lengthMissing == name.length())
+        {
+          ACE_DEBUG ((LM_ERROR, "Null name length.\n\n"));
+        }
+
+      if (isNotFound)
+        {
+          for (CORBA::ULong l = OriginalLength-lengthMissing;
+                l < OriginalLength;
+                l++)
+              {
+                tmpName.length(l+1);
+                for (CORBA::ULong i=0; i <= l; i++)
+                  {
+                    tmpName[i] = name[i];
+
+                    CORBA::String_var newSCName = nc->to_string(tmpName);
+                    ACE_DEBUG ((LM_DEBUG, "What's left of the name:%s\n",
+                                newSCName.in ()));
+                  }
+
+                tmpCtxVar = nc->bind_new_context(tmpName);
+                ACE_DEBUG ((LM_DEBUG, "Bound New Context.\n"));
+              }
+          }
+    }
+
+    //---------------------------------------------------------------------------------------------
+    void NameUtility::BindObjectPath (const CosNaming::NamingContextExt_ptr nc,
+                                      const CosNaming::Name& name,
+                                      const CORBA::Object_var obj)
     {
-      ACE_OS::fprintf (ior_output_file_,
-                       "%s",
-                       ior);
-      ACE_OS::fclose (ior_output_file_);
-      return 0;
+      CosNaming::Name tmpName;
+      CORBA::String_var  newSCName = nc->to_string(name);
+      ACE_DEBUG ((LM_DEBUG, "The name is: %s\n", newSCName.in ()));
+
+      ACE_TRY
+        {
+          nc->rebind(name, obj);
+        }
+
+      ACE_CATCH (CosNaming::NamingContext::NotFound, ex )
+        {
+          ACE_DEBUG ((LM_DEBUG, "Name not found, doing new bind.\n"));
+          nc->bind(name, obj);
+        }
+      ACE_ENDTRY;
+    }
+
+    //---------------------------------------------------------------------------------------------
+    CosNaming::BindingList *
+    NameUtility::listBindings (const CosNaming::NamingContext_ptr nc,
+                               const CosNaming::Name& name,
+                               CORBA::ULong max_list_size)
+    {
+      CosNaming::BindingList_var   basicListV;
+      CosNaming::BindingIterator_var bIterV;
+
+      CORBA::Object_var objV;
+      CosNaming::NamingContext_var tmpContextV;
+
+      if (name.length()==0)
+        {
+          tmpContextV = CosNaming::NamingContext::_duplicate(nc);
+        }
+      else
+        {
+          objV = nc->resolve(name);
+          tmpContextV = CosNaming::NamingContext::_narrow(objV.in ());
+        }
+      if (CORBA::is_nil(tmpContextV.in ()))
+        {
+          ACE_DEBUG ((LM_ERROR, "listBindings: Nil context.\n"));
+          return 0;
+        }
+
+      tmpContextV->list(max_list_size, basicListV.out(), bIterV.out());
+
+      CORBA::Long   max_remaining = max_list_size - basicListV->length();
+      CORBA::Boolean moreBindings = !CORBA::is_nil(bIterV.in ());
+
+      if (moreBindings)
+        {
+          while (moreBindings && (max_remaining > 0) )
+            {
+              CosNaming::BindingList_var tmpListV;
+
+              moreBindings = bIterV->next_n(max_remaining, tmpListV.out());
+
+              //Append 'tmpListV' to 'basicListV'
+              CORBA::ULong basicListLen = basicListV->length();
+              basicListV->length(basicListLen+tmpListV->length());
+              for (CORBA::ULong i=0; i < tmpListV->length(); i++)
+                {
+                  (*basicListV)[i+basicListLen] = (*tmpListV)[i];
+                }
+
+              //Re-calculate 'max_remaining'
+              max_remaining = max_list_size - basicListV->length();
+            }
+          bIterV->destroy();
+        }
+
+      return basicListV._retn();
+    }
+
+    //---------------------------------------------------------------------------------------------
+    void
+    NameUtility::recursiveUnbind (const CosNaming::NamingContext_ptr nc,
+                                  const CosNaming::Name& name)
+    {
+      CORBA::Object_var objV;
+      CosNaming::NamingContext_var tmpContextV;
+
+      objV = nc->resolve(name);
+      tmpContextV = CosNaming::NamingContext::_narrow(objV.in ());
+      if (CORBA::is_nil(tmpContextV.in ()))
+        {
+          ACE_DEBUG ((LM_ERROR, "recursiveUnbind: Nil context reference.\n"));
+          return;
+        }
+
+      CosNaming::BindingList_var blV;
+      CosNaming::Name tmpName;
+      tmpName.length(0);
+
+      blV = NameUtility::listBindings(tmpContextV.in(),
+                                      tmpName,
+                                      10000);  // 'max_list_size'
+
+      for (CORBA::ULong i=0; i<blV->length(); i++)
+        {
+          tmpName = (*blV)[i].binding_name;
+
+          if ((*blV)[i].binding_type==CosNaming::nobject)
+            {
+              tmpContextV->unbind(tmpName);
+            }
+          else if ( (*blV)[i].binding_type==CosNaming::ncontext)
+            {
+              NameUtility::recursiveUnbind(tmpContextV.in(), tmpName);
+            }
+        }
+      nc->unbind(name);
+      tmpContextV->destroy();
     }
 
-  return -1;
-}
+  } /* namespace Utility */
+} /* namespace CIAO */
diff --git a/TAO/CIAO/ciao/Server_init.h b/TAO/CIAO/ciao/Server_init.h
index 728c4abdd10..c5fe53ed77d 100644
--- a/TAO/CIAO/ciao/Server_init.h
+++ b/TAO/CIAO/ciao/Server_init.h
@@ -7,6 +7,7 @@
  * I'm also puting some utilities functions here.
  *
  * @author Nanbor Wang <nanbor@cs.wustl.edu>
+ * @author Gan Deng <dengg@dre.vanderbilt.edu>
  */
 
 #ifndef CIAO_SERVER_INIT_H
@@ -15,6 +16,7 @@
 
 #include "CIAO_Server_Export.h"
 #include "tao/Versioned_Namespace.h"
+#include <orbsvcs/CosNamingC.h>
 
 #if !defined ACE_LACKS_PRAGMA_ONCE
 #pragma once
@@ -46,6 +48,42 @@ namespace CIAO
     /// overwritten.
     CIAO_SERVER_Export int write_IOR (const char *pathname,
                                       const char *IOR);
+
+    class CIAO_SERVER_Export NameUtility
+    {
+      /**
+      * A utility class to bind naming context. This class is contributed by
+      * Dipa Suri <dipa.suri@lmco.com>.
+      *
+      * The concept/code are derived from
+      * http://www.informit.com/articles/article.asp?p=23266&seqNum=6
+      */
+
+    public:
+      /// For each 'NameComponent' in 'name', create a corresponding 'NamingContext'.
+      static  void CreateContextPath (const CosNaming::NamingContextExt_ptr,
+                                      const CosNaming::Name &);
+
+      /// For the first [0, length-2] NameComponents of 'name', create a
+      /// corresponding 'NamingContext'.
+      /// For the length-1 NameComponent of 'name', bind it to the object
+      /// reference 'obj'.
+      static  void BindObjectPath (const CosNaming::NamingContextExt_ptr,
+                                   const CosNaming::Name&,
+                                   const CORBA::Object_var);
+
+      /// Get a list of all bindings under the given context, up to
+      /// max_list_size.
+      static CosNaming::BindingList * listBindings (const CosNaming::NamingContext_ptr,
+                                                    const CosNaming::Name&,
+                                                    CORBA::ULong);
+
+      /// Recursively unbind all objects and contexts below the given name
+      /// context, given the initial context nc.
+      /// Assumes a tree shape to service (not cyclic)
+      static void recursiveUnbind (const CosNaming::NamingContext_ptr,
+                                   const CosNaming::Name&);
+    };
   }
 }
 
diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
index 2b7e644b0b9..452aea78035 100644
--- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -229,7 +229,7 @@ namespace CIAO
 
     this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
-    
+
     this->dynamic_servant_map_.bind (oid.in (), svt);
 
     COMP_VAR ho = COMP::_narrow (objref.in ()
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
index b2a85351487..da7843974c4 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
@@ -7,9 +7,9 @@
 
 namespace CIAO
 {
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
       Upgradeable_Context_Impl (
@@ -21,18 +21,18 @@ namespace CIAO
   {
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
        ~Upgradeable_Context_Impl (void)
   {
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::deactivate_facet (
@@ -50,9 +50,9 @@ namespace CIAO
     ACE_CHECK;
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
@@ -65,17 +65,17 @@ namespace CIAO
       this->container_->the_facet_cons_POA ()->reference_to_id
          (reference ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     this->update_port_activator (oid.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     this->deactivate_facet (oid.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
index 42a28142284..62086b1f0c3 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -31,9 +31,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
-  template <typename BASE_CTX, 
-            typename SVNT, 
-            typename COMP, 
+  template <typename BASE_CTX,
+            typename SVNT,
+            typename COMP,
             typename COMP_VAR>
   class Upgradeable_Context_Impl : public virtual Context_Impl<
                                    BASE_CTX, SVNT, COMP, COMP_VAR>
@@ -66,7 +66,7 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::InvalidName,
                        ::Components::InvalidConnection)) = 0;
-                       
+
   protected:
     SVNT *servant_;
     COMP_VAR component_;
diff --git a/TAO/CIAO/docs/Purify.html b/TAO/CIAO/docs/Purify.html
index fff258db120..12c1900ba0c 100644
--- a/TAO/CIAO/docs/Purify.html
+++ b/TAO/CIAO/docs/Purify.html
@@ -1,72 +1,72 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
   <head>
-    <title>Using Rational Purify with CIAO</title> 
+    <title>Using Rational Purify with CIAO</title>
     <!-- $Id$ -->
   </head>
   <body>
     <h1>Using Rational Purify with CIAO</h1>
-    <p>This document is about using Purify with Visual Studio 7.1 to track down 
-      memory leaks and other bugs in CIAO applications. For the Linux/Unix 
-      environment, Valgrind is a better-suited tool - see Will Otte's documentation 
+    <p>This document is about using Purify with Visual Studio 7.1 to track down
+      memory leaks and other bugs in CIAO applications. For the Linux/Unix
+      environment, Valgrind is a better-suited tool - see Will Otte's documentation
       on using Valgrind with CIAO in this directory.</p>
-    <p>Purify can be run from within Visual Studio, or standalone. The executable is 
-      c:\Program Files\Rational\PurifyPlus\purifyw.exe. Typing this will bring up the 
-      same Purify window you see if you run it from within Visual Studio. You can 
+    <p>Purify can be run from within Visual Studio, or standalone. The executable is
+      c:\Program Files\Rational\PurifyPlus\purifyw.exe. Typing this will bring up the
+      same Purify window you see if you run it from within Visual Studio. You can
       install Purify from the web by going to <A href="file://\\Atlantis\software\RationSuiteEnterprise-v2003-06-12">
-        \\Atlantis\software\RationSuiteEnterprise-v2003-06-12</A> &nbsp;and clicking 
-      on <code>C57BPML.zip</code>. This will install a whole bunch of Rational stuff 
-      by default, so you will probaby want to deselect everything but PurifyPlus, 
-      although Quantify is a good bottleneck-finder when you're trying to improve 
-      performance, so that might be worth installing and playing with as well. During 
-      the installation process, you'll be prompted for a mode of licensing. Select 
+        \\Atlantis\software\RationSuiteEnterprise-v2003-06-12</A> &nbsp;and clicking
+      on <code>C57BPML.zip</code>. This will install a whole bunch of Rational stuff
+      by default, so you will probaby want to deselect everything but PurifyPlus,
+      although Quantify is a good bottleneck-finder when you're trying to improve
+      performance, so that might be worth installing and playing with as well. During
+      the installation process, you'll be prompted for a mode of licensing. Select
       the use of a license server, and then you'll be prompted for its address. Use <code>
         rational.vuse.vanderbilt.edu</code>.</p>
-    <p>The option to exclude all modules in Windows directories will probably be set 
-      by default, but if you notice memory leaks reported for Windows stuff, you 
-      might want to double check this and turn it off. From the PurifyPlus menu bar 
-      item in Visual Studio, it's at <b>PurifyPlus-&gt;Purify-&gt;Settings-&gt;DefaultSettings-&gt;PowerCheck</b>. 
-      When run for the first time, Purify will instrument all libraries linked to the 
-      executable. Select <b>PurifyPlus-&gt;Purify-&gt;Run</b>, and a window will pop 
-      up prompting you for the executable name, command line options, and working 
+    <p>The option to exclude all modules in Windows directories will probably be set
+      by default, but if you notice memory leaks reported for Windows stuff, you
+      might want to double check this and turn it off. From the PurifyPlus menu bar
+      item in Visual Studio, it's at <b>PurifyPlus-&gt;Purify-&gt;Settings-&gt;DefaultSettings-&gt;PowerCheck</b>.
+      When run for the first time, Purify will instrument all libraries linked to the
+      executable. Select <b>PurifyPlus-&gt;Purify-&gt;Run</b>, and a window will pop
+      up prompting you for the executable name, command line options, and working
       directory.</p>
-    <p>Purify's output will appear in the Visual Studio text editing window. This 
-      output can be saved to the given filename. The type of error reported is 
-      indicated by a 3-letter code - the most common are UMR (Unitialized Memory 
-      Read), FMM (Freeing Mismatched Memory), and MLK (Memory Leak). Each of these 
-      can be expanded to show the call stack. The depth of the call stack can be 
-      modified in Settings if it's not deep enough. FMM messages will show both 
+    <p>Purify's output will appear in the Visual Studio text editing window. This
+      output can be saved to the given filename. The type of error reported is
+      indicated by a 3-letter code - the most common are UMR (Unitialized Memory
+      Read), FMM (Freeing Mismatched Memory), and MLK (Memory Leak). Each of these
+      can be expanded to show the call stack. The depth of the call stack can be
+      modified in Settings if it's not deep enough. FMM messages will show both
       allocation and deallocation call stacks.</p>
-    Quite often in CIAO, we will want to Purify a process that is spawned by 
-    another process, and therefore not directly runnable in Purify. This is fairly 
-    easy to do, but it must be done from the command line. If the name of the child 
-    process we want to instrument is <code>child.exe</code>, then it can be 
+    Quite often in CIAO, we will want to Purify a process that is spawned by
+    another process, and therefore not directly runnable in Purify. This is fairly
+    easy to do, but it must be done from the command line. If the name of the child
+    process we want to instrument is <code>child.exe</code>, then it can be
     instrumented by typing
     <br>
     <code>purifyw /Run=no /Replace=yes child.exe</code><br>
-    This will rename the original executable as <code>child.exe.Original</code>, 
-    and the new instrumented executable will be <code>child.exe</code>. Now when 
-    you run the parent process under Purify, you'll see one window opened up in 
-    Visual Studio's text editor for this process, and when the child process is 
-    spawned, a second window will open. A couple of caveats to make this work 
+    This will rename the original executable as <code>child.exe.Original</code>,
+    and the new instrumented executable will be <code>child.exe</code>. Now when
+    you run the parent process under Purify, you'll see one window opened up in
+    Visual Studio's text editor for this process, and when the child process is
+    spawned, a second window will open. A couple of caveats to make this work
     smoothly:
     <ul>
       <li>
-        Instrumented executables run 2 to 5 times slower than uninstrumented ones, so 
-        any timeouts in the code should be extended accordingly. For example, if an 
+        Instrumented executables run 2 to 5 times slower than uninstrumented ones, so
+        any timeouts in the code should be extended accordingly. For example, if an
         instrumented NodeApplication is spawned by NodeManager, add <code>-d 15</code> or
         <code>-d 20</code>
       to NodeManager's command line.
       <li>
-        If an instrumented process is simply killed, there will probably be many 
-        spurious error messages, mostly related to ORB resources that were not cleaned 
-        up by a graceful shutdown. All processes tested with Purify should have a 
+        If an instrumented process is simply killed, there will probably be many
+        spurious error messages, mostly related to ORB resources that were not cleaned
+        up by a graceful shutdown. All processes tested with Purify should have a
         graceful shutdown built in to eliminate these bogus memory leak messages.
       </li>
     </ul>
     <hr>
     <address>Jeff Parsons</address>
-    <!-- hhmts start --> Last modified: Oct&nbsp;3 2005 
+    <!-- hhmts start --> Last modified: Oct&nbsp;3 2005
     <!-- hhmts end -->
   </body>
 </html>
diff --git a/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd b/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd
index 7877afe2151..ca30620ae4f 100644
--- a/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd
+++ b/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd
@@ -90,4 +90,4 @@
      <connectionbands> element.
 -->
 <!ATTLIST banded_connection_policy
-        idref           IDREF   #REQUIRED>
\ No newline at end of file
+        idref           IDREF   #REQUIRED>
diff --git a/TAO/CIAO/docs/imgs/CCM-v5.vsd b/TAO/CIAO/docs/imgs/CCM-v5.vsd
index 7f4d7539050..ba79699b477 100644
--- a/TAO/CIAO/docs/imgs/CCM-v5.vsd
+++ b/TAO/CIAO/docs/imgs/CCM-v5.vsd
diff --git a/TAO/CIAO/docs/imgs/CCM.vsd b/TAO/CIAO/docs/imgs/CCM.vsd
index 239a4e7943d..4ca4f231805 100644
--- a/TAO/CIAO/docs/imgs/CCM.vsd
+++ b/TAO/CIAO/docs/imgs/CCM.vsd
diff --git a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png
index 2e9917e1520..ac719b3af2a 100644
--- a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png
+++ b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png
diff --git a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd
index b795c5ae049..3175b935a17 100644
--- a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd
+++ b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd
diff --git a/TAO/CIAO/docs/imgs/File-Gen-Existing.png b/TAO/CIAO/docs/imgs/File-Gen-Existing.png
index 8deb5d32fd3..0c89f232ce3 100644
--- a/TAO/CIAO/docs/imgs/File-Gen-Existing.png
+++ b/TAO/CIAO/docs/imgs/File-Gen-Existing.png
diff --git a/TAO/CIAO/docs/imgs/File-Gen-Future.png b/TAO/CIAO/docs/imgs/File-Gen-Future.png
index 1daef691bdf..1b4d3ae25cb 100644
--- a/TAO/CIAO/docs/imgs/File-Gen-Future.png
+++ b/TAO/CIAO/docs/imgs/File-Gen-Future.png
diff --git a/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd b/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd
index ef6332d49ac..e39ba75c4e6 100644
--- a/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd
+++ b/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd
diff --git a/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd b/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd
index 0986aa78d70..ed1c7191bab 100644
--- a/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd
+++ b/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd
diff --git a/TAO/CIAO/docs/imgs/basic-container.png b/TAO/CIAO/docs/imgs/basic-container.png
index 9df767b45a2..99f0bc2dd4b 100644
--- a/TAO/CIAO/docs/imgs/basic-container.png
+++ b/TAO/CIAO/docs/imgs/basic-container.png
diff --git a/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg b/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg
index a385ad30848..65f5d4154f8 100644
--- a/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg
+++ b/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg
diff --git a/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg b/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg
index e0a705b9d3a..31d5eeb88d7 100644
--- a/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg
+++ b/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg
diff --git a/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg b/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg
index b876b7a82cb..eeb699c3469 100644
--- a/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg
+++ b/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg
diff --git a/TAO/CIAO/docs/imgs/ciao-static1.jpg b/TAO/CIAO/docs/imgs/ciao-static1.jpg
index 313084ff34d..de49dd66015 100644
--- a/TAO/CIAO/docs/imgs/ciao-static1.jpg
+++ b/TAO/CIAO/docs/imgs/ciao-static1.jpg
diff --git a/TAO/CIAO/docs/imgs/ciao-static2.jpg b/TAO/CIAO/docs/imgs/ciao-static2.jpg
index 86ded87f448..6fd6e60b503 100644
--- a/TAO/CIAO/docs/imgs/ciao-static2.jpg
+++ b/TAO/CIAO/docs/imgs/ciao-static2.jpg
diff --git a/TAO/CIAO/docs/imgs/component-basic.png b/TAO/CIAO/docs/imgs/component-basic.png
index 520dc9c4cca..ee5aed4951d 100644
--- a/TAO/CIAO/docs/imgs/component-basic.png
+++ b/TAO/CIAO/docs/imgs/component-basic.png
diff --git a/TAO/CIAO/docs/imgs/dance_arch.jpg b/TAO/CIAO/docs/imgs/dance_arch.jpg
index 95f139c7e6e..2bb391f7b92 100644
--- a/TAO/CIAO/docs/imgs/dance_arch.jpg
+++ b/TAO/CIAO/docs/imgs/dance_arch.jpg
diff --git a/TAO/CIAO/docs/imgs/dance_arch.vsd b/TAO/CIAO/docs/imgs/dance_arch.vsd
index cfe75fca9c6..d8813a7afdf 100644
--- a/TAO/CIAO/docs/imgs/dance_arch.vsd
+++ b/TAO/CIAO/docs/imgs/dance_arch.vsd
diff --git a/TAO/CIAO/docs/imgs/deployment.png b/TAO/CIAO/docs/imgs/deployment.png
index 4cd8c6be646..f7759729b8b 100644
--- a/TAO/CIAO/docs/imgs/deployment.png
+++ b/TAO/CIAO/docs/imgs/deployment.png
diff --git a/TAO/CIAO/docs/imgs/extended-container.png b/TAO/CIAO/docs/imgs/extended-container.png
index 39977e6eb83..5ff96da018e 100644
--- a/TAO/CIAO/docs/imgs/extended-container.png
+++ b/TAO/CIAO/docs/imgs/extended-container.png
diff --git a/TAO/CIAO/docs/imgs/home-config.png b/TAO/CIAO/docs/imgs/home-config.png
index aebf5e62751..69144945bae 100644
--- a/TAO/CIAO/docs/imgs/home-config.png
+++ b/TAO/CIAO/docs/imgs/home-config.png
diff --git a/TAO/CIAO/docs/imgs/static_dance_arch.jpg b/TAO/CIAO/docs/imgs/static_dance_arch.jpg
index 3a4b579c3d5..7811cc27f6b 100644
--- a/TAO/CIAO/docs/imgs/static_dance_arch.jpg
+++ b/TAO/CIAO/docs/imgs/static_dance_arch.jpg
diff --git a/TAO/CIAO/docs/imgs/static_dance_arch.vsd b/TAO/CIAO/docs/imgs/static_dance_arch.vsd
index 1ca1f50f69d..bc7a826c668 100644
--- a/TAO/CIAO/docs/imgs/static_dance_arch.vsd
+++ b/TAO/CIAO/docs/imgs/static_dance_arch.vsd
diff --git a/TAO/CIAO/docs/imgs/static_dance_impl.jpg b/TAO/CIAO/docs/imgs/static_dance_impl.jpg
index 1040e65c1db..51923fe5152 100644
--- a/TAO/CIAO/docs/imgs/static_dance_impl.jpg
+++ b/TAO/CIAO/docs/imgs/static_dance_impl.jpg
diff --git a/TAO/CIAO/docs/imgs/static_dance_impl.vsd b/TAO/CIAO/docs/imgs/static_dance_impl.vsd
index 6c21e6139d4..1971a11292b 100644
--- a/TAO/CIAO/docs/imgs/static_dance_impl.vsd
+++ b/TAO/CIAO/docs/imgs/static_dance_impl.vsd
diff --git a/TAO/CIAO/docs/index.html b/TAO/CIAO/docs/index.html
index fcfc8cd2060..2c6a17379a0 100644
--- a/TAO/CIAO/docs/index.html
+++ b/TAO/CIAO/docs/index.html
@@ -34,7 +34,7 @@ notes.)</a></li>
 <ul>
 </ul>
 <ul>
-  <p><!--      
+  <p><!--
 
   <li>This <a href="new_components.html">page on implementing new
 
@@ -77,7 +77,7 @@ interfaces </a></li>
 </ul>
 All these diagrams are generated from the <a href="imgs/CCM.vsd">CCM.vsd
 Visio file</a> (The same file in Visio V.5 format is <a
- href="imgs/CCM-v5.vsd">here</a>.) and OpenOffice source file 
+ href="imgs/CCM-v5.vsd">here</a>.) and OpenOffice source file
  <a href="imgs/DAnCE-Dynamic.sxd">DAnCE-Dynamic.sxd</a> <br>
 <br>
 <hr>
diff --git a/TAO/CIAO/docs/releasenotes/index.html b/TAO/CIAO/docs/releasenotes/index.html
index 324f1d83c77..0c4235aff1c 100644
--- a/TAO/CIAO/docs/releasenotes/index.html
+++ b/TAO/CIAO/docs/releasenotes/index.html
@@ -49,17 +49,17 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>:
   <CODE>$CIAO_ROOT/tools</CODE> that are missing in the DAnCE
   implementation. Please see <a href="../TODO.html"> TODO </a> file
   for more details. We plan to implement them soon and use DAnCE
-  continuously. 
+  continuously.
 
- <li> The first cut of DAnCE includes two parts:  
+ <li> The first cut of DAnCE includes two parts:
   <ul>
   <li>
   A modeling tool chain , <a href="http://www.dre.vanderbilt.edu/CoSMIC/">
-  CoSMIC</a>, which is capable of describing the Assembly/Component 
+  CoSMIC</a>, which is capable of describing the Assembly/Component
   using <a
   href="http://www.isis.vanderbilt.edu/Projects/gme/default.html">
   GME</a> as the development bed. The artifacts generated from the
- CoSMIC are a set of XML descriptors. 
+ CoSMIC are a set of XML descriptors.
 
   <!-- Tao, I realy don't understand what this means - Bala -->
   <li>This run-time infrastructure that performs the actual deployment
@@ -85,14 +85,14 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>:
   developers have to implement those operations within the
   executor. We plan to get around this, i.e., users having to
   implement these two operations, in the next month or so. <p>
-  
+
   <li>
-        
+
   Here is a set of updates in the CIDL Compiler.<p>
   <ul>
   <li>Fixed bugs in generation of inherited: home operations,
   attribute operations, port operations, home factory operations,
-  supported operations.<p> 
+  supported operations.<p>
 
   <li>Added support for multiplex uses ports. This implies that users
   could use "uses multiple" in their component definitions. <p>
@@ -100,28 +100,28 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>:
   <li>Added automatic registration of value factories for  event
   consumers. This has been long outstanding. This change alleviates
   component developers need to register the valuetype factory of their
-  eventtypes with the ORB. <p>  
+  eventtypes with the ORB. <p>
 
   <li>Added support for emits keyword and we now generate navigation
   code for this.<p>
 
   <li>Fixed bug with multiple facets in a build that provide the same
   interface.<p>
-  
+
   <li>Added option <code>--gen-exec-impl</code> to generate executor
   impl classes, with no-op versions of each IDL operation.<p>
 
   <li>Implemented get_all_facets() and get_all_consumers() navigation
   methods.<p>
-      
+
   <li>Added support for the IDL keywords <code>setraises</code> and
   <code>getraises</code>, associated with attributes in IDL3.<p>
-  
+
   <li>Added support for both subscription and event push of event types
   that are a base class of the IDL-specified port type. A check is
   performed during the subscribe call to make sure the eventtype is
   actually an ancestor of the declared port type.<p>
-  
+
   <li>Problems with generated code when the composition declaration is
   nested inside one or more IDL modules has prompted a change. The
   'CIAO_GLUE_' prefix has been eliminated. The composition name is now
@@ -150,12 +150,12 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>:
  <li> The CIAO static configurator tool has been enhanced to support
  processing of RTCORBA policy related information. Please see
  ACE_wrappers/TAO/CIAO/docs/static_ciao_index.html.<p>
- 
+
  <li> To further interoperability with non-component-aware clients, there
- are files in the $CIAO_ROOT/tools/IDL3_to_IDL2 directory that can be 
+ are files in the $CIAO_ROOT/tools/IDL3_to_IDL2 directory that can be
  compiled into an executable called tao_idl3_to_idl2. This executable
  takes an IDL file (on the command line) containing IDL3 declarations
- and outputs an IDL file with the IDL3 declarations converted to 
+ and outputs an IDL file with the IDL3 declarations converted to
  equivalent IDL2. IDL2 declarations in the input file are unchanged.
  See the README file in that directory for more information.<p>
 
diff --git a/TAO/CIAO/docs/releasenotes/switch.html b/TAO/CIAO/docs/releasenotes/switch.html
index 1120239b6ec..b9df3850193 100644
--- a/TAO/CIAO/docs/releasenotes/switch.html
+++ b/TAO/CIAO/docs/releasenotes/switch.html
@@ -23,7 +23,7 @@
   binaries.<br>
 
   A couple examples of the component implementation are at:
-  <code>$CIAO_ROOT/DAnCE/tests</code>. 
+  <code>$CIAO_ROOT/DAnCE/tests</code>.
 </ul>
 
 <h3>When switching from the new CIAO runtime to the old one</h3>
diff --git a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
index a14a8f508d9..1d386841ea5 100644
--- a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
+++ b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
@@ -50,10 +50,9 @@
     <xsd:sequence>
       <xsd:element name="kind" type="Deployment:TCKind"/>
       <xsd:element name="enum" type="Deployment:EnumType" minOccurs="0"/>
-<!--      
+<!--
 @@ not supported now..
 
-
       <xsd:element name="objref" type="Deployment:ObjrefType"/>
       <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
       <xsd:element name="fixed" type="Deployment:FixedType"/>
@@ -67,7 +66,6 @@
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="DataValue">
     <xsd:choice maxOccurs="unbounded">
       <xsd:element name="short" type="xsd:short"/>
@@ -107,19 +105,17 @@
   <xsd:complexType name="Any">
     <xsd:sequence>
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="Property">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:Any"/>    
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
 <!-- End of base definitions. -->
 
   <xsd:simpleType name="SatisfierPropertyKind">
@@ -133,16 +129,15 @@
     </xsd:restriction>
   </xsd:simpleType>
 
-
   <xsd:complexType name="SatisfierProperty">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
-      <xsd:element name="value" type="Deployment:Any"/>      
+      <xsd:element name="dynamic" type="xsd:boolean" />
+      <xsd:element name="value" type="Deployment:Any"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="Resource">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
@@ -155,22 +150,20 @@
     <xsd:sequence>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
+      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
 <!-- Deployment -->
 
   <xsd:complexType name="ResourceDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="ArtifactDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
@@ -184,7 +177,6 @@
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
 
-
   <xsd:complexType name="MonolithicDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
@@ -206,32 +198,28 @@
     </xsd:restriction>
   </xsd:simpleType>
 
-
   <xsd:complexType name="InstanceResourceDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="InstanceDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="node" type="xsd:string"/>
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription -->
-      <xsd:element name="configProperty" type="Deployment:Property"
-    minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
       <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
 
-
   <xsd:simpleType name="CCMComponentPortKind">
     <xsd:restriction base="xsd:NCName">
       <xsd:enumeration value="Facet"/>
@@ -243,21 +231,20 @@
     </xsd:restriction>
   </xsd:simpleType>
 
-
   <xsd:complexType name="ComponentPortDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="specificType" type="xsd:string"/>
-      <xsd:element name="supportedType" type="xsd:string"/>
-      <xsd:element name="provider" type="xsd:string"/>
-      <xsd:element name="exclusiveProvider" type="xsd:string"/>
-      <xsd:element name="exclusiveUser" type="xsd:string"/>
-      <xsd:element name="optional" type="xsd:string"/>
+      <!-- @@MAJO:  Hack - specific/supported types should be required. -->
+      <xsd:element name="specificType" type="xsd:string" minOccurs="0"/>
+      <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="provider" type="xsd:boolean"/>
+      <xsd:element name="exclusiveProvider" type="xsd:boolean"/>
+      <xsd:element name="exclusiveUser" type="xsd:boolean"/>
+      <xsd:element name="optional" type="xsd:boolean"/>
       <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="ComponentPropertyDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
@@ -265,14 +252,12 @@
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="ComponentExternalPortEndpoint">
     <xsd:sequence>
-      <xsd:element name="portName" type="xsd:string"/>      
+      <xsd:element name="portName" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="PlanSubcomponentPortEndpoint">
     <xsd:sequence>
       <xsd:element name="portName" type="xsd:string"/>
@@ -282,24 +267,21 @@
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="ExternalReferenceEndpoint">
     <xsd:sequence>
-      <xsd:element name="location" type="xsd:string"/>      
+      <xsd:element name="location" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="ConnectionResourceDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="targetName" type="xsd:string"/>
       <xsd:element name="requirementName" type="xsd:string"/>
       <xsd:element name="resourceName" type="xsd:string"/>
-      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="PlanConnectionDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
@@ -312,72 +294,41 @@
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="ImplementationDependency">
     <xsd:sequence>
-      <xsd:element name="requiredType" type="xsd:string"/>     
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
 <!-- Implementation -->
 
-
   <xsd:complexType name="Capability">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
+      <xsd:element name="resourceType" type="xsd:string" maxOccurs="unbounded" />
+      <xsd:element name="property" type="Deployment:SatisfierProperty" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="ImplementationRequirement">
     <xsd:sequence>
-      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
-      <xsd:element name="resourcePort" type="xsd:string"/>
-      <xsd:element name="componentPort" type="xsd:string"/>
+      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind" minOccurs="0"/>
+      <xsd:element name="resourcePort" type="xsd:string" minOccurs="0" />
+      <xsd:element name="componentPort" type="xsd:string" minOccurs="0"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:Property"/>      
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- Bala commented
-  <xsd:complexType name="MonolithicImplementationDescription">
-    <xsd:sequence>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/>
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/>
+      <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
--->
-
 
   <xsd:complexType name="ComponentPackageReference">
     <xsd:sequence>
-      <xsd:element name="requiredUUID" type="xsd:string"/>
-      <xsd:element name="requiredName" type="xsd:string"/>
-      <xsd:element name="requiredType" type="xsd:string"/>      
+      <xsd:element name="requiredUUID" type="xsd:string" minOccurs="0" />
+      <xsd:element name="requiredName" type="xsd:string" minOccurs="0" />
+      <xsd:element name="requiredType" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
-<!-- Bala commented
-  <xsd:complexType name="SubcomponentInstantiationDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
--->
-
-
   <xsd:complexType name="SubcomponentPortEndpoint">
     <xsd:sequence>
       <xsd:element name="portName" type="xsd:string"/>
@@ -385,13 +336,12 @@
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="AssemblyConnectionDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
diff --git a/TAO/CIAO/docs/schema/CIAOServerResources.xsd b/TAO/CIAO/docs/schema/CIAOServerResources.xsd
index d9fb63da88f..3d1554c861a 100644
--- a/TAO/CIAO/docs/schema/CIAOServerResources.xsd
+++ b/TAO/CIAO/docs/schema/CIAOServerResources.xsd
@@ -7,10 +7,10 @@
   <xsd:element name="ServerResources" type="CIAO:ServerResourcesDef">
     <xsd:annotation>
       <xsd:documentation>
-        Root element for defining all the resources used by a DeploymentPlan.  
-        A CIAO:ServerResources document should reside in a separate file.  
+        Root element for defining all the resources used by a DeploymentPlan.
+        A CIAO:ServerResources document should reside in a separate file.
         A DeploymentPlan can refer to one or more CIAO:ServerResources file names
-        using the "infoProperty" tag.  
+        using the "infoProperty" tag.
       </xsd:documentation>
     </xsd:annotation>
   </xsd:element>
@@ -73,7 +73,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
-      <xsd:element name="resources" type="CIAO:ORBResources" 
+      <xsd:element name="resources" type="CIAO:ORBResources"
                                     minOccurs="0"/>
       <xsd:element name="policySet" type="CIAO:PolicySet"
                                     maxOccurs="unbounded"/>
@@ -113,7 +113,7 @@
 
   <xsd:complexType name="ThreadpoolWithLanesDef">
     <xsd:sequence>
-      <xsd:element name="threadpoolLane" type="CIAO:ThreadpoolLaneDef" 
+      <xsd:element name="threadpoolLane" type="CIAO:ThreadpoolLaneDef"
                    maxOccurs="unbounded"/>
       <xsd:element name="stacksize" type="xsd:unsignedLong" />
       <xsd:element name="allow_borrowing" type="xsd:boolean"/>
@@ -121,7 +121,7 @@
       <xsd:element name="max_buffered_requests" type="xsd:unsignedLong"/>
       <xsd:element name="max_request_buffered_size" type="xsd:unsignedLong"/>
     </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>  <!-- Threadpool ID should be 
+    <xsd:attribute name="id" type="xsd:ID"/>  <!-- Threadpool ID should be
                                                    referenced by individual policies
                                                    in the policysets below -->
   </xsd:complexType>
diff --git a/TAO/CIAO/docs/schema/README.html b/TAO/CIAO/docs/schema/README.html
index d810c8a6065..7b8e84b98ca 100644
--- a/TAO/CIAO/docs/schema/README.html
+++ b/TAO/CIAO/docs/schema/README.html
@@ -9,7 +9,7 @@
 The schema in this directory are all based on the new Deployment and
 Configuration spec. As part of our work on DAnCE we have tried to
 subset and normalize the schema so that our developers, and tools
-would be able to parse and use the information effectively. 
+would be able to parse and use the information effectively.
 
 The following table illustrates the meaning and use of the various
 schemata in this directory:
@@ -18,7 +18,7 @@ schemata in this directory:
     <td><b>Spec_Defined_Deployment.xsd</b></td>
     <td>This is the schema file from the spec which is unaltered. This
     is just for reference. CIAO and DAnCE will not be using this file
-    directly. 
+    directly.
     </td>
   </tr>
   <tr valign=top>
@@ -36,7 +36,7 @@ schemata in this directory:
     Deployment and Configuration spec talks about the various
     descriptors that are part of the package. The schema files are
     broken down in accordance with the suggested descriptor format in
-    the  section mentioned above. 
+    the  section mentioned above.
     </td>
   </tr>
   <tr valign=top">
@@ -59,6 +59,6 @@ schemata in this directory:
     the ones that CIAo and DAnCedoesn't support.</td>
   </tr>
 </table>
-</body> 
+</body>
 </html>
 
diff --git a/TAO/CIAO/docs/schema/ServerResourceUsage.txt b/TAO/CIAO/docs/schema/ServerResourceUsage.txt
index 1300110babb..80acc81026c 100644
--- a/TAO/CIAO/docs/schema/ServerResourceUsage.txt
+++ b/TAO/CIAO/docs/schema/ServerResourceUsage.txt
@@ -27,7 +27,7 @@ So, the DeploymentPlan should look something like:
             <type>tk_tring</type>
             <value>RTConfig4LinuxBox</value>  <!-- Component instances
                                                    will refer to this
-                                                   name to specify 
+                                                   name to specify
                                                    required server
                                                    config -->
           </value>
@@ -52,7 +52,7 @@ So, the DeploymentPlan should look something like:
             <type>tk_tring</type>
             <value>RTConfig4Win32Box</value>  <!-- Component instances
                                                    will refer to this
-                                                   name to specify 
+                                                   name to specify
                                                    required server
                                                    config -->
           </value>
@@ -75,7 +75,7 @@ policySet as following:
      ....
      <instance ...>
 
-     
+
        <deployedResource>
          <resourceUsage>InstanceUsesResource</resourceUsage>
          <requirementName>CIAO:PolicySet</requirementName>
@@ -99,7 +99,7 @@ policySet as following:
 
      </instance>
    </deploymentplan>
-  
+
 If only ID of CIAO:ServerResources is specified, we are using it as a
 collocation constraint.  I.e., if two instances are deployed to the
 same target node with different ServerResources IDs, DAnCE should
diff --git a/TAO/CIAO/docs/schema/ccd.xsd b/TAO/CIAO/docs/schema/ccd.xsd
index edc80f3b720..b52996c4bab 100644
--- a/TAO/CIAO/docs/schema/ccd.xsd
+++ b/TAO/CIAO/docs/schema/ccd.xsd
@@ -4,15 +4,16 @@
             xmlns:Deployment="http://www.omg.org/Deployment"
             targetNamespace="http://www.omg.org/Deployment">
 
-            <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
+  <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
 
   <xsd:complexType name="ComponentInterfaceDescription">
     <xsd:choice minOccurs="0" maxOccurs="1">
       <xsd:sequence>
         <xsd:element name="label" type="xsd:string" minOccurs="0"/>
         <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>
-        <xsd:element name="specificType" type="xsd:string"/>
-        <xsd:element name="supportedType" type="xsd:string" maxOccurs="unbounded"/>
+        <!-- @@ MAJO : HACK - SpecificType and SupportedType should be required! -->
+        <xsd:element name="specificType" type="xsd:string" minOccurs="0" />
+        <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
         <xsd:element name="idlFile" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
         <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
         <xsd:element name="port" type="Deployment:ComponentPortDescription" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/TAO/CIAO/docs/schema/cdd.xsd b/TAO/CIAO/docs/schema/cdd.xsd
index 711ec8d4e0a..18d9760f155 100644
--- a/TAO/CIAO/docs/schema/cdd.xsd
+++ b/TAO/CIAO/docs/schema/cdd.xsd
@@ -8,13 +8,13 @@
 
   <xsd:complexType name="Domain">
     <xsd:sequence>
-      <xsd:element name="UUID" type="xsd:string" minOccurs="0" />       
+      <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
       <xsd:element name="label" type="xsd:string" minOccurs="0" />
       <xsd:element name="node" type="Deployment:Node" maxOccurs="unbounded"/>
-      <xsd:element name="interconnect" type="Deployment:Interconnect"/>
-      <xsd:element name="bridge" type="Deployment:Bridge"/>
-      <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0"/>
-      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="interconnect" type="Deployment:Interconnect" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="bridge" type="Deployment:Bridge" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -23,7 +23,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="label" type="xsd:string" minOccurs="0" />
       <xsd:element name="connect" type="Deployment:Interconnect" maxOccurs="unbounded" />
-      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />      
+      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
@@ -33,17 +33,17 @@
       <xsd:element name="label" type="xsd:string" minOccurs="0" />
       <xsd:element name="connection" type="Deployment:Bridge" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="connect" type="Deployment:Node" maxOccurs="unbounded" />
-      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />      
+      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
-  
+
   <xsd:complexType name="Node">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="label" type="xsd:string" minOccurs="0" />
       <xsd:element name="connection" type="Deployment:Interconnect" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />      
+      <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
@@ -53,8 +53,8 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
       <xsd:element name="node" type="Deployment:Node"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:sequence>
   </xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd
index 4fa69acd3fe..36fc24f5fc7 100644
--- a/TAO/CIAO/docs/schema/cdp.xsd
+++ b/TAO/CIAO/docs/schema/cdp.xsd
@@ -9,8 +9,8 @@
   <xsd:complexType name="DeploymentPlan">
    <xsd:sequence>
 	<xsd:element name="label" type="xsd:string" minOccurs="0"/>
-    <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-    <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />     
+    <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>
+    <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />
     <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" />
     <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
     <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/TAO/CIAO/docs/schema/ciaopolicy.xsd b/TAO/CIAO/docs/schema/ciaopolicy.xsd
index 93a7415c4b4..0d663ff2166 100644
--- a/TAO/CIAO/docs/schema/ciaopolicy.xsd
+++ b/TAO/CIAO/docs/schema/ciaopolicy.xsd
@@ -17,7 +17,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:complexType name="policyType">
     <xs:sequence>
       <xs:choice>
@@ -43,12 +43,12 @@
       </xs:choice>
     </xs:sequence>
   </xs:complexType>
-    
+
   <xs:complexType name="policyBase" abstract="true">
     <xs:annotation>
       <xs:documentation>
         This is the base policy type.  All policies
-        should be an extension of this type.  
+        should be an extension of this type.
       </xs:documentation>
     </xs:annotation>
     <xs:sequence>
@@ -69,24 +69,24 @@
   <xs:simpleType name="policyIDType">
     <xs:annotation>
       <xs:documentation>
-        This type represents the policy ID.  
+        This type represents the policy ID.
         Need to add a restriction.
       </xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:integer">
     </xs:restriction>
   </xs:simpleType>
-  
+
   <xs:simpleType name="overrideType">
     <xs:restriction base="xs:string">
       <xs:enumeration value="SET_OVERRIDE" />
       <xs:enumeration value="ADD_OVERRIDE" />
     </xs:restriction>
   </xs:simpleType>
-  
 
-  
-  <!-- The following are extensions of policyBase, one each for each policy 
+
+
+  <!-- The following are extensions of policyBase, one each for each policy
        we may want to group these into seperate schema documents, for our
        own sanity.
   -->
@@ -109,7 +109,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:simpleType name="rebindModeType">
     <xs:annotation>
       <xs:documentation>
@@ -170,7 +170,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="replyPriorityPolicyType">
     <xs:annotation>
       <xs:documentation>
@@ -186,7 +186,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="priorityRangeType">
     <xs:annotation>
       <xs:documentation>
@@ -198,8 +198,8 @@
       <xs:element name="max" type="xs:integer" />
     </xs:sequence>
   </xs:complexType>
-  
-  
+
+
   <xs:complexType name="requestStartTimePolicyType">
     <xs:annotation>
       <xs:documentation>
@@ -215,8 +215,8 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
-  
+
+
   <xs:complexType name="requestEndTimePolicyType">
     <xs:annotation>
       <xs:documentation>
@@ -232,7 +232,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
 
   <xs:complexType name="replyStartTimePolicyType">
     <xs:annotation>
@@ -249,7 +249,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
 
   <xs:complexType name="replyEndTimePolicyType">
     <xs:annotation>
@@ -266,7 +266,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="utcTime">
     <xs:annotation>
       <xs:documentation>
@@ -296,7 +296,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="relativeRoundtripPolicyType">
     <xs:annotation>
       <xs:documentation>
@@ -375,7 +375,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:simpleType name="ordersType">
     <xs:annotation>
       <xs:documentation>
@@ -399,7 +399,7 @@
         Represents the Priority Model Policy, ID 40
       </xs:documentation>
     </xs:annotation>
-    
+
     <xs:complexContent>
       <xs:extension base="ciao:policyBase">
         <xs:sequence>
@@ -410,7 +410,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:simpleType name="priorityModelType">
     <xs:restriction base="xs:string">
       <xs:enumeration value="CLIENT_PROPAGATED" />
@@ -426,7 +426,7 @@
         Represents the ThreadPool policy, ID 41
       </xs:documentation>
     </xs:annotation>
-    
+
     <xs:complexContent>
       <xs:extension base="ciao:policyBase">
         <xs:sequence>
@@ -436,8 +436,8 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
-  
+
+
   <!-- serverProtocolPolicy -->
 
   <xs:complexType name="serverProtocolPolicyType">
@@ -446,7 +446,7 @@
         Represents the Server Protocol policy, ID 42
       </xs:documentation>
     </xs:annotation>
-    
+
     <xs:complexContent>
       <xs:extension base="ciao:policyBase">
         <xs:sequence>
@@ -457,8 +457,8 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
-  
+
+
   <!-- clientProtocolPolicy -->
   <xs:complexType name="clientProtocolPolicyType">
     <xs:annotation>
@@ -466,7 +466,7 @@
         Represents the Client Protocol policy, ID 43
       </xs:documentation>
     </xs:annotation>
-    
+
     <xs:complexContent>
       <xs:extension base="ciao:policyBase">
         <xs:sequence>
@@ -477,7 +477,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
 
   <!-- Protocol definitions for client and server Protocol properties types. -->
   <xs:complexType name="protocolType">
@@ -487,7 +487,7 @@
       <xs:element name="transportProtocolProperties" type="ciao:protocolPropertyType" />
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="protocolPropertyType">
     <xs:sequence>
       <xs:choice>
@@ -507,7 +507,7 @@
     </xs:annotation>
     <xs:attribute name="type" type="xs:string" use="required" />
   </xs:complexType>
-  
+
   <xs:complexType name="tcpProtocolPropertiesType">
     <xs:complexContent>
       <xs:extension base="ciao:protocolPropertyBase">
@@ -528,7 +528,7 @@
       <xs:extension base="ciao:protocolPropertyBase" />
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="unixDomainProtocolPropertiesType">
     <xs:complexContent>
       <xs:extension base="ciao:protocolPropertyBase">
@@ -551,7 +551,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-        
+
   <!-- TODO:  Provide other protocolProperties types -->
 
   <!-- privateConnectionPolicy -->
@@ -568,8 +568,8 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
-  
+
+
   <!-- priorityBandedPolicy -->
   <xs:complexType name="priorityBandedPolicyType">
     <xs:annotation>
@@ -577,7 +577,7 @@
         priorityBandedPolicy extension of policyBase, ID 45
       </xs:documentation>
     </xs:annotation>
-    
+
     <xs:complexContent>
       <xs:extension base="ciao:policyBase">
         <xs:sequence>
@@ -589,7 +589,7 @@
     </xs:complexContent>
   </xs:complexType>
 
-  
+
   <xs:complexType name="priorityBandType">
     <xs:annotation>
       <xs:documentation>
@@ -601,7 +601,7 @@
       <xs:element name="high" type="xs:integer" />
     </xs:sequence>
   </xs:complexType>
-  
 
 
-</xs:schema>
\ No newline at end of file
+
+</xs:schema>
diff --git a/TAO/CIAO/docs/schema/cid.xsd b/TAO/CIAO/docs/schema/cid.xsd
index c8ecb846d33..7e5233d770f 100644
--- a/TAO/CIAO/docs/schema/cid.xsd
+++ b/TAO/CIAO/docs/schema/cid.xsd
@@ -4,80 +4,75 @@
             xmlns:Deployment="http://www.omg.org/Deployment"
             targetNamespace="http://www.omg.org/Deployment">
 
-            <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
-            <xsd:include schemaLocation="cpd.xsd" />
-            <xsd:include schemaLocation="iad.xsd" />
-
+  <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
+  <xsd:include schemaLocation="cpd.xsd" />
+  <xsd:include schemaLocation="iad.xsd" />
+  <xsd:include schemaLocation="pcd.xsd" />
 
   <xsd:complexType name="SubcomponentInstantiationDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
+      <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription" minOccurs="0" />
+      <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration" minOccurs="0" />
+      <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="referencedPackage" type="Deployment:ComponentPackageReference" minOccurs="0"/>
+      <xsd:element name="importedPackage" type="Deployment:ComponentPackageImport" minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
 
-
   <xsd:complexType name="SubcomponentPropertyReference">
     <xsd:sequence>
       <xsd:element name="propertyName" type="xsd:string"/>
-      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
+      <xsd:element name="instance" type="xsd:IDREF"/>
     </xsd:sequence>
   </xsd:complexType>
 
-
   <xsd:complexType name="AssemblyPropertyMapping">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="externalName" type="xsd:string"/>
-      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>
+      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
   <xsd:complexType name="ComponentAssemblyDescription">
     <xsd:sequence>
       <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" maxOccurs="unbounded"/>
-      <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" maxOccurs="unbounded"/>
-      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/>
+      <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- <xsd:element name="locality" type="Deployment:Locality" minOccurs="0" maxOccurs="unbounded" /> -->
+      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 
   <xsd:complexType name="MonolithicImplementationDescription">
     <xsd:sequence>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="nodeExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="componentExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/>
-      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
 
   <xsd:complexType name="ComponentImplementationDescription">
-    <!-- @@mxiong: added minOccurs="0" maxOccurs="unbounded"
-                   when adding config_handler support
-                   for repoMan
-    -->
     <xsd:choice minOccurs="0" maxOccurs="1">
       <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
+        <xsd:element name="label" type="xsd:string" minOccurs="0" />
+        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
+        <!-- @@ MAJO : Hack: Implements should be required. -->
+        <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />
         <xsd:choice>
           <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
           <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
         </xsd:choice>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="capability" type="Deployment:Capability" minOccurs="0"/>
-        <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="capability" type="Deployment:Capability" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
-    <!-- @@mxiong: added href
-                   when adding config_handler support
-                   for repoMan
-    -->
     <xsd:attribute name="href" type="xsd:string" use="optional"/>
   </xsd:complexType>
 
diff --git a/TAO/CIAO/docs/schema/cpd.xsd b/TAO/CIAO/docs/schema/cpd.xsd
index dc8cb81be3f..6f049fa839b 100644
--- a/TAO/CIAO/docs/schema/cpd.xsd
+++ b/TAO/CIAO/docs/schema/cpd.xsd
@@ -16,25 +16,18 @@
   </xsd:complexType>
 
   <xsd:complexType name="ComponentPackageDescription">
-    <!-- @@mxiong: added minOccurs="0" maxOccurs="1"
-                   when adding config_handler support
-                   for repoMan
-    -->
     <xsd:choice minOccurs="0" maxOccurs="1">
       <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-        <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="label" type="xsd:string" minOccurs="0" />
+        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
+        <!-- @@MAJO - This is a hack, realizes is required. -->
+        <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />
+        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation" maxOccurs="unbounded" />
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
-    <!-- @@mxiong: added href
-                   when adding config_handler support
-                   for repoMan
-    -->
     <xsd:attribute name="href" type="xsd:string" use="optional"/>
   </xsd:complexType>
 
diff --git a/TAO/CIAO/docs/schema/iad.xsd b/TAO/CIAO/docs/schema/iad.xsd
index 246af16cd43..c44166c7d9d 100644
--- a/TAO/CIAO/docs/schema/iad.xsd
+++ b/TAO/CIAO/docs/schema/iad.xsd
@@ -15,29 +15,18 @@
   </xsd:complexType>
 
   <xsd:complexType name="ImplementationArtifactDescription">
-    <!-- @@mxiong: added minOccurs="0" maxOccurs="1"
-                   when adding config_handler support
-                   for repoMan
-    -->
     <xsd:choice minOccurs="0" maxOccurs="1">
       <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-
-        <!-- @@ There probably should be only one location? -->
+        <xsd:element name="label" type="xsd:string" minOccurs="0" />
+        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
         <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
-        <!-- @@mxiong: move <dependsOn> before <execParameter>  -->
         <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-        <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
-    <!-- @@mxiong: added a href attribute
-                   when adding config_handler support
-                   for repoMan
-    -->
     <xsd:attribute name="href" type="xsd:string" use="optional"/>
   </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/TAO/CIAO/docs/schema/pcd.xsd b/TAO/CIAO/docs/schema/pcd.xsd
index 99a6f62f6be..61f32ddcee7 100644
--- a/TAO/CIAO/docs/schema/pcd.xsd
+++ b/TAO/CIAO/docs/schema/pcd.xsd
@@ -4,26 +4,29 @@
             xmlns:Deployment="http://www.omg.org/Deployment"
             targetNamespace="http://www.omg.org/Deployment">
 
-            <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
-            <xsd:include schemaLocation="cpd.xsd" />
+  <xsd:include schemaLocation="Basic_Deployment_Data.xsd" />
+  <xsd:include schemaLocation="cpd.xsd" />
+
+  <xsd:complexType name="ComponentPackageImport">
+    <xsd:sequence>
+      <xsd:element name="location" type="xsd:string" maxOccurs="unbounded" />
+    </xsd:sequence>
+  </xsd:complexType>
 
   <xsd:complexType name="PackageConfiguration">
     <xsd:choice>
       <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
-<!--
-@@ recursive, not used
-        <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/>
--->
-
-        <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
-        <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
-        <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="label" type="xsd:string" minOccurs="0" />
+        <xsd:element name="UUID" type="xsd:string" minOccurs="0" />
+        <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription" minOccurs="0" />
+        <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration" minOccurs="0" />
+        <xsd:element name="importedPackage" type="Deployment:ComponentPackageImport" minOccurs="0" />
+        <xsd:element name="referencedPackage" type="Deployment:ComponentPackageReference" minOccurs="0"/>
+        <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" />
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
   </xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/TAO/CIAO/docs/schema/toplevel.xsd b/TAO/CIAO/docs/schema/toplevel.xsd
index e456a1bc005..0c67f5fb7a9 100644
--- a/TAO/CIAO/docs/schema/toplevel.xsd
+++ b/TAO/CIAO/docs/schema/toplevel.xsd
@@ -8,8 +8,8 @@
 
   <xsd:complexType name="TopLevelPackageDescription">
     <xsd:sequence>
-      <xsd:element name="package" type="Deployment:PackageConfiguration" maxOccurs="unbounded"/>
+      <xsd:element name="basePackage" type="Deployment:PackageConfiguration" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/TAO/CIAO/docs/schema/unused_elements.xsd b/TAO/CIAO/docs/schema/unused_elements.xsd
index c1200b088e9..6f5aaddabdb 100644
--- a/TAO/CIAO/docs/schema/unused_elements.xsd
+++ b/TAO/CIAO/docs/schema/unused_elements.xsd
@@ -4,7 +4,7 @@
             xmlns:Deployment="http://www.omg.org/Deployment"
             targetNamespace="http://www.omg.org/Deployment">
 
-<!-- VAULT 
+<!-- VAULT
 
 Place for strange things. Nobody knows what they are for...
 
@@ -23,14 +23,14 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="ObjrefType">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="typeId" type="xsd:string"/>      
+      <xsd:element name="typeId" type="xsd:string"/>
     </xsd:sequence>
   </xsd:complexType>
 
 
   <xsd:complexType name="BoundedStringType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="bound" type="xsd:string"/>      
+      <xsd:element name="bound" type="xsd:string"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -38,7 +38,7 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="FixedType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="digits" type="xsd:string"/>
-      <xsd:element name="scale" type="xsd:string"/>      
+      <xsd:element name="scale" type="xsd:string"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -46,14 +46,14 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="ArrayType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="length" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
   <xsd:complexType name="SequenceType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="bound" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -61,7 +61,7 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="elementType" type="Deployment:DataType"/>      
+      <xsd:element name="elementType" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -69,14 +69,14 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="typeId" type="xsd:string"/>
-      <xsd:element name="member" type="Deployment:StructMemberType"/>      
+      <xsd:element name="member" type="Deployment:StructMemberType"/>
     </xsd:choice>
   </xsd:complexType>
 
   <xsd:complexType name="StructMemberType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -86,7 +86,7 @@ Place for strange things. Nobody knows what they are for...
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="modifier" type="xsd:string"/>
       <xsd:element name="baseType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
+      <xsd:element name="member" type="Deployment:ValueMemberType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -94,7 +94,7 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="visibility" type="xsd:string"/>
-      <xsd:element name="type" type="Deployment:DataType"/>      
+      <xsd:element name="type" type="Deployment:DataType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -104,7 +104,7 @@ Place for strange things. Nobody knows what they are for...
       <xsd:element name="typeId" type="xsd:string"/>
       <xsd:element name="default" type="Deployment:UnionMemberType"/>
       <xsd:element name="discriminatorType" type="Deployment:DataType"/>
-      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
+      <xsd:element name="member" type="Deployment:UnionMemberType"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -112,7 +112,7 @@ Place for strange things. Nobody knows what they are for...
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="type" type="Deployment:DataType"/>
-      <xsd:element name="label" type="Deployment:DataValue"/>      
+      <xsd:element name="label" type="Deployment:DataValue"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -120,7 +120,7 @@ Place for strange things. Nobody knows what they are for...
   <xsd:complexType name="NamedValue">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="value" type="Deployment:DataValue"/>      
+      <xsd:element name="value" type="Deployment:DataValue"/>
     </xsd:choice>
   </xsd:complexType>
 
@@ -146,13 +146,13 @@ Place for strange things. Nobody knows what they are for...
 
 <!--
 
-  This type is not referenced anywhere. 
+  This type is not referenced anywhere.
 
   <xsd:complexType name="RequirementSatisfier">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="resourceType" type="xsd:string"/>
-      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:choice>
   </xsd:complexType>
 
diff --git a/TAO/CIAO/docs/schema/xsc-banner.cpp b/TAO/CIAO/docs/schema/xsc-banner.cpp
index ecd90a877a6..53cf582e37e 100644
--- a/TAO/CIAO/docs/schema/xsc-banner.cpp
+++ b/TAO/CIAO/docs/schema/xsc-banner.cpp
@@ -3,9 +3,9 @@
  *
  * 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>
  */
- 
+
diff --git a/TAO/CIAO/docs/schema/xsc-banner.h b/TAO/CIAO/docs/schema/xsc-banner.h
index 361ae2c84d1..4208948eae2 100644
--- a/TAO/CIAO/docs/schema/xsc-banner.h
+++ b/TAO/CIAO/docs/schema/xsc-banner.h
@@ -3,7 +3,7 @@
  *
  * 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>
@@ -12,7 +12,7 @@
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
diff --git a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
index b692eb6a859..d51f32288be 100644
--- a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
+++ b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
@@ -101,7 +101,7 @@ void
   this->ciao_emits_[event name]_consumer_->push_[event name] (ev
                                                               ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
-  
+
 ##  else [event name] belongs to a 'publishes' port
   ACE_Active_Map_Manager<[eventtype]Consumer_var>::iterator
     end = this->ciao_publishes_[event name]_map_.end ();
@@ -469,7 +469,7 @@ CORBA::Object_ptr
   x->type_id ((const char *) "[facet type's repo id]"); //
   x->facet_ref (this->provide_[facet name] (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK_RETURN (0);
-  
+
   collection[i] = x._retn ();
   ++i;
 ##end foreach [facet name] with [facet type]
@@ -1018,7 +1018,7 @@ void
   ::Components::FacetDescriptions_var facets_desc
       = this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   ::Components::ReceptacleDescriptions_var receptacle_desc
       = get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -1030,7 +1030,7 @@ void
   ::Components::EmitterDescriptions_var emitter_desc
       = this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   ::Components::PublisherDescriptions_var publisher_desc
       = this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif
index 3604d32946d..fb224304ecd 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif
index 6dcad861f07..05be9c8595c 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg
index a8550fe1176..26adb41aaad 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg
index 7cf8dc9863e..a35073607cf 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg
index e3be06e88de..a55ce9de74f 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg
index ceb172b12a8..f8b7670094b 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg
index 0559dc7382b..9a6c2ec3772 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg
index ba8196220b7..e2fceceb0b1 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg
index e4f18c39782..b3c0f2a35ed 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg
index 3d3700d9016..dc23399c32e 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg
index 8c5f88fd65e..e318a0e123f 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg
index c39343517e5..200f332f5e4 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg
index c577448df84..1f9d0a670ca 100644
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg
+++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
index 014838a3b5a..ee9912aaa4d 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -22,7 +22,7 @@ project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
   after += Stock_Base_svnt Stock_Base_Distributor_stub
   sharedname  = Distributor_svnt
   libs    += Distributor_stub Stock_Base_stub Stock_Base_svnt
-  
+
   idlflags  +=  -Wb,export_macro=DISTRIBUTOR_SVNT_Export -Wb,export_include=Distributor_svnt_export.h
   dynamicflags = DISTRIBUTOR_SVNT_BUILD_DLL
 
@@ -46,16 +46,16 @@ project(Stock_Base_Distributor_exec) : ciao_component_dnc {
   after   += Stock_Base_Distributor_svnt
   sharedname = Distributor_exec
   libs      += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt
-  
+
   idlflags  +=  -Wb,export_macro=DISTRIBUTOR_EXEC_Export -Wb,export_include=Distributor_exec_export.h
   dynamicflags   = DISTRIBUTOR_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
-    
+
     Distributor_exec.cpp
   }
 }
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
index 236bcc345a1..07111b62da3 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
@@ -40,7 +40,7 @@ namespace CIDL_StockDistributor_Impl
   pulse_Generator::open_h ()
   {
     // convert the task into a active object that runs in separate thread
-    return this->activate (); 
+    return this->activate ();
   }
 
   int
@@ -49,7 +49,7 @@ namespace CIDL_StockDistributor_Impl
     this->reactor ()->end_reactor_event_loop ();
 
     // wait for all threads in the task to exit before it returns
-    return this->wait (); 
+    return this->wait ();
   }
 
   int
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd
index c2a0630b87b..f6afd13c695 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd
@@ -30,4 +30,4 @@
     <kind>SimplexReceptacle</kind>
   </port>
 
-</Deployment:ComponentInterfaceDescription>
\ No newline at end of file
+</Deployment:ComponentInterfaceDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid
index 47f49102136..c484e8cb273 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid
@@ -32,4 +32,4 @@
       </value>
     </value>
   </configProperty>
-</Deployment:ComponentImplementationDescription>
\ No newline at end of file
+</Deployment:ComponentImplementationDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd
index cc6381b658a..e43bb88aa83 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd
@@ -11,4 +11,4 @@
     <name>Broker</name>
     <referencedImplementation href="Broker.cid"/>
   </implementation>
-</Deployment:ComponentPackageDescription>
\ No newline at end of file
+</Deployment:ComponentPackageDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad
index 724a5b2c6bb..b488032ec40 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad
@@ -26,4 +26,4 @@
         </value>
       </value>
     </execParameter>
-</Deployment:ImplementationArtifactDescription>
\ No newline at end of file
+</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad
index ac1f0834e19..ebd2d43b33a 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad
@@ -11,4 +11,4 @@
     <name>ACE</name>
     <referencedArtifact href="Libraries.iad"/>
   </dependsOn>
-</Deployment:ImplementationArtifactDescription>
\ No newline at end of file
+</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
index 2944181e015..85d2bb10eec 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
@@ -26,4 +26,4 @@
         </value>
       </value>
     </execParameter>
-</Deployment:ImplementationArtifactDescription>
\ No newline at end of file
+</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd
index 7557e143c56..ceb0380d2ac 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd
@@ -38,4 +38,4 @@
     <specificType>IDL:Stock/StockQuoter:1.0</specificType>
     <kind>Facet</kind>
   </port>
-</Deployment:ComponentInterfaceDescription>
\ No newline at end of file
+</Deployment:ComponentInterfaceDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid
index b5eac80c543..91b9eb7d834 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid
@@ -32,4 +32,4 @@
       </value>
     </value>
   </configProperty>
-</Deployment:ComponentImplementationDescription>
\ No newline at end of file
+</Deployment:ComponentImplementationDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd
index c451a5637e8..5656275762b 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd
@@ -11,4 +11,4 @@
     <name>Distributor</name>
     <referencedImplementation href="Distributor.cid"/>
   </implementation>
-</Deployment:ComponentPackageDescription>
\ No newline at end of file
+</Deployment:ComponentPackageDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad
index 784e11b99bf..5806e835588 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad
@@ -26,4 +26,4 @@
         </value>
       </value>
     </execParameter>
-</Deployment:ImplementationArtifactDescription>
\ No newline at end of file
+</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad
index c55a74916ef..bde35461864 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad
@@ -11,4 +11,4 @@
     <name>ACE</name>
     <referencedArtifact href="Libraries.iad"/>
   </dependsOn>
-</Deployment:ImplementationArtifactDescription>
\ No newline at end of file
+</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
index 7643089044f..3d755206763 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
@@ -26,4 +26,4 @@
         </value>
       </value>
     </execParameter>
-</Deployment:ImplementationArtifactDescription>
\ No newline at end of file
+</Deployment:ImplementationArtifactDescription>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg b/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg
index 2f3edd11329..4a0d9980316 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg
diff --git a/TAO/CIAO/docs/value_factory_registration.html b/TAO/CIAO/docs/value_factory_registration.html
index 3c2a45d6815..66a4804cdad 100644
--- a/TAO/CIAO/docs/value_factory_registration.html
+++ b/TAO/CIAO/docs/value_factory_registration.html
@@ -1,49 +1,49 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-		<meta name="Author" content="Jeff Parsons">
-		<meta name="GENERATOR" content="Mozilla/4.76 [en] (Windows NT 5.0; U) [Netscape]">
-		<title>Registration of Valuetype Factories for Event Sinks</title> 
-		<!-- $Id$ -->
-	</head>
-	<body>
-	<h3>Registration of Valuetype Factories for Event Sinks</h3>
-		<p>Components with one or more event sink (consumer) ports will need to have a 
-			valuetype factory registered with the underlying ORB in order to correctly 
-			demarshal the state of eventtypes it receives over the wire.</p>
-		<p>For the common case (eventtypes that contain only one or more state members), 
-			the IDL compiler generates a concrete class with a name constructed from the 
-			valuetype name and an '_init' suffix, and the CIDL compiler generates a macro 
-			in the servant constructor that registers this factory with the container's 
-			ORB. However, an eventtype, like any valuetype, may also contain operation 
-			and/or factory declarations. In these cases things are not so simple. For 
-			example a factory declaration in an IDL valuetype or eventtype will generate a 
-			pure virtual function of the same name in the associated _init class, meaning 
-			that ORB factory registration for this type must be with a derived factory 
-			class written by the application developer. The table below shows all possible 
-			cases of IDL compiler factory generation.</p>
-		<TABLE BORDER="4" CELLSPACING="4" CELLPADDING="4" ID="Table1">
-			<TR>
-				<TD></TD>
-				<TD><b>Has Operation</b></TD>
-				<TD><b>Has No Operation</b></TD>
-			</TR>
-			<tr>
-				<td><b>Has Factory</b></td>
-				<td>ABSTRACT FACTORY</td>
-				<td>ABSTRACT FACTORY</td>
-			</tr>
-			<tr>
-				<td><b>Has No Factory</b></td>
-				<td>NO FACTORY</td>
-				<td>CONCRETE FACTORY</td>
-			</tr>
-		</TABLE>
-		<p>The CIAO CIDL compiler will generate a macro to register the factory with the 
-			container's ORB only in the case where a concrete factory is generated by the 
-			IDL compiler, and thus no subclassing is necessary. There is also a command 
-			line option for the CIDL compiler, <tt>--suppress-register-factory</tt>, 
-			that turns off generation of the macro in all cases.</p>
-	</body>
-</html>
+        <!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+        <html>
+                <head>
+                                <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+                                                <meta name="Author" content="Jeff Parsons">
+                                                                <meta name="GENERATOR" content="Mozilla/4.76 [en] (Windows NT 5.0; U) [Netscape]">
+                                                                                <title>Registration of Valuetype Factories for Event Sinks</title>
+                                                                                                <!-- $Id$ -->
+                                                                                                        </head>
+                                                                                                                <body>
+                                                                                                                        <h3>Registration of Valuetype Factories for Event Sinks</h3>
+                                                                                                                                        <p>Components with one or more event sink (consumer) ports will need to have a
+                                                                                                                                                                valuetype factory registered with the underlying ORB in order to correctly
+                                                                                                                                                                                        demarshal the state of eventtypes it receives over the wire.</p>
+                                                                                                                                                                                                        <p>For the common case (eventtypes that contain only one or more state members),
+                                                                                                                                                                                                                                the IDL compiler generates a concrete class with a name constructed from the
+                                                                                                                                                                                                                                                        valuetype name and an '_init' suffix, and the CIDL compiler generates a macro
+                                                                                                                                                                                                                                                                                in the servant constructor that registers this factory with the container's
+                                                                                                                                                                                                                                                                                                        ORB. However, an eventtype, like any valuetype, may also contain operation
+                                                                                                                                                                                                                                                                                                                                and/or factory declarations. In these cases things are not so simple. For
+                                                                                                                                                                                                                                                                                                                                                        example a factory declaration in an IDL valuetype or eventtype will generate a
+                                                                                                                                                                                                                                                                                                                                                                                pure virtual function of the same name in the associated _init class, meaning
+                                                                                                                                                                                                                                                                                                                                                                                                        that ORB factory registration for this type must be with a derived factory
+                                                                                                                                                                                                                                                                                                                                                                                                                                class written by the application developer. The table below shows all possible
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        cases of IDL compiler factory generation.</p>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <TABLE BORDER="4" CELLSPACING="4" CELLPADDING="4" ID="Table1">
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <TR>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <TD></TD>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <TD><b>Has Operation</b></TD>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <TD><b>Has No Operation</b></TD>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </TR>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <tr>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <td><b>Has Factory</b></td>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <td>ABSTRACT FACTORY</td>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <td>ABSTRACT FACTORY</td>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </tr>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <tr>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <td><b>Has No Factory</b></td>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <td>NO FACTORY</td>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <td>CONCRETE FACTORY</td>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </tr>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </TABLE>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <p>The CIAO CIDL compiler will generate a macro to register the factory with the
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                container's ORB only in the case where a concrete factory is generated by the
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        IDL compiler, and thus no subclassing is necessary. There is also a command
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                line option for the CIDL compiler, <tt>--suppress-register-factory</tt>,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        that turns off generation of the macro in all cases.</p>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </body>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </html>
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 652dab2f7a3..c676d5b7f66 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -6,9 +6,9 @@ project(BMClosedED_DnC_stub): ciao_client_dnc {
   after += BasicSP_DnC_stub
   sharedname = BMClosedED_stub
 
-  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export 
-  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h 
-  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export
+  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h
+  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export
   idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
 
   libs += BasicSP_stub
@@ -29,12 +29,12 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
 
   sharedname = BMClosedED_svnt
 
-  libs    += BMClosedED_stub BasicSP_stub 
+  libs    += BMClosedED_stub BasicSP_stub
   libs    += BasicSP_svnt
 
   libpaths += ..
 
-  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export
   idlflags  += -Wb,export_include=BMClosedED_svnt_export.h
 
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
@@ -60,11 +60,11 @@ project(BMClosedED_DnC_exec) : ciao_component_dnc {
 
   sharedname = BMClosedED_exec
 
-  libs       += BMClosedED_stub BMClosedED_svnt 
+  libs       += BMClosedED_stub BMClosedED_svnt
   libs       += BasicSP_stub BasicSP_svnt
 
   libpaths   += ..
-  idlflags   += -Wb,export_macro=BMCLOSEDED_EXEC_Export 
+  idlflags   += -Wb,export_macro=BMCLOSEDED_EXEC_Export
   idlflags   += -Wb,export_include=BMClosedED_exec_export.h
 
   dynamicflags   = BMCLOSEDED_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
index 089ea646f76..a4c783f882d 100644
--- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -59,15 +59,15 @@ MyImpl::BMDevice_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL)
 // Operations from Components::SessionComponent
 void
 MyImpl::BMDevice_exec_i::set_session_context (
-    Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
-  )
+                                              Components::SessionContext_ptr ctx
+                                              ACE_ENV_ARG_DECL
+                                              )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::set_session_context\n"));
     }
 
@@ -97,10 +97,10 @@ MyImpl::BMDevice_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::ccm_activate\n"));
     }
-    
+
 }
 
 void
@@ -117,7 +117,7 @@ MyImpl::BMDevice_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::ccm_passivate\n"));
     }
 }
@@ -129,7 +129,7 @@ MyImpl::BMDevice_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::ccm_remove\n"));
     }
 }
@@ -156,7 +156,7 @@ MyImpl::BMDeviceHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
   Components::EnterpriseComponent_ptr tmp= 0;
   ACE_NEW_THROW_EX (tmp,
                     MyImpl::BMDevice_exec_i,
-		                CORBA::NO_MEMORY ());
+                    CORBA::NO_MEMORY ());
 
   return tmp;
 }
diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 5a28ed1b783..d73f69ce65e 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -6,12 +6,12 @@ project(BMDisplay_DnC_stub): ciao_client_dnc {
 
   sharedname = BMDisplay_stub
 
-  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export 
-  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h 
-  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export
+  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h
+  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export
   idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
   dynamicflags   = BMDISPLAY_STUB_BUILD_DLL
- 
+
   libs += BasicSP_stub
 
   IDL_Files {
@@ -32,7 +32,7 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
 
   libpaths += ..
 
-  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export 
+  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export
   idlflags += -Wb,export_include=BMDisplay_svnt_export.h
 
   dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
@@ -58,12 +58,12 @@ project(BMDisplay_DnC_exec) : ciao_component_dnc {
 
   sharedname = BMDisplay_exec
 
-  libs      += BMDisplay_stub BMDisplay_svnt 
+  libs      += BMDisplay_stub BMDisplay_svnt
   libs      += BasicSP_stub BasicSP_svnt
 
   libpaths  += ..
 
-  idlflags  += -Wb,export_macro=BMDISPLAY_EXEC_Export 
+  idlflags  += -Wb,export_macro=BMDISPLAY_EXEC_Export
   idlflags  += -Wb,export_include=BMDisplay_exec_export.h
 
   dynamicflags   = BMDISPLAY_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
index f0fc61007d7..6b075cf9c5c 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -62,7 +62,7 @@ MyImpl::BMDisplay_exec_impl::set_session_context (
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::set_session_context\n"));
     }
 
@@ -92,7 +92,7 @@ MyImpl::BMDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::ccm_activate\n"));
     }
 
@@ -116,7 +116,7 @@ MyImpl::BMDisplay_exec_impl::ccm_passivate (
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::ccm_passivate\n"));
     }
 }
@@ -128,7 +128,7 @@ MyImpl::BMDisplay_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::ccm_remove\n"));
     }
 }
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
index c850d19e968..381afbe454f 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -6,9 +6,9 @@ project(EC_DnC_stub): ciao_client_dnc {
 
   sharedname = EC_stub
 
-  idlflags += -Wb,stub_export_macro=EC_STUB_Export 
-  idlflags += -Wb,stub_export_include=EC_stub_export.h 
-  idlflags += -Wb,skel_export_macro=EC_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=EC_STUB_Export
+  idlflags += -Wb,stub_export_include=EC_stub_export.h
+  idlflags += -Wb,skel_export_macro=EC_SVNT_Export
   idlflags += -Wb,skel_export_include=EC_svnt_export.h
 
   dynamicflags   = EC_STUB_BUILD_DLL
@@ -30,7 +30,7 @@ project(EC_DnC_svnt) : ciao_servant_dnc {
 
   libpaths  += ..
 
-  idlflags  += -Wb,export_macro=EC_SVNT_Export 
+  idlflags  += -Wb,export_macro=EC_SVNT_Export
   idlflags  += -Wb,export_include=EC_svnt_export.h
 
   dynamicflags = EC_SVNT_BUILD_DLL
@@ -61,7 +61,7 @@ project(EC_DnC_exec) : ciao_component_dnc {
 
   libpaths += ..
 
-  idlflags +=  -Wb,export_macro=EC_EXEC_Export 
+  idlflags +=  -Wb,export_macro=EC_EXEC_Export
   idlflags += -Wb,export_include=EC_exec_export.h
 
   dynamicflags   = EC_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
index d52ac54dba9..d385ad186d1 100644
--- a/TAO/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
@@ -38,8 +38,8 @@ parse_args (int argc, char *argv[])
           break;
 
         case 'r':
-        rate = atoi (get_opts.opt_arg ());
-        break;
+          rate = atoi (get_opts.opt_arg ());
+          break;
 
         case '?':  // display help for use of the server.
         default:
@@ -75,10 +75,10 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-		                                        argv,
-					                                  ""
-					                                  ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            ""
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
 
       if (CORBA::is_nil (pulser.in ()))
         {
-          ACE_ERROR_RETURN ((LM_ERROR, 
+          ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to acquire 'EC' objref\n"),
                             -1);
         }
diff --git a/TAO/CIAO/examples/BasicSP/README.html b/TAO/CIAO/examples/BasicSP/README.html
index 00c785c7c2f..c9ce1dfd2e3 100644
--- a/TAO/CIAO/examples/BasicSP/README.html
+++ b/TAO/CIAO/examples/BasicSP/README.html
@@ -18,21 +18,21 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
 
     Copy the file into the <code> $CIAO_ROOT/bin </code> directory.
     Build ACE, TAO, DAnCE before you proceed.
-    
+
     <br><br>
     <em>NOTE</em>:  <br>
            While buiding DAnCE, we also suggest that you build the tests in the $CIAO_ROOT/test directory and make sure
            all the tests run OK before you proceed to try out the BasicSP example or any other DAnCE-based
            applications. To do this, open the file
-    
-          $ACE_ROOT/bin/MakeProjectCreator/config/global.features, 
-          
+
+          $ACE_ROOT/bin/MakeProjectCreator/config/global.features,
+
          then change the line from "cidl = 0" to "cidl = 1". <br><br>
-          
+
           After this, go back to the $CIAO_ROOT/DAnCE directory to generate your workspace/project or makefile by using MPC.<br>
           After the DAnCE and the tests are build OK, go to the $CIAO_ROOT/DAnCE/tests/NodeApplicationTest directory and make
           sure all the three perl scripts (run_test.pl, run_test_simple.pl and run_test_ex.pl) run successfully.
-          
+
           <br><br>
   </LI>
 
@@ -52,14 +52,14 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
 <UL>
 
   <LI> Change into the $CIAO_ROOT/DAnCE/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code>
-  
+
   <LI> Start the execution manager:
   <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code>
   </LI>
 
   <LI> Start the executor:
   <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattern_deploymentplan.cdp -k file://EM.ior </code>
-  
+
   <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/DAnCE/examples/BasicSP/EC/controller to start the application.
        Please make sure that the component IOR file for the EC component is present when you run this client.
 
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat b/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat
index 6f4bbd25734..9ad8b55bacb 100644
--- a/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat
+++ b/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat
@@ -1,2 +1,2 @@
 AirFrameDevice      corbaloc:iiop:localhost:10000/NodeManager
-TimerDevice         corbaloc:iiop:localhost:20000/NodeManager
\ No newline at end of file
+TimerDevice         corbaloc:iiop:localhost:20000/NodeManager
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl b/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl
index 582b0b95358..7c4dc98c25d 100755
--- a/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl
+++ b/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl
@@ -45,9 +45,9 @@ $SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
 
 $SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
-                             
+
 $SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
-                             "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
+                             "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV1->Spawn ();
 $SV2->Spawn ();
 $SV3->Spawn ();
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
index d3aa1197327..fdeb12c4da8 100644
--- a/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp
@@ -6,13 +6,13 @@
 
   <label>BasicSP-DeploymentPlan</label>
   <UUID>Test_UUID_0000</UUID>
-  <!-- Exactly one realizes 
+  <!-- Exactly one realizes
        This realizes section may also not be right. -->
   <realizes>
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>timeout</name>
       <specificType>IDL:BasicSP/TimeOut:1.0</specificType>
@@ -24,7 +24,7 @@
       <kind>EventConsumer</kind>
     </port>
   </realizes>
-  
+
   <implementation id="BasicSP-BMClosedED-mdd">
     <name>BasicSP-BMClosedED-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -40,7 +40,7 @@
   <implementation id="BasicSP-BMDevice-mdd">
     <name>BasicSP-BMDevice-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
-    
+
     <artifact>BasicSP-BMDevice_exec</artifact>
     <artifact>BasicSP-BMDevice_stub</artifact>
     <artifact>BasicSP-BMDevice_svnt</artifact>
@@ -49,28 +49,28 @@
     <deployRequirement></deployRequirement>
     -->
   </implementation>
-  
+
   <implementation id="BasicSP-BMDisplay-mdd">
     <name>BasicSP-BMDisplay-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
     <artifact>BasicSP-BMDisplay_exec</artifact>
     <artifact>BasicSP-BMDisplay_svnt</artifact>
     <artifact>BasicSP-BMDisplay_stub</artifact>
-    
+
     <!--
       <execParameter></execParameter>
       <deployRequirement></deployRequirement>
     -->
   </implementation>
-  
+
   <implementation id="BasicSP-EC-mdd">
     <name>BasicSP-EC-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
-    
+
     <artifact>BasicSP-EC_stub</artifact>
     <artifact>BasicSP-EC_svnt</artifact>
     <artifact>BasicSP-EC_exec</artifact>
-    
+
     <!--
       <execParameter></execParameter>
       <deployRequirement></deployRequirement>
@@ -103,7 +103,7 @@
         <value>
           <string>AirFrameDevice_001</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
   </instance>
 
@@ -124,7 +124,7 @@
       </value>
     </configProperty>
   </instance>
-  
+
   <instance id="BasicSP-BMDisplay-idd">
     <name>BasicSP-BMDisplay-idd</name>
     <node>AirFrameDevice</node>
@@ -142,7 +142,7 @@
       </value>
     </configProperty>
   </instance>
-  
+
   <instance id="BasicSP-EC-idd">
     <name>BasicSP-EC-idd</name>
     <node>TimerDevice</node>
@@ -159,7 +159,7 @@
         </value>
       </value>
     </configProperty>
-  </instance>  
+  </instance>
 
   <connection>
     <name>datain_data_read</name>
@@ -247,10 +247,10 @@
         </value>
       </value>
     </execParameter>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMClosedED_svnt">
     <name>BMClosedED_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -269,16 +269,16 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMClosedED_stub">
     <name>BMClosedED_stub</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>BMClosedED_stub</location>
-    
+
      <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMDevice_exec">
     <name>BMDevice_exec</name>
     <source><!-- @@ Not sure --></source>
@@ -297,7 +297,7 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMDevice_stub">
     <name>BMDevice_stub</name>
     <source><!-- @@ Not sure --></source>
@@ -305,7 +305,7 @@
     <location>BMDevice_stub</location>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMDevice_svnt">
     <name>BMDevice_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -324,7 +324,7 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMDisplay_exec">
     <name>BMDisplay_exec</name>
     <source><!-- @@ Not sure --></source>
@@ -343,7 +343,7 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMDisplay_svnt">
     <name>BMDisplay_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -362,25 +362,25 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-BMDisplay_stub">
     <name>BMDisplay_stub</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>BMDisplay_stub</location>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-EC_stub">
     <name>EC_stub</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>EC_stub</location>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-EC_svnt">
     <name>EC_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -399,7 +399,7 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="BasicSP-EC_exec">
     <name>EC_exec</name>
     <source><!-- @@ Not sure --></source>
@@ -416,7 +416,7 @@
         </value>
       </value>
     </execParameter>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc
index 9722a2747b9..323b0aeb053 100644
--- a/TAO/CIAO/examples/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc
@@ -8,7 +8,7 @@ project(GPS_DnC_stub): ciao_client_dnc {
   libpaths+=..
   libs += HUDisplay_DnC_stub
   dynamicflags   = GPS_STUB_BUILD_DLL
-  
+
   IDL_Files {
     GPS.idl
   }
@@ -55,7 +55,7 @@ project(GPS_DnC_exec) : ciao_component_dnc {
   }
 
   Source_Files {
-    
+
     GPSEIC.cpp
 
     GPS_exec.cpp
diff --git a/TAO/CIAO/examples/Display/HUDisplay.mpc b/TAO/CIAO/examples/Display/HUDisplay.mpc
index 29016a5c4d6..1290bde29a3 100644
--- a/TAO/CIAO/examples/Display/HUDisplay.mpc
+++ b/TAO/CIAO/examples/Display/HUDisplay.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
 project(HUDisplay_DnC_stub): ciao_client_dnc {
-  
+
   sharedname = HUDisplay_DnC_stub
   idlflags += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h
   dynamicflags   = HUDISPLAY_STUB_BUILD_DLL
@@ -19,20 +19,20 @@ project(HUDisplay_DnC_stub): ciao_client_dnc {
 project(HUDisplay_DnC_svnt) : ciao_servant_dnc {
   after +=  HUDisplay_DnC_stub
   sharedname  = HUDisplay_DnC_svnt
-  libs    += HUDisplay_DnC_stub 
-  
+  libs    += HUDisplay_DnC_stub
+
   //idlflags  +=  -Wb,export_macro=HUDISPLAY_SVNT_Export -Wb,export_include=HUDisplay_svnt_export.h
-  
+
   idlflags  += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h
-  
+
   dynamicflags = HUDISPLAY_SVNT_BUILD_DLL
 
-  
+
 
   Source_Files {
-    
+
     HUDisplayS.cpp
-    
+
   }
 }
 
diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 5aeaaa0ef8a..12505060fdb 100644
--- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -20,7 +20,7 @@ project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
   after += HUDisplay_DnC_svnt NavDisplay_DnC_stub
   sharedname  = NavDisplay_DnC_svnt
   libs    += NavDisplay_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
-  
+
   idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif
index f674369efc4..66da94fb44c 100644
--- a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif
+++ b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif
diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif
index 99fe78a7673..efaf4c37e90 100644
--- a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif
+++ b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif
diff --git a/TAO/CIAO/examples/Display/README.html b/TAO/CIAO/examples/Display/README.html
index 3f6958893db..8bc7ee110bb 100644
--- a/TAO/CIAO/examples/Display/README.html
+++ b/TAO/CIAO/examples/Display/README.html
@@ -53,7 +53,7 @@ the following three components:
 
 
 <li>1. The interfaces,
-data types and exceptions used by the components of this application are 
+data types and exceptions used by the components of this application are
 specified in the
 <a href="HUDisplay.idl"> <code>
 HUDisplay.idl</code></a> file, placed in this example root directory ($CIAO_ROOT/examples/Display).
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
index d063453a020..2ce4b9f6aa0 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -73,6 +73,6 @@ project(RateGen_DnC_exec) : ciao_component_dnc {
       controller.cpp
         }
 }
-					
+
 
 
diff --git a/TAO/CIAO/examples/Display/descriptors/EM.ior b/TAO/CIAO/examples/Display/descriptors/EM.ior
index e177e5d5062..9bead57c287 100644
--- a/TAO/CIAO/examples/Display/descriptors/EM.ior
+++ b/TAO/CIAO/examples/Display/descriptors/EM.ior
@@ -1 +1 @@
-IOR:010000002400000049444c3a4349414f2f457865637574696f6e4d616e616765724461656d6f6e3a312e3000010000000000000078000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000c89f00001b00000014010f00525354ca168142626304000000000001000000010000000002000000000000000800000001000000004f415401000000140000000176e9b601000100000000000901010000000000
\ No newline at end of file
+IOR:010000002400000049444c3a4349414f2f457865637574696f6e4d616e616765724461656d6f6e3a312e3000010000000000000078000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000c89f00001b00000014010f00525354ca168142626304000000000001000000010000000002000000000000000800000001000000004f415401000000140000000176e9b601000100000000000901010000000000
diff --git a/TAO/CIAO/examples/Display/descriptors/GPS.ior b/TAO/CIAO/examples/Display/descriptors/GPS.ior
index d5469764621..3338f591312 100644
--- a/TAO/CIAO/examples/Display/descriptors/GPS.ior
+++ b/TAO/CIAO/examples/Display/descriptors/GPS.ior
@@ -1 +1 @@
-IOR:010000001600000049444c3a4855446973706c61792f4750533a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
\ No newline at end of file
+IOR:010000001600000049444c3a4855446973706c61792f4750533a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
diff --git a/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior b/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior
index 9dc8184f9a9..12ee7567186 100644
--- a/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior
+++ b/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior
@@ -1 +1 @@
-IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e456475000038b100002300000014010f004e535400fa7842a820000001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
\ No newline at end of file
+IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e456475000038b100002300000014010f004e535400fa7842a820000001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
diff --git a/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior b/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior
index 0eefd174095..4fa3741ac5a 100644
--- a/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior
+++ b/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior
@@ -1 +1 @@
-IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000500000001000000060000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
\ No newline at end of file
+IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000500000001000000060000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
diff --git a/TAO/CIAO/examples/Display/descriptors/RateGen.ior b/TAO/CIAO/examples/Display/descriptors/RateGen.ior
index 60326a12b43..e589de21d27 100644
--- a/TAO/CIAO/examples/Display/descriptors/RateGen.ior
+++ b/TAO/CIAO/examples/Display/descriptors/RateGen.ior
@@ -1 +1 @@
-IOR:010000001a00000049444c3a4855446973706c61792f5261746547656e3a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000300000001000000040000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
\ No newline at end of file
+IOR:010000001a00000049444c3a4855446973706c61792f5261746547656e3a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000300000001000000040000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
diff --git a/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
index da93ff1c72d..a3dc38609e7 100755
--- a/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
+++ b/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
@@ -45,9 +45,9 @@ $SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
 
 $SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
                              "-ORBEndpoint iiop://localhost:40000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
-                             
+
 $SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
-                             "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
+                             "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV1->Spawn ();
 $SV2->Spawn ();
 $SV3->Spawn ();
diff --git a/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp
index ddfd9a3ca37..c92a18ffb0c 100644
--- a/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp
@@ -6,13 +6,13 @@
 
   <label>Display-DeploymentPlan</label>
   <UUID><!-- @@ fill in --> </UUID>
-  <!-- Exactly one realizes 
+  <!-- Exactly one realizes
        This realizes section may also not be right. -->
   <realizes>
     <label>HUDisplay-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:HUDisplay/RateGen:1.0</supportedType> 
+    <supportedType>IDL:HUDisplay/RateGen:1.0</supportedType>
     <port>
       <name>Pulse</name>
       <specificType>IDL:HUDisplay/TimeOut:1.0</specificType>
@@ -24,21 +24,21 @@
       <kind>EventPublisher</kind>
     </port>
   </realizes>
-  
+
   <implementation id="HUDisplay-RateGen-mdd">
     <name>HUDisplay-RateGen-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
-    
+
     <artifact>HUDisplay-RateGen_stub</artifact>
     <artifact>HUDisplay-RateGen_svnt</artifact>
     <artifact>HUDisplay-RateGen_exec</artifact>
-    
+
     <!--
       <execParameter></execParameter>
       <deployRequirement></deployRequirement>
     -->
   </implementation>
-  
+
   <implementation id="HUDisplay-GPS-mdd">
     <name>HUDisplay-GPS-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -51,22 +51,22 @@
     -->
   </implementation>
 
-  
-  
-  
+
+
+
   <implementation id="HUDisplay-NavDisplayGUI-mdd">
     <name>HUDisplay-NavDisplayGUI-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
   <artifact>HUDisplay-NavDisplay_stub</artifact>
     <artifact>HUDisplay-NavDisplay_svnt</artifact>
    <artifact>HUDisplay-NavDisplayGUI_exec</artifact>
-    
+
     <!--
       <execParameter></execParameter>
       <deployRequirement></deployRequirement>
     -->
   </implementation>
-  
+
    <instance id="HUDisplay-RateGen-idd">
     <name>HUDisplay-RateGen-idd</name>
     <node>AirFrameDevice</node>
@@ -83,7 +83,7 @@
         </value>
       </value>
     </configProperty>
-  </instance>  
+  </instance>
 
   <instance id="HUDisplay-GPS-idd">
     <name>HUDisplay-GPS-idd</name>
@@ -103,10 +103,10 @@
     </configProperty>
   </instance>
 
- 
-  
 
-  
+
+
+
    <instance id="HUDisplay-NavDisplayGUI-idd">
     <name>HUDisplay-NavDisplayGUI-idd</name>
     <node>AirFrameDevice</node>
@@ -140,7 +140,7 @@
     </internalEndpoint>
   </connection>
 
- 
+
 
   <connection>
     <name>Refresh_Ready</name>
@@ -169,16 +169,16 @@
       <instance>HUDisplay-GPS-idd</instance>
     </internalEndpoint>
   </connection>
-  
+
    <artifact id="HUDisplay-RateGen_stub">
     <name>RateGen_stub</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>RateGen_stub</location>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="HUDisplay-RateGen_svnt">
     <name>RateGen_DnC_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -197,7 +197,7 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="HUDisplay-RateGen_exec">
     <name>RateGen_DnC_exec</name>
     <source><!-- @@ Not sure --></source>
@@ -214,19 +214,19 @@
         </value>
       </value>
     </execParameter>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
+
   <artifact id="HUDisplay-GPS_stub">
     <name>GPS_DnC_stub</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>GPS_DnC_stub</location>
-    
+
      <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact> 
-  
+  </artifact>
+
    <artifact id="HUDisplay-GPS_svnt">
     <name>GPS_DnC_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -245,8 +245,8 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
-  
+
+
   <artifact id="HUDisplay-GPS_exec">
     <name>GPS_DnC_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -263,21 +263,21 @@
         </value>
       </value>
     </execParameter>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
- 
+
+
    <artifact id="HUDisplay-NavDisplay_stub">
     <name>NavDisplay_DnC_stub</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>NavDisplay_DnC_stub</location>
-    
+
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
 
-  
+
   <artifact id="HUDisplay-NavDisplay_svnt">
     <name>NavDisplay_DnC_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -296,11 +296,11 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
- 
 
-  
-  
-  
+
+
+
+
   <artifact id="HUDisplay-NavDisplayGUI_exec">
     <name>NavDisplayGUI_DnC_exec</name>
     <source><!-- @@ Not sure --></source>
@@ -319,7 +319,7 @@
     </execParameter>
     <!-- @@ This has dependancies that need to be specified, how? -->
   </artifact>
-  
-  
- 
-</Deployment:deploymentPlan>  
+
+
+
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index b5c00fea2c8..4bfcf5bcd20 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
 project(Hello_Base_DnC_stub): ciao_client_dnc {
-  
+
   sharedname = Hello_Base_DnC_stub
   idlflags += -Sc \
               -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
@@ -18,11 +18,11 @@ project(Hello_Base_DnC_stub): ciao_client_dnc {
   Source_Files {
     Hello_BaseC.cpp
   }
-  
+
   Header_Files {
     Hello_BaseC.h
   }
-  
+
   Inline_Files {
     Hello_BaseC.inl
   }
@@ -31,14 +31,14 @@ project(Hello_Base_DnC_stub): ciao_client_dnc {
 project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
   after +=  Hello_Base_DnC_stub
   sharedname  = Hello_Base_DnC_svnt
-  libs    += Hello_Base_DnC_stub 
-  
+  libs    += Hello_Base_DnC_stub
+
   idlflags  += -Sc \
                -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
                -Wb,stub_export_include=Hello_Base_stub_export.h \
                -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \
                -Wb,skel_export_include=Hello_Base_svnt_export.h
-  dynamicflags = HELLO_BASE_SVNT_BUILD_DLL 
+  dynamicflags = HELLO_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Hello_Base.idl
@@ -47,11 +47,11 @@ project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
   Source_Files {
     Hello_BaseS.cpp
   }
-  
+
   Header_Files {
     Hello_BaseS.h
   }
-  
+
   Inline_Files {
     Hello_BaseS.inl
   }
diff --git a/TAO/CIAO/examples/Hello/ReDaC-Usage.html b/TAO/CIAO/examples/Hello/ReDaC-Usage.html
index eb9b8c729b7..9b8148c7798 100644
--- a/TAO/CIAO/examples/Hello/ReDaC-Usage.html
+++ b/TAO/CIAO/examples/Hello/ReDaC-Usage.html
@@ -4,7 +4,7 @@
 <!--//$Id$ -->
 
 
-  
+
   <title>ReDaC Service Usage</title>
 </head>
 
@@ -78,7 +78,7 @@ Start NodeManagers (NodeDameons) by running <code>
 run_NodeDaemons.pl </code> </li>
 
 
-  
+
   <ul>
 
 
@@ -87,7 +87,7 @@ run_NodeDaemons.pl </code> </li>
 tutorial page. </li>
 
 
-  
+
   </ul>
 
 
@@ -95,7 +95,7 @@ tutorial page. </li>
 -o EM.ior -i NodeManagerMap.dat </code> </li>
 
 
-  
+
   <ul>
 
 
@@ -105,11 +105,11 @@ the endpoint of each individual NodeManager (i.e., Node Daemon) where
 component(s) will be deployed.</li>
 
 
-  
+
   </ul>
 
 
-  
+
   <ul>
 
 
@@ -118,7 +118,7 @@ component(s) will be deployed.</li>
 tutorial page. </li>
 
 
-  
+
   </ul>
 
 
@@ -127,7 +127,7 @@ $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p
 flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior</code>&nbsp;</li>
 
 
-  
+
   <ul>
 
 
@@ -147,7 +147,7 @@ in the interactive mode. (As a normal user, you don't need to worry
 about the details of what exactly a DomainApplicationManager is.)</li>
 
 
-  
+
   </ul>
 
 
@@ -197,7 +197,7 @@ Deployment" section of this tutorial.<code> </code>
 
 
   <li>
-    
+
     <p> Use ReDaC service through <code>Plan_Launcher</code>'s
 "-r" command line option to perform redeployment and reconfiguration.<br>
 
@@ -212,7 +212,7 @@ additional components to the existing running assembly.</p>
 
 
   <li>
-    
+
     <p>Run the command
     <code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -r
 flattened_deploymentplan_without_ns_remove.cdp </code>will
@@ -253,19 +253,19 @@ changes to the existing plan. One could use <a href="http://www.dre.vanderbilt.e
 <ul>
 
 
-  
+
   <p> You could also use ReDaC service programmatically by writing your
 own client to invoke ReDaC service. Basically, to accomplish this, your
 client program needs to:</p>
 
-  
+
   <ol>
 
     <li>Obtain the&nbsp;<code>ExecutionManager</code> object reference, either through naming service or through IOR file.</li>
 
     <li>Invoke the operation&nbsp;<code>perform_redeployment</code> on this interface by passing a single argument type called&nbsp;<code>DeploymentPlan</code>.</li>
 
-  
+
   </ol>
 
 
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
index 5aa0c89e176..f157495c4b6 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -19,11 +19,11 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
   Source_Files {
     ReceiverC.cpp
   }
-  
+
   Header_Files {
     ReceiverC.h
   }
-  
+
   Inline_Files {
     ReceiverC.inl
   }
@@ -36,7 +36,7 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
   libs    += Receiver_DnC_stub \
              Hello_Base_DnC_stub \
              Hello_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_SVNT_Export \
                 -Wb,export_include=Receiver_svnt_export.h
@@ -76,7 +76,7 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
                Receiver_DnC_svnt \
                Hello_Base_DnC_stub \
                Hello_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_EXEC_Export \
                 -Wb,export_include=Receiver_exec_export.h
@@ -88,10 +88,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Receiver_exec.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
index 318e4c8f3b4..3a1a5d9ade9 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
@@ -28,7 +28,7 @@ namespace CIDL_Receiver_Impl
                 "Receiver - Informed by the Sender \n"));
 
     Hello::ReadMessage_var rev
-      = this->context_->get_connection_read_message 
+      = this->context_->get_connection_read_message
         (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.idl b/TAO/CIAO/examples/Hello/Sender/Sender.idl
index d182b68008c..d5cf61b89cc 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.idl
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.idl
@@ -11,17 +11,17 @@ module Hello
   /* This is a Sender specific interface which will be used to get the
    * process start.
    */
-  
+
   interface trigger
   {
     void start ();
   };
 
-  enum COLOR_SELECTION 
+  enum COLOR_SELECTION
     {
       empty,
-      white, 
-      red, 
+      white,
+      red,
       yellow
     };
 
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
index 45b4dd2db78..a6871565b9b 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
@@ -19,11 +19,11 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
   Source_Files {
     SenderC.cpp
   }
-  
+
   Header_Files {
     SenderC.h
   }
-  
+
   Inline_Files {
     SenderC.inl
   }
@@ -55,13 +55,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
     SenderS.cpp
     Sender_svnt.cpp
   }
-  
+
   Header_Files {
     SenderEC.h
     SenderS.h
     Sender_svnt.h
   }
-  
+
   Inline_Files {
     SenderEC.inl
     SenderS.inl
@@ -87,7 +87,7 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Sender_exec.cpp
   }
-  
+
   Header_Files {
     Sender_exec.h
   }
@@ -104,10 +104,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
   Source_Files {
     starter.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.h b/TAO/CIAO/examples/Hello/Sender/Sender_exec.h
index 043973c0826..6a7c122dad3 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender_exec.h
+++ b/TAO/CIAO/examples/Hello/Sender/Sender_exec.h
@@ -122,7 +122,7 @@ namespace CIDL_Sender_Impl
     CORBA::Long hertz_;
 
     ::Hello::COLOR_SELECTION color_;
-    
+
     friend class Message_Impl;
   };
 
diff --git a/TAO/CIAO/examples/Hello/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp
index 7c647ef01dd..d391aa2aff7 100644
--- a/TAO/CIAO/examples/Hello/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp
@@ -13,26 +13,26 @@ parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:m:");
   int c = 0;
-  
+
   while ((c = get_opts ()) != -1)
     {
       switch (c)
         {
         case 'k':
           ior = get_opts.opt_arg ();
-	        break;
+          break;
 
         case 'm':
-	        message = get_opts.opt_arg ();
-	        break;
+          message = get_opts.opt_arg ();
+          break;
 
         case '?':  // display help for use of the server.
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "Usage:  %s\n"
-			                      "-k <Sender IOR> (default is file://Sender.ior)\n",
-			                      "-m <Message>\n",
-                            argv [0]),
+                             "Usage:  %s\n"
+                             "-k <Sender IOR> (default is file://Sender.ior)\n",
+                             "-m <Message>\n",
+                             argv [0]),
                             -1);
           break;
         }
@@ -42,7 +42,7 @@ parse_args (int argc, char *argv[])
     {
       ior = "file://Sender.ior";
     }
-    
+
   return 0;
 }
 
@@ -73,15 +73,15 @@ main (int argc, char *argv[])
 
       if (CORBA::is_nil (sender.in ()))
         {
-          ACE_ERROR_RETURN ((LM_ERROR, 
+          ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to acquire Sender's objref\n"),
                             -1);
         }
 
       if (message)
-      {
-        sender->local_message (message);
-      }
+        {
+          sender->local_message (message);
+        }
 
       sender->start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/CIAO/examples/Hello/descriptors/Hello.cid b/TAO/CIAO/examples/Hello/descriptors/Hello.cid
index f7abad71ded..31386b59efd 100644
--- a/TAO/CIAO/examples/Hello/descriptors/Hello.cid
+++ b/TAO/CIAO/examples/Hello/descriptors/Hello.cid
@@ -10,7 +10,7 @@
     <instance xmi:id="a_Sender">
       <name>Sender_Instance</name>
       <package href="Sender.cpd"/>
-      
+
 		  <configProperty>
 		    <name>ComponentIOR</name>
 		    <value>
@@ -22,7 +22,7 @@
 		      </value>
 		    </value>
 		  </configProperty>
-		  
+
 		  <configProperty>
 		    <name>local_message</name>
 		    <value>
@@ -34,7 +34,7 @@
 		      </value>
 		    </value>
 		  </configProperty>
-        
+
 		  <configProperty>
 		    <name>hertz</name>
 		    <value>
@@ -47,13 +47,13 @@
 		    </value>
 		  </configProperty>
     </instance>
-    
-		<!-- ***************************** -->    
-    
+
+		<!-- ***************************** -->
+
     <instance xmi:id="a_Receiver">
       <name>Receiver_Instance</name>
       <package href="Receiver.cpd"/>
-      
+
 		  <configProperty>
 		    <name>ComponentIOR</name>
 		    <value>
@@ -66,7 +66,7 @@
 		    </value>
 		  </configProperty>
     </instance>
-    
+
     <connection>
       <name>Messages</name>
       <internalEndpoint>
diff --git a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
index 7192a2bc061..31dfaa5c81e 100644
--- a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
@@ -1,4 +1,4 @@
-<!-- This flattened deployment plan allows component instance to 
+<!-- This flattened deployment plan allows component instance to
      register to naming service, if you don't want to use naming
      service at all, you can use the flattened_deployment_without_ns.cdp
      as your deployment descriptor. -->
@@ -16,7 +16,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -28,7 +28,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -81,7 +81,7 @@
         <value>
           <string>Sender_001</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
 
     <!-- Add this property if you want to initialize component attribute -->
@@ -94,7 +94,7 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
@@ -183,7 +183,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -201,7 +201,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -219,7 +219,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -237,4 +237,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
index 8b42fa056ef..9212b855367 100644
--- a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
@@ -11,7 +11,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -23,7 +23,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -75,9 +75,9 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
-        
+
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
       <name>color</name>
@@ -165,7 +165,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -183,7 +183,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -201,7 +201,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -219,4 +219,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test.pl b/TAO/CIAO/examples/Hello/descriptors/run_test.pl
index cfb0e0e9e49..1e3917dffa9 100755
--- a/TAO/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/TAO/CIAO/examples/Hello/descriptors/run_test.pl
@@ -38,7 +38,7 @@ sub delete_ior_files {
     unlink PerlACE::LocalFile ("Receiver.ior");
     unlink PerlACE::LocalFile ("Sender.ior");
     unlink PerlACE::LocalFile ("DAM.ior");
-    unlink PerlACE::LocalFile ("ns.ior");    
+    unlink PerlACE::LocalFile ("ns.ior");
 }
 
 sub kill_node_daemons {
@@ -56,11 +56,11 @@ sub kill_open_processes {
     $EM->Kill ();
     $EM->TimedWait (1);
   }
-  
+
   if ($ns_running == 1) {
     $NS->Kill ();
     $NS->TimedWait (1);
-  }  
+  }
 
 }
 
@@ -135,7 +135,7 @@ if (PerlACE::waitforfile_timed ("EM.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR
       "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
@@ -146,21 +146,21 @@ print "Invoking executor - start the application -\n";
 $E =
   new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
                         "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior");
- 
+
 $E->SpawnWaitKill (5000);
 
 if (PerlACE::waitforfile_timed (
       "Receiver.ior",
       $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of receiver could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
 if (PerlACE::waitforfile_timed ("Sender.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of sender could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index c0659c4299f..10a167a513e 100755
--- a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -104,7 +104,7 @@ if (PerlACE::waitforfile_timed ("EM.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR
       "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
@@ -115,21 +115,21 @@ print "Invoking executor - start the application -\n";
 $E =
   new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
                         "-p flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior");
- 
+
 $E->SpawnWaitKill (5000);
 
 if (PerlACE::waitforfile_timed (
       "Receiver.ior",
       $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of receiver could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
 if (PerlACE::waitforfile_timed ("Sender.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of sender could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr b/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr
index a3881225930..1fd5b174edf 100644
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr
+++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr
@@ -4,17 +4,17 @@
  xmlns:xmi="http://www.omg.org/XMI"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd">
-  
+
   <cmdline>
     <arg> -ORBDebugLevel 10 -ORBEndpoint corbaloc://foo/bar</arg>
   </cmdline>
-  
+
   <svcconf>
     <uri>
       svcconf.uri
     </uri>
   </svcconf>
-  
+
   <orbConfigs>
     <resources>
       <threadpool id="threadpool-1">
@@ -26,7 +26,7 @@
         <max_buffered_requests>10</max_buffered_requests>
         <max_request_buffered_size>20</max_request_buffered_size>
       </threadpool>
-      
+
       <threadpoolWithLanes id="threadpool-2">
         <threadpoolLane>
           <static_threads>50</static_threads>
@@ -39,7 +39,7 @@
         <max_buffered_requests>10</max_buffered_requests>
         <max_request_buffered_size>20</max_request_buffered_size>
       </threadpoolWithLanes>
-      
+
       <connectionBands id="cb-1">
         <band>
           <low>0</low>
@@ -51,7 +51,7 @@
         </band>
       </connectionBands>
     </resources>
-    
+
     <policySet id="test_policy_set_id">
       <priorityModel server_priority="10">
         <priority_model>SERVER_DECLARED</priority_model>
@@ -59,12 +59,12 @@
       <priorityModel>
         <priority_model>CLIENT_PROPAGATED</priority_model>
       </priorityModel>
-      
+
       <threadpool>threadpool-1</threadpool>
       <threadpool>threadpool-2</threadpool>
-      
+
       <priorityBandedConnection>cb-1</priorityBandedConnection>
-      
+
     </policySet>
   </orbConfigs>
-</CIAO:ServerResources>
\ No newline at end of file
+</CIAO:ServerResources>
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp
index 72e1694b1c3..cfd0688d09e 100644
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:deploymentPlan 
- xmlns:Deployment="http://www.omg.org/Deployment" 
- xmlns:xmi="http://www.omg.org/XMI" 
+<Deployment:deploymentPlan
+ xmlns:Deployment="http://www.omg.org/Deployment"
+ xmlns:xmi="http://www.omg.org/XMI"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.omg.org/Deployment Modified_Deployment.xsd">
 
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr
index 9c63f545984..b55d7ee52e5 100644
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr
+++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr
@@ -5,17 +5,17 @@
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd"
  id="test_server_resource_id">
-  
+
   <cmdline>
     <arg> -ORBDebugLevel 10 -ORBEndpoint corbaloc://foo/bar</arg>
   </cmdline>
-  
+
   <svcconf>
     <uri>
       svcconf.uri
     </uri>
   </svcconf>
-  
+
   <orbConfigs>
     <resources>
       <threadpool id="threadpool-1">
@@ -57,7 +57,7 @@
         </band>
       </connectionBands>
     </resources>
-    
+
     <policySet id="test_policy_set_id">
       <priorityModel server_priority="1">
         <priority_model>SERVER_DECLARED</priority_model>
@@ -70,6 +70,6 @@
       </priorityModel>
       <threadpool>threadpool-2</threadpool>
     </policySet>
-    
+
   </orbConfigs>
-</CIAO:ServerResources>
\ No newline at end of file
+</CIAO:ServerResources>
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
index 10317dbe33e..4254e37e723 100644
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
@@ -11,7 +11,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -23,7 +23,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -75,9 +75,9 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
-        
+
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
       <name>color</name>
@@ -195,7 +195,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -213,7 +213,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -231,7 +231,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -262,4 +262,4 @@
     </value>
   </infoProperty>
 
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
index a790fef1be0..35bf89a3dd8 100644
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
+++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
@@ -109,7 +109,7 @@ if (PerlACE::waitforfile_timed ("EM.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR
       "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
@@ -120,21 +120,21 @@ print "Invoking executor - start the application -\n";
 $E =
   new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
                         "-p rt-example.cdp -k file://EM.ior -o DAM.ior");
- 
+
 $E->SpawnWaitKill (5000);
 
 if (PerlACE::waitforfile_timed (
       "Receiver.ior",
       $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of receiver could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
 if (PerlACE::waitforfile_timed ("Sender.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of sender could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
index 8b42fa056ef..9212b855367 100644
--- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
@@ -11,7 +11,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -23,7 +23,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -75,9 +75,9 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
-        
+
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
       <name>color</name>
@@ -165,7 +165,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -183,7 +183,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -201,7 +201,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -219,4 +219,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
index 3cd860509a6..e3d8b012065 100644
--- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
@@ -11,7 +11,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -23,7 +23,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -75,9 +75,9 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
-        
+
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
       <name>color</name>
@@ -210,7 +210,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -228,7 +228,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -246,7 +246,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -264,4 +264,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
index 6a34f62e7b0..6a7b964dca8 100644
--- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
@@ -11,7 +11,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -23,7 +23,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -75,9 +75,9 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
-        
+
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
       <name>color</name>
@@ -166,7 +166,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -184,7 +184,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -202,7 +202,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -220,4 +220,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp b/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
index 7192a2bc061..31dfaa5c81e 100644
--- a/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
@@ -1,4 +1,4 @@
-<!-- This flattened deployment plan allows component instance to 
+<!-- This flattened deployment plan allows component instance to
      register to naming service, if you don't want to use naming
      service at all, you can use the flattened_deployment_without_ns.cdp
      as your deployment descriptor. -->
@@ -16,7 +16,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -28,7 +28,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -81,7 +81,7 @@
         <value>
           <string>Sender_001</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
 
     <!-- Add this property if you want to initialize component attribute -->
@@ -94,7 +94,7 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
@@ -183,7 +183,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -201,7 +201,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -219,7 +219,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -237,4 +237,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
index c8bf5543c05..292c7d3f6c0 100644
--- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
@@ -11,7 +11,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -23,7 +23,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -75,9 +75,9 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
-        
+
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
       <name>color</name>
@@ -167,7 +167,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -185,7 +185,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -203,7 +203,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -221,4 +221,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
index 4565256398b..215e6729a14 100644
--- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
@@ -11,7 +11,7 @@
     <label>BasicSP-realizes-cid</label>
     <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
     <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
     <port>
       <name>read_message</name>
       <specificType>IDL:Hello/ReadMessage:1.0</specificType>
@@ -23,7 +23,7 @@
       <kind>SimplexReceptacle</kind>
     </port>
   </realizes>
-  
+
   <implementation id="Hello-Sender-mdd">
     <name>Hello-Sender-mdd</name>
     <source><!-- @@ Don't know what goes here --></source>
@@ -75,9 +75,9 @@
         <value>
           <string>This is a test message passed in through XML.</string>
         </value>
-      </value> 
+      </value>
     </configProperty>
-        
+
     <!-- This attribute initializes an enumerated value -->
     <configProperty>
       <name>color</name>
@@ -113,9 +113,9 @@
         </type>
         <value>
           <!-- ****************************************
-               This IOR file should NOT be generated. 
-               DAnCE should NOT create this component instance 
-               because it is a "shared" component  
+               This IOR file should NOT be generated.
+               DAnCE should NOT create this component instance
+               because it is a "shared" component
                **************************************** -->
           <string>Receiver_new_component.ior</string>
         </value>
@@ -172,7 +172,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Sender_svnt">
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -190,7 +190,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_exec">
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
@@ -208,7 +208,7 @@
       </value>
     </execParameter>
   </artifact>
-  
+
   <artifact id="Hello-Receiver_svnt">
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
@@ -226,4 +226,4 @@
       </value>
     </execParameter>
   </artifact>
-</Deployment:deploymentPlan>  
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/examples/Hello/step-by-step.html b/TAO/CIAO/examples/Hello/step-by-step.html
index cb73707d0b7..bf7e77da1e2 100644
--- a/TAO/CIAO/examples/Hello/step-by-step.html
+++ b/TAO/CIAO/examples/Hello/step-by-step.html
@@ -45,7 +45,7 @@ This Hello example is contructed in the following ways:
     interface <code>ReadMessage</code>, which are used by both the
     Sender and the Receiver, so we put both of them in Hello.idl.</li>
     <P>
-    
+
 <li>Look at the <code>Hello_Base.mpc</code> file to get an idea how the Hello_Base_stub and Hello_Base_svnt projects are organized. <a href="http://downloads.ociweb.com/MPC/MakeProjectCreator.pdf">MPC</a> is a utility we used to generate makefiles or VC project/solution files for all <a href="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</a>, <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a> and <a href="http://www.cs.wustl.edu/~schmidt/CIAO.html">CIAO</a> libraries.</li>
 </Ol>
 
@@ -132,12 +132,12 @@ Receiver. However, you need to change the Sender.idl to make it
 <li> Please make sure that the Modified_Deployment.xsd and XMI.xsd files are in the Hello/descriptors directory.
 The former file could be found in $CIAO_ROOT/docs/schema directory. <P>
 
-<li> Create the <em>NodeManagerMap.dat</em> file containing the CORBALOC IIOP address of each <code>NodeManager</code> 
-     where it is running. Please refer to the existing <code>NodeManagerMap.dat</code> for details, 
-     as you can see, we only specify 2 <code>NodeManagers</code>, which means these two components 
+<li> Create the <em>NodeManagerMap.dat</em> file containing the CORBALOC IIOP address of each <code>NodeManager</code>
+     where it is running. Please refer to the existing <code>NodeManagerMap.dat</code> for details,
+     as you can see, we only specify 2 <code>NodeManagers</code>, which means these two components
      will be installed in the different <code>NodeApplication</code> server. Please refer to the
      <em>flattened_deploymentplan.cdp</em> file to see how a deployer
-    could specify the mapping between components and nodes.</li> 
+    could specify the mapping between components and nodes.</li>
 
 Note: Creating the deployment plan descriptor is a tedious and
     error-prone job, you can download <a
@@ -158,26 +158,26 @@ Finally you are ready to deploy the component-based application you have develop
 
   <LI> Go into the <em> descriptors </em> directory Start NodeManagers
       (NodeDameon) by running <code> run_NodeDaemons.pl </code> <P>
-  
+
   <LI> Start the execution manager:
   <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code>
   </LI>
-  
-  <ul type="square"> <li> <em>NOTE</em>: As one can see, we use the "NodeManagerMap.dat" file to instruct the 
+
+  <ul type="square"> <li> <em>NOTE</em>: As one can see, we use the "NodeManagerMap.dat" file to instruct the
        Execution_Manager how to find the endpoint of each individual NodeManager (i.e., Node Daemon) where
        component(s) will be deployed, so this is non-standard. We plan to use Naming Service to do this in the future.
   </ul><P>
 
   <LI> Start the plan launcher:
   <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp -k file://EM.ior </code>
-  
+
   <ul type="square"> <li> If you don't want to register component(s) with CORBA naming service, then you don't have to start
   your naming service, and you can use the below code to start the executor:
-  
+
   <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan_without_ns.cdp -k file://EM.ior </code><P>
-  
+
   After this, components should be deployed successfully. </ul><P>
-  
+
   <LI> You can go into the <em>
       $CIAO_ROOT/DAnCE/examples/Hello/descriptor </em> directory and
       run the
diff --git a/TAO/CIAO/examples/Philosophers/README b/TAO/CIAO/examples/Philosophers/README
index 96a56e61b73..fcaf73fc4a6 100644
--- a/TAO/CIAO/examples/Philosophers/README
+++ b/TAO/CIAO/examples/Philosophers/README
@@ -1 +1 @@
-This example is unfinished.
\ No newline at end of file
+This example is unfinished.
diff --git a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
index 22c0598f8a7..3e12160cb00 100644
--- a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
 project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc {
-  
+
   sharedname = Hello_Base_DnC_Upgradeable_stub
   idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export -Wb,stub_export_include=Hello_Base_stub_export.h -Wb,skel_export_macro=HELLO_BASE_SVNT_Export -Wb,skel_export_include=Hello_Base_svnt_export.h
   dynamicflags   = HELLO_BASE_STUB_BUILD_DLL
@@ -19,8 +19,8 @@ project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc {
 project(Hello_Base_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   after +=  Hello_Base_DnC_Upgradeable_stub
   sharedname  = Hello_Base_DnC_Upgradeable_svnt
-  libs    += Hello_Base_DnC_Upgradeable_stub 
-  
+  libs    += Hello_Base_DnC_Upgradeable_stub
+
   idlflags  += -Wb,stub_export_macro=HELLO_BASE_STUB_Export -Wb,stub_export_include=Hello_Base_stub_export.h -Wb,skel_export_macro=HELLO_BASE_SVNT_Export -Wb,skel_export_include=Hello_Base_svnt_export.h
   dynamicflags = HELLO_BASE_SVNT_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
index 6dfd8271a73..2366b57c08c 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -21,7 +21,7 @@ project(Hello_Base_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   after += Hello_Base_DnC_Upgradeable_svnt Hello_Base_Receiver_DnC_Upgradeable_stub
   sharedname  = Receiver_DnC_Upgradeable_svnt
   libs    += Receiver_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-  
+
   idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
   cidlflags -= --
@@ -47,7 +47,7 @@ project(Hello_Base_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc {
   after   += Hello_Base_Receiver_DnC_Upgradeable_svnt
   sharedname = Receiver_DnC_Upgradeable_exec
   libs      += Receiver_DnC_Upgradeable_stub Receiver_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-  
+
   idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
index e4f4691c9b1..d91539ae57a 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
@@ -50,7 +50,7 @@ namespace CIDL_Receiver_Impl
                 "Receiver - Informed by the Sender \n"));
 
     Hello::ReadMessage_var rev
-      = this->context_->get_connection_read_message 
+      = this->context_->get_connection_read_message
         (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
@@ -173,17 +173,17 @@ namespace CIDL_Receiver_Impl
                      Components::CCMException))
   {
     Components::EnterpriseComponent_ptr tmp;
-      
+
     ACE_NEW_THROW_EX (tmp,
                       ReceiverSwap_exec_i,
                       CORBA::NO_MEMORY ());
-   
-    /* 
+
+    /*
     ACE_NEW_THROW_EX (tmp,
                       Receiver_exec_i,
                       CORBA::NO_MEMORY ());
     */
-   
+
     return tmp;
   }
 
diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h
index e05ff6a138f..beb75f1b211 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h
@@ -25,8 +25,8 @@ namespace CIDL_Receiver_Impl
    */
 
   class RECEIVER_EXEC_Export ReceiverSwap_exec_i :
-      public virtual CIAO::Swap_Exec,
-      public virtual TAO_Local_RefCounted_Object
+    public virtual CIAO::Swap_Exec,
+    public virtual TAO_Local_RefCounted_Object
   {
   public:
     ReceiverSwap_exec_i ();
@@ -43,8 +43,8 @@ namespace CIDL_Receiver_Impl
   };
 
   class RECEIVER_EXEC_Export Receiver_exec_i :
-          public virtual Receiver_Exec,
-	  public virtual TAO_Local_RefCounted_Object
+    public virtual Receiver_Exec,
+    public virtual TAO_Local_RefCounted_Object
   {
 
   public:
@@ -117,7 +117,7 @@ namespace CIDL_Receiver_Impl
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
-  
+
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
   createReceiverHome_Impl (void);
 }
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.idl b/TAO/CIAO/examples/Swapping/Sender/Sender.idl
index e2c8ca64b0e..0f89e1d6119 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender.idl
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender.idl
@@ -11,7 +11,7 @@ module Hello
   /* This is a Sender specific interface which will be used to get the
    * process start.
    */
-  
+
   interface trigger
   {
     void start ();
diff --git a/TAO/CIAO/examples/Swapping/Sender/starter.cpp b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
index c88771ea568..3f795c2aefc 100644
--- a/TAO/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
@@ -13,27 +13,27 @@ parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:m");
   int c = 0;
-  
+
   while ((c = get_opts ()) != -1)
     {
       switch (c)
         {
         case 'k':
           ior = get_opts.opt_arg ();
-	        break;
+          break;
 
         case 'm':
-	        message = get_opts.opt_arg ();
-	        break;
+          message = get_opts.opt_arg ();
+          break;
 
         case '?':  // display help for use of the server.
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "usage:  %s\n"
-			    "-k <Sender IOR> (default is file://sender.ior)\n",
-			    "-m <Message> (default is starters message)\n"
-			    "\n",
-                            argv [0]),
+                             "usage:  %s\n"
+                             "-k <Sender IOR> (default is file://sender.ior)\n",
+                             "-m <Message> (default is starters message)\n"
+                             "\n",
+                             argv [0]),
                             -1);
           break;
         }
@@ -43,7 +43,7 @@ parse_args (int argc, char *argv[])
     {
       ior = "file://sender.ior";
     }
-    
+
   return 0;
 }
 
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
 
       if (CORBA::is_nil (sender.in ()))
         {
-          ACE_ERROR_RETURN ((LM_ERROR, 
+          ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to acquire Sender's objref\n"),
                             -1);
         }
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl b/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl
index d363628c891..f9f1b747279 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl
@@ -20,7 +20,7 @@ module Benchmark
    * @interface RoundTrip
    *
    * This Latency test provides operations to measure the round-trip
-   * latency of the ORB. The interface is  same as that of 
+   * latency of the ORB. The interface is  same as that of
    * $TAO_ROOT/performance-tests/Latency/Single_Threaded
    */
 
@@ -37,7 +37,7 @@ module Benchmark
    *
    * This interface is used to start the tests.
    */
-  interface Controller 
+  interface Controller
   {
     /// Start the test
     void start ();
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index 32f12acaa2e..c04f758a3bd 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 project(Benchmark_stub): ciao_client_dnc {
 
@@ -32,7 +32,7 @@ project(Benchmark_svnt) : ciao_component_dnc {
 
 project (*server) : taoserver, strategies,ciao_component_dnc {
   after += Benchmark_svnt
-  libs += Benchmark_svnt Benchmark_stub 
+  libs += Benchmark_svnt Benchmark_stub
 
   Source_Files {
     server.cpp
@@ -40,7 +40,7 @@ project (*server) : taoserver, strategies,ciao_component_dnc {
     BenchmarkEC.cpp
     BenchmarkES.cpp
   }
-  
+
   IDL_Files {
 	BenchmarkE.idl
   }
diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt
index a0ae140a0ee..e1ed8e75a32 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt
+++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt
@@ -2,7 +2,7 @@ $Id$
 
 PRE Condition:
 =============
-This test assumes that there is an appropriate svc.conf file present in 
+This test assumes that there is an appropriate svc.conf file present in
 $CIAO_ROOOT/tools/ComponentServer. Moreover, the Component Server does not
 curerntly expose interfaces to configure multi-threading. Hence, this
 experiment, will produce the desired results *only* when this feature has been
@@ -11,5 +11,5 @@ added in CIAO. Till then, the server will run in single-threaded mode.
 Similarly, the client also requires the svc.conf file that enables
 multi-threading. This file is present in this directory.
 
-The svc.conf file required for this experiment can be obtained from 
+The svc.conf file required for this experiment can be obtained from
 $TAO_ROOT/performance-tests/Latency/Thread_Pool
diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README
index 0cadcfc8e51..24a6ed860b6 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README
+++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README
@@ -1,12 +1,12 @@
 /**
 
 @page Multi_Threaded README File
-      
-      This black box experiment measures "multi-threading" support present in CIAO. 
-In this test, a client component spawns four threads that concurrently invoke operations 
+
+      This black box experiment measures "multi-threading" support present in CIAO.
+In this test, a client component spawns four threads that concurrently invoke operations
 on the server. The latency, throughput and jitter for each thread is printed out. The
-motivation of this test is to observe scalability when a ComponentServer receives 
-multiple requests from parallel clients. A sister test, ../Multi_Process documents 
+motivation of this test is to observe scalability when a ComponentServer receives
+multiple requests from parallel clients. A sister test, ../Multi_Process documents
 behavior as parallel clients (separate processes) invoke requests on the server.
 
 */
diff --git a/TAO/CIAO/performance-tests/Benchmark/README b/TAO/CIAO/performance-tests/Benchmark/README
index ec8463d2aae..972473f5b33 100644
--- a/TAO/CIAO/performance-tests/Benchmark/README
+++ b/TAO/CIAO/performance-tests/Benchmark/README
@@ -4,9 +4,9 @@
 
       The most basic of the Boeing scenarios that form part of the
 OEP. This is done to illustrate how the OEP can be implemented using
-CIAO. 
+CIAO.
 
-      This example does not yet use MPC to generate MSVC 
+      This example does not yet use MPC to generate MSVC
 projects/workspaces/solutions or makefiles - we are still
 working on getting the execution of the CIDL compiler
 integrated into MPC. The CIDL compiler execution has
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README
index 8bd003eaf72..8fad0d190cb 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README
@@ -2,8 +2,8 @@
 
 @page RoundTrip README File
 
-      The RoundTrip component. This component measures the round-trip 
-latency for single-threaded case. This test adapted from 
+      The RoundTrip component. This component measures the round-trip
+latency for single-threaded case. This test adapted from
 $TAO_ROOT/performance-tests/Latency/Single_Threaded
 
 */
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 793f486cbbf..57e8ed9c264 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -7,9 +7,9 @@ project(RoundTrip_stub): ciao_client_dnc {
 
   libs     += Benchmark_stub
 
-  idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export 
-  idlflags += -Wb,stub_export_include=RoundTrip_stub_export.h 
-  idlflags += -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export
+  idlflags += -Wb,stub_export_include=RoundTrip_stub_export.h
+  idlflags += -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export
   idlflags += -Wb,skel_export_include=RoundTrip_svnt_export.h
 
   dynamicflags   = ROUNDTRIP_STUB_BUILD_DLL
@@ -31,7 +31,7 @@ project(RoundTrip_svnt) : ciao_servant_dnc {
 
   libpaths += ..
 
-  idlflags +=  -Wb,export_macro=ROUNDTRIP_SVNT_Export 
+  idlflags +=  -Wb,export_macro=ROUNDTRIP_SVNT_Export
   idlflags += -Wb,export_include=RoundTrip_svnt_export.h
 
   dynamicflags = ROUNDTRIP_SVNT_BUILD_DLL
@@ -59,7 +59,7 @@ project(RoundTrip_exec) : ciao_component_dnc {
   libs     += RoundTrip_stub Benchmark_stub Benchmark_svnt RoundTrip_svnt
   libpaths += ..
 
-  idlflags +=  -Wb,export_macro=ROUNDTRIP_EXEC_Export 
+  idlflags +=  -Wb,export_macro=ROUNDTRIP_EXEC_Export
   idlflags += -Wb,export_include=RoundTrip_exec_export.h
 
   dynamicflags   = ROUNDTRIP_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
index a28de5948d2..b42a56eb907 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
@@ -5,7 +5,7 @@
  * @file RoundTripEI.idl
  *
  *
- * @author 
+ * @author
  */
 //=============================================================================
 
@@ -24,7 +24,7 @@ module Benchmark
    * define the component executor interface explicitly here.
    */
   local interface RoundTrip_Exec : CCM_RoundTrip, CCM_LatencyTest,
-				 Components::SessionComponent
+                                   Components::SessionComponent
   {
   };
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf
index e1706aae4e5..071cb24a082 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf
@@ -1,5 +1,5 @@
 #
-# $Id$ 
+# $Id$
 #
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index ee44efc892a..4cce64553db 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -7,9 +7,9 @@ project(RoundTripClient_stub): ciao_client_dnc {
 
   libs     += Benchmark_stub
 
-  idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export 
-  idlflags += -Wb,stub_export_include=RoundTripClient_stub_export.h 
-  idlflags += -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export
+  idlflags += -Wb,stub_export_include=RoundTripClient_stub_export.h
+  idlflags += -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export
   idlflags += -Wb,skel_export_include=RoundTripClient_svnt_export.h
 
   dynamicflags   = ROUNDTRIPCLIENT_STUB_BUILD_DLL
@@ -29,7 +29,7 @@ project(RoundTripClient_svnt) : ciao_servant_dnc {
   libs    += RoundTripClient_stub Benchmark_stub Benchmark_svnt
   libpaths += ..
 
-  idlflags +=  -Wb,export_macro=ROUNDTRIPCLIENT_SVNT_Export 
+  idlflags +=  -Wb,export_macro=ROUNDTRIPCLIENT_SVNT_Export
   idlflags +=-Wb,export_include=RoundTripClient_svnt_export.h
 
   dynamicflags = ROUNDTRIPCLIENT_SVNT_BUILD_DLL
@@ -59,7 +59,7 @@ project(RoundTripClient_exec) : ciao_component_dnc {
 
   libpaths += ..
 
-  idlflags  += -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export 
+  idlflags  += -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export
   idlflags  += -Wb,export_include=RoundTripClient_exec_export.h
 
   dynamicflags   = ROUNDTRIPCLIENT_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
index d9009c56e8a..d2aad00938b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
@@ -5,7 +5,7 @@
  * @file RoundTripClientEI.idl
  *
  *
- * @author 
+ * @author
  */
 //=============================================================================
 
@@ -24,8 +24,8 @@ module Benchmark
    * define the component executor interface explicitly here.
    */
   local interface RoundTripClient_Exec : CCM_RoundTripClient,
-					 Components::SessionComponent,
-					 CCM_Controller //Monolithic
+                                         Components::SessionComponent,
+                                         CCM_Controller //Monolithic
   {
   };
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl
index b7f83dbedd8..57af615669e 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl
@@ -1,5 +1,5 @@
 //
-// $Id$ 
+// $Id$
 //
 
 /// Measure roundtrip delay
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index c6f2f81ae0c..1a48222b34f 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #include "LatencyTest.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad b/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad
index 0c0be0cb71c..feca2a714e1 100644
--- a/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad
+++ b/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad
@@ -19,8 +19,8 @@
         <componentfileref idref="com-RoundTrip"/>
         <componentinstantiation id="a_RoundTrip"/>
       </homeplacement>
-    
-    <processcollocation> 
+
+    <processcollocation>
       <homeplacement id="a_RoundTripClientHome">
         <componentfileref idref="com-RoundTripClient"/>
         <componentinstantiation id="a_RoundTripClient">
@@ -29,7 +29,7 @@
           </registercomponent>
 	</componentinstantiation>
       </homeplacement>
-    
+
 
       <homeplacement id="b_RoundTripClientHome">
 	<componentfileref idref="com-RoundTripClient"/>
@@ -48,8 +48,8 @@
             </registercomponent>
 	  </componentinstantiation>
 	</homeplacement>
-	
-	
+
+
 	<homeplacement id="d_RoundTripClientHome">
 	  <componentfileref idref="com-RoundTripClient"/>
           <componentinstantiation id="d_RoundTripClient">
@@ -60,7 +60,7 @@
 	</homeplacement>
 	<destination>Remote</destination>
     </processcollocation>
-      
+
   </partitioning>
 
 
@@ -86,7 +86,7 @@
         <componentinstantiationref idref="a_RoundTrip"/>
       </providesport>
     </connectinterface>
-  
+
    <connectinterface>
       <usesport>
         <usesidentifier>latency</usesidentifier>
diff --git a/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt b/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt
index 7bcd2fbfade..a9b27abedd8 100644
--- a/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt
+++ b/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt
@@ -39,10 +39,10 @@ test.dat:
                  the RoundTrip component on the location given in test.dat.
   RoundTripClient.cad : A descriptor file for the client component
                         RoundTripClient that uses the interface provided by
-                        RoundTrip. 
+                        RoundTrip.
   Test-IOR.cad: This cad file should be used to for testing a CORBA server
                 with a CIAO client. The IOR of the server should added in
-                this file. 
+                this file.
 
 There are automated perl scripts that can run the tests to generate the
 required results. These are located in the individual component directories
@@ -50,7 +50,7 @@ Round Trip and RoundTripClient. The descriptors directory has the required
 .cad files that specify the component configuration used in the various
 experiments.
 
-To run a simple CORBA component with a normal client: 
+To run a simple CORBA component with a normal client:
   cd descriptors;
   ../Roundtrip/run_test.pl
 
@@ -60,6 +60,6 @@ To run a simple CORBA component with a normal client:
   server. Statistics are printed for RoundTrip latency jitter etc
 
  cd descritors;
- ../RoundTripClient/run_test_ior_cad.pl 
- Script runs a CORBA server and a CIAO component that acts as a client. 
+ ../RoundTripClient/run_test_ior_cad.pl
+ Script runs a CORBA server and a CIAO component that acts as a client.
  Similar statistics are printed.
diff --git a/TAO/CIAO/performance-tests/Benchmark/server.cpp b/TAO/CIAO/performance-tests/Benchmark/server.cpp
index 345610c1eb2..fa0bdba0bbd 100644
--- a/TAO/CIAO/performance-tests/Benchmark/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/server.cpp
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #include "LatencyTest.h"
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/svc.conf b/TAO/CIAO/performance-tests/Benchmark/svc.conf
index 7b8129f5667..9e0c5ed01ed 100644
--- a/TAO/CIAO/performance-tests/Benchmark/svc.conf
+++ b/TAO/CIAO/performance-tests/Benchmark/svc.conf
@@ -1,5 +1,5 @@
 #
-# $Id$ 
+# $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl
index e76f0922215..4dbc0045b20 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl
@@ -12,8 +12,8 @@ module Protocols
         THROUGHPUT,
         LATENCY
       };
-    
-    void start (in unsigned long iterations, 
+
+    void start (in unsigned long iterations,
                 in unsigned long invocation_rate,
                 in boolean count_missed_end_deadlines,
                 in boolean do_dump_history,
diff --git a/TAO/CIAO/performance-tests/Protocols/common/Protocols.idl b/TAO/CIAO/performance-tests/Protocols/common/Protocols.idl
index 580167f57b3..aa27247af96 100644
--- a/TAO/CIAO/performance-tests/Protocols/common/Protocols.idl
+++ b/TAO/CIAO/performance-tests/Protocols/common/Protocols.idl
@@ -17,15 +17,15 @@ module Protocols
     oneway void oneway_sync ();
 
     void twoway_sync ();
-  
+
     typedef sequence<octet> octets;
 
     oneway void oneway_method (in long session_id,
                                in unsigned long iteration,
                                in octets payload);
-  
+
     void twoway_method (inout long session_id,
                         inout unsigned long iteration,
-                        inout octets payload);  
+                        inout octets payload);
   };
 };
diff --git a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 43caa154675..1b3b8957da1 100644
--- a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
 project(Protocols_stub): ciao_client_dnc {
-  
+
   sharedname = Protocols_stub
   idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export -Wb,stub_export_include=Protocols_stub_export.h -Wb,skel_export_macro=PROTOCOLS_SVNT_Export -Wb,skel_export_include=Protocols_svnt_export.h
   dynamicflags   = PROTOCOLS_STUB_BUILD_DLL
@@ -19,8 +19,8 @@ project(Protocols_stub): ciao_client_dnc {
 project(Protocols_svnt) : ciao_servant_dnc {
   after +=  Protocols_stub
   sharedname  = Protocols_svnt
-  libs    += Protocols_stub 
-  
+  libs    += Protocols_stub
+
   idlflags  +=  -Wb,export_macro=PROTOCOLS_SVNT_Export -Wb,export_include=Protocols_svnt_export.h
   dynamicflags = PROTOCOLS_SVNT_BUILD_DLL
 
diff --git a/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd b/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd
index 83f896c5416..765feb3d642 100644
--- a/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd
+++ b/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd
@@ -11,7 +11,7 @@
 
   <title>componentizedSender::Receiver Servants</title>
 
-  <idl id="IDL:Protocols/Receiver:1.0" 
+  <idl id="IDL:Protocols/Receiver:1.0"
        homeid="IDL:Protocols/ReceiverHome:1.0">
    <fileinarchive name="Receiver.idl"/>
   </idl>
diff --git a/TAO/CIAO/performance-tests/mico/mico-thrput-st/README b/TAO/CIAO/performance-tests/mico/mico-thrput-st/README
index ee534c0c0a4..6442d25ea01 100644
--- a/TAO/CIAO/performance-tests/mico/mico-thrput-st/README
+++ b/TAO/CIAO/performance-tests/mico/mico-thrput-st/README
@@ -4,21 +4,21 @@
 Throughput Experiment
 ====================
 
-This experiment is used to gather latency and throughput related metrics for MICO ORB. 
-The benchmark uses ACE to analyze the data sample and generate results. In order to run 
+This experiment is used to gather latency and throughput related metrics for MICO ORB.
+The benchmark uses ACE to analyze the data sample and generate results. In order to run
 this benchmark the following is required
 
 1: MICO ORB configured in single-threaded mode
 2: This directory placed under $MICO_ROOT/demo/<name-of-directory>
-3: The envrionment setting required for running this test is provided in 
+3: The envrionment setting required for running this test is provided in
    the mico-env file.
 4: These tests can only run on *nix systems as of now. For windows project files will
-   be added shortly 
+   be added shortly
 
 Compilation
 ===========
 To compile the files
- 
+
 $make
 
 To run the experiment
diff --git a/TAO/CIAO/performance-tests/mico/mico-thrput-st/mico-env b/TAO/CIAO/performance-tests/mico/mico-thrput-st/mico-env
index 67b444acef9..6574fcf46c2 100755
--- a/TAO/CIAO/performance-tests/mico/mico-thrput-st/mico-env
+++ b/TAO/CIAO/performance-tests/mico/mico-thrput-st/mico-env
@@ -1,7 +1,7 @@
 ##############
 ## MICO ENVIRONMENT SETTINGS
 #############
-# 
+#
 # If MICO has been built in /build/ccm/mico-obj
 # then add the following to your path and Library paths
 # for Bash Shell:
@@ -9,6 +9,6 @@
 #export PATH=/build/ccm/mico-obj/bin:$PATH
 #export LD_LIBRARY_PATH=/build/ccm/mico-obj/lib:$LD_LIBRARY_PATH
 #
-# Note: The place where object files and binaries are built could be 
-# different from source files. The environment variables use the obj 
+# Note: The place where object files and binaries are built could be
+# different from source files. The environment variables use the obj
 # path rather than source path
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl b/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl
index 2d8ab209e5a..8b45f9e9c75 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl
+++ b/TAO/CIAO/tests/CIDL/CodeGen/Basic.idl
@@ -27,7 +27,7 @@ module Extra
     long superfluous_op (in string empty_arg)
       raises (NoReason);
   };
-  
+
   interface Supernumerary
   {
     void supernumerary_op (out string dummy_arg)
@@ -39,11 +39,11 @@ module Extra
 
 module Basic
 {
-  interface ReadData : Extra::Superfluous 
+  interface ReadData : Extra::Superfluous
   {
     string get_data ();
   };
-  
+
   interface AnalyzeData
   {
     void perform_analysis (inout string data);
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl
index e14f5fde42e..0c22cce2c50 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.idl
@@ -8,7 +8,7 @@ module Basic
     provides  ReadData data_read;
     attribute boolean is_not_necessary;
   };
-  
+
   component CodeGen : Base
   {
     provides  ReadData data_out;
@@ -16,30 +16,30 @@ module Basic
     publishes DataAvailable out_avail;
     consumes  DataAvailable in_avail;
     provides  AnalyzeData data_crunch;
-    
+
     readonly attribute boolean is_necessary;
   };
-    
+
   home BaseHome supports Extra::Supernumerary manages Base
   {
     void base_do_nothing ();
-    
+
     factory create_no_base (in long fake_id)
       raises (Extra::NoRhyme);
-      
+
     finder find_no_base ();
-      
+
     readonly attribute boolean is_useful;
   };
 
   home CodeGenHome : BaseHome manages CodeGen
   {
     factory create_no_derived ();
-    
+
     finder find_no_derived ();
-    
+
     attribute boolean is_not_useful;
-    
+
     string do_nothing ();
   };
 };
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/README b/TAO/CIAO/tests/CIDL/CodeGen/README
index da6e8f6ee90..770843887af 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/README
+++ b/TAO/CIAO/tests/CIDL/CodeGen/README
@@ -37,4 +37,4 @@ ACE_ROOT/TAO/TAO_IDL) and gperf (ACE_ROOT/apps/gperf/src).
 
 Enjoy!
 
-Jeff
\ No newline at end of file
+Jeff
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl
index 15c32fe82b3..e65b1ea7794 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl
@@ -13,37 +13,37 @@ module Attributes
       attribute float test;
       attribute long testA, testB;
     };
-  
+
   component Bar
     {
       readonly attribute float test1;
       readonly attribute long testB, testC;
     };
-  
+
   exception FooException
     {
     };
-  
+
   exception BarException
     {
     };
-  
+
   component FooRaises
     {
       attribute float test2 getraises (FooException);
     };
-  
+
   component BarRaises
     {
       attribute float test3 setraises (BarException);
     };
-  
+
   component FooBarRaises
     {
-      attribute float test4 
+      attribute float test4
         getraises (FooException) setraises (BarException);
     };
-  
+
   component ROFooRaises
     {
       readonly attribute float test5 raises (FooException);
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
index 1372ae82668..9776b118333 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Attributes"
 
 project(Attributes_stub): ciao_client_dnc {
-  
+
   sharedname = Attributes_stub
   idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h
   dynamicflags   = ATTRIBUTES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl
index 7d995acb617..7103e984472 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl
@@ -11,19 +11,19 @@ module EventSink
   eventtype foo_event
     {
     };
-  
+
   eventtype bar_event
     {
     };
-  
+
   component Foo
     {
       consumes foo_event foo;
     };
-  
+
   component Bar : Foo
     {
       consumes bar_event bar;
     };
-  
+
 };
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
index a1a90abe9a3..918c9d56747 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n EventSink"
 
 project(EventSink_stub): ciao_client_dnc {
-  
+
   sharedname = EventSink_stub
   idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h
   dynamicflags   = EVENTSINK_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl
index 2ac7e663556..fa36b76d986 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl
@@ -11,12 +11,12 @@ module PublishesEmits
   eventtype foo_event
     {
     };
-  
+
   component Foo
     {
       publishes foo_event foo;
     };
-  
+
   component Bar
     {
       emits foo_event foo;
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
index e98d21e8a5a..71995df3a31 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n EventSource"
 
 project(EventSource_stub): ciao_client_dnc {
-  
+
   sharedname = EventSource_stub
   idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h
   dynamicflags   = EVENTSOURCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl
index 0d134e40d52..3cbf39c936e 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl
@@ -10,19 +10,19 @@
 
 module Facets
 {
-  interface foo_interface 
+  interface foo_interface
     {
     };
-  
+
   interface bar_interface
     {
     };
-  
+
   component Foo
     {
       provides foo_interface foo;
     };
-  
+
   component Bar : Foo
     {
       provides bar_interface bar;
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
index 1f1ba286b7d..0e60e3be139 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Facets"
 
 project(Facets_stub): ciao_client_dnc {
-  
+
   sharedname = Facets_stub
   idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h
   dynamicflags   = FACETS_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl
index 99162919b47..d63ea3cdc1e 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl
@@ -13,7 +13,7 @@ module ReceptaclesSingle
   interface foo_interface
     {
     };
-  
+
   interface bar_interface
     {
     };
@@ -22,23 +22,23 @@ module ReceptaclesSingle
     {
       uses foo_interface foo;
     };
-  
+
   component Bar : Foo
     {
       uses bar_interface bar;
     };
-  
+
   component FooBar
     {
       uses foo_interface foo;
       uses bar_interface bar;
     };
-  
+
   component ObjectFoo
     {
       uses Object foo;
     };
-  
+
 };
 
 module ReceptaclesMultiple
@@ -46,21 +46,21 @@ module ReceptaclesMultiple
   interface foo_interface
     {
     };
-  
+
   interface bar_interface
     {
     };
-  
+
   component Foo
     {
       uses multiple foo_interface foo;
     };
-  
+
   component Bar
     {
       uses multiple bar_interface bar;
     };
-  
+
   component ObjectFoo
     {
       uses multiple Object foo;
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
index 6ecfc50f438..78dd6b6978b 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Receptacles"
 
 project(Receptacles_stub): ciao_client_dnc {
-  
+
   sharedname = Receptacles_stub
   idlflags += -Wb,stub_export_macro=RECEPTACLES_STUB_Export -Wb,stub_export_include=Receptacles_stub_export.h -Wb,skel_export_macro=RECEPTACLES_SVNT_Export -Wb,skel_export_include=Receptacles_svnt_export.h
   dynamicflags   = RECEPTACLES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
index cc07a3f12e9..6a926a50846 100644
--- a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
+++ b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl
@@ -9,31 +9,31 @@
 
 module VerySimple
 {
-  
+
   component Foo
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
-  
+
 };
 
 module SupportsInterface
 {
-  interface foo_interface 
+  interface foo_interface
     {
     };
-  
+
   component Foo supports foo_interface
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
-  
+
 };
 
 
@@ -42,15 +42,15 @@ module SupportsMultiple
   interface foo_interface
     {
     };
-  
+
   interface bar_interface
     {
     };
-  
+
   component FooBar supports foo_interface, bar_interface
     {
     };
-  
+
   home FooBarHome manages FooBar
     {
     };
@@ -65,19 +65,19 @@ module Inheritance
   interface Bar_interface
     {
     };
-  
+
   component Foo supports foo_interface
     {
     };
-  
+
   component Bar : Foo
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
-  
+
   home BarHome manages Bar
     {
     };
diff --git a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
index da4084ee9f3..df62e90c6da 100644
--- a/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl SimpleComponent"
 
 project(SimpleComponent_stub): ciao_client_dnc {
-  
+
   sharedname = SimpleComponent_stub
   idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export -Wb,stub_export_include=SimpleComponent_stub_export.h -Wb,skel_export_macro=SIMPLECOMPONENT_SVNT_Export -Wb,skel_export_include=SimpleComponent_svnt_export.h
   dynamicflags   = SIMPLECOMPONENT_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
index 15eb50971b3..9d07f285c90 100644
--- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
+++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.idl
@@ -17,21 +17,21 @@ module AbstractEvents
   abstract eventtype InhFoo_event : foo_event
     {
     };
-  
+
   abstract eventtype bar_event
     {
     };
-  
+
   abstract eventtype foobar_event : foo_event, bar_event
     {
     };
 
   // test event multiple inheretance
-  
+
   eventtype concrete_foo
   {
   };
-  
+
   eventtype concrete_foobar : concrete_foo, foo_event
   {
   };
diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
index bffbdebb9df..e1a4a36cc54 100644
--- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Abstract"
 
 project(Abstract_stub): ciao_client_dnc {
-  
+
   sharedname = Abstract_stub
   idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h
   dynamicflags   = ABSTRACT_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl
index f9169026e88..c244ea4af3e 100644
--- a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl
+++ b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.idl
@@ -13,21 +13,21 @@ module RegularEvents
   eventtype foo
     {
     };
-  
+
   eventtype bar
     {
     };
-  
+
   eventtype InhFoo : foo
     {
     };
 
-  /* @@ 
-   * TAO_IDL cannot handle custom yet.  
+  /* @@
+   * TAO_IDL cannot handle custom yet.
   custom eventtype custom_foo
     {
     };
-  
+
   custom eventtype custom_InhFoo : foo
     {
     };
@@ -39,6 +39,6 @@ module RegularEvents
     void test_op_a (in long foo, out float bar);
     InhFoo test_op_b ();
   };
-  
-  
+
+
 };
diff --git a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
index 81faf3a8e4f..b654e690bae 100644
--- a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Regular"
 
 project(Regular_stub): ciao_client_dnc {
-  
+
   sharedname = Regular_stub
   idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export -Wb,stub_export_include=Regular_stub_export.h -Wb,skel_export_macro=REGULAR_SVNT_Export -Wb,skel_export_include=Regular_svnt_export.h
   dynamicflags   = REGULAR_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl
index 7dd338d871e..245a0eb449c 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl
+++ b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl
@@ -10,45 +10,45 @@
 
 module HomeAttributes
 {
-  interface foo_interface 
+  interface foo_interface
     {
     };
-  
-  component Foo supports foo_interface 
+
+  component Foo supports foo_interface
     {
     };
-  
+
   home FooHome manages Foo
     {
       attribute float test;
       attribute long testA, testB;
     };
-  
+
   exception FooException
     {
     };
-  
+
   exception BarException
     {
     };
-  
+
   home ROFooHome manages Foo
     {
       readonly attribute float test1;
       readonly attribute long testB, testC;
     };
-  
+
   home FooRaisesHome manages Foo
     {
       attribute float test2 getraises (FooException);
       attribute float test3 setraises (BarException);
-      attribute float test4 
+      attribute float test4
         getraises (FooException) setraises (BarException);
     };
-  
+
   home ROFooRaisesHome manages Foo
     {
       readonly attribute float test5 raises (FooException);
     };
-  
+
 };
diff --git a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
index 413748705d0..4105b180342 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n HomeAttributes"
 
 project(HomeAttributes_stub): ciao_client_dnc {
-  
+
   sharedname = HomeAttributes_stub
   idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h
   dynamicflags   = HOMEATTRIBUTES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl
index 3d9f4c5162e..47705a7bdb2 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl
+++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.idl
@@ -10,22 +10,22 @@
 
 module BasicHomes
 {
-  
+
   interface foo_interface {};
-  
+
   component Foo supports foo_interface {};
-  
+
   home FooHome manages Foo
     {
     };
-  
-  
+
+
   interface bar_interface {};
-  
+
   component Bar supports bar_interface {};
-  
+
   home BarHome supports foo_interface manages Bar
     {
     };
-  
+
 };
diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
index f364c13c293..c79cf8c919b 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Basic"
 
 project(IDL3_Basic_stub): ciao_client_dnc {
-  
+
   sharedname = Homes_Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags   = BASIC_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl
index c9520b11c0a..64646d93515 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl
+++ b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.idl
@@ -13,23 +13,23 @@ module FactoryHomes
   exception foo_exception
     {
     };
-  
-  interface foo_interface 
+
+  interface foo_interface
     {
     };
-  
-  component Foo supports foo_interface 
+
+  component Foo supports foo_interface
     {
     };
-  
+
   home FooHome manages Foo
     {
       factory FooFactory (in string foo, in short bar) raises (foo_exception);
     };
-  
+
   eventtype food
     {
     };
-  
+
 
 };
diff --git a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
index 7ff6c2a75bc..c861d0df611 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Factory"
 
 project(Factory_stub): ciao_client_dnc {
-  
+
   sharedname = Factory_stub
   idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h
   dynamicflags   = FACTORY_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl
index 5057b162fc3..ce5abc74804 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl
+++ b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.idl
@@ -13,18 +13,18 @@ module FactoryHomes
   exception foo_exception
     {
     };
-  
-  interface foo_interface 
+
+  interface foo_interface
     {
     };
-  
-  component Foo supports foo_interface 
+
+  component Foo supports foo_interface
     {
     };
-  
+
   home FooHome manages Foo
     {
       factory FooFinder (in string foo, in short bar) raises (foo_exception);
     };
-  
+
 };
diff --git a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
index 0409af4d8ad..9881aad88f1 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Finder"
 
 project(Finder_stub): ciao_client_dnc {
-  
+
   sharedname = Finder_stub
   idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h
   dynamicflags   = FINDER_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl
index e1bce50fc2f..dca1c828c20 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl
+++ b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl
@@ -2,7 +2,7 @@
 /**
  * @file Inheritance.idl
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * Tests the compilation of Home inheritance.
  */
 
@@ -10,24 +10,24 @@
 
 module HomeInheritance
 {
-  interface foo_interface 
+  interface foo_interface
     {
     };
-  
+
   component Foo supports foo_interface
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
-  
+
   component Bar
     {
     };
-  
+
   home BarHome : FooHome manages Bar
     {
     };
-  
+
 };
diff --git a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
index b8c27d5b42d..6faf9f0b6cc 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Inheritance"
 
 project(Inheritance_stub): ciao_client_dnc {
-  
+
   sharedname = Inheritance_stub
   idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h
   dynamicflags   = INHERITANCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README
index fe43b62b221..95a4938475b 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/README
@@ -1,6 +1,6 @@
                             Converting IDL3 to IDL2
                             =======================
-                            
+
 Introduction
 ============
 
@@ -20,7 +20,7 @@ would have been generated in one step by a CCM-aware IDL compiler.
 The tao_idl3_to_idl2 executable itself is built in
 CIAO_ROOT/tools/IDL3_to_IDL2. It uses the TAO IDL compiler
 front end parsing engine and the TAO IDL compiler driver
-files, so it depends on ACE. The IDL generation is 
+files, so it depends on ACE. The IDL generation is
 accomplished by a custom backend library.
 
 Running The Test
@@ -54,7 +54,7 @@ order of execution.
 2.
 The -Sm option passed to the IDL compiler must be used when
 processing an IDL file resulting from the execution of
-tao_idl3_to_idl2. This option disables the action of the 
+tao_idl3_to_idl2. This option disables the action of the
 tao_idl backend 'preprocessor' (which is 'on' by default)
 that adds implied IDL nodes to the Abstract Syntax Tree
 for subsequent C++ code generation. In the case of an eventtype,
@@ -66,4 +66,4 @@ original eventtype. Without the -Sm option, the event consumer
 interface would appear redundantly in both explicit and implied
 IDL, resulting in a name clash. Since the IDL compiler cannot
 know the origin of the IDL file it is processing, the -Sm
-option encapsulates that knowledge.
\ No newline at end of file
+option encapsulates that knowledge.
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
index e91274525a4..f3e96309eca 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
@@ -3,19 +3,19 @@
 
 project(ConvertIDL3) : taoidl3toidl2defaults, ciao_component_dnc {
   idlflags += -Sc -Sm
-  
+
   IDL3TOIDL2_Files {
     convert.idl
     include.idl
     pass_through.idl
   }
-  
+
   IDL_Files {
     convert_IDL2.idl
     include_IDL2.idl
     pass_through_IDL2.idl << include_IDL2.idl
   }
-  
+
   Source_Files {
     convert_IDL2C.cpp
     convert_IDL2S.cpp
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl
index 6a08a6c03d6..13b46de54c3 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/include.idl
@@ -17,7 +17,7 @@ module pre_mod
     string reasons[4][2];
     wstring<3> why;
   };
-  
+
   enum which
   {
     ZERO,
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl
index f5a4a76627c..4d51f0b3030 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl
@@ -34,16 +34,16 @@ module mod
   interface foo
   {
     typeprefix foo "preefy";
-    
+
     exception wrongety_wrong
     {
       base unrelated;
       string explanation;
     };
-    
+
     attribute base base_attr
       getraises (wrongety_wrong)
-      setraises (pre_mod::wrong, wrongety_wrong);     
+      setraises (pre_mod::wrong, wrongety_wrong);
   };
 
   interface bleep;
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
index 5759c52f43c..c1767d3310f 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n ICBasic"
 
 project(ICBasic_stub): ciao_client_dnc {
-  
+
   sharedname = ICBasic_stub
   idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h
   dynamicflags   = ICBASIC_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl
index 01d41895a3a..029e068d1dd 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl
@@ -13,7 +13,7 @@ module ImpliedEventSink
   eventtype foo_event
     {
     };
-  
+
   component Foo
     {
       consumes foo_event foo;
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
index f3707d8bea2..ac7b02caf97 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n ICEventSink"
 
 project(ICEventSink_stub): ciao_client_dnc {
-  
+
   sharedname = ICEventSink_stub
   idlflags += -Wb,stub_export_macro=ICEVENTSINK_STUB_Export -Wb,stub_export_include=ICEventSink_stub_export.h -Wb,skel_export_macro=ICEVENTSINK_SVNT_Export -Wb,skel_export_include=ICEventSink_svnt_export.h
   dynamicflags   = ICEVENTSINK_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl
index 08baec86e3f..48177109a59 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl
@@ -13,21 +13,21 @@ module ImpliedSources
   eventtype foo_event
     {
     };
-  
+
   eventtype bar_event
     {
     };
-  
+
   component Foo
     {
       publishes foo_event foo;
     };
-  
+
   component Bar
     {
       emits bar_event bar;
     };
-  /*  
+  /*
   interface test
     {
       ImpliedSources::FooEventConsumers::foo_eventConsumer test_op ();
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
index c86b9521ce4..b8eaded62c5 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n ICEventSource"
 
 project(ICEventSource_stub): ciao_client_dnc {
-  
+
   sharedname = ICEventSource_stub
   idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h
   dynamicflags   = ICEVENTSOURCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
index 7af66e50e8c..56681c3a5cb 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl
@@ -2,7 +2,7 @@
 /**
  * @file ICReceptacles.idl
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * Tests equivalent idl for receptacles.
  */
 #include <Components.idl>
@@ -12,12 +12,12 @@ module EquivReceptacles
   interface foo_interface
     {
     };
-  
-  component Foo 
+
+  component Foo
     {
       uses multiple foo_interface foo_recep;
     };
-  
+
   /**
   interface bar
     {
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
index d47827f2a2d..9ab64c3df92 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n ICReceptacles"
 
 project(ICReceptacles_stub): ciao_client_dnc {
-  
+
   sharedname = ICReceptacles_stub
   idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h
   dynamicflags   = ICRECEPTACLES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl
index 62092c9e958..c7940d821e8 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl
@@ -2,7 +2,7 @@
 /**
  * @file Events.idl
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * Tests implied IDL for event types.
  */
 
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
index 7c3478d0b2e..c5b51e417c4 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Events"
 
 project(Events_stub): ciao_client_dnc {
-  
+
   sharedname = Events_stub
   idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h
   dynamicflags   = EVENTS_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl
index 3440458b4b2..8c781e8fea4 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl
@@ -2,7 +2,7 @@
 /**
  * @file Homes.idl
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * Tests equivalent IDL semantics for Homes
  */
 
@@ -13,7 +13,7 @@ module ImplicitHomes
   component Foo
     {
     };
-  
+
   home FooHome manages Foo
     {
     };
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
index c81e215abfa..6865c71b120 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Homes"
 
 project(Homes_stub): ciao_client_dnc {
-  
+
   sharedname = Homes_stub
   idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h
   dynamicflags   = HOMES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Lookup/README b/TAO/CIAO/tests/IDL3/Lookup/README
index a92531070a6..3dec4403a9a 100644
--- a/TAO/CIAO/tests/IDL3/Lookup/README
+++ b/TAO/CIAO/tests/IDL3/Lookup/README
@@ -18,4 +18,4 @@ original example IDL file, which has been slightly modified
 for use in this test.
 
 
-Jeff Parsons
\ No newline at end of file
+Jeff Parsons
diff --git a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl
index 74d9b85de22..4850ab2e743 100644
--- a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl
+++ b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.idl
@@ -3,7 +3,7 @@
  * @file lookup_test.idl
  * @authors Boris Kolpackov <boris@dre.vanderbilt.edu>
  *          Jeff Parsons <j.parsons@vanderbilt.edu>
- * 
+ *
  * Tests IDL compiler lookup when local names are used
  * to reference declarations in supported interfaces,
  * base valuetypes, base components, and base homes.
@@ -27,46 +27,46 @@ module M
   {
     void f (in Foo bar) raises (Ex);
   };
-  
+
   valuetype VB
   {
     typedef long Bar;
   };
-  
+
   valuetype V : VB supports IB
   {
     void f (in Bar foo) raises (Ex);
   };
-  
+
   valuetype EB
   {
     typedef long Bar;
   };
-  
+
   valuetype E : EB supports IB
   {
     void f (in Bar foo) raises (Ex);
   };
-  
+
   interface T
   {
     typedef long Bar;
   };
-  
+
   component CB supports T
   {
   };
-  
+
   component C : CB
   {
     attribute Bar baz;
   };
-  
+
   home HB supports IB manages CB
   {
     typedef long Bar;
   };
-  
+
   home H : HB manages C
   {
     void f (in Bar b) raises (Ex);
diff --git a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
index 9814f248c5a..9cec290e5a1 100644
--- a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
+++ b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(LookupTest_stub): ciao_client_dnc {
-  
+
   sharedname = LookupTest_stub
   idlflags += -Sc
 
diff --git a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
index f4393115c4f..2262a8485bd 100644
--- a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
+++ b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -n Minimum_Base"
 
 project(Minimum_Base_DnC_stub): ciao_client_dnc {
-  
+
   sharedname = Minimum_Base_DnC_stub
   idlflags += -Sc \
               -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
@@ -18,11 +18,11 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc {
   Source_Files {
     Minimum_BaseC.cpp
   }
-  
+
   Header_Files {
     Minimum_BaseC.h
   }
-  
+
   Inline_Files {
     Minimum_BaseC.inl
   }
@@ -31,14 +31,14 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc {
 project(Minimum_Base_DnC_svnt) : ciao_servant_dnc {
   after +=  Minimum_Base_DnC_stub
   sharedname  = Minimum_Base_DnC_svnt
-  libs    += Minimum_Base_DnC_stub 
-  
+  libs    += Minimum_Base_DnC_stub
+
   idlflags  += -Sc \
                -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
                -Wb,stub_export_include=Minimum_Base_stub_export.h \
                -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \
                -Wb,skel_export_include=Minimum_Base_svnt_export.h
-  dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL 
+  dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Minimum_Base.idl
@@ -47,11 +47,11 @@ project(Minimum_Base_DnC_svnt) : ciao_servant_dnc {
   Source_Files {
     Minimum_BaseS.cpp
   }
-  
+
   Header_Files {
     Minimum_BaseS.h
   }
-  
+
   Inline_Files {
     Minimum_BaseS.inl
   }
diff --git a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 3b7d613143d..1a84ab4d137 100644
--- a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -19,11 +19,11 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
   Source_Files {
     ReceiverC.cpp
   }
-  
+
   Header_Files {
     ReceiverC.h
   }
-  
+
   Inline_Files {
     ReceiverC.inl
   }
@@ -36,7 +36,7 @@ project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
   libs    += Minimum_Receiver_DnC_stub \
              Minimum_Base_DnC_stub \
              Minimum_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_SVNT_Export \
                 -Wb,export_include=Receiver_svnt_export.h
@@ -76,7 +76,7 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc {
                Minimum_Receiver_DnC_svnt \
                Minimum_Base_DnC_stub \
                Minimum_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_EXEC_Export \
                 -Wb,export_include=Receiver_exec_export.h
@@ -88,10 +88,10 @@ project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Receiver_exec.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/TAO/CIAO/tests/Minimum/Sender/Sender.idl b/TAO/CIAO/tests/Minimum/Sender/Sender.idl
index 74b9bf76f9a..dc1548f5394 100644
--- a/TAO/CIAO/tests/Minimum/Sender/Sender.idl
+++ b/TAO/CIAO/tests/Minimum/Sender/Sender.idl
@@ -11,7 +11,7 @@ module Minimum
   /* This is a Sender specific interface which will be used to get the
    * process start.
    */
-  
+
   interface trigger
   {
     void bar ();
diff --git a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
index d1a92577943..0c3c40f2279 100644
--- a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -19,11 +19,11 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
   Source_Files {
     SenderC.cpp
   }
-  
+
   Header_Files {
     SenderC.h
   }
-  
+
   Inline_Files {
     SenderC.inl
   }
@@ -55,13 +55,13 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
     SenderS.cpp
     Sender_svnt.cpp
   }
-  
+
   Header_Files {
     SenderEC.h
     SenderS.h
     Sender_svnt.h
   }
-  
+
   Inline_Files {
     SenderEC.inl
     SenderS.inl
@@ -87,7 +87,7 @@ project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Sender_exec.cpp
   }
-  
+
   Header_Files {
     Sender_exec.h
   }
diff --git a/TAO/CIAO/tests/tests.mwc b/TAO/CIAO/tests/tests.mwc
index 6479880bd23..d924d0f1726 100644
--- a/TAO/CIAO/tests/tests.mwc
+++ b/TAO/CIAO/tests/tests.mwc
@@ -6,4 +6,4 @@ workspace {
                 RTCCM
         }
 
-}
\ No newline at end of file
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index 09d53d2afd5..c038bd9d4b7 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -9,160 +9,163 @@ ACE_RCSID (DAnCE,
            ADD_Handler,
            "$Id$")
 
- 
-namespace CIAO
-{
-  namespace Config_Handlers
+
+  namespace CIAO
   {
-    IDREF_Base<CORBA::ULong> ADD_Handler::IDREF;
-    
-    void
-    ADD_Handler::artifact_deployment_descrs (
-        const DeploymentPlan &src,
-        ::Deployment::ArtifactDeploymentDescriptions &dest)
+    namespace Config_Handlers
     {
-      DeploymentPlan::artifact_const_iterator aci_e =
-        src.end_artifact ();
-      dest.length (src.count_artifact ());
-      CORBA::ULong pos = 0;
-      for (DeploymentPlan::artifact_const_iterator aci_b =
-             src.begin_artifact ();
-           aci_e != aci_b;
-           ++aci_b)
-        {
-          ADD_Handler::artifact_deployment_descr ((*aci_b),
-                                                  dest[pos],
-                                                  pos);
-	  pos++;
-        }
-    }
+      IDREF_Base<CORBA::ULong> ADD_Handler::IDREF;
 
-    void
-    ADD_Handler::artifact_deployment_descr (
-        const ArtifactDeploymentDescription &src,
-        Deployment::ArtifactDeploymentDescription &dest,
-        CORBA::ULong pos)
-    {
-      dest.name = src.name ().c_str ();
-
-      dest.node = src.node ().c_str ();
-
-      ArtifactDeploymentDescription::location_const_iterator end =
-        src.end_location ();
-      
-      dest.location.length (src.count_location ());
-      CORBA::ULong len = 0;
-      for (ArtifactDeploymentDescription::location_const_iterator
-           start = src.begin_location ();
-           start != end;
-           ++start)
-        {
-          dest.location[len++] = start->c_str ();
-        }
-
-      ArtifactDeploymentDescription::source_const_iterator sce =
-        src.end_source ();
-      len = 0;
-      dest.source.length (src.count_source ());
-      for (ArtifactDeploymentDescription::source_const_iterator
-           scb = src.begin_source ();
-           scb != sce;
-           ++scb)
-        {
-          dest.source[len++] = scb->c_str ();
-        }
-
-      // @@TODO: See this loop is repeated
-      ArtifactDeploymentDescription::execParameter_const_iterator adce =
-        src.end_execParameter ();
-      len = 0;
-      dest.execParameter.length (src.count_execParameter ());
-      for (ArtifactDeploymentDescription::execParameter_const_iterator adcb =
-             src.begin_execParameter ();
-           adcb != adce;
-           ++adcb)
-        {
-          Property_Handler::get_property ((*adcb),
-                                          dest.execParameter[len++]);
-        }
-
-      if (src.id_p ())
-        {
-          ACE_CString cstr (src.id ().c_str ());
-          
-          ADD_Handler::IDREF.bind_ref (cstr,pos);
-	}
-      else
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) Warning: ADD %s has no idref.\n",
-                      src.name ().c_str ()));
-        }
+      void
+      ADD_Handler::artifact_deployment_descrs (
+                                               const DeploymentPlan &src,
+                                               ::Deployment::ArtifactDeploymentDescriptions &dest)
+      {
+        CIAO_TRACE("ADD_Handler::atrifact_deployment_descrs");
+        DeploymentPlan::artifact_const_iterator aci_e =
+          src.end_artifact ();
+        dest.length (src.count_artifact ());
+        CORBA::ULong pos = 0;
+        for (DeploymentPlan::artifact_const_iterator aci_b =
+               src.begin_artifact ();
+             aci_e != aci_b;
+             ++aci_b)
+          {
+            ADD_Handler::artifact_deployment_descr ((*aci_b),
+                                                    dest[pos],
+                                                    pos);
+            pos++;
+          }
+      }
+
+      void
+      ADD_Handler::artifact_deployment_descr (
+                                              const ArtifactDeploymentDescription &src,
+                                              Deployment::ArtifactDeploymentDescription &dest,
+                                              CORBA::ULong pos)
+      {
+        CIAO_TRACE("ADD_Handler::atrifact_deployment_descr");
+        dest.name = src.name ().c_str ();
+
+        dest.node = src.node ().c_str ();
+
+        ArtifactDeploymentDescription::location_const_iterator end =
+          src.end_location ();
+
+        dest.location.length (src.count_location ());
+        CORBA::ULong len = 0;
+        for (ArtifactDeploymentDescription::location_const_iterator
+               start = src.begin_location ();
+             start != end;
+             ++start)
+          {
+            dest.location[len++] = start->c_str ();
+          }
+
+        ArtifactDeploymentDescription::source_const_iterator sce =
+          src.end_source ();
+        len = 0;
+        dest.source.length (src.count_source ());
+        for (ArtifactDeploymentDescription::source_const_iterator
+               scb = src.begin_source ();
+             scb != sce;
+             ++scb)
+          {
+            dest.source[len++] = scb->c_str ();
+          }
+
+        // @@TODO: See this loop is repeated
+        ArtifactDeploymentDescription::execParameter_const_iterator adce =
+          src.end_execParameter ();
+        len = 0;
+        dest.execParameter.length (src.count_execParameter ());
+        for (ArtifactDeploymentDescription::execParameter_const_iterator adcb =
+               src.begin_execParameter ();
+             adcb != adce;
+             ++adcb)
+          {
+            Property_Handler::get_property ((*adcb),
+                                            dest.execParameter[len++]);
+          }
+
+        if (src.id_p ())
+          {
+            ACE_CString cstr (src.id ().c_str ());
+
+            ADD_Handler::IDREF.bind_ref (cstr,pos);
+          }
+        else
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        "(%P|%t) Warning: ADD %s has no idref.\n",
+                        src.name ().c_str ()));
+          }
 
 #if 0
-      // @@ MAJO: Don't know how to handle this.
-      if (src.deployRequirement_p ())
-        {
-          Req_Handler handler;
-          add.deployRequirement.length (
-            add.deployRequirement.length () + 1);
-          handler.get_Requirement (
-            add.deployRequirement[add.deployRequirement.length () - 1],
-            src.deployRequirement ());
-        }
-
-      if (src.deployedResource_p ())
-        {
-          RDD_Handler handler;
-          add.deployedResource.length (
-            add.deployedResource.length () + 1);
-          handler.get_ResourceDeploymentDescription (
-            add.deployedResource[add.deployedResource.length () - 1],
-            src.deployedResource ());
-        }
+        // @@ MAJO: Don't know how to handle this.
+        if (src.deployRequirement_p ())
+          {
+            Req_Handler handler;
+            add.deployRequirement.length (
+                                          add.deployRequirement.length () + 1);
+            handler.get_Requirement (
+                                     add.deployRequirement[add.deployRequirement.length () - 1],
+                                     src.deployRequirement ());
+          }
+
+        if (src.deployedResource_p ())
+          {
+            RDD_Handler handler;
+            add.deployedResource.length (
+                                         add.deployedResource.length () + 1);
+            handler.get_ResourceDeploymentDescription (
+                                                       add.deployedResource[add.deployedResource.length () - 1],
+                                                       src.deployedResource ());
+          }
 #endif /* 0  */
-    }
-    
+      }
+
       ArtifactDeploymentDescription
       ADD_Handler::artifact_deployment_descr (
-	  const Deployment::ArtifactDeploymentDescription &src)
+                                              const Deployment::ArtifactDeploymentDescription &src)
       {
-	  //Get the name and node and store them in the add
-	  XMLSchema::string< char > name ((src.name));
-	  XMLSchema::string< char > node ((src.node));
-	  
-	  ArtifactDeploymentDescription add (name,node);
-
-	  //Get the location(s) and store it/them in the add
-	  size_t total = src.location.length ();
-	  for (size_t i = 0; i < total; ++i)
-	  {
-	      XMLSchema::string< char > curr ((src.location[i]));
-	      add.add_location (curr);
-	  }
-
-	  //As above, for the source(s)
-	  total = src.source.length ();
-	  for (size_t j = 0; j < total; ++j)
-	  {
-	      XMLSchema::string< char > curr ((src.source[j]));
-	      add.add_source (curr);
-	  }  
-
-	  //As above for the execParameter(s)
-	  total = src.execParameter.length ();
-	  for (size_t k = 0; k < total; ++k)
-	  {
-	      add.add_execParameter (
-		  Property_Handler::get_property (
-		      src.execParameter[k]));
-	  }
-        
-	  return add;       
-    }
+        CIAO_TRACE("ADD_Handler::atrifact_deployment_descr - reverse");
+        //Get the name and node and store them in the add
+        XMLSchema::string< char > name ((src.name));
+        XMLSchema::string< char > node ((src.node));
+
+        ArtifactDeploymentDescription add (name,node);
+
+        //Get the location(s) and store it/them in the add
+        size_t total = src.location.length ();
+        for (size_t i = 0; i < total; ++i)
+          {
+            XMLSchema::string< char > curr ((src.location[i]));
+            add.add_location (curr);
+          }
+
+        //As above, for the source(s)
+        total = src.source.length ();
+        for (size_t j = 0; j < total; ++j)
+          {
+            XMLSchema::string< char > curr ((src.source[j]));
+            add.add_source (curr);
+          }
+
+        //As above for the execParameter(s)
+        total = src.execParameter.length ();
+        for (size_t k = 0; k < total; ++k)
+          {
+            add.add_execParameter (
+                                   Property_Handler::get_property (
+                                                                   src.execParameter[k]));
+          }
+
+        return add;
+      }
 
-    
 
-  }
 
-}
+    }
+
+  }
diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h
index 6ac3d36f194..0db82b30fb2 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  ADD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ADD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ADD_Handler_H
@@ -23,50 +23,50 @@
 
 namespace Deployment
 {
-  struct ArtifactDeploymentDescription;
-  class ArtifactDeploymentDescriptions;
+struct ArtifactDeploymentDescription;
+class ArtifactDeploymentDescriptions;
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-    class ArtifactDeploymentDescription;
+namespace Config_Handlers
+{
+class DeploymentPlan;
+class ArtifactDeploymentDescription;
+
+/*
+* @class ADD_Handler
+*
+* @brief Handler class for <ArtifactDeploymentDescription> types.
+*
+* This class defines handler methods to map values from XSC
+* ArtifactDeploymentDescription objects, parsed from the
+*       // @@ Jules, why Any type?
+* descriptor files, to the  corresponding CORBA IDL Any type.
+*/
+class Config_Handlers_Export ADD_Handler
+{
+public:
+static void artifact_deployment_descrs (
+const DeploymentPlan &src,
+::Deployment::ArtifactDeploymentDescriptions &dest);
 
-    /*
-    * @class ADD_Handler
-    *
-    * @brief Handler class for <ArtifactDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from XSC
-    * ArtifactDeploymentDescription objects, parsed from the
-    *       // @@ Jules, why Any type?
-    * descriptor files, to the  corresponding CORBA IDL Any type.
-    */
-    class Config_Handlers_Export ADD_Handler
-    {
-    public:
-      static void artifact_deployment_descrs (
-          const DeploymentPlan &src,
-          ::Deployment::ArtifactDeploymentDescriptions &dest);
+static ArtifactDeploymentDescription
+artifact_deployment_descr (
+const Deployment::ArtifactDeploymentDescription &src);
 
-      static ArtifactDeploymentDescription
-	  artifact_deployment_descr (
-	      const Deployment::ArtifactDeploymentDescription &src);
+///  The IDREF Table associated with this class
+static IDREF_Base<CORBA::ULong> IDREF;
 
-      ///  The IDREF Table associated with this class
-      static IDREF_Base<CORBA::ULong> IDREF;
-      
-    private:
-      static void artifact_deployment_descr (
-          const ArtifactDeploymentDescription& desc,
-          ::Deployment::ArtifactDeploymentDescription &dest,
-          CORBA::ULong l = 0);
-    };
-  }
+private:
+static void artifact_deployment_descr (
+const ArtifactDeploymentDescription& desc,
+::Deployment::ArtifactDeploymentDescription &dest,
+CORBA::ULong l = 0);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
index e14838e9a9a..535d5a88d8a 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
@@ -6,7 +6,7 @@
 #include "DataType_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "tao/AnyTypeCode/Any.h"
-
+#include "ciao/CIAO_common.h"
 #include "DynAny_Handler/DynAny_Handler.h"
 
 namespace CIAO
@@ -27,24 +27,20 @@ namespace CIAO
                                    CORBA::Any& toconfig)
 
     {
+      CIAO_TRACE("Any_Handler::extract_into_any");
       DynamicAny::DynAny_var dyn = DYNANY_HANDLER->extract_into_dynany (desc.type (),
-                                                 desc.value ());
-      
+                                                                        desc.value ());
+
       toconfig = *dyn->to_any ();
-      
+
       dyn->destroy ();
     }
 
     Any Any_Handler::get_any (const ::CORBA::Any& src)
     {
-      //MAJO
-      //@Bala ... still haven't figured this one out yet
-      //I was saving it for last...going from corba::any
-      //to xsc DataValue
-      DataType type = DataType_Handler::data_type (src.type ());
-      DataValue value;
-      Any any (type,value);
-      return any;
+      CIAO_TRACE("Any_Handler::extract_into_any - reverse");
+
+      return DYNANY_HANDLER->extract_from_dynany (src);
     }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
index 17b0814ad41..e7086f6ec2c 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  Any_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Any_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ANY_HANDLER_H
@@ -23,38 +23,38 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
-  class Any;
+class Any;
 }
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class Any;
-
-   /*
-    * @class Any_Handler
-    *
-    * @brief Handler class for <ComponentInterfaceDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC Any objects, parsed from the descriptor files, to the
-    * corresponding CORBA IDL Any type.
-    *
-    */
-    class Config_Handlers_Export Any_Handler
-    {
-      public:
-      Any_Handler (void);
-      virtual ~Any_Handler (void);
-
-      static void extract_into_any (const Any& desc,
-                                    ::CORBA::Any& toconfig);
-
-      static Any get_any (const CORBA::Any &src);
-    };
-  }
+namespace Config_Handlers
+{
+class Any;
+
+/*
+* @class Any_Handler
+*
+* @brief Handler class for <ComponentInterfaceDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC Any objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL Any type.
+*
+*/
+class Config_Handlers_Export Any_Handler
+{
+public:
+Any_Handler (void);
+virtual ~Any_Handler (void);
+
+static void extract_into_any (const Any& desc,
+::CORBA::Any& toconfig);
+
+static Any get_any (const CORBA::Any &src);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp b/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp
index b9fa6a6e221..dee3dc87fcf 100644
--- a/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp
+++ b/TAO/CIAO/tools/Config_Handlers/BasicSP.cdp
@@ -1,489 +1,489 @@
 <Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Modified_Deployment.xsd">
-
-  <label>BasicSP-DeploymentPlan</label>
-  <UUID><!-- @@ fill in --> </UUID>
-  <!-- Exactly one realizes 
-       This realizes section may also not be right. -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/BMClosedED:1.0</supportedType>
-    <supportedType>IDL:BasicSP/BMDevice:1.0</supportedType>
-    <supportedType>IDL:BasicSP/BMDisplay:1.0</supportedType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
-    <!--
-    <idlFile></idlFile>
-    <configProperty></configProperty>
-    -->
-    
-    <port>
-      <name>in_avail</name>
-      <specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-      <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>false</exclusiveUser>
-      <optional>false</optional>
-      <kind>EventConsumer</kind>
-    </port>
-    
-    <port>
-      <name>out_avail</name>
-      <specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
-      <supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
-      <provider>true</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>false</exclusiveUser>
-      <optional>false</optional>
-      <kind>EventPublisher</kind>
-    </port>
-    
-    <port>
-      <name>dataout</name>
-      <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-      <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-      <provider>true</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>false</exclusiveUser>
-      <optional>false</optional>
-      <kind>Facet</kind>
-    </port>
-    
-    <port>
-      <name>datain</name>
-      <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-      <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-      <provider>true</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>false</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-    
-    <port>
-      <name>data_read</name>
-      <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-      <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-      <provider>false></provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>false</exclusiveUser>
-      <optional>false</optional>
-      <kind>EventPublisher</kind>
-    </port>
-    
-    <port>
-      <name>timeout</name>
-      <specificType>IDL:BasicSP/TimeOut:1.0</specificType>
-      <supportedType>IDL:BasicSP/TimeOut:1.0</supportedType>
-      <provider>false></provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>false</exclusiveUser>
-      <optional>false</optional>
-      <kind>EventConsumer</kind>
-    </port>
-      
-    <port>
-      <name>comp_data</name>
-      <specificType>IDL:BasicSP/ReadData:1.0</specificType>
-      <supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>false</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-
-    <!--
-    <property></property>
-    <infoProperty></infoProperty>
-    -->
-  </realizes>
-  
-  <implementation id="BasicSP-BMClosedED-mdd">
-    <name>BasicSP-BMClosedED-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>BasicSP-BMClosedED_DnC_svnt</artifact>
-    <artifact>BasicSP-BMClosedED_DnC_stub</artifact>
-    <artifact>BasicSP-BMClosedED_DnC_exec</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="BasicSP-BMDevice-mdd">
-    <name>BasicSP-BMDevice-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    
-    <artifact>BasicSP-BMDevice_DnC_exec</artifact>
-    <artifact>BasicSP-BMDevice_DnC_stub</artifact>
-    <artifact>BasicSP-BMDevice_DnC_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-  
-  <implementation id="BasicSP-BMDisplay-mdd">
-    <name>BasicSP-BMDisplay-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>BasicSP-BMDisplay_DnC_exec</artifact>
-    <artifact>BasicSP-BMDisplay_DnC_svnt</artifact>
-    <artifact>BasicSP-BMDisplay_DnC_stub</artifact>
-    
-    <!--
-      <execParameter></execParameter>
-      <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-  
-  <implementation id="BasicSP-EC-mdd">
-    <name>BasicSP-EC-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    
-    <artifact>BasicSP-EC_DnC_stub</artifact>
-    <artifact>BasicSP-EC_DnC_svnt</artifact>
-    <artifact>BasicSP-EC_DnC_exec</artifact>
-    
-    <!--
-      <execParameter></execParameter>
-      <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="BasicSP-BMClosedED-idd">
-    <name>BasicSP-BMClosedED-idd</name>
-    <node>BMDisplay</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>BasicSP-BMClosedED-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>BMClosedED.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="BasicSP-BMDevice-idd">
-    <name>BasicSP-BMDevice-idd</name>
-    <node>BMDisplay</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>BasicSP-BMDevice-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>BMDevice.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  
-  <instance id="BasicSP-BMDisplay-idd">
-    <name>BasicSP-BMDisplay-idd</name>
-    <node>BMDisplay</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>BasicSP-BMDisplay-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>BMDisplay.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  
-  <instance id="BasicSP-EC-idd">
-    <name>BasicSP-EC-idd</name>
-    <node>EC</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>BasicSP-EC-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EC.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>  
-
-  <connection>
-    <name>datain_data_read</name>
-    <internalEndpoint>
-      <portName>data_read</portName>
-      <kind>Facet</kind>
-      <instance>BasicSP-BMDevice-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>datain</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>BasicSP-BMClosedED-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>comp_data_dataout</name>
-    <internalEndpoint>
-      <portName>dataout</portName>
-      <kind>Facet</kind>
-      <instance>BasicSP-BMClosedED-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>comp_data</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>BasicSP-BMDisplay-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>timeout_timeout</name>
-    <internalEndpoint>
-      <portName>timeout</portName>
-      <kind>EventPublisher</kind>
-      <instance>BasicSP-EC-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>timeout</portName>
-      <kind>EventConsumer</kind>
-      <instance>BasicSP-BMDevice-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>in_avail_data_available</name>
-    <internalEndpoint>
-      <portName>data_available</portName>
-      <kind>EventPublisher</kind>
-      <instance>BasicSP-BMDevice-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>in_avail</portName>
-      <kind>EventConsumer</kind>
-      <instance>BasicSP-BMClosedED-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>data_ready_out_avail</name>
-    <internalEndpoint>
-      <portName>out_avail</portName>
-      <kind>EventPublisher</kind>
-      <instance>BasicSP-BMClosedED-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>data_ready</portName>
-      <kind>EventConsumer</kind>
-      <instance>BasicSP-BMDisplay-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <artifact id="BasicSP-BMClosedED_DnC_exec">
-    <name>BMClosedED_DnC_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>BMClosedED_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createBMClosedEDHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMClosedED_DnC_svnt">
-    <name>BMClosedED_DnC_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMClosedED_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createBMClosedEDHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMClosedED_DnC_stub">
-    <name>BMClosedED_DnC_stub</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMClosedED_DnC_stub</location>
-    
-     <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMDevice_DnC_exec">
-    <name>BMDevice_DnC_exec</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMDevice_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createBMDeviceHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMDevice_DnC_stub">
-    <name>BMDevice_DnC_stub</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMDevice_DnC_stub</location>
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMDevice_DnC_svnt">
-    <name>BMDevice_DnC_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMDevice_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createBMDeviceHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMDisplay_DnC_exec">
-    <name>BMDisplay_DnC_exec</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMDisplay_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createBMDisplayHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMDisplay_DnC_svnt">
-    <name>BMDisplay_DnC_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMDisplay_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createBMDisplayHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-BMDisplay_DnC_stub">
-    <name>BMDisplay_DnC_stub</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>BMDisplay_DnC_stub</location>
-    
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-EC_DnC_stub">
-    <name>EC_DnC_stub</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>EC_DnC_stub</location>
-    
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-EC_DnC_svnt">
-    <name>EC_DnC_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>EC_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createECHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-  
-  <artifact id="BasicSP-EC_DnC_exec">
-    <name>EC_DnC_exec</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>EC_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createECHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    
-    <!-- @@ This has dependancies that need to be specified, how? -->
-  </artifact>
-</Deployment:deploymentPlan>  
+xmlns:Deployment="http://www.omg.org/Deployment"
+xmlns:xmi="http://www.omg.org/XMI"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://www.omg.org/Deployment Modified_Deployment.xsd">
+
+<label>BasicSP-DeploymentPlan</label>
+<UUID><!-- @@ fill in --> </UUID>
+<!-- Exactly one realizes
+This realizes section may also not be right. -->
+<realizes>
+<label>BasicSP-realizes-cid</label>
+<UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+<specificType><!-- @@ What does here? --></specificType>
+<supportedType>IDL:BasicSP/BMClosedED:1.0</supportedType>
+<supportedType>IDL:BasicSP/BMDevice:1.0</supportedType>
+<supportedType>IDL:BasicSP/BMDisplay:1.0</supportedType>
+<supportedType>IDL:BasicSP/EC:1.0</supportedType>
+<!--
+<idlFile></idlFile>
+<configProperty></configProperty>
+-->
+
+<port>
+<name>in_avail</name>
+<specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
+<supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
+<provider>false</provider>
+<exclusiveProvider>false</exclusiveProvider>
+<exclusiveUser>false</exclusiveUser>
+<optional>false</optional>
+<kind>EventConsumer</kind>
+</port>
+
+<port>
+<name>out_avail</name>
+<specificType>IDL:BasicSP/DataAvailable:1.0</specificType>
+<supportedType>IDL:BasicSP/DataAvailable:1.0</supportedType>
+<provider>true</provider>
+<exclusiveProvider>false</exclusiveProvider>
+<exclusiveUser>false</exclusiveUser>
+<optional>false</optional>
+<kind>EventPublisher</kind>
+</port>
+
+<port>
+<name>dataout</name>
+<specificType>IDL:BasicSP/ReadData:1.0</specificType>
+<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
+<provider>true</provider>
+<exclusiveProvider>false</exclusiveProvider>
+<exclusiveUser>false</exclusiveUser>
+<optional>false</optional>
+<kind>Facet</kind>
+</port>
+
+<port>
+<name>datain</name>
+<specificType>IDL:BasicSP/ReadData:1.0</specificType>
+<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
+<provider>true</provider>
+<exclusiveProvider>false</exclusiveProvider>
+<exclusiveUser>false</exclusiveUser>
+<optional>false</optional>
+<kind>SimplexReceptacle</kind>
+</port>
+
+<port>
+<name>data_read</name>
+<specificType>IDL:BasicSP/ReadData:1.0</specificType>
+<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
+<provider>false></provider>
+<exclusiveProvider>false</exclusiveProvider>
+<exclusiveUser>false</exclusiveUser>
+<optional>false</optional>
+<kind>EventPublisher</kind>
+</port>
+
+<port>
+<name>timeout</name>
+<specificType>IDL:BasicSP/TimeOut:1.0</specificType>
+<supportedType>IDL:BasicSP/TimeOut:1.0</supportedType>
+<provider>false></provider>
+<exclusiveProvider>false</exclusiveProvider>
+<exclusiveUser>false</exclusiveUser>
+<optional>false</optional>
+<kind>EventConsumer</kind>
+</port>
+
+<port>
+<name>comp_data</name>
+<specificType>IDL:BasicSP/ReadData:1.0</specificType>
+<supportedType>IDL:BasicSP/ReadData:1.0</supportedType>
+<provider>false</provider>
+<exclusiveProvider>false</exclusiveProvider>
+<exclusiveUser>false</exclusiveUser>
+<optional>false</optional>
+<kind>SimplexReceptacle</kind>
+</port>
+
+<!--
+<property></property>
+<infoProperty></infoProperty>
+-->
+</realizes>
+
+<implementation id="BasicSP-BMClosedED-mdd">
+<name>BasicSP-BMClosedED-mdd</name>
+<source><!-- @@ Don't know what goes here --></source>
+<artifact>BasicSP-BMClosedED_DnC_svnt</artifact>
+<artifact>BasicSP-BMClosedED_DnC_stub</artifact>
+<artifact>BasicSP-BMClosedED_DnC_exec</artifact>
+<!--
+<execParameter></execParameter>
+<deployRequirement></deployRequirement>
+-->
+</implementation>
+
+<implementation id="BasicSP-BMDevice-mdd">
+<name>BasicSP-BMDevice-mdd</name>
+<source><!-- @@ Don't know what goes here --></source>
+
+<artifact>BasicSP-BMDevice_DnC_exec</artifact>
+<artifact>BasicSP-BMDevice_DnC_stub</artifact>
+<artifact>BasicSP-BMDevice_DnC_svnt</artifact>
+<!--
+<execParameter></execParameter>
+<deployRequirement></deployRequirement>
+-->
+</implementation>
+
+<implementation id="BasicSP-BMDisplay-mdd">
+<name>BasicSP-BMDisplay-mdd</name>
+<source><!-- @@ Don't know what goes here --></source>
+<artifact>BasicSP-BMDisplay_DnC_exec</artifact>
+<artifact>BasicSP-BMDisplay_DnC_svnt</artifact>
+<artifact>BasicSP-BMDisplay_DnC_stub</artifact>
+
+<!--
+<execParameter></execParameter>
+<deployRequirement></deployRequirement>
+-->
+</implementation>
+
+<implementation id="BasicSP-EC-mdd">
+<name>BasicSP-EC-mdd</name>
+<source><!-- @@ Don't know what goes here --></source>
+
+<artifact>BasicSP-EC_DnC_stub</artifact>
+<artifact>BasicSP-EC_DnC_svnt</artifact>
+<artifact>BasicSP-EC_DnC_exec</artifact>
+
+<!--
+<execParameter></execParameter>
+<deployRequirement></deployRequirement>
+-->
+</implementation>
+
+<instance id="BasicSP-BMClosedED-idd">
+<name>BasicSP-BMClosedED-idd</name>
+<node>BMDisplay</node>
+<source><!-- @@ What goes here --></source>
+<implementation>BasicSP-BMClosedED-mdd</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>BMClosedED.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="BasicSP-BMDevice-idd">
+<name>BasicSP-BMDevice-idd</name>
+<node>BMDisplay</node>
+<source><!-- @@ What goes here --></source>
+<implementation>BasicSP-BMDevice-mdd</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>BMDevice.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="BasicSP-BMDisplay-idd">
+<name>BasicSP-BMDisplay-idd</name>
+<node>BMDisplay</node>
+<source><!-- @@ What goes here --></source>
+<implementation>BasicSP-BMDisplay-mdd</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>BMDisplay.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="BasicSP-EC-idd">
+<name>BasicSP-EC-idd</name>
+<node>EC</node>
+<source><!-- @@ What goes here --></source>
+<implementation>BasicSP-EC-mdd</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>EC.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<connection>
+<name>datain_data_read</name>
+<internalEndpoint>
+<portName>data_read</portName>
+<kind>Facet</kind>
+<instance>BasicSP-BMDevice-idd</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>datain</portName>
+<kind>SimplexReceptacle</kind>
+<instance>BasicSP-BMClosedED-idd</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>comp_data_dataout</name>
+<internalEndpoint>
+<portName>dataout</portName>
+<kind>Facet</kind>
+<instance>BasicSP-BMClosedED-idd</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>comp_data</portName>
+<kind>SimplexReceptacle</kind>
+<instance>BasicSP-BMDisplay-idd</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>timeout_timeout</name>
+<internalEndpoint>
+<portName>timeout</portName>
+<kind>EventPublisher</kind>
+<instance>BasicSP-EC-idd</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>timeout</portName>
+<kind>EventConsumer</kind>
+<instance>BasicSP-BMDevice-idd</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>in_avail_data_available</name>
+<internalEndpoint>
+<portName>data_available</portName>
+<kind>EventPublisher</kind>
+<instance>BasicSP-BMDevice-idd</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>in_avail</portName>
+<kind>EventConsumer</kind>
+<instance>BasicSP-BMClosedED-idd</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>data_ready_out_avail</name>
+<internalEndpoint>
+<portName>out_avail</portName>
+<kind>EventPublisher</kind>
+<instance>BasicSP-BMClosedED-idd</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>data_ready</portName>
+<kind>EventConsumer</kind>
+<instance>BasicSP-BMDisplay-idd</instance>
+</internalEndpoint>
+</connection>
+
+<artifact id="BasicSP-BMClosedED_DnC_exec">
+<name>BMClosedED_DnC_exec</name>
+<source><!-- @@ Not sure about this--></source>
+<node><!-- blank --></node>
+<location>BMClosedED_DnC_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createBMClosedEDHome_Impl</string>
+</value>
+</value>
+</execParameter>
+
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMClosedED_DnC_svnt">
+<name>BMClosedED_DnC_svnt</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMClosedED_DnC_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createBMClosedEDHome_Servant</string>
+</value>
+</value>
+</execParameter>
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMClosedED_DnC_stub">
+<name>BMClosedED_DnC_stub</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMClosedED_DnC_stub</location>
+
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMDevice_DnC_exec">
+<name>BMDevice_DnC_exec</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMDevice_DnC_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createBMDeviceHome_Impl</string>
+</value>
+</value>
+</execParameter>
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMDevice_DnC_stub">
+<name>BMDevice_DnC_stub</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMDevice_DnC_stub</location>
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMDevice_DnC_svnt">
+<name>BMDevice_DnC_svnt</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMDevice_DnC_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createBMDeviceHome_Servant</string>
+</value>
+</value>
+</execParameter>
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMDisplay_DnC_exec">
+<name>BMDisplay_DnC_exec</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMDisplay_DnC_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createBMDisplayHome_Impl</string>
+</value>
+</value>
+</execParameter>
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMDisplay_DnC_svnt">
+<name>BMDisplay_DnC_svnt</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMDisplay_DnC_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createBMDisplayHome_Servant</string>
+</value>
+</value>
+</execParameter>
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-BMDisplay_DnC_stub">
+<name>BMDisplay_DnC_stub</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>BMDisplay_DnC_stub</location>
+
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-EC_DnC_stub">
+<name>EC_DnC_stub</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>EC_DnC_stub</location>
+
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-EC_DnC_svnt">
+<name>EC_DnC_svnt</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>EC_DnC_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createECHome_Servant</string>
+</value>
+</value>
+</execParameter>
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+
+<artifact id="BasicSP-EC_DnC_exec">
+<name>EC_DnC_exec</name>
+<source><!-- @@ Not sure --></source>
+<node><!-- blank --></node>
+<location>EC_DnC_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>createECHome_Impl</string>
+</value>
+</value>
+</execParameter>
+
+<!-- @@ This has dependancies that need to be specified, how? -->
+</artifact>
+</Deployment:deploymentPlan>
diff --git a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index 111232c6a4e..25191d1daaf 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.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 "Basic_Deployment_Data.hpp"
 
 namespace CIAO
@@ -16,7 +16,7 @@ namespace CIAO
   namespace Config_Handlers
   {
     // TCKind
-    // 
+    //
 
     TCKind::Value TCKind::
     integral () const
@@ -38,30 +38,30 @@ namespace CIAO
 
     TCKind::
     TCKind (TCKind::Value v)
-    : v_ (v)
+      : v_ (v)
     {
     }
 
     // DataType
-    // 
+    //
 
     DataType::
     DataType (::CIAO::Config_Handlers::TCKind const& kind__)
-    : 
-    ::XSCRT::Type (), 
-    kind_ (new ::CIAO::Config_Handlers::TCKind (kind__)),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      kind_ (new ::CIAO::Config_Handlers::TCKind (kind__)),
+      regulator__ ()
     {
       kind_->container (this);
     }
 
     DataType::
     DataType (::CIAO::Config_Handlers::DataType const& s)
-    :
-    ::XSCRT::Type (),
-    kind_ (new ::CIAO::Config_Handlers::TCKind (*s.kind_)),
-    enum__ (s.enum__.get () ? new ::CIAO::Config_Handlers::EnumType (*s.enum__) : 0),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      kind_ (new ::CIAO::Config_Handlers::TCKind (*s.kind_)),
+      enum__ (s.enum__.get () ? new ::CIAO::Config_Handlers::EnumType (*s.enum__) : 0),
+      regulator__ ()
     {
       kind_->container (this);
       if (enum__.get ()) enum__->container (this);
@@ -80,7 +80,7 @@ namespace CIAO
 
 
     // DataType
-    // 
+    //
     ::CIAO::Config_Handlers::TCKind const& DataType::
     kind () const
     {
@@ -94,7 +94,7 @@ namespace CIAO
     }
 
     // DataType
-    // 
+    //
     bool DataType::
     enum_p () const
     {
@@ -111,34 +111,34 @@ namespace CIAO
     enum_ (::CIAO::Config_Handlers::EnumType const& e)
     {
       if (enum__.get ())
-      {
-        *enum__ = e;
-      }
+        {
+          *enum__ = e;
+        }
 
       else
-      {
-        enum__ = ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > (new ::CIAO::Config_Handlers::EnumType (e));
-        enum__->container (this);
-      }
+        {
+          enum__ = ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > (new ::CIAO::Config_Handlers::EnumType (e));
+          enum__->container (this);
+        }
     }
 
 
     // DataValue
-    // 
+    //
 
     DataValue::
     DataValue ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
     {
     }
 
     DataValue::
     DataValue (::CIAO::Config_Handlers::DataValue const& s)
-    :
-    ::XSCRT::Type (),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
     {
       {
         for (short_const_iterator i (s.short_.begin ());i != s.short_.end ();++i) add_short (*i);
@@ -266,7 +266,7 @@ namespace CIAO
 
 
     // DataValue
-    // 
+    //
     DataValue::short_iterator DataValue::
     begin_short ()
     {
@@ -304,7 +304,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::long_iterator DataValue::
     begin_long ()
     {
@@ -342,7 +342,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::ushort_iterator DataValue::
     begin_ushort ()
     {
@@ -380,7 +380,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::ulong_iterator DataValue::
     begin_ulong ()
     {
@@ -418,7 +418,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::float_iterator DataValue::
     begin_float ()
     {
@@ -456,7 +456,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::double_iterator DataValue::
     begin_double ()
     {
@@ -494,7 +494,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::boolean_iterator DataValue::
     begin_boolean ()
     {
@@ -532,7 +532,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::octet_iterator DataValue::
     begin_octet ()
     {
@@ -570,7 +570,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::enum_iterator DataValue::
     begin_enum ()
     {
@@ -608,7 +608,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::string_iterator DataValue::
     begin_string ()
     {
@@ -646,7 +646,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::longlong_iterator DataValue::
     begin_longlong ()
     {
@@ -684,7 +684,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::ulonglong_iterator DataValue::
     begin_ulonglong ()
     {
@@ -722,7 +722,7 @@ namespace CIAO
     }
 
     // DataValue
-    // 
+    //
     DataValue::longdouble_iterator DataValue::
     begin_longdouble ()
     {
@@ -761,12191 +761,13326 @@ namespace CIAO
 
 
     // EnumType
-    // 
+    //
 
     EnumType::
     EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
               ::XMLSchema::string< ACE_TCHAR > const& typeId__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      typeId_->container (this);
-    }
+      :
+      ::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)),
+regulator__ ()
+{
+name_->container (this);
+typeId_->container (this);
+}
 
-    EnumType::
-    EnumType (::CIAO::Config_Handlers::EnumType const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      typeId_->container (this);
-      {
-        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
-      }
-    }
+EnumType::
+EnumType (::CIAO::Config_Handlers::EnumType const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)),
+regulator__ ()
+{
+name_->container (this);
+typeId_->container (this);
+{
+for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+}
+}
 
-    ::CIAO::Config_Handlers::EnumType& EnumType::
-    operator= (::CIAO::Config_Handlers::EnumType const& s)
-    {
-      name (s.name ());
+::CIAO::Config_Handlers::EnumType& EnumType::
+operator= (::CIAO::Config_Handlers::EnumType const& s)
+{
+name (s.name ());
 
-      typeId (s.typeId ());
+typeId (s.typeId ());
 
-      member_.clear ();
-      {
-        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
-      }
+member_.clear ();
+{
+for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+}
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // EnumType
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& EnumType::
-    name () const
-    {
-      return *name_;
-    }
+// EnumType
+//
+::XMLSchema::string< ACE_TCHAR > const& EnumType::
+name () const
+{
+return *name_;
+}
 
-    void EnumType::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void EnumType::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // EnumType
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& EnumType::
-    typeId () const
-    {
-      return *typeId_;
-    }
+// EnumType
+//
+::XMLSchema::string< ACE_TCHAR > const& EnumType::
+typeId () const
+{
+return *typeId_;
+}
 
-    void EnumType::
-    typeId (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *typeId_ = e;
-    }
+void EnumType::
+typeId (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*typeId_ = e;
+}
 
-    // EnumType
-    // 
-    EnumType::member_iterator EnumType::
-    begin_member ()
-    {
-      return member_.begin ();
-    }
+// EnumType
+//
+EnumType::member_iterator EnumType::
+begin_member ()
+{
+return member_.begin ();
+}
 
-    EnumType::member_iterator EnumType::
-    end_member ()
-    {
-      return member_.end ();
-    }
+EnumType::member_iterator EnumType::
+end_member ()
+{
+return member_.end ();
+}
 
-    EnumType::member_const_iterator EnumType::
-    begin_member () const
-    {
-      return member_.begin ();
-    }
+EnumType::member_const_iterator EnumType::
+begin_member () const
+{
+return member_.begin ();
+}
 
-    EnumType::member_const_iterator EnumType::
-    end_member () const
-    {
-      return member_.end ();
-    }
+EnumType::member_const_iterator EnumType::
+end_member () const
+{
+return member_.end ();
+}
 
-    void EnumType::
-    add_member (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      member_.push_back (e);
-    }
+void EnumType::
+add_member (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+member_.push_back (e);
+}
 
-    size_t EnumType::
-    count_member(void) const
-    {
-      return member_.size ();
-    }
+size_t EnumType::
+count_member(void) const
+{
+return member_.size ();
+}
 
 
-    // Any
-    // 
+// Any
+//
 
-    Any::
-    Any (::CIAO::Config_Handlers::DataType const& type__,
-         ::CIAO::Config_Handlers::DataValue const& value__)
-    : 
-    ::XSCRT::Type (), 
-    type_ (new ::CIAO::Config_Handlers::DataType (type__)),
-    value_ (new ::CIAO::Config_Handlers::DataValue (value__)),
-    regulator__ ()
-    {
-      type_->container (this);
-      value_->container (this);
-    }
+Any::
+Any (::CIAO::Config_Handlers::DataType const& type__,
+::CIAO::Config_Handlers::DataValue const& value__)
+:
+::XSCRT::Type (),
+type_ (new ::CIAO::Config_Handlers::DataType (type__)),
+value_ (new ::CIAO::Config_Handlers::DataValue (value__)),
+regulator__ ()
+{
+type_->container (this);
+value_->container (this);
+}
 
-    Any::
-    Any (::CIAO::Config_Handlers::Any const& s)
-    :
-    ::XSCRT::Type (),
-    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
-    value_ (new ::CIAO::Config_Handlers::DataValue (*s.value_)),
-    regulator__ ()
-    {
-      type_->container (this);
-      value_->container (this);
-    }
+Any::
+Any (::CIAO::Config_Handlers::Any const& s)
+:
+::XSCRT::Type (),
+type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
+value_ (new ::CIAO::Config_Handlers::DataValue (*s.value_)),
+regulator__ ()
+{
+type_->container (this);
+value_->container (this);
+}
 
-    ::CIAO::Config_Handlers::Any& Any::
-    operator= (::CIAO::Config_Handlers::Any const& s)
-    {
-      type (s.type ());
+::CIAO::Config_Handlers::Any& Any::
+operator= (::CIAO::Config_Handlers::Any const& s)
+{
+type (s.type ());
 
-      value (s.value ());
+value (s.value ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // Any
-    // 
-    ::CIAO::Config_Handlers::DataType const& Any::
-    type () const
-    {
-      return *type_;
-    }
+// Any
+//
+::CIAO::Config_Handlers::DataType const& Any::
+type () const
+{
+return *type_;
+}
 
-    void Any::
-    type (::CIAO::Config_Handlers::DataType const& e)
-    {
-      *type_ = e;
-    }
+void Any::
+type (::CIAO::Config_Handlers::DataType const& e)
+{
+*type_ = e;
+}
 
-    // Any
-    // 
-    ::CIAO::Config_Handlers::DataValue const& Any::
-    value () const
-    {
-      return *value_;
-    }
+// Any
+//
+::CIAO::Config_Handlers::DataValue const& Any::
+value () const
+{
+return *value_;
+}
 
-    void Any::
-    value (::CIAO::Config_Handlers::DataValue const& e)
-    {
-      *value_ = e;
-    }
+void Any::
+value (::CIAO::Config_Handlers::DataValue const& e)
+{
+*value_ = e;
+}
 
 
-    // Property
-    // 
+// Property
+//
 
-    Property::
-    Property (::XMLSchema::string< ACE_TCHAR > const& name__,
-              ::CIAO::Config_Handlers::Any const& value__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    value_ (new ::CIAO::Config_Handlers::Any (value__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      value_->container (this);
-    }
+Property::
+Property (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::Any const& value__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+value_ (new ::CIAO::Config_Handlers::Any (value__)),
+regulator__ ()
+{
+name_->container (this);
+value_->container (this);
+}
 
-    Property::
-    Property (::CIAO::Config_Handlers::Property const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      value_->container (this);
-    }
+Property::
+Property (::CIAO::Config_Handlers::Property const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
+regulator__ ()
+{
+name_->container (this);
+value_->container (this);
+}
 
-    ::CIAO::Config_Handlers::Property& Property::
-    operator= (::CIAO::Config_Handlers::Property const& s)
-    {
-      name (s.name ());
+::CIAO::Config_Handlers::Property& Property::
+operator= (::CIAO::Config_Handlers::Property const& s)
+{
+name (s.name ());
 
-      value (s.value ());
+value (s.value ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // Property
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Property::
-    name () const
-    {
-      return *name_;
-    }
+// Property
+//
+::XMLSchema::string< ACE_TCHAR > const& Property::
+name () const
+{
+return *name_;
+}
 
-    void Property::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void Property::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // Property
-    // 
-    ::CIAO::Config_Handlers::Any const& Property::
-    value () const
-    {
-      return *value_;
-    }
+// Property
+//
+::CIAO::Config_Handlers::Any const& Property::
+value () const
+{
+return *value_;
+}
 
-    void Property::
-    value (::CIAO::Config_Handlers::Any const& e)
-    {
-      *value_ = e;
-    }
+void Property::
+value (::CIAO::Config_Handlers::Any const& e)
+{
+*value_ = e;
+}
 
 
-    // SatisfierPropertyKind
-    // 
+// SatisfierPropertyKind
+//
 
-    SatisfierPropertyKind::Value SatisfierPropertyKind::
-    integral () const
-    {
-      return v_;
-    }
+SatisfierPropertyKind::Value SatisfierPropertyKind::
+integral () const
+{
+return v_;
+}
 
-    bool
-    operator== (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
+bool
+operator== (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
+{
+return a.v_ == b.v_;
+}
 
-    bool
-    operator!= (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
+bool
+operator!= (::CIAO::Config_Handlers::SatisfierPropertyKind const& a, ::CIAO::Config_Handlers::SatisfierPropertyKind const& b)
+{
+return a.v_ != b.v_;
+}
 
-    SatisfierPropertyKind::
-    SatisfierPropertyKind (SatisfierPropertyKind::Value v)
-    : v_ (v)
-    {
-    }
+SatisfierPropertyKind::
+SatisfierPropertyKind (SatisfierPropertyKind::Value v)
+: v_ (v)
+{
+}
 
-    // SatisfierProperty
-    // 
-
-    SatisfierProperty::
-    SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-                       ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-                       ::CIAO::Config_Handlers::Any const& value__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)),
-    value_ (new ::CIAO::Config_Handlers::Any (value__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      kind_->container (this);
-      value_->container (this);
-    }
+// SatisfierProperty
+//
+
+SatisfierProperty::
+SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
+::XMLSchema::boolean const& dynamic__,
+::CIAO::Config_Handlers::Any const& value__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)),
+dynamic_ (new ::XMLSchema::boolean (dynamic__)),
+value_ (new ::CIAO::Config_Handlers::Any (value__)),
+regulator__ ()
+{
+name_->container (this);
+kind_->container (this);
+dynamic_->container (this);
+value_->container (this);
+}
 
-    SatisfierProperty::
-    SatisfierProperty (::CIAO::Config_Handlers::SatisfierProperty const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (*s.kind_)),
-    value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      kind_->container (this);
-      value_->container (this);
-    }
+SatisfierProperty::
+SatisfierProperty (::CIAO::Config_Handlers::SatisfierProperty const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (*s.kind_)),
+dynamic_ (new ::XMLSchema::boolean (*s.dynamic_)),
+value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
+regulator__ ()
+{
+name_->container (this);
+kind_->container (this);
+dynamic_->container (this);
+value_->container (this);
+}
 
-    ::CIAO::Config_Handlers::SatisfierProperty& SatisfierProperty::
-    operator= (::CIAO::Config_Handlers::SatisfierProperty const& s)
-    {
-      name (s.name ());
+::CIAO::Config_Handlers::SatisfierProperty& SatisfierProperty::
+operator= (::CIAO::Config_Handlers::SatisfierProperty const& s)
+{
+name (s.name ());
 
-      kind (s.kind ());
+kind (s.kind ());
 
-      value (s.value ());
+dynamic (s.dynamic ());
 
-      return *this;
-    }
+value (s.value ());
 
+return *this;
+}
 
-    // SatisfierProperty
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SatisfierProperty::
-    name () const
-    {
-      return *name_;
-    }
 
-    void SatisfierProperty::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+// SatisfierProperty
+//
+::XMLSchema::string< ACE_TCHAR > const& SatisfierProperty::
+name () const
+{
+return *name_;
+}
 
-    // SatisfierProperty
-    // 
-    ::CIAO::Config_Handlers::SatisfierPropertyKind const& SatisfierProperty::
-    kind () const
-    {
-      return *kind_;
-    }
+void SatisfierProperty::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void SatisfierProperty::
-    kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& e)
-    {
-      *kind_ = e;
-    }
+// SatisfierProperty
+//
+::CIAO::Config_Handlers::SatisfierPropertyKind const& SatisfierProperty::
+kind () const
+{
+return *kind_;
+}
 
-    // SatisfierProperty
-    // 
-    ::CIAO::Config_Handlers::Any const& SatisfierProperty::
-    value () const
-    {
-      return *value_;
-    }
+void SatisfierProperty::
+kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& e)
+{
+*kind_ = e;
+}
 
-    void SatisfierProperty::
-    value (::CIAO::Config_Handlers::Any const& e)
-    {
-      *value_ = e;
-    }
+// SatisfierProperty
+//
+::XMLSchema::boolean const& SatisfierProperty::
+dynamic () const
+{
+return *dynamic_;
+}
 
+void SatisfierProperty::
+dynamic (::XMLSchema::boolean const& e)
+{
+*dynamic_ = e;
+}
 
-    // Resource
-    // 
+// SatisfierProperty
+//
+::CIAO::Config_Handlers::Any const& SatisfierProperty::
+value () const
+{
+return *value_;
+}
 
-    Resource::
-    Resource (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+void SatisfierProperty::
+value (::CIAO::Config_Handlers::Any const& e)
+{
+*value_ = e;
+}
 
-    Resource::
-    Resource (::CIAO::Config_Handlers::Resource const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      {
-        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-      }
 
-      {
-        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-      }
-    }
+// Resource
+//
 
-    ::CIAO::Config_Handlers::Resource& Resource::
-    operator= (::CIAO::Config_Handlers::Resource const& s)
-    {
-      name (s.name ());
+Resource::
+Resource (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-      resourceType_.clear ();
-      {
-        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-      }
+Resource::
+Resource (::CIAO::Config_Handlers::Resource const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+regulator__ ()
+{
+name_->container (this);
+{
+for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+}
 
-      property_.clear ();
-      {
-        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-      }
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-      return *this;
-    }
+::CIAO::Config_Handlers::Resource& Resource::
+operator= (::CIAO::Config_Handlers::Resource const& s)
+{
+name (s.name ());
 
+resourceType_.clear ();
+{
+for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+}
 
-    // Resource
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Resource::
-    name () const
-    {
-      return *name_;
-    }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    void Resource::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+return *this;
+}
 
-    // Resource
-    // 
-    Resource::resourceType_iterator Resource::
-    begin_resourceType ()
-    {
-      return resourceType_.begin ();
-    }
 
-    Resource::resourceType_iterator Resource::
-    end_resourceType ()
-    {
-      return resourceType_.end ();
-    }
+// Resource
+//
+::XMLSchema::string< ACE_TCHAR > const& Resource::
+name () const
+{
+return *name_;
+}
 
-    Resource::resourceType_const_iterator Resource::
-    begin_resourceType () const
-    {
-      return resourceType_.begin ();
-    }
+void Resource::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    Resource::resourceType_const_iterator Resource::
-    end_resourceType () const
-    {
-      return resourceType_.end ();
-    }
+// Resource
+//
+Resource::resourceType_iterator Resource::
+begin_resourceType ()
+{
+return resourceType_.begin ();
+}
 
-    void Resource::
-    add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      resourceType_.push_back (e);
-    }
+Resource::resourceType_iterator Resource::
+end_resourceType ()
+{
+return resourceType_.end ();
+}
 
-    size_t Resource::
-    count_resourceType(void) const
-    {
-      return resourceType_.size ();
-    }
+Resource::resourceType_const_iterator Resource::
+begin_resourceType () const
+{
+return resourceType_.begin ();
+}
 
-    // Resource
-    // 
-    Resource::property_iterator Resource::
-    begin_property ()
-    {
-      return property_.begin ();
-    }
+Resource::resourceType_const_iterator Resource::
+end_resourceType () const
+{
+return resourceType_.end ();
+}
 
-    Resource::property_iterator Resource::
-    end_property ()
-    {
-      return property_.end ();
-    }
+void Resource::
+add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+resourceType_.push_back (e);
+}
 
-    Resource::property_const_iterator Resource::
-    begin_property () const
-    {
-      return property_.begin ();
-    }
+size_t Resource::
+count_resourceType(void) const
+{
+return resourceType_.size ();
+}
 
-    Resource::property_const_iterator Resource::
-    end_property () const
-    {
-      return property_.end ();
-    }
+// Resource
+//
+Resource::property_iterator Resource::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    void Resource::
-    add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      property_.push_back (e);
-    }
+Resource::property_iterator Resource::
+end_property ()
+{
+return property_.end ();
+}
 
-    size_t Resource::
-    count_property(void) const
-    {
-      return property_.size ();
-    }
+Resource::property_const_iterator Resource::
+begin_property () const
+{
+return property_.begin ();
+}
 
+Resource::property_const_iterator Resource::
+end_property () const
+{
+return property_.end ();
+}
 
-    // Requirement
-    // 
+void Resource::
+add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+{
+property_.push_back (e);
+}
 
-    Requirement::
-    Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                 ::XMLSchema::string< ACE_TCHAR > const& name__,
-                 ::CIAO::Config_Handlers::Property const& property__)
-    : 
-    ::XSCRT::Type (), 
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    property_ (new ::CIAO::Config_Handlers::Property (property__)),
-    regulator__ ()
-    {
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
+size_t Resource::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    Requirement::
-    Requirement (::CIAO::Config_Handlers::Requirement const& s)
-    :
-    ::XSCRT::Type (),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    property_ (new ::CIAO::Config_Handlers::Property (*s.property_)),
-    regulator__ ()
-    {
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
 
-    ::CIAO::Config_Handlers::Requirement& Requirement::
-    operator= (::CIAO::Config_Handlers::Requirement const& s)
-    {
-      resourceType (s.resourceType ());
+// Requirement
+//
 
-      name (s.name ());
+Requirement::
+Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+resourceType_->container (this);
+name_->container (this);
+}
 
-      property (s.property ());
+Requirement::
+Requirement (::CIAO::Config_Handlers::Requirement const& s)
+:
+::XSCRT::Type (),
+resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+regulator__ ()
+{
+resourceType_->container (this);
+name_->container (this);
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-      return *this;
-    }
+::CIAO::Config_Handlers::Requirement& Requirement::
+operator= (::CIAO::Config_Handlers::Requirement const& s)
+{
+resourceType (s.resourceType ());
 
+name (s.name ());
 
-    // Requirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Requirement::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    void Requirement::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
+return *this;
+}
 
-    // Requirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Requirement::
-    name () const
-    {
-      return *name_;
-    }
 
-    void Requirement::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+// Requirement
+//
+::XMLSchema::string< ACE_TCHAR > const& Requirement::
+resourceType () const
+{
+return *resourceType_;
+}
 
-    // Requirement
-    // 
-    ::CIAO::Config_Handlers::Property const& Requirement::
-    property () const
-    {
-      return *property_;
-    }
+void Requirement::
+resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceType_ = e;
+}
 
-    void Requirement::
-    property (::CIAO::Config_Handlers::Property const& e)
-    {
-      *property_ = e;
-    }
+// Requirement
+//
+::XMLSchema::string< ACE_TCHAR > const& Requirement::
+name () const
+{
+return *name_;
+}
 
+void Requirement::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // ResourceDeploymentDescription
-    // 
+// Requirement
+//
+Requirement::property_iterator Requirement::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                   ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                   ::CIAO::Config_Handlers::Any const& resourceValue__)
-    : 
-    ::XSCRT::Type (), 
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)),
-    regulator__ ()
-    {
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+Requirement::property_iterator Requirement::
+end_property ()
+{
+return property_.end ();
+}
 
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
-    :
-    ::XSCRT::Type (),
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+Requirement::property_const_iterator Requirement::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    ::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
-    {
-      requirementName (s.requirementName ());
+Requirement::property_const_iterator Requirement::
+end_property () const
+{
+return property_.end ();
+}
 
-      resourceName (s.resourceName ());
+void Requirement::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-      resourceValue (s.resourceValue ());
+size_t Requirement::
+count_property(void) const
+{
+return property_.size ();
+}
 
-      return *this;
-    }
 
+// ResourceDeploymentDescription
+//
 
-    // ResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+::XMLSchema::string< ACE_TCHAR > const& resourceName__)
+:
+::XSCRT::Type (),
+requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
+resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
+regulator__ ()
+{
+requirementName_->container (this);
+resourceName_->container (this);
+}
 
-    void ResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requirementName_ = e;
-    }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
+:
+::XSCRT::Type (),
+requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
+resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
+regulator__ ()
+{
+requirementName_->container (this);
+resourceName_->container (this);
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-    // ResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
+::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
+{
+requirementName (s.requirementName ());
 
-    void ResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceName_ = e;
-    }
+resourceName (s.resourceName ());
 
-    // ResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& ResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    void ResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
+return *this;
+}
 
 
-    // ArtifactDeploymentDescription
-    // 
+// ResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
+requirementName () const
+{
+return *requirementName_;
+}
 
-    ArtifactDeploymentDescription::
-    ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                   ::XMLSchema::string< ACE_TCHAR > const& node__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      node_->container (this);
-    }
+void ResourceDeploymentDescription::
+requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requirementName_ = e;
+}
 
-    ArtifactDeploymentDescription::
-    ArtifactDeploymentDescription (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-      }
+// ResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ResourceDeploymentDescription::
+resourceName () const
+{
+return *resourceName_;
+}
 
-      node_->container (this);
-      {
-        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-      }
+void ResourceDeploymentDescription::
+resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceName_ = e;
+}
 
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-      }
+// ResourceDeploymentDescription
+//
+ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
+begin_property ()
+{
+return property_.begin ();
+}
 
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-      }
+ResourceDeploymentDescription::property_iterator ResourceDeploymentDescription::
+end_property ()
+{
+return property_.end ();
+}
 
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-      }
+ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
+begin_property () const
+{
+return property_.begin ();
+}
 
-      if (id_.get ()) id_->container (this);
-    }
+ResourceDeploymentDescription::property_const_iterator ResourceDeploymentDescription::
+end_property () const
+{
+return property_.end ();
+}
 
-    ::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
-    {
-      name (s.name ());
+void ResourceDeploymentDescription::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-      source_.clear ();
-      {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-      }
+size_t ResourceDeploymentDescription::
+count_property(void) const
+{
+return property_.size ();
+}
 
-      node (s.node ());
 
-      location_.clear ();
-      {
-        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-      }
+// ArtifactDeploymentDescription
+//
 
-      execParameter_.clear ();
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-      }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& node__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
+regulator__ ()
+{
+name_->container (this);
+node_->container (this);
+}
 
-      deployRequirement_.clear ();
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-      }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
+id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+regulator__ ()
+{
+name_->container (this);
+{
+for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+}
 
-      deployedResource_.clear ();
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-      }
+node_->container (this);
+{
+for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+}
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-      return *this;
-    }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
+if (id_.get ()) id_->container (this);
+}
 
-    void ArtifactDeploymentDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
+operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
+{
+name (s.name ());
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
-    begin_source ()
-    {
-      return source_.begin ();
-    }
+source_.clear ();
+{
+for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+}
 
-    ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
-    end_source ()
-    {
-      return source_.end ();
-    }
+node (s.node ());
 
-    ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
-    begin_source () const
-    {
-      return source_.begin ();
-    }
+location_.clear ();
+{
+for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+}
 
-    ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
-    end_source () const
-    {
-      return source_.end ();
-    }
+execParameter_.clear ();
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-    void ArtifactDeploymentDescription::
-    add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      source_.push_back (e);
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_source(void) const
-    {
-      return source_.size ();
-    }
+deployedResource_.clear ();
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
-    node () const
-    {
-      return *node_;
-    }
+if (s.id_.get ()) id (*(s.id_));
+else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-    void ArtifactDeploymentDescription::
-    node (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *node_ = e;
-    }
+return *this;
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-    begin_location ()
-    {
-      return location_.begin ();
-    }
 
-    ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
-    end_location ()
-    {
-      return location_.end ();
-    }
+// ArtifactDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
+name () const
+{
+return *name_;
+}
 
-    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-    begin_location () const
-    {
-      return location_.begin ();
-    }
+void ArtifactDeploymentDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
-    end_location () const
-    {
-      return location_.end ();
-    }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
+begin_source ()
+{
+return source_.begin ();
+}
 
-    void ArtifactDeploymentDescription::
-    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      location_.push_back (e);
-    }
+ArtifactDeploymentDescription::source_iterator ArtifactDeploymentDescription::
+end_source ()
+{
+return source_.end ();
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_location(void) const
-    {
-      return location_.size ();
-    }
+ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
+begin_source () const
+{
+return source_.begin ();
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
-    begin_execParameter ()
-    {
-      return execParameter_.begin ();
-    }
+ArtifactDeploymentDescription::source_const_iterator ArtifactDeploymentDescription::
+end_source () const
+{
+return source_.end ();
+}
 
-    ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
-    end_execParameter ()
-    {
-      return execParameter_.end ();
-    }
+void ArtifactDeploymentDescription::
+add_source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+source_.push_back (e);
+}
 
-    ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
-    begin_execParameter () const
-    {
-      return execParameter_.begin ();
-    }
+size_t ArtifactDeploymentDescription::
+count_source(void) const
+{
+return source_.size ();
+}
 
-    ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
-    end_execParameter () const
-    {
-      return execParameter_.end ();
-    }
+// ArtifactDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ArtifactDeploymentDescription::
+node () const
+{
+return *node_;
+}
 
-    void ArtifactDeploymentDescription::
-    add_execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      execParameter_.push_back (e);
-    }
+void ArtifactDeploymentDescription::
+node (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*node_ = e;
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_execParameter(void) const
-    {
-      return execParameter_.size ();
-    }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
+begin_location ()
+{
+return location_.begin ();
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
-    begin_deployRequirement ()
-    {
-      return deployRequirement_.begin ();
-    }
+ArtifactDeploymentDescription::location_iterator ArtifactDeploymentDescription::
+end_location ()
+{
+return location_.end ();
+}
 
-    ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
-    end_deployRequirement ()
-    {
-      return deployRequirement_.end ();
-    }
+ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
+begin_location () const
+{
+return location_.begin ();
+}
 
-    ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
-    begin_deployRequirement () const
-    {
-      return deployRequirement_.begin ();
-    }
+ArtifactDeploymentDescription::location_const_iterator ArtifactDeploymentDescription::
+end_location () const
+{
+return location_.end ();
+}
 
-    ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
-    end_deployRequirement () const
-    {
-      return deployRequirement_.end ();
-    }
+void ArtifactDeploymentDescription::
+add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+location_.push_back (e);
+}
 
-    void ArtifactDeploymentDescription::
-    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      deployRequirement_.push_back (e);
-    }
+size_t ArtifactDeploymentDescription::
+count_location(void) const
+{
+return location_.size ();
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_deployRequirement(void) const
-    {
-      return deployRequirement_.size ();
-    }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
+begin_execParameter ()
+{
+return execParameter_.begin ();
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
-    begin_deployedResource ()
-    {
-      return deployedResource_.begin ();
-    }
+ArtifactDeploymentDescription::execParameter_iterator ArtifactDeploymentDescription::
+end_execParameter ()
+{
+return execParameter_.end ();
+}
 
-    ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
-    end_deployedResource ()
-    {
-      return deployedResource_.end ();
-    }
+ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
+begin_execParameter () const
+{
+return execParameter_.begin ();
+}
 
-    ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
-    begin_deployedResource () const
-    {
-      return deployedResource_.begin ();
-    }
+ArtifactDeploymentDescription::execParameter_const_iterator ArtifactDeploymentDescription::
+end_execParameter () const
+{
+return execParameter_.end ();
+}
 
-    ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
-    end_deployedResource () const
-    {
-      return deployedResource_.end ();
-    }
+void ArtifactDeploymentDescription::
+add_execParameter (::CIAO::Config_Handlers::Property const& e)
+{
+execParameter_.push_back (e);
+}
 
-    void ArtifactDeploymentDescription::
-    add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e)
-    {
-      deployedResource_.push_back (e);
-    }
+size_t ArtifactDeploymentDescription::
+count_execParameter(void) const
+{
+return execParameter_.size ();
+}
 
-    size_t ArtifactDeploymentDescription::
-    count_deployedResource(void) const
-    {
-      return deployedResource_.size ();
-    }
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-    // ArtifactDeploymentDescription
-    // 
-    bool ArtifactDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
+ArtifactDeploymentDescription::deployRequirement_iterator ArtifactDeploymentDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-    ::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
+ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-    ::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
+ArtifactDeploymentDescription::deployRequirement_const_iterator ArtifactDeploymentDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-    void ArtifactDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
+void ArtifactDeploymentDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
-    }
+size_t ArtifactDeploymentDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
+// ArtifactDeploymentDescription
+//
+ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
+begin_deployedResource ()
+{
+return deployedResource_.begin ();
+}
 
-    // MonolithicDeploymentDescription
-    // 
+ArtifactDeploymentDescription::deployedResource_iterator ArtifactDeploymentDescription::
+end_deployedResource ()
+{
+return deployedResource_.end ();
+}
 
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
+begin_deployedResource () const
+{
+return deployedResource_.begin ();
+}
 
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-      }
+ArtifactDeploymentDescription::deployedResource_const_iterator ArtifactDeploymentDescription::
+end_deployedResource () const
+{
+return deployedResource_.end ();
+}
 
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
-      }
+void ArtifactDeploymentDescription::
+add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e)
+{
+deployedResource_.push_back (e);
+}
 
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-      }
+size_t ArtifactDeploymentDescription::
+count_deployedResource(void) const
+{
+return deployedResource_.size ();
+}
 
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-      }
+// ArtifactDeploymentDescription
+//
+bool ArtifactDeploymentDescription::
+id_p () const
+{
+return id_.get () != 0;
+}
 
-      if (id_.get ()) id_->container (this);
-    }
+::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription::
+id () const
+{
+return *id_;
+}
 
-    ::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
-    {
-      name (s.name ());
+::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription::
+id ()
+{
+return *id_;
+}
 
-      source_.clear ();
-      {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-      }
+void ArtifactDeploymentDescription::
+id (::XMLSchema::ID< ACE_TCHAR > const& e)
+{
+if (id_.get ())
+{
+*id_ = e;
+}
 
-      artifact_.clear ();
-      {
-        for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
-      }
+else
+{
+id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+id_->container (this);
+}
+}
 
-      execParameter_.clear ();
-      {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
-      }
 
-      deployRequirement_.clear ();
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-      }
+// MonolithicDeploymentDescription
+//
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-      return *this;
-    }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+regulator__ ()
+{
+name_->container (this);
+{
+for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+}
 
+{
+for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& MonolithicDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-    void MonolithicDeploymentDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
-    begin_source ()
-    {
-      return source_.begin ();
-    }
+if (id_.get ()) id_->container (this);
+}
 
-    MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
-    end_source ()
-    {
-      return source_.end ();
-    }
+::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
+operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
+{
+name (s.name ());
 
-    MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
-    begin_source () const
-    {
-      return source_.begin ();
-    }
+source_.clear ();
+{
+for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+}
 
-    MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
-    end_source () const
-    {
-      return source_.end ();
-    }
+artifact_.clear ();
+{
+for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i);
+}
 
-    void MonolithicDeploymentDescription::
-    add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      source_.push_back (e);
-    }
+execParameter_.clear ();
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-    size_t MonolithicDeploymentDescription::
-    count_source(void) const
-    {
-      return source_.size ();
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-    begin_artifact ()
-    {
-      return artifact_.begin ();
-    }
+if (s.id_.get ()) id (*(s.id_));
+else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-    MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
-    end_artifact ()
-    {
-      return artifact_.end ();
-    }
+return *this;
+}
 
-    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-    begin_artifact () const
-    {
-      return artifact_.begin ();
-    }
 
-    MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
-    end_artifact () const
-    {
-      return artifact_.end ();
-    }
+// MonolithicDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& MonolithicDeploymentDescription::
+name () const
+{
+return *name_;
+}
 
-    void MonolithicDeploymentDescription::
-    add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      artifact_.push_back (e);
-    }
+void MonolithicDeploymentDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    size_t MonolithicDeploymentDescription::
-    count_artifact(void) const
-    {
-      return artifact_.size ();
-    }
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
+begin_source ()
+{
+return source_.begin ();
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
-    begin_execParameter ()
-    {
-      return execParameter_.begin ();
-    }
+MonolithicDeploymentDescription::source_iterator MonolithicDeploymentDescription::
+end_source ()
+{
+return source_.end ();
+}
 
-    MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
-    end_execParameter ()
-    {
-      return execParameter_.end ();
-    }
+MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
+begin_source () const
+{
+return source_.begin ();
+}
 
-    MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
-    begin_execParameter () const
-    {
-      return execParameter_.begin ();
-    }
+MonolithicDeploymentDescription::source_const_iterator MonolithicDeploymentDescription::
+end_source () const
+{
+return source_.end ();
+}
 
-    MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
-    end_execParameter () const
-    {
-      return execParameter_.end ();
-    }
+void MonolithicDeploymentDescription::
+add_source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+source_.push_back (e);
+}
 
-    void MonolithicDeploymentDescription::
-    add_execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      execParameter_.push_back (e);
-    }
+size_t MonolithicDeploymentDescription::
+count_source(void) const
+{
+return source_.size ();
+}
 
-    size_t MonolithicDeploymentDescription::
-    count_execParameter(void) const
-    {
-      return execParameter_.size ();
-    }
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
+begin_artifact ()
+{
+return artifact_.begin ();
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
-    begin_deployRequirement ()
-    {
-      return deployRequirement_.begin ();
-    }
+MonolithicDeploymentDescription::artifact_iterator MonolithicDeploymentDescription::
+end_artifact ()
+{
+return artifact_.end ();
+}
 
-    MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
-    end_deployRequirement ()
-    {
-      return deployRequirement_.end ();
-    }
+MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
+begin_artifact () const
+{
+return artifact_.begin ();
+}
 
-    MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
-    begin_deployRequirement () const
-    {
-      return deployRequirement_.begin ();
-    }
+MonolithicDeploymentDescription::artifact_const_iterator MonolithicDeploymentDescription::
+end_artifact () const
+{
+return artifact_.end ();
+}
 
-    MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
-    end_deployRequirement () const
-    {
-      return deployRequirement_.end ();
-    }
+void MonolithicDeploymentDescription::
+add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+artifact_.push_back (e);
+}
 
-    void MonolithicDeploymentDescription::
-    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      deployRequirement_.push_back (e);
-    }
+size_t MonolithicDeploymentDescription::
+count_artifact(void) const
+{
+return artifact_.size ();
+}
 
-    size_t MonolithicDeploymentDescription::
-    count_deployRequirement(void) const
-    {
-      return deployRequirement_.size ();
-    }
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
+begin_execParameter ()
+{
+return execParameter_.begin ();
+}
 
-    // MonolithicDeploymentDescription
-    // 
-    bool MonolithicDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
+MonolithicDeploymentDescription::execParameter_iterator MonolithicDeploymentDescription::
+end_execParameter ()
+{
+return execParameter_.end ();
+}
 
-    ::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
+MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
+begin_execParameter () const
+{
+return execParameter_.begin ();
+}
 
-    ::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
+MonolithicDeploymentDescription::execParameter_const_iterator MonolithicDeploymentDescription::
+end_execParameter () const
+{
+return execParameter_.end ();
+}
 
-    void MonolithicDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
+void MonolithicDeploymentDescription::
+add_execParameter (::CIAO::Config_Handlers::Property const& e)
+{
+execParameter_.push_back (e);
+}
 
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
-    }
+size_t MonolithicDeploymentDescription::
+count_execParameter(void) const
+{
+return execParameter_.size ();
+}
 
+// MonolithicDeploymentDescription
+//
+MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-    // ResourceUsageKind
-    // 
+MonolithicDeploymentDescription::deployRequirement_iterator MonolithicDeploymentDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-    ResourceUsageKind::Value ResourceUsageKind::
-    integral () const
-    {
-      return v_;
-    }
+MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-    bool
-    operator== (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
+MonolithicDeploymentDescription::deployRequirement_const_iterator MonolithicDeploymentDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-    bool
-    operator!= (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
+void MonolithicDeploymentDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-    ResourceUsageKind::
-    ResourceUsageKind (ResourceUsageKind::Value v)
-    : v_ (v)
-    {
-    }
+size_t MonolithicDeploymentDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-                                           ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                           ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                           ::CIAO::Config_Handlers::Any const& resourceValue__)
-    : 
-    ::XSCRT::Type (), 
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+// MonolithicDeploymentDescription
+//
+bool MonolithicDeploymentDescription::
+id_p () const
+{
+return id_.get () != 0;
+}
 
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
-    :
-    ::XSCRT::Type (),
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription::
+id () const
+{
+return *id_;
+}
 
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
-    {
-      resourceUsage (s.resourceUsage ());
+::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription::
+id ()
+{
+return *id_;
+}
 
-      requirementName (s.requirementName ());
+void MonolithicDeploymentDescription::
+id (::XMLSchema::ID< ACE_TCHAR > const& e)
+{
+if (id_.get ())
+{
+*id_ = e;
+}
 
-      resourceName (s.resourceName ());
+else
+{
+id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+id_->container (this);
+}
+}
 
-      resourceValue (s.resourceValue ());
 
-      return *this;
-    }
+// ResourceUsageKind
+//
 
+ResourceUsageKind::Value ResourceUsageKind::
+integral () const
+{
+return v_;
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::ResourceUsageKind const& InstanceResourceDeploymentDescription::
-    resourceUsage () const
-    {
-      return *resourceUsage_;
-    }
+bool
+operator== (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
+{
+return a.v_ == b.v_;
+}
 
-    void InstanceResourceDeploymentDescription::
-    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-    {
-      *resourceUsage_ = e;
-    }
+bool
+operator!= (::CIAO::Config_Handlers::ResourceUsageKind const& a, ::CIAO::Config_Handlers::ResourceUsageKind const& b)
+{
+return a.v_ != b.v_;
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
+ResourceUsageKind::
+ResourceUsageKind (ResourceUsageKind::Value v)
+: v_ (v)
+{
+}
 
-    void InstanceResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requirementName_ = e;
-    }
+// InstanceResourceDeploymentDescription
+//
+
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
+::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+::XMLSchema::string< ACE_TCHAR > const& resourceName__)
+:
+::XSCRT::Type (),
+resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
+requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
+resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
+regulator__ ()
+{
+resourceUsage_->container (this);
+requirementName_->container (this);
+resourceName_->container (this);
+}
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
+:
+::XSCRT::Type (),
+resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
+requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
+resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
+regulator__ ()
+{
+resourceUsage_->container (this);
+requirementName_->container (this);
+resourceName_->container (this);
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-    void InstanceResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceName_ = e;
-    }
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
+{
+resourceUsage (s.resourceUsage ());
 
-    // InstanceResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& InstanceResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
+requirementName (s.requirementName ());
 
-    void InstanceResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
+resourceName (s.resourceName ());
 
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    // InstanceDeploymentDescription
-    // 
-
-    InstanceDeploymentDescription::
-    InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                   ::XMLSchema::string< ACE_TCHAR > const& node__,
-                                   ::XMLSchema::string< ACE_TCHAR > const& source__,
-                                   ::XMLSchema::IDREF< ACE_TCHAR > const& implementation__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-    source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)),
-    implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (implementation__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      node_->container (this);
-      source_->container (this);
-      implementation_->container (this);
-    }
+return *this;
+}
 
-    InstanceDeploymentDescription::
-    InstanceDeploymentDescription (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-    source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
-    implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.implementation_)),
-    deployedResource_ (s.deployedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedResource_) : 0),
-    deployedSharedResource_ (s.deployedSharedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedSharedResource_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      node_->container (this);
-      source_->container (this);
-      implementation_->container (this);
-      {
-        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-      }
 
-      if (deployedResource_.get ()) deployedResource_->container (this);
-      if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
-      if (id_.get ()) id_->container (this);
-    }
+// InstanceResourceDeploymentDescription
+//
+::CIAO::Config_Handlers::ResourceUsageKind const& InstanceResourceDeploymentDescription::
+resourceUsage () const
+{
+return *resourceUsage_;
+}
 
-    ::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
-    {
-      name (s.name ());
+void InstanceResourceDeploymentDescription::
+resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
+{
+*resourceUsage_ = e;
+}
 
-      node (s.node ());
+// InstanceResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
+requirementName () const
+{
+return *requirementName_;
+}
 
-      source (s.source ());
+void InstanceResourceDeploymentDescription::
+requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requirementName_ = e;
+}
 
-      implementation (s.implementation ());
+// InstanceResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceResourceDeploymentDescription::
+resourceName () const
+{
+return *resourceName_;
+}
 
-      configProperty_.clear ();
-      {
-        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
-      }
+void InstanceResourceDeploymentDescription::
+resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceName_ = e;
+}
 
-      if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
-      else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
+// InstanceResourceDeploymentDescription
+//
+InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
+begin_property ()
+{
+return property_.begin ();
+}
 
-      if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
-      else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
+InstanceResourceDeploymentDescription::property_iterator InstanceResourceDeploymentDescription::
+end_property ()
+{
+return property_.end ();
+}
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
+begin_property () const
+{
+return property_.begin ();
+}
 
-      return *this;
-    }
+InstanceResourceDeploymentDescription::property_const_iterator InstanceResourceDeploymentDescription::
+end_property () const
+{
+return property_.end ();
+}
 
+void InstanceResourceDeploymentDescription::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-    name () const
-    {
-      return *name_;
-    }
+size_t InstanceResourceDeploymentDescription::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    void InstanceDeploymentDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-    node () const
-    {
-      return *node_;
-    }
+// InstanceDeploymentDescription
+//
+
+InstanceDeploymentDescription::
+InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& node__,
+::XMLSchema::string< ACE_TCHAR > const& source__,
+::XMLSchema::IDREF< ACE_TCHAR > const& implementation__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
+source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)),
+implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (implementation__)),
+regulator__ ()
+{
+name_->container (this);
+node_->container (this);
+source_->container (this);
+implementation_->container (this);
+}
 
-    void InstanceDeploymentDescription::
-    node (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *node_ = e;
-    }
+InstanceDeploymentDescription::
+InstanceDeploymentDescription (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
+source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
+implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.implementation_)),
+deployedResource_ (s.deployedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedResource_) : 0),
+deployedSharedResource_ (s.deployedSharedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedSharedResource_) : 0),
+id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+regulator__ ()
+{
+name_->container (this);
+node_->container (this);
+source_->container (this);
+implementation_->container (this);
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
-    source () const
-    {
-      return *source_;
-    }
+if (deployedResource_.get ()) deployedResource_->container (this);
+if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
+if (id_.get ()) id_->container (this);
+}
 
-    void InstanceDeploymentDescription::
-    source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *source_ = e;
-    }
+::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
+{
+name (s.name ());
 
-    // InstanceDeploymentDescription
-    // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& InstanceDeploymentDescription::
-    implementation () const
-    {
-      return *implementation_;
-    }
+node (s.node ());
 
-    void InstanceDeploymentDescription::
-    implementation (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      *implementation_ = e;
-    }
+source (s.source ());
 
-    // InstanceDeploymentDescription
-    // 
-    InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
-    begin_configProperty ()
-    {
-      return configProperty_.begin ();
-    }
+implementation (s.implementation ());
 
-    InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
-    end_configProperty ()
-    {
-      return configProperty_.end ();
-    }
+configProperty_.clear ();
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-    InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
-    begin_configProperty () const
-    {
-      return configProperty_.begin ();
-    }
+if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
+else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
 
-    InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
-    end_configProperty () const
-    {
-      return configProperty_.end ();
-    }
+if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
+else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
 
-    void InstanceDeploymentDescription::
-    add_configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      configProperty_.push_back (e);
-    }
+if (s.id_.get ()) id (*(s.id_));
+else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-    size_t InstanceDeploymentDescription::
-    count_configProperty(void) const
-    {
-      return configProperty_.size ();
-    }
+return *this;
+}
 
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    deployedResource_p () const
-    {
-      return deployedResource_.get () != 0;
-    }
 
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-    deployedResource () const
-    {
-      return *deployedResource_;
-    }
+// InstanceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+name () const
+{
+return *name_;
+}
 
-    void InstanceDeploymentDescription::
-    deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-    {
-      if (deployedResource_.get ())
-      {
-        *deployedResource_ = e;
-      }
+void InstanceDeploymentDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-      else
-      {
-        deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-        deployedResource_->container (this);
-      }
-    }
+// InstanceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+node () const
+{
+return *node_;
+}
 
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    deployedSharedResource_p () const
-    {
-      return deployedSharedResource_.get () != 0;
-    }
+void InstanceDeploymentDescription::
+node (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*node_ = e;
+}
 
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-    deployedSharedResource () const
-    {
-      return *deployedSharedResource_;
-    }
+// InstanceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& InstanceDeploymentDescription::
+source () const
+{
+return *source_;
+}
 
-    void InstanceDeploymentDescription::
-    deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
-    {
-      if (deployedSharedResource_.get ())
-      {
-        *deployedSharedResource_ = e;
-      }
+void InstanceDeploymentDescription::
+source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*source_ = e;
+}
 
-      else
-      {
-        deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-        deployedSharedResource_->container (this);
-      }
-    }
+// InstanceDeploymentDescription
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& InstanceDeploymentDescription::
+implementation () const
+{
+return *implementation_;
+}
 
-    // InstanceDeploymentDescription
-    // 
-    bool InstanceDeploymentDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
+void InstanceDeploymentDescription::
+implementation (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+*implementation_ = e;
+}
 
-    ::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription::
-    id () const
-    {
-      return *id_;
-    }
+// InstanceDeploymentDescription
+//
+InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
+begin_configProperty ()
+{
+return configProperty_.begin ();
+}
 
-    ::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription::
-    id ()
-    {
-      return *id_;
-    }
+InstanceDeploymentDescription::configProperty_iterator InstanceDeploymentDescription::
+end_configProperty ()
+{
+return configProperty_.end ();
+}
 
-    void InstanceDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
+InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
+begin_configProperty () const
+{
+return configProperty_.begin ();
+}
 
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
-    }
+InstanceDeploymentDescription::configProperty_const_iterator InstanceDeploymentDescription::
+end_configProperty () const
+{
+return configProperty_.end ();
+}
 
+void InstanceDeploymentDescription::
+add_configProperty (::CIAO::Config_Handlers::Property const& e)
+{
+configProperty_.push_back (e);
+}
 
-    // CCMComponentPortKind
-    // 
+size_t InstanceDeploymentDescription::
+count_configProperty(void) const
+{
+return configProperty_.size ();
+}
 
-    CCMComponentPortKind::Value CCMComponentPortKind::
-    integral () const
-    {
-      return v_;
-    }
+// InstanceDeploymentDescription
+//
+bool InstanceDeploymentDescription::
+deployedResource_p () const
+{
+return deployedResource_.get () != 0;
+}
 
-    bool
-    operator== (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-    {
-      return a.v_ == b.v_;
-    }
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
+deployedResource () const
+{
+return *deployedResource_;
+}
 
-    bool
-    operator!= (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
-    {
-      return a.v_ != b.v_;
-    }
+void InstanceDeploymentDescription::
+deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+{
+if (deployedResource_.get ())
+{
+*deployedResource_ = e;
+}
 
-    CCMComponentPortKind::
-    CCMComponentPortKind (CCMComponentPortKind::Value v)
-    : v_ (v)
-    {
-    }
+else
+{
+deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
+deployedResource_->container (this);
+}
+}
 
-    // ComponentPortDescription
-    // 
-
-    ComponentPortDescription::
-    ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                              ::XMLSchema::string< ACE_TCHAR > const& specificType__,
-                              ::XMLSchema::string< ACE_TCHAR > const& supportedType__,
-                              ::XMLSchema::string< ACE_TCHAR > const& provider__,
-                              ::XMLSchema::string< ACE_TCHAR > const& exclusiveProvider__,
-                              ::XMLSchema::string< ACE_TCHAR > const& exclusiveUser__,
-                              ::XMLSchema::string< ACE_TCHAR > const& optional__,
-                              ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    specificType_ (new ::XMLSchema::string< ACE_TCHAR > (specificType__)),
-    supportedType_ (new ::XMLSchema::string< ACE_TCHAR > (supportedType__)),
-    provider_ (new ::XMLSchema::string< ACE_TCHAR > (provider__)),
-    exclusiveProvider_ (new ::XMLSchema::string< ACE_TCHAR > (exclusiveProvider__)),
-    exclusiveUser_ (new ::XMLSchema::string< ACE_TCHAR > (exclusiveUser__)),
-    optional_ (new ::XMLSchema::string< ACE_TCHAR > (optional__)),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      specificType_->container (this);
-      supportedType_->container (this);
-      provider_->container (this);
-      exclusiveProvider_->container (this);
-      exclusiveUser_->container (this);
-      optional_->container (this);
-      kind_->container (this);
-    }
+// InstanceDeploymentDescription
+//
+bool InstanceDeploymentDescription::
+deployedSharedResource_p () const
+{
+return deployedSharedResource_.get () != 0;
+}
 
-    ComponentPortDescription::
-    ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    specificType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_)),
-    supportedType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.supportedType_)),
-    provider_ (new ::XMLSchema::string< ACE_TCHAR > (*s.provider_)),
-    exclusiveProvider_ (new ::XMLSchema::string< ACE_TCHAR > (*s.exclusiveProvider_)),
-    exclusiveUser_ (new ::XMLSchema::string< ACE_TCHAR > (*s.exclusiveUser_)),
-    optional_ (new ::XMLSchema::string< ACE_TCHAR > (*s.optional_)),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      specificType_->container (this);
-      supportedType_->container (this);
-      provider_->container (this);
-      exclusiveProvider_->container (this);
-      exclusiveUser_->container (this);
-      optional_->container (this);
-      kind_->container (this);
-    }
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
+deployedSharedResource () const
+{
+return *deployedSharedResource_;
+}
 
-    ::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription::
-    operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s)
-    {
-      name (s.name ());
+void InstanceDeploymentDescription::
+deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+{
+if (deployedSharedResource_.get ())
+{
+*deployedSharedResource_ = e;
+}
 
-      specificType (s.specificType ());
+else
+{
+deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
+deployedSharedResource_->container (this);
+}
+}
 
-      supportedType (s.supportedType ());
+// InstanceDeploymentDescription
+//
+bool InstanceDeploymentDescription::
+id_p () const
+{
+return id_.get () != 0;
+}
 
-      provider (s.provider ());
+::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription::
+id () const
+{
+return *id_;
+}
 
-      exclusiveProvider (s.exclusiveProvider ());
+::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription::
+id ()
+{
+return *id_;
+}
 
-      exclusiveUser (s.exclusiveUser ());
+void InstanceDeploymentDescription::
+id (::XMLSchema::ID< ACE_TCHAR > const& e)
+{
+if (id_.get ())
+{
+*id_ = e;
+}
 
-      optional (s.optional ());
+else
+{
+id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+id_->container (this);
+}
+}
 
-      kind (s.kind ());
 
-      return *this;
-    }
+// CCMComponentPortKind
+//
 
+CCMComponentPortKind::Value CCMComponentPortKind::
+integral () const
+{
+return v_;
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    name () const
-    {
-      return *name_;
-    }
+bool
+operator== (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
+{
+return a.v_ == b.v_;
+}
 
-    void ComponentPortDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+bool
+operator!= (::CIAO::Config_Handlers::CCMComponentPortKind const& a, ::CIAO::Config_Handlers::CCMComponentPortKind const& b)
+{
+return a.v_ != b.v_;
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    specificType () const
-    {
-      return *specificType_;
-    }
+CCMComponentPortKind::
+CCMComponentPortKind (CCMComponentPortKind::Value v)
+: v_ (v)
+{
+}
 
-    void ComponentPortDescription::
-    specificType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *specificType_ = e;
-    }
+// ComponentPortDescription
+//
+
+ComponentPortDescription::
+ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::boolean const& provider__,
+::XMLSchema::boolean const& exclusiveProvider__,
+::XMLSchema::boolean const& exclusiveUser__,
+::XMLSchema::boolean const& optional__,
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+provider_ (new ::XMLSchema::boolean (provider__)),
+exclusiveProvider_ (new ::XMLSchema::boolean (exclusiveProvider__)),
+exclusiveUser_ (new ::XMLSchema::boolean (exclusiveUser__)),
+optional_ (new ::XMLSchema::boolean (optional__)),
+kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
+regulator__ ()
+{
+name_->container (this);
+provider_->container (this);
+exclusiveProvider_->container (this);
+exclusiveUser_->container (this);
+optional_->container (this);
+kind_->container (this);
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    supportedType () const
-    {
-      return *supportedType_;
-    }
+ComponentPortDescription::
+ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0),
+provider_ (new ::XMLSchema::boolean (*s.provider_)),
+exclusiveProvider_ (new ::XMLSchema::boolean (*s.exclusiveProvider_)),
+exclusiveUser_ (new ::XMLSchema::boolean (*s.exclusiveUser_)),
+optional_ (new ::XMLSchema::boolean (*s.optional_)),
+kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
+regulator__ ()
+{
+name_->container (this);
+if (specificType_.get ()) specificType_->container (this);
+{
+for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
+}
 
-    void ComponentPortDescription::
-    supportedType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *supportedType_ = e;
-    }
+provider_->container (this);
+exclusiveProvider_->container (this);
+exclusiveUser_->container (this);
+optional_->container (this);
+kind_->container (this);
+}
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    provider () const
-    {
-      return *provider_;
-    }
+::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription::
+operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s)
+{
+name (s.name ());
 
-    void ComponentPortDescription::
-    provider (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *provider_ = e;
-    }
+if (s.specificType_.get ()) specificType (*(s.specificType_));
+else specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    exclusiveProvider () const
-    {
-      return *exclusiveProvider_;
-    }
+supportedType_.clear ();
+{
+for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
+}
 
-    void ComponentPortDescription::
-    exclusiveProvider (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *exclusiveProvider_ = e;
-    }
+provider (s.provider ());
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    exclusiveUser () const
-    {
-      return *exclusiveUser_;
-    }
+exclusiveProvider (s.exclusiveProvider ());
 
-    void ComponentPortDescription::
-    exclusiveUser (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *exclusiveUser_ = e;
-    }
+exclusiveUser (s.exclusiveUser ());
 
-    // ComponentPortDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
-    optional () const
-    {
-      return *optional_;
-    }
+optional (s.optional ());
 
-    void ComponentPortDescription::
-    optional (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *optional_ = e;
-    }
+kind (s.kind ());
 
-    // ComponentPortDescription
-    // 
-    ::CIAO::Config_Handlers::CCMComponentPortKind const& ComponentPortDescription::
-    kind () const
-    {
-      return *kind_;
-    }
+return *this;
+}
 
-    void ComponentPortDescription::
-    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-    {
-      *kind_ = e;
-    }
 
+// ComponentPortDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
+name () const
+{
+return *name_;
+}
 
-    // ComponentPropertyDescription
-    // 
+void ComponentPortDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    ComponentPropertyDescription::
-    ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                  ::CIAO::Config_Handlers::DataType const& type__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    type_ (new ::CIAO::Config_Handlers::DataType (type__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      type_->container (this);
-    }
+// ComponentPortDescription
+//
+bool ComponentPortDescription::
+specificType_p () const
+{
+return specificType_.get () != 0;
+}
 
-    ComponentPropertyDescription::
-    ComponentPropertyDescription (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      type_->container (this);
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPortDescription::
+specificType () const
+{
+return *specificType_;
+}
 
-    ::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription::
-    operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
-    {
-      name (s.name ());
+void ComponentPortDescription::
+specificType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (specificType_.get ())
+{
+*specificType_ = e;
+}
 
-      type (s.type ());
+else
+{
+specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+specificType_->container (this);
+}
+}
 
-      return *this;
-    }
+// ComponentPortDescription
+//
+ComponentPortDescription::supportedType_iterator ComponentPortDescription::
+begin_supportedType ()
+{
+return supportedType_.begin ();
+}
 
+ComponentPortDescription::supportedType_iterator ComponentPortDescription::
+end_supportedType ()
+{
+return supportedType_.end ();
+}
 
-    // ComponentPropertyDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPropertyDescription::
-    name () const
-    {
-      return *name_;
-    }
+ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
+begin_supportedType () const
+{
+return supportedType_.begin ();
+}
 
-    void ComponentPropertyDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+ComponentPortDescription::supportedType_const_iterator ComponentPortDescription::
+end_supportedType () const
+{
+return supportedType_.end ();
+}
 
-    // ComponentPropertyDescription
-    // 
-    ::CIAO::Config_Handlers::DataType const& ComponentPropertyDescription::
-    type () const
-    {
-      return *type_;
-    }
+void ComponentPortDescription::
+add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+supportedType_.push_back (e);
+}
 
-    void ComponentPropertyDescription::
-    type (::CIAO::Config_Handlers::DataType const& e)
-    {
-      *type_ = e;
-    }
+size_t ComponentPortDescription::
+count_supportedType(void) const
+{
+return supportedType_.size ();
+}
 
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+provider () const
+{
+return *provider_;
+}
 
-    // ComponentExternalPortEndpoint
-    // 
+void ComponentPortDescription::
+provider (::XMLSchema::boolean const& e)
+{
+*provider_ = e;
+}
 
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__)
-    : 
-    ::XSCRT::Type (), 
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-    regulator__ ()
-    {
-      portName_->container (this);
-    }
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+exclusiveProvider () const
+{
+return *exclusiveProvider_;
+}
 
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-    :
-    ::XSCRT::Type (),
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-    regulator__ ()
-    {
-      portName_->container (this);
-    }
+void ComponentPortDescription::
+exclusiveProvider (::XMLSchema::boolean const& e)
+{
+*exclusiveProvider_ = e;
+}
 
-    ::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
-    operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
-    {
-      portName (s.portName ());
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+exclusiveUser () const
+{
+return *exclusiveUser_;
+}
 
-      return *this;
-    }
+void ComponentPortDescription::
+exclusiveUser (::XMLSchema::boolean const& e)
+{
+*exclusiveUser_ = e;
+}
 
+// ComponentPortDescription
+//
+::XMLSchema::boolean const& ComponentPortDescription::
+optional () const
+{
+return *optional_;
+}
 
-    // ComponentExternalPortEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentExternalPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
+void ComponentPortDescription::
+optional (::XMLSchema::boolean const& e)
+{
+*optional_ = e;
+}
 
-    void ComponentExternalPortEndpoint::
-    portName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *portName_ = e;
-    }
+// ComponentPortDescription
+//
+::CIAO::Config_Handlers::CCMComponentPortKind const& ComponentPortDescription::
+kind () const
+{
+return *kind_;
+}
 
+void ComponentPortDescription::
+kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
+{
+*kind_ = e;
+}
 
-    // PlanSubcomponentPortEndpoint
-    // 
 
-    PlanSubcomponentPortEndpoint::
-    PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                                  ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-                                  ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
-    : 
-    ::XSCRT::Type (), 
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
-    regulator__ ()
-    {
-      portName_->container (this);
-      kind_->container (this);
-      instance_->container (this);
-    }
+// ComponentPropertyDescription
+//
 
-    PlanSubcomponentPortEndpoint::
-    PlanSubcomponentPortEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
-    :
-    ::XSCRT::Type (),
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-    provider_ (s.provider_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.provider_) : 0),
-    kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
-    regulator__ ()
-    {
-      portName_->container (this);
-      if (provider_.get ()) provider_->container (this);
-      kind_->container (this);
-      instance_->container (this);
-    }
+ComponentPropertyDescription::
+ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::DataType const& type__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+type_ (new ::CIAO::Config_Handlers::DataType (type__)),
+regulator__ ()
+{
+name_->container (this);
+type_->container (this);
+}
 
-    ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint::
-    operator= (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
-    {
-      portName (s.portName ());
+ComponentPropertyDescription::
+ComponentPropertyDescription (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
+regulator__ ()
+{
+name_->container (this);
+type_->container (this);
+}
 
-      if (s.provider_.get ()) provider (*(s.provider_));
-      else provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription::
+operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
+{
+name (s.name ());
 
-      kind (s.kind ());
+type (s.type ());
 
-      instance (s.instance ());
+return *this;
+}
 
-      return *this;
-    }
 
+// ComponentPropertyDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentPropertyDescription::
+name () const
+{
+return *name_;
+}
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
+void ComponentPropertyDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void PlanSubcomponentPortEndpoint::
-    portName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *portName_ = e;
-    }
+// ComponentPropertyDescription
+//
+::CIAO::Config_Handlers::DataType const& ComponentPropertyDescription::
+type () const
+{
+return *type_;
+}
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    bool PlanSubcomponentPortEndpoint::
-    provider_p () const
-    {
-      return provider_.get () != 0;
-    }
+void ComponentPropertyDescription::
+type (::CIAO::Config_Handlers::DataType const& e)
+{
+*type_ = e;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-    provider () const
-    {
-      return *provider_;
-    }
 
-    void PlanSubcomponentPortEndpoint::
-    provider (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (provider_.get ())
-      {
-        *provider_ = e;
-      }
+// ComponentExternalPortEndpoint
+//
 
-      else
-      {
-        provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        provider_->container (this);
-      }
-    }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
+regulator__ ()
+{
+portName_->container (this);
+}
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::CIAO::Config_Handlers::CCMComponentPortKind const& PlanSubcomponentPortEndpoint::
-    kind () const
-    {
-      return *kind_;
-    }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
+regulator__ ()
+{
+portName_->container (this);
+}
 
-    void PlanSubcomponentPortEndpoint::
-    kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
-    {
-      *kind_ = e;
-    }
+::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
+operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
+{
+portName (s.portName ());
 
-    // PlanSubcomponentPortEndpoint
-    // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
-    instance () const
-    {
-      return *instance_;
-    }
+return *this;
+}
 
-    void PlanSubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      *instance_ = e;
-    }
 
+// ComponentExternalPortEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentExternalPortEndpoint::
+portName () const
+{
+return *portName_;
+}
 
-    // ExternalReferenceEndpoint
-    // 
+void ComponentExternalPortEndpoint::
+portName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*portName_ = e;
+}
 
-    ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__)
-    : 
-    ::XSCRT::Type (), 
-    location_ (new ::XMLSchema::string< ACE_TCHAR > (location__)),
-    regulator__ ()
-    {
-      location_->container (this);
-    }
 
-    ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
-    :
-    ::XSCRT::Type (),
-    location_ (new ::XMLSchema::string< ACE_TCHAR > (*s.location_)),
-    regulator__ ()
-    {
-      location_->container (this);
-    }
+// PlanSubcomponentPortEndpoint
+//
 
-    ::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
-    operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
-    {
-      location (s.location ());
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
+::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
+kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
+instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+regulator__ ()
+{
+portName_->container (this);
+kind_->container (this);
+instance_->container (this);
+}
 
-      return *this;
-    }
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
+provider_ (s.provider_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.provider_) : 0),
+kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
+instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+regulator__ ()
+{
+portName_->container (this);
+if (provider_.get ()) provider_->container (this);
+kind_->container (this);
+instance_->container (this);
+}
 
+::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint::
+operator= (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
+{
+portName (s.portName ());
 
-    // ExternalReferenceEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ExternalReferenceEndpoint::
-    location () const
-    {
-      return *location_;
-    }
+if (s.provider_.get ()) provider (*(s.provider_));
+else provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    void ExternalReferenceEndpoint::
-    location (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *location_ = e;
-    }
+kind (s.kind ());
 
+instance (s.instance ());
 
-    // ConnectionResourceDeploymentDescription
-    // 
-
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
-                                             ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                             ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                             ::CIAO::Config_Handlers::Any const& resourceValue__)
-    : 
-    ::XSCRT::Type (), 
-    targetName_ (new ::XMLSchema::string< ACE_TCHAR > (targetName__)),
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)),
-    regulator__ ()
-    {
-      targetName_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
+return *this;
+}
 
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
-    :
-    ::XSCRT::Type (),
-    targetName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.targetName_)),
-    requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
-    resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
-    resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
-    regulator__ ()
-    {
-      targetName_->container (this);
-      requirementName_->container (this);
-      resourceName_->container (this);
-      resourceValue_->container (this);
-    }
 
-    ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
-    operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
-    {
-      targetName (s.targetName ());
+// PlanSubcomponentPortEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+portName () const
+{
+return *portName_;
+}
 
-      requirementName (s.requirementName ());
+void PlanSubcomponentPortEndpoint::
+portName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*portName_ = e;
+}
 
-      resourceName (s.resourceName ());
+// PlanSubcomponentPortEndpoint
+//
+bool PlanSubcomponentPortEndpoint::
+provider_p () const
+{
+return provider_.get () != 0;
+}
 
-      resourceValue (s.resourceValue ());
+::XMLSchema::string< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+provider () const
+{
+return *provider_;
+}
 
-      return *this;
-    }
+void PlanSubcomponentPortEndpoint::
+provider (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (provider_.get ())
+{
+*provider_ = e;
+}
 
+else
+{
+provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+provider_->container (this);
+}
+}
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-    targetName () const
-    {
-      return *targetName_;
-    }
+// PlanSubcomponentPortEndpoint
+//
+::CIAO::Config_Handlers::CCMComponentPortKind const& PlanSubcomponentPortEndpoint::
+kind () const
+{
+return *kind_;
+}
 
-    void ConnectionResourceDeploymentDescription::
-    targetName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *targetName_ = e;
-    }
+void PlanSubcomponentPortEndpoint::
+kind (::CIAO::Config_Handlers::CCMComponentPortKind const& e)
+{
+*kind_ = e;
+}
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-    requirementName () const
-    {
-      return *requirementName_;
-    }
+// PlanSubcomponentPortEndpoint
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+instance () const
+{
+return *instance_;
+}
 
-    void ConnectionResourceDeploymentDescription::
-    requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requirementName_ = e;
-    }
+void PlanSubcomponentPortEndpoint::
+instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+*instance_ = e;
+}
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
-    resourceName () const
-    {
-      return *resourceName_;
-    }
 
-    void ConnectionResourceDeploymentDescription::
-    resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceName_ = e;
-    }
+// ExternalReferenceEndpoint
+//
 
-    // ConnectionResourceDeploymentDescription
-    // 
-    ::CIAO::Config_Handlers::Any const& ConnectionResourceDeploymentDescription::
-    resourceValue () const
-    {
-      return *resourceValue_;
-    }
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__)
+:
+::XSCRT::Type (),
+location_ (new ::XMLSchema::string< ACE_TCHAR > (location__)),
+regulator__ ()
+{
+location_->container (this);
+}
 
-    void ConnectionResourceDeploymentDescription::
-    resourceValue (::CIAO::Config_Handlers::Any const& e)
-    {
-      *resourceValue_ = e;
-    }
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
+:
+::XSCRT::Type (),
+location_ (new ::XMLSchema::string< ACE_TCHAR > (*s.location_)),
+regulator__ ()
+{
+location_->container (this);
+}
 
+::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
+operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
+{
+location (s.location ());
 
-    // PlanConnectionDescription
-    // 
+return *this;
+}
 
-    PlanConnectionDescription::
-    PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
 
-    PlanConnectionDescription::
-    PlanConnectionDescription (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    source_ (s.source_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.source_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      if (source_.get ()) source_->container (this);
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-      }
+// ExternalReferenceEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& ExternalReferenceEndpoint::
+location () const
+{
+return *location_;
+}
 
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-      }
+void ExternalReferenceEndpoint::
+location (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*location_ = e;
+}
 
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-      }
 
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-      }
+// ConnectionResourceDeploymentDescription
+//
 
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-      }
-    }
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
+::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+::XMLSchema::string< ACE_TCHAR > const& resourceName__)
+:
+::XSCRT::Type (),
+targetName_ (new ::XMLSchema::string< ACE_TCHAR > (targetName__)),
+requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
+resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)),
+regulator__ ()
+{
+targetName_->container (this);
+requirementName_->container (this);
+resourceName_->container (this);
+}
 
-    ::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription::
-    operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
-    {
-      name (s.name ());
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
+:
+::XSCRT::Type (),
+targetName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.targetName_)),
+requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)),
+resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)),
+regulator__ ()
+{
+targetName_->container (this);
+requirementName_->container (this);
+resourceName_->container (this);
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-      if (s.source_.get ()) source (*(s.source_));
-      else source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
+operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
+{
+targetName (s.targetName ());
 
-      deployRequirement_.clear ();
-      {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
-      }
+requirementName (s.requirementName ());
 
-      externalEndpoint_.clear ();
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-      }
+resourceName (s.resourceName ());
 
-      internalEndpoint_.clear ();
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-      }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-      externalReference_.clear ();
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-      }
+return *this;
+}
 
-      deployedResource_.clear ();
-      {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
-      }
 
-      return *this;
-    }
+// ConnectionResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+targetName () const
+{
+return *targetName_;
+}
 
+void ConnectionResourceDeploymentDescription::
+targetName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*targetName_ = e;
+}
 
-    // PlanConnectionDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
-    name () const
-    {
-      return *name_;
-    }
+// ConnectionResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+requirementName () const
+{
+return *requirementName_;
+}
 
-    void PlanConnectionDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void ConnectionResourceDeploymentDescription::
+requirementName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requirementName_ = e;
+}
 
-    // PlanConnectionDescription
-    // 
-    bool PlanConnectionDescription::
-    source_p () const
-    {
-      return source_.get () != 0;
-    }
+// ConnectionResourceDeploymentDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& ConnectionResourceDeploymentDescription::
+resourceName () const
+{
+return *resourceName_;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
-    source () const
-    {
-      return *source_;
-    }
+void ConnectionResourceDeploymentDescription::
+resourceName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceName_ = e;
+}
 
-    void PlanConnectionDescription::
-    source (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (source_.get ())
-      {
-        *source_ = e;
-      }
+// ConnectionResourceDeploymentDescription
+//
+ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
+begin_property ()
+{
+return property_.begin ();
+}
 
-      else
-      {
-        source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        source_->container (this);
-      }
-    }
+ConnectionResourceDeploymentDescription::property_iterator ConnectionResourceDeploymentDescription::
+end_property ()
+{
+return property_.end ();
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
-    begin_deployRequirement ()
-    {
-      return deployRequirement_.begin ();
-    }
+ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
-    end_deployRequirement ()
-    {
-      return deployRequirement_.end ();
-    }
+ConnectionResourceDeploymentDescription::property_const_iterator ConnectionResourceDeploymentDescription::
+end_property () const
+{
+return property_.end ();
+}
 
-    PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
-    begin_deployRequirement () const
-    {
-      return deployRequirement_.begin ();
-    }
+void ConnectionResourceDeploymentDescription::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-    PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
-    end_deployRequirement () const
-    {
-      return deployRequirement_.end ();
-    }
+size_t ConnectionResourceDeploymentDescription::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    void PlanConnectionDescription::
-    add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      deployRequirement_.push_back (e);
-    }
 
-    size_t PlanConnectionDescription::
-    count_deployRequirement(void) const
-    {
-      return deployRequirement_.size ();
-    }
+// PlanConnectionDescription
+//
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-    begin_externalEndpoint ()
-    {
-      return externalEndpoint_.begin ();
-    }
+PlanConnectionDescription::
+PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
-    end_externalEndpoint ()
-    {
-      return externalEndpoint_.end ();
-    }
+PlanConnectionDescription::
+PlanConnectionDescription (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+source_ (s.source_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.source_) : 0),
+regulator__ ()
+{
+name_->container (this);
+if (source_.get ()) source_->container (this);
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-    begin_externalEndpoint () const
-    {
-      return externalEndpoint_.begin ();
-    }
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-    PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
-    end_externalEndpoint () const
-    {
-      return externalEndpoint_.end ();
-    }
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-    void PlanConnectionDescription::
-    add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
-    {
-      externalEndpoint_.push_back (e);
-    }
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
 
-    size_t PlanConnectionDescription::
-    count_externalEndpoint(void) const
-    {
-      return externalEndpoint_.size ();
-    }
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-    begin_internalEndpoint ()
-    {
-      return internalEndpoint_.begin ();
-    }
+::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription::
+operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
+{
+name (s.name ());
 
-    PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
-    end_internalEndpoint ()
-    {
-      return internalEndpoint_.end ();
-    }
+if (s.source_.get ()) source (*(s.source_));
+else source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-    begin_internalEndpoint () const
-    {
-      return internalEndpoint_.begin ();
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
-    end_internalEndpoint () const
-    {
-      return internalEndpoint_.end ();
-    }
+externalEndpoint_.clear ();
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-    void PlanConnectionDescription::
-    add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e)
-    {
-      internalEndpoint_.push_back (e);
-    }
+internalEndpoint_.clear ();
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-    size_t PlanConnectionDescription::
-    count_internalEndpoint(void) const
-    {
-      return internalEndpoint_.size ();
-    }
+externalReference_.clear ();
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-    begin_externalReference ()
-    {
-      return externalReference_.begin ();
-    }
+deployedResource_.clear ();
+{
+for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+}
 
-    PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
-    end_externalReference ()
-    {
-      return externalReference_.end ();
-    }
+return *this;
+}
 
-    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-    begin_externalReference () const
-    {
-      return externalReference_.begin ();
-    }
 
-    PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
-    end_externalReference () const
-    {
-      return externalReference_.end ();
-    }
+// PlanConnectionDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
+name () const
+{
+return *name_;
+}
 
-    void PlanConnectionDescription::
-    add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
-    {
-      externalReference_.push_back (e);
-    }
+void PlanConnectionDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    size_t PlanConnectionDescription::
-    count_externalReference(void) const
-    {
-      return externalReference_.size ();
-    }
+// PlanConnectionDescription
+//
+bool PlanConnectionDescription::
+source_p () const
+{
+return source_.get () != 0;
+}
 
-    // PlanConnectionDescription
-    // 
-    PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
-    begin_deployedResource ()
-    {
-      return deployedResource_.begin ();
-    }
+::XMLSchema::string< ACE_TCHAR > const& PlanConnectionDescription::
+source () const
+{
+return *source_;
+}
 
-    PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
-    end_deployedResource ()
-    {
-      return deployedResource_.end ();
-    }
+void PlanConnectionDescription::
+source (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (source_.get ())
+{
+*source_ = e;
+}
 
-    PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
-    begin_deployedResource () const
-    {
-      return deployedResource_.begin ();
-    }
+else
+{
+source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+source_->container (this);
+}
+}
 
-    PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
-    end_deployedResource () const
-    {
-      return deployedResource_.end ();
-    }
+// PlanConnectionDescription
+//
+PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-    void PlanConnectionDescription::
-    add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e)
-    {
-      deployedResource_.push_back (e);
-    }
+PlanConnectionDescription::deployRequirement_iterator PlanConnectionDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-    size_t PlanConnectionDescription::
-    count_deployedResource(void) const
-    {
-      return deployedResource_.size ();
-    }
+PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
+PlanConnectionDescription::deployRequirement_const_iterator PlanConnectionDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-    // ImplementationDependency
-    // 
+void PlanConnectionDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-    ImplementationDependency::
-    ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
-    : 
-    ::XSCRT::Type (), 
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
-    regulator__ ()
-    {
-      requiredType_->container (this);
-    }
+size_t PlanConnectionDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-    ImplementationDependency::
-    ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
-    :
-    ::XSCRT::Type (),
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
-    regulator__ ()
-    {
-      requiredType_->container (this);
-    }
+// PlanConnectionDescription
+//
+PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
+begin_externalEndpoint ()
+{
+return externalEndpoint_.begin ();
+}
 
-    ::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency::
-    operator= (::CIAO::Config_Handlers::ImplementationDependency const& s)
-    {
-      requiredType (s.requiredType ());
+PlanConnectionDescription::externalEndpoint_iterator PlanConnectionDescription::
+end_externalEndpoint ()
+{
+return externalEndpoint_.end ();
+}
 
-      return *this;
-    }
+PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
+begin_externalEndpoint () const
+{
+return externalEndpoint_.begin ();
+}
 
+PlanConnectionDescription::externalEndpoint_const_iterator PlanConnectionDescription::
+end_externalEndpoint () const
+{
+return externalEndpoint_.end ();
+}
 
-    // ImplementationDependency
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationDependency::
-    requiredType () const
-    {
-      return *requiredType_;
-    }
+void PlanConnectionDescription::
+add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
+{
+externalEndpoint_.push_back (e);
+}
 
-    void ImplementationDependency::
-    requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredType_ = e;
-    }
+size_t PlanConnectionDescription::
+count_externalEndpoint(void) const
+{
+return externalEndpoint_.size ();
+}
 
+// PlanConnectionDescription
+//
+PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
+begin_internalEndpoint ()
+{
+return internalEndpoint_.begin ();
+}
 
-    // Capability
-    // 
+PlanConnectionDescription::internalEndpoint_iterator PlanConnectionDescription::
+end_internalEndpoint ()
+{
+return internalEndpoint_.end ();
+}
 
-    Capability::
-    Capability (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                ::CIAO::Config_Handlers::SatisfierProperty const& property__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
+PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
+begin_internalEndpoint () const
+{
+return internalEndpoint_.begin ();
+}
 
-    Capability::
-    Capability (::CIAO::Config_Handlers::Capability const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      property_->container (this);
-    }
+PlanConnectionDescription::internalEndpoint_const_iterator PlanConnectionDescription::
+end_internalEndpoint () const
+{
+return internalEndpoint_.end ();
+}
 
-    ::CIAO::Config_Handlers::Capability& Capability::
-    operator= (::CIAO::Config_Handlers::Capability const& s)
-    {
-      name (s.name ());
+void PlanConnectionDescription::
+add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e)
+{
+internalEndpoint_.push_back (e);
+}
 
-      resourceType (s.resourceType ());
+size_t PlanConnectionDescription::
+count_internalEndpoint(void) const
+{
+return internalEndpoint_.size ();
+}
 
-      property (s.property ());
+// PlanConnectionDescription
+//
+PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
+begin_externalReference ()
+{
+return externalReference_.begin ();
+}
 
-      return *this;
-    }
+PlanConnectionDescription::externalReference_iterator PlanConnectionDescription::
+end_externalReference ()
+{
+return externalReference_.end ();
+}
 
+PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
+begin_externalReference () const
+{
+return externalReference_.begin ();
+}
 
-    // Capability
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Capability::
-    name () const
-    {
-      return *name_;
-    }
+PlanConnectionDescription::externalReference_const_iterator PlanConnectionDescription::
+end_externalReference () const
+{
+return externalReference_.end ();
+}
 
-    void Capability::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void PlanConnectionDescription::
+add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
+{
+externalReference_.push_back (e);
+}
 
-    // Capability
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Capability::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+size_t PlanConnectionDescription::
+count_externalReference(void) const
+{
+return externalReference_.size ();
+}
 
-    void Capability::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
+// PlanConnectionDescription
+//
+PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
+begin_deployedResource ()
+{
+return deployedResource_.begin ();
+}
 
-    // Capability
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& Capability::
-    property () const
-    {
-      return *property_;
-    }
+PlanConnectionDescription::deployedResource_iterator PlanConnectionDescription::
+end_deployedResource ()
+{
+return deployedResource_.end ();
+}
 
-    void Capability::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
+PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
+begin_deployedResource () const
+{
+return deployedResource_.begin ();
+}
 
+PlanConnectionDescription::deployedResource_const_iterator PlanConnectionDescription::
+end_deployedResource () const
+{
+return deployedResource_.end ();
+}
 
-    // ImplementationRequirement
-    // 
-
-    ImplementationRequirement::
-    ImplementationRequirement (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-                               ::XMLSchema::string< ACE_TCHAR > const& resourcePort__,
-                               ::XMLSchema::string< ACE_TCHAR > const& componentPort__,
-                               ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                               ::XMLSchema::string< ACE_TCHAR > const& name__,
-                               ::CIAO::Config_Handlers::Property const& property__)
-    : 
-    ::XSCRT::Type (), 
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
-    resourcePort_ (new ::XMLSchema::string< ACE_TCHAR > (resourcePort__)),
-    componentPort_ (new ::XMLSchema::string< ACE_TCHAR > (componentPort__)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    property_ (new ::CIAO::Config_Handlers::Property (property__)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      resourcePort_->container (this);
-      componentPort_->container (this);
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
+void PlanConnectionDescription::
+add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e)
+{
+deployedResource_.push_back (e);
+}
 
-    ImplementationRequirement::
-    ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-    :
-    ::XSCRT::Type (),
-    resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
-    resourcePort_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourcePort_)),
-    componentPort_ (new ::XMLSchema::string< ACE_TCHAR > (*s.componentPort_)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    property_ (new ::CIAO::Config_Handlers::Property (*s.property_)),
-    regulator__ ()
-    {
-      resourceUsage_->container (this);
-      resourcePort_->container (this);
-      componentPort_->container (this);
-      resourceType_->container (this);
-      name_->container (this);
-      property_->container (this);
-    }
+size_t PlanConnectionDescription::
+count_deployedResource(void) const
+{
+return deployedResource_.size ();
+}
 
-    ::CIAO::Config_Handlers::ImplementationRequirement& ImplementationRequirement::
-    operator= (::CIAO::Config_Handlers::ImplementationRequirement const& s)
-    {
-      resourceUsage (s.resourceUsage ());
 
-      resourcePort (s.resourcePort ());
+// ImplementationDependency
+//
 
-      componentPort (s.componentPort ());
+ImplementationDependency::
+ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
+:
+::XSCRT::Type (),
+requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
+regulator__ ()
+{
+requiredType_->container (this);
+}
 
-      resourceType (s.resourceType ());
+ImplementationDependency::
+ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
+:
+::XSCRT::Type (),
+requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
+regulator__ ()
+{
+requiredType_->container (this);
+}
 
-      name (s.name ());
+::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency::
+operator= (::CIAO::Config_Handlers::ImplementationDependency const& s)
+{
+requiredType (s.requiredType ());
 
-      property (s.property ());
+return *this;
+}
 
-      return *this;
-    }
 
+// ImplementationDependency
+//
+::XMLSchema::string< ACE_TCHAR > const& ImplementationDependency::
+requiredType () const
+{
+return *requiredType_;
+}
 
-    // ImplementationRequirement
-    // 
-    ::CIAO::Config_Handlers::ResourceUsageKind const& ImplementationRequirement::
-    resourceUsage () const
-    {
-      return *resourceUsage_;
-    }
+void ImplementationDependency::
+requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requiredType_ = e;
+}
 
-    void ImplementationRequirement::
-    resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
-    {
-      *resourceUsage_ = e;
-    }
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    resourcePort () const
-    {
-      return *resourcePort_;
-    }
+// Capability
+//
 
-    void ImplementationRequirement::
-    resourcePort (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourcePort_ = e;
-    }
+Capability::
+Capability (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    componentPort () const
-    {
-      return *componentPort_;
-    }
+Capability::
+Capability (::CIAO::Config_Handlers::Capability const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+regulator__ ()
+{
+name_->container (this);
+{
+for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+}
 
-    void ImplementationRequirement::
-    componentPort (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *componentPort_ = e;
-    }
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+::CIAO::Config_Handlers::Capability& Capability::
+operator= (::CIAO::Config_Handlers::Capability const& s)
+{
+name (s.name ());
 
-    void ImplementationRequirement::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
+resourceType_.clear ();
+{
+for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
+}
 
-    // ImplementationRequirement
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
-    name () const
-    {
-      return *name_;
-    }
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    void ImplementationRequirement::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+return *this;
+}
 
-    // ImplementationRequirement
-    // 
-    ::CIAO::Config_Handlers::Property const& ImplementationRequirement::
-    property () const
-    {
-      return *property_;
-    }
 
-    void ImplementationRequirement::
-    property (::CIAO::Config_Handlers::Property const& e)
-    {
-      *property_ = e;
-    }
+// Capability
+//
+::XMLSchema::string< ACE_TCHAR > const& Capability::
+name () const
+{
+return *name_;
+}
 
+void Capability::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // ComponentPackageReference
-    // 
+// Capability
+//
+Capability::resourceType_iterator Capability::
+begin_resourceType ()
+{
+return resourceType_.begin ();
+}
 
-    ComponentPackageReference::
-    ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredUUID__,
-                               ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
-                               ::XMLSchema::string< ACE_TCHAR > const& requiredType__)
-    : 
-    ::XSCRT::Type (), 
-    requiredUUID_ (new ::XMLSchema::string< ACE_TCHAR > (requiredUUID__)),
-    requiredName_ (new ::XMLSchema::string< ACE_TCHAR > (requiredName__)),
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
-    regulator__ ()
-    {
-      requiredUUID_->container (this);
-      requiredName_->container (this);
-      requiredType_->container (this);
-    }
+Capability::resourceType_iterator Capability::
+end_resourceType ()
+{
+return resourceType_.end ();
+}
 
-    ComponentPackageReference::
-    ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-    :
-    ::XSCRT::Type (),
-    requiredUUID_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredUUID_)),
-    requiredName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredName_)),
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
-    regulator__ ()
-    {
-      requiredUUID_->container (this);
-      requiredName_->container (this);
-      requiredType_->container (this);
-    }
+Capability::resourceType_const_iterator Capability::
+begin_resourceType () const
+{
+return resourceType_.begin ();
+}
 
-    ::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference::
-    operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s)
-    {
-      requiredUUID (s.requiredUUID ());
+Capability::resourceType_const_iterator Capability::
+end_resourceType () const
+{
+return resourceType_.end ();
+}
 
-      requiredName (s.requiredName ());
+void Capability::
+add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+resourceType_.push_back (e);
+}
 
-      requiredType (s.requiredType ());
+size_t Capability::
+count_resourceType(void) const
+{
+return resourceType_.size ();
+}
 
-      return *this;
-    }
+// Capability
+//
+Capability::property_iterator Capability::
+begin_property ()
+{
+return property_.begin ();
+}
 
+Capability::property_iterator Capability::
+end_property ()
+{
+return property_.end ();
+}
 
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-    requiredUUID () const
-    {
-      return *requiredUUID_;
-    }
+Capability::property_const_iterator Capability::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    void ComponentPackageReference::
-    requiredUUID (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredUUID_ = e;
-    }
+Capability::property_const_iterator Capability::
+end_property () const
+{
+return property_.end ();
+}
 
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-    requiredName () const
-    {
-      return *requiredName_;
-    }
+void Capability::
+add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+{
+property_.push_back (e);
+}
 
-    void ComponentPackageReference::
-    requiredName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredName_ = e;
-    }
+size_t Capability::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    // ComponentPackageReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-    requiredType () const
-    {
-      return *requiredType_;
-    }
 
-    void ComponentPackageReference::
-    requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredType_ = e;
-    }
+// ImplementationRequirement
+//
 
+ImplementationRequirement::
+ImplementationRequirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+resourceType_->container (this);
+name_->container (this);
+}
 
-    // SubcomponentPortEndpoint
-    // 
+ImplementationRequirement::
+ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s)
+:
+::XSCRT::Type (),
+resourceUsage_ (s.resourceUsage_.get () ? new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_) : 0),
+resourcePort_ (s.resourcePort_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.resourcePort_) : 0),
+componentPort_ (s.componentPort_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.componentPort_) : 0),
+resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+regulator__ ()
+{
+if (resourceUsage_.get ()) resourceUsage_->container (this);
+if (resourcePort_.get ()) resourcePort_->container (this);
+if (componentPort_.get ()) componentPort_->container (this);
+resourceType_->container (this);
+name_->container (this);
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
+}
 
-    SubcomponentPortEndpoint::
-    SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                              ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
-    : 
-    ::XSCRT::Type (), 
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
-    regulator__ ()
-    {
-      portName_->container (this);
-      instance_->container (this);
-    }
+::CIAO::Config_Handlers::ImplementationRequirement& ImplementationRequirement::
+operator= (::CIAO::Config_Handlers::ImplementationRequirement const& s)
+{
+if (s.resourceUsage_.get ()) resourceUsage (*(s.resourceUsage_));
+else resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (0);
 
-    SubcomponentPortEndpoint::
-    SubcomponentPortEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
-    :
-    ::XSCRT::Type (),
-    portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
-    regulator__ ()
-    {
-      portName_->container (this);
-      instance_->container (this);
-    }
+if (s.resourcePort_.get ()) resourcePort (*(s.resourcePort_));
+else resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    ::CIAO::Config_Handlers::SubcomponentPortEndpoint& SubcomponentPortEndpoint::
-    operator= (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
-    {
-      portName (s.portName ());
+if (s.componentPort_.get ()) componentPort (*(s.componentPort_));
+else componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      instance (s.instance ());
+resourceType (s.resourceType ());
 
-      return *this;
-    }
+name (s.name ());
 
+property_.clear ();
+{
+for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
+}
 
-    // SubcomponentPortEndpoint
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SubcomponentPortEndpoint::
-    portName () const
-    {
-      return *portName_;
-    }
+return *this;
+}
 
-    void SubcomponentPortEndpoint::
-    portName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *portName_ = e;
-    }
 
-    // SubcomponentPortEndpoint
-    // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPortEndpoint::
-    instance () const
-    {
-      return *instance_;
-    }
+// ImplementationRequirement
+//
+bool ImplementationRequirement::
+resourceUsage_p () const
+{
+return resourceUsage_.get () != 0;
+}
 
-    void SubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
-    {
-      *instance_ = e;
-    }
+::CIAO::Config_Handlers::ResourceUsageKind const& ImplementationRequirement::
+resourceUsage () const
+{
+return *resourceUsage_;
+}
 
+void ImplementationRequirement::
+resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& e)
+{
+if (resourceUsage_.get ())
+{
+*resourceUsage_ = e;
+}
 
-    // AssemblyConnectionDescription
-    // 
+else
+{
+resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
+resourceUsage_->container (this);
+}
+}
 
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+// ImplementationRequirement
+//
+bool ImplementationRequirement::
+resourcePort_p () const
+{
+return resourcePort_.get () != 0;
+}
 
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-      }
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+resourcePort () const
+{
+return *resourcePort_;
+}
 
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-      }
+void ImplementationRequirement::
+resourcePort (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (resourcePort_.get ())
+{
+*resourcePort_ = e;
+}
 
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-      }
-    }
+else
+{
+resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourcePort_->container (this);
+}
+}
 
-    ::CIAO::Config_Handlers::AssemblyConnectionDescription& AssemblyConnectionDescription::
-    operator= (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
-    {
-      name (s.name ());
+// ImplementationRequirement
+//
+bool ImplementationRequirement::
+componentPort_p () const
+{
+return componentPort_.get () != 0;
+}
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+componentPort () const
+{
+return *componentPort_;
+}
 
-      externalEndpoint_.clear ();
-      {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
-      }
+void ImplementationRequirement::
+componentPort (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (componentPort_.get ())
+{
+*componentPort_ = e;
+}
 
-      internalEndpoint_.clear ();
-      {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
-      }
+else
+{
+componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+componentPort_->container (this);
+}
+}
 
-      externalReference_.clear ();
-      {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
-      }
+// ImplementationRequirement
+//
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+resourceType () const
+{
+return *resourceType_;
+}
 
-      return *this;
-    }
+void ImplementationRequirement::
+resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceType_ = e;
+}
 
+// ImplementationRequirement
+//
+::XMLSchema::string< ACE_TCHAR > const& ImplementationRequirement::
+name () const
+{
+return *name_;
+}
 
-    // AssemblyConnectionDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& AssemblyConnectionDescription::
-    name () const
-    {
-      return *name_;
-    }
+void ImplementationRequirement::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    void AssemblyConnectionDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+// ImplementationRequirement
+//
+ImplementationRequirement::property_iterator ImplementationRequirement::
+begin_property ()
+{
+return property_.begin ();
+}
 
-    // AssemblyConnectionDescription
-    // 
-    bool AssemblyConnectionDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
+ImplementationRequirement::property_iterator ImplementationRequirement::
+end_property ()
+{
+return property_.end ();
+}
 
-    ::CIAO::Config_Handlers::Requirement const& AssemblyConnectionDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
+ImplementationRequirement::property_const_iterator ImplementationRequirement::
+begin_property () const
+{
+return property_.begin ();
+}
 
-    void AssemblyConnectionDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
+ImplementationRequirement::property_const_iterator ImplementationRequirement::
+end_property () const
+{
+return property_.end ();
+}
 
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
+void ImplementationRequirement::
+add_property (::CIAO::Config_Handlers::Property const& e)
+{
+property_.push_back (e);
+}
 
-    // AssemblyConnectionDescription
-    // 
-    AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
-    begin_externalEndpoint ()
-    {
-      return externalEndpoint_.begin ();
-    }
+size_t ImplementationRequirement::
+count_property(void) const
+{
+return property_.size ();
+}
 
-    AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
-    end_externalEndpoint ()
-    {
-      return externalEndpoint_.end ();
-    }
 
-    AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
-    begin_externalEndpoint () const
-    {
-      return externalEndpoint_.begin ();
-    }
+// ComponentPackageReference
+//
 
-    AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
-    end_externalEndpoint () const
-    {
-      return externalEndpoint_.end ();
-    }
+ComponentPackageReference::
+ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
+:
+::XSCRT::Type (),
+requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)),
+regulator__ ()
+{
+requiredType_->container (this);
+}
 
-    void AssemblyConnectionDescription::
-    add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
-    {
-      externalEndpoint_.push_back (e);
-    }
+ComponentPackageReference::
+ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
+:
+::XSCRT::Type (),
+requiredUUID_ (s.requiredUUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredUUID_) : 0),
+requiredName_ (s.requiredName_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredName_) : 0),
+requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)),
+regulator__ ()
+{
+if (requiredUUID_.get ()) requiredUUID_->container (this);
+if (requiredName_.get ()) requiredName_->container (this);
+requiredType_->container (this);
+}
 
-    size_t AssemblyConnectionDescription::
-    count_externalEndpoint(void) const
-    {
-      return externalEndpoint_.size ();
-    }
+::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference::
+operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s)
+{
+if (s.requiredUUID_.get ()) requiredUUID (*(s.requiredUUID_));
+else requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // AssemblyConnectionDescription
-    // 
-    AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
-    begin_internalEndpoint ()
-    {
-      return internalEndpoint_.begin ();
-    }
+if (s.requiredName_.get ()) requiredName (*(s.requiredName_));
+else requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
-    end_internalEndpoint ()
-    {
-      return internalEndpoint_.end ();
-    }
+requiredType (s.requiredType ());
 
-    AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
-    begin_internalEndpoint () const
-    {
-      return internalEndpoint_.begin ();
-    }
+return *this;
+}
 
-    AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
-    end_internalEndpoint () const
-    {
-      return internalEndpoint_.end ();
-    }
 
-    void AssemblyConnectionDescription::
-    add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& e)
-    {
-      internalEndpoint_.push_back (e);
-    }
+// ComponentPackageReference
+//
+bool ComponentPackageReference::
+requiredUUID_p () const
+{
+return requiredUUID_.get () != 0;
+}
 
-    size_t AssemblyConnectionDescription::
-    count_internalEndpoint(void) const
-    {
-      return internalEndpoint_.size ();
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+requiredUUID () const
+{
+return *requiredUUID_;
+}
 
-    // AssemblyConnectionDescription
-    // 
-    AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
-    begin_externalReference ()
-    {
-      return externalReference_.begin ();
-    }
+void ComponentPackageReference::
+requiredUUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (requiredUUID_.get ())
+{
+*requiredUUID_ = e;
+}
 
-    AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
-    end_externalReference ()
-    {
-      return externalReference_.end ();
-    }
+else
+{
+requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requiredUUID_->container (this);
+}
+}
 
-    AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
-    begin_externalReference () const
-    {
-      return externalReference_.begin ();
-    }
+// ComponentPackageReference
+//
+bool ComponentPackageReference::
+requiredName_p () const
+{
+return requiredName_.get () != 0;
+}
 
-    AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
-    end_externalReference () const
-    {
-      return externalReference_.end ();
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+requiredName () const
+{
+return *requiredName_;
+}
 
-    void AssemblyConnectionDescription::
-    add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
-    {
-      externalReference_.push_back (e);
-    }
+void ComponentPackageReference::
+requiredName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (requiredName_.get ())
+{
+*requiredName_ = e;
+}
 
-    size_t AssemblyConnectionDescription::
-    count_externalReference(void) const
-    {
-      return externalReference_.size ();
-    }
-  }
+else
+{
+requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requiredName_->container (this);
+}
 }
 
-namespace CIAO
+// ComponentPackageReference
+//
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+requiredType () const
 {
-  namespace Config_Handlers
-  {
-    // TCKind
-    //
+return *requiredType_;
+}
 
-    TCKind::
-    TCKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    : ::XSCRT::Type (e)
-    {
-      ::std::basic_string< ACE_TCHAR > v (e.value ());
-
-      if (v == "tk_null") v_ = tk_null_l;
-      else if (v == "tk_void") v_ = tk_void_l;
-      else if (v == "tk_short") v_ = tk_short_l;
-      else if (v == "tk_long") v_ = tk_long_l;
-      else if (v == "tk_ushort") v_ = tk_ushort_l;
-      else if (v == "tk_ulong") v_ = tk_ulong_l;
-      else if (v == "tk_float") v_ = tk_float_l;
-      else if (v == "tk_double") v_ = tk_double_l;
-      else if (v == "tk_boolean") v_ = tk_boolean_l;
-      else if (v == "tk_char") v_ = tk_char_l;
-      else if (v == "tk_octet") v_ = tk_octet_l;
-      else if (v == "tk_any") v_ = tk_any_l;
-      else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
-      else if (v == "tk_Principal") v_ = tk_Principal_l;
-      else if (v == "tk_objref") v_ = tk_objref_l;
-      else if (v == "tk_struct") v_ = tk_struct_l;
-      else if (v == "tk_union") v_ = tk_union_l;
-      else if (v == "tk_enum") v_ = tk_enum_l;
-      else if (v == "tk_string") v_ = tk_string_l;
-      else if (v == "tk_sequence") v_ = tk_sequence_l;
-      else if (v == "tk_array") v_ = tk_array_l;
-      else if (v == "tk_alias") v_ = tk_alias_l;
-      else if (v == "tk_except") v_ = tk_except_l;
-      else if (v == "tk_longlong") v_ = tk_longlong_l;
-      else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
-      else if (v == "tk_longdouble") v_ = tk_longdouble_l;
-      else if (v == "tk_wchar") v_ = tk_wchar_l;
-      else if (v == "tk_wstring") v_ = tk_wstring_l;
-      else if (v == "tk_wfixed") v_ = tk_wfixed_l;
-      else if (v == "tk_value") v_ = tk_value_l;
-      else if (v == "tk_value_box") v_ = tk_value_box_l;
-      else if (v == "tk_native") v_ = tk_native_l;
-      else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
-      else if (v == "tk_local_interface") v_ = tk_local_interface_l;
-      else if (v == "tk_component") v_ = tk_component_l;
-      else if (v == "tk_home") v_ = tk_home_l;
-      else if (v == "tk_event") v_ = tk_event_l;
-      else 
-      {
-      }
-    }
+void ComponentPackageReference::
+requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*requiredType_ = e;
+}
 
-    TCKind::
-    TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-    : ::XSCRT::Type (a)
-    {
-      ::std::basic_string< ACE_TCHAR > v (a.value ());
-
-      if (v == "tk_null") v_ = tk_null_l;
-      else if (v == "tk_void") v_ = tk_void_l;
-      else if (v == "tk_short") v_ = tk_short_l;
-      else if (v == "tk_long") v_ = tk_long_l;
-      else if (v == "tk_ushort") v_ = tk_ushort_l;
-      else if (v == "tk_ulong") v_ = tk_ulong_l;
-      else if (v == "tk_float") v_ = tk_float_l;
-      else if (v == "tk_double") v_ = tk_double_l;
-      else if (v == "tk_boolean") v_ = tk_boolean_l;
-      else if (v == "tk_char") v_ = tk_char_l;
-      else if (v == "tk_octet") v_ = tk_octet_l;
-      else if (v == "tk_any") v_ = tk_any_l;
-      else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
-      else if (v == "tk_Principal") v_ = tk_Principal_l;
-      else if (v == "tk_objref") v_ = tk_objref_l;
-      else if (v == "tk_struct") v_ = tk_struct_l;
-      else if (v == "tk_union") v_ = tk_union_l;
-      else if (v == "tk_enum") v_ = tk_enum_l;
-      else if (v == "tk_string") v_ = tk_string_l;
-      else if (v == "tk_sequence") v_ = tk_sequence_l;
-      else if (v == "tk_array") v_ = tk_array_l;
-      else if (v == "tk_alias") v_ = tk_alias_l;
-      else if (v == "tk_except") v_ = tk_except_l;
-      else if (v == "tk_longlong") v_ = tk_longlong_l;
-      else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
-      else if (v == "tk_longdouble") v_ = tk_longdouble_l;
-      else if (v == "tk_wchar") v_ = tk_wchar_l;
-      else if (v == "tk_wstring") v_ = tk_wstring_l;
-      else if (v == "tk_wfixed") v_ = tk_wfixed_l;
-      else if (v == "tk_value") v_ = tk_value_l;
-      else if (v == "tk_value_box") v_ = tk_value_box_l;
-      else if (v == "tk_native") v_ = tk_native_l;
-      else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
-      else if (v == "tk_local_interface") v_ = tk_local_interface_l;
-      else if (v == "tk_component") v_ = tk_component_l;
-      else if (v == "tk_home") v_ = tk_home_l;
-      else if (v == "tk_event") v_ = tk_event_l;
-      else 
-      {
-      }
-    }
 
-    TCKind const TCKind::tk_null (TCKind::tk_null_l);
-    TCKind const TCKind::tk_void (TCKind::tk_void_l);
-    TCKind const TCKind::tk_short (TCKind::tk_short_l);
-    TCKind const TCKind::tk_long (TCKind::tk_long_l);
-    TCKind const TCKind::tk_ushort (TCKind::tk_ushort_l);
-    TCKind const TCKind::tk_ulong (TCKind::tk_ulong_l);
-    TCKind const TCKind::tk_float (TCKind::tk_float_l);
-    TCKind const TCKind::tk_double (TCKind::tk_double_l);
-    TCKind const TCKind::tk_boolean (TCKind::tk_boolean_l);
-    TCKind const TCKind::tk_char (TCKind::tk_char_l);
-    TCKind const TCKind::tk_octet (TCKind::tk_octet_l);
-    TCKind const TCKind::tk_any (TCKind::tk_any_l);
-    TCKind const TCKind::tk_TypeCode (TCKind::tk_TypeCode_l);
-    TCKind const TCKind::tk_Principal (TCKind::tk_Principal_l);
-    TCKind const TCKind::tk_objref (TCKind::tk_objref_l);
-    TCKind const TCKind::tk_struct (TCKind::tk_struct_l);
-    TCKind const TCKind::tk_union (TCKind::tk_union_l);
-    TCKind const TCKind::tk_enum (TCKind::tk_enum_l);
-    TCKind const TCKind::tk_string (TCKind::tk_string_l);
-    TCKind const TCKind::tk_sequence (TCKind::tk_sequence_l);
-    TCKind const TCKind::tk_array (TCKind::tk_array_l);
-    TCKind const TCKind::tk_alias (TCKind::tk_alias_l);
-    TCKind const TCKind::tk_except (TCKind::tk_except_l);
-    TCKind const TCKind::tk_longlong (TCKind::tk_longlong_l);
-    TCKind const TCKind::tk_ulonglong (TCKind::tk_ulonglong_l);
-    TCKind const TCKind::tk_longdouble (TCKind::tk_longdouble_l);
-    TCKind const TCKind::tk_wchar (TCKind::tk_wchar_l);
-    TCKind const TCKind::tk_wstring (TCKind::tk_wstring_l);
-    TCKind const TCKind::tk_wfixed (TCKind::tk_wfixed_l);
-    TCKind const TCKind::tk_value (TCKind::tk_value_l);
-    TCKind const TCKind::tk_value_box (TCKind::tk_value_box_l);
-    TCKind const TCKind::tk_native (TCKind::tk_native_l);
-    TCKind const TCKind::tk_abstract_interface (TCKind::tk_abstract_interface_l);
-    TCKind const TCKind::tk_local_interface (TCKind::tk_local_interface_l);
-    TCKind const TCKind::tk_component (TCKind::tk_component_l);
-    TCKind const TCKind::tk_home (TCKind::tk_home_l);
-    TCKind const TCKind::tk_event (TCKind::tk_event_l);
+// SubcomponentPortEndpoint
+//
 
-    // DataType
-    //
+SubcomponentPortEndpoint::
+SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
+instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+regulator__ ()
+{
+portName_->container (this);
+instance_->container (this);
+}
 
-    DataType::
-    DataType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+SubcomponentPortEndpoint::
+SubcomponentPortEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
+:
+::XSCRT::Type (),
+portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
+instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+regulator__ ()
+{
+portName_->container (this);
+instance_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::CIAO::Config_Handlers::SubcomponentPortEndpoint& SubcomponentPortEndpoint::
+operator= (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
+{
+portName (s.portName ());
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+instance (s.instance ());
 
-        if (n == "kind")
-        {
-          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
-          kind_->container (this);
-        }
+return *this;
+}
 
-        else if (n == "enum")
-        {
-          ::CIAO::Config_Handlers::EnumType t (e);
-          enum_ (t);
-        }
 
-        else 
-        {
-        }
-      }
-    }
+// SubcomponentPortEndpoint
+//
+::XMLSchema::string< ACE_TCHAR > const& SubcomponentPortEndpoint::
+portName () const
+{
+return *portName_;
+}
 
-    // DataValue
-    //
+void SubcomponentPortEndpoint::
+portName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*portName_ = e;
+}
 
-    DataValue::
-    DataValue (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+// SubcomponentPortEndpoint
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPortEndpoint::
+instance () const
+{
+return *instance_;
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+void SubcomponentPortEndpoint::
+instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+*instance_ = e;
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "short")
-        {
-          ::XMLSchema::short_ t (e);
-          add_short (t);
-        }
+// AssemblyConnectionDescription
+//
 
-        else if (n == "long")
-        {
-          ::XMLSchema::int_ t (e);
-          add_long (t);
-        }
+AssemblyConnectionDescription::
+AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-        else if (n == "ushort")
-        {
-          ::XMLSchema::unsignedShort t (e);
-          add_ushort (t);
-        }
+AssemblyConnectionDescription::
+AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+regulator__ ()
+{
+name_->container (this);
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-        else if (n == "ulong")
-        {
-          ::XMLSchema::unsignedInt t (e);
-          add_ulong (t);
-        }
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-        else if (n == "float")
-        {
-          ::XMLSchema::float_ t (e);
-          add_float (t);
-        }
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-        else if (n == "double")
-        {
-          ::XMLSchema::double_ t (e);
-          add_double (t);
-        }
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
+}
 
-        else if (n == "boolean")
-        {
-          ::XMLSchema::boolean t (e);
-          add_boolean (t);
-        }
+::CIAO::Config_Handlers::AssemblyConnectionDescription& AssemblyConnectionDescription::
+operator= (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
+{
+name (s.name ());
 
-        else if (n == "octet")
-        {
-          ::XMLSchema::unsignedByte t (e);
-          add_octet (t);
-        }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-        else if (n == "enum")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_enum (t);
-        }
+internalEndpoint_.clear ();
+{
+for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+}
 
-        else if (n == "string")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_string (t);
-        }
+externalEndpoint_.clear ();
+{
+for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+}
 
-        else if (n == "longlong")
-        {
-          ::XMLSchema::long_ t (e);
-          add_longlong (t);
-        }
+externalReference_.clear ();
+{
+for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+}
 
-        else if (n == "ulonglong")
-        {
-          ::XMLSchema::unsignedLong t (e);
-          add_ulonglong (t);
-        }
+return *this;
+}
 
-        else if (n == "longdouble")
-        {
-          ::XMLSchema::double_ t (e);
-          add_longdouble (t);
-        }
 
-        else 
-        {
-        }
-      }
-    }
+// AssemblyConnectionDescription
+//
+::XMLSchema::string< ACE_TCHAR > const& AssemblyConnectionDescription::
+name () const
+{
+return *name_;
+}
 
-    // EnumType
-    //
+void AssemblyConnectionDescription::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    EnumType::
-    EnumType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+AssemblyConnectionDescription::deployRequirement_iterator AssemblyConnectionDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+AssemblyConnectionDescription::deployRequirement_const_iterator AssemblyConnectionDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-        else if (n == "typeId")
-        {
-          typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          typeId_->container (this);
-        }
+void AssemblyConnectionDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-        else if (n == "member")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_member (t);
-        }
+size_t AssemblyConnectionDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-        else 
-        {
-        }
-      }
-    }
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
+begin_internalEndpoint ()
+{
+return internalEndpoint_.begin ();
+}
 
-    // Any
-    //
+AssemblyConnectionDescription::internalEndpoint_iterator AssemblyConnectionDescription::
+end_internalEndpoint ()
+{
+return internalEndpoint_.end ();
+}
 
-    Any::
-    Any (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
+begin_internalEndpoint () const
+{
+return internalEndpoint_.begin ();
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+AssemblyConnectionDescription::internalEndpoint_const_iterator AssemblyConnectionDescription::
+end_internalEndpoint () const
+{
+return internalEndpoint_.end ();
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+void AssemblyConnectionDescription::
+add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& e)
+{
+internalEndpoint_.push_back (e);
+}
 
-        if (n == "type")
-        {
-          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
-          type_->container (this);
-        }
+size_t AssemblyConnectionDescription::
+count_internalEndpoint(void) const
+{
+return internalEndpoint_.size ();
+}
 
-        else if (n == "value")
-        {
-          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
-          value_->container (this);
-        }
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
+begin_externalEndpoint ()
+{
+return externalEndpoint_.begin ();
+}
 
-        else 
-        {
-        }
-      }
-    }
+AssemblyConnectionDescription::externalEndpoint_iterator AssemblyConnectionDescription::
+end_externalEndpoint ()
+{
+return externalEndpoint_.end ();
+}
 
-    // Property
-    //
+AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
+begin_externalEndpoint () const
+{
+return externalEndpoint_.begin ();
+}
 
-    Property::
-    Property (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+AssemblyConnectionDescription::externalEndpoint_const_iterator AssemblyConnectionDescription::
+end_externalEndpoint () const
+{
+return externalEndpoint_.end ();
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+void AssemblyConnectionDescription::
+add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e)
+{
+externalEndpoint_.push_back (e);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+size_t AssemblyConnectionDescription::
+count_externalEndpoint(void) const
+{
+return externalEndpoint_.size ();
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+// AssemblyConnectionDescription
+//
+AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
+begin_externalReference ()
+{
+return externalReference_.begin ();
+}
 
-        else if (n == "value")
-        {
-          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          value_->container (this);
-        }
+AssemblyConnectionDescription::externalReference_iterator AssemblyConnectionDescription::
+end_externalReference ()
+{
+return externalReference_.end ();
+}
 
-        else 
-        {
-        }
-      }
-    }
+AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
+begin_externalReference () const
+{
+return externalReference_.begin ();
+}
 
-    // SatisfierPropertyKind
-    //
+AssemblyConnectionDescription::externalReference_const_iterator AssemblyConnectionDescription::
+end_externalReference () const
+{
+return externalReference_.end ();
+}
 
-    SatisfierPropertyKind::
-    SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    : ::XSCRT::Type (e)
-    {
-      ::std::basic_string< ACE_TCHAR > v (e.value ());
-
-      if (v == "Quantity") v_ = Quantity_l;
-      else if (v == "Capacity") v_ = Capacity_l;
-      else if (v == "Minimum") v_ = Minimum_l;
-      else if (v == "Maximum") v_ = Maximum_l;
-      else if (v == "Attribute") v_ = Attribute_l;
-      else if (v == "Selection") v_ = Selection_l;
-      else 
-      {
-      }
-    }
+void AssemblyConnectionDescription::
+add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e)
+{
+externalReference_.push_back (e);
+}
 
-    SatisfierPropertyKind::
-    SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-    : ::XSCRT::Type (a)
-    {
-      ::std::basic_string< ACE_TCHAR > v (a.value ());
-
-      if (v == "Quantity") v_ = Quantity_l;
-      else if (v == "Capacity") v_ = Capacity_l;
-      else if (v == "Minimum") v_ = Minimum_l;
-      else if (v == "Maximum") v_ = Maximum_l;
-      else if (v == "Attribute") v_ = Attribute_l;
-      else if (v == "Selection") v_ = Selection_l;
-      else 
-      {
-      }
-    }
+size_t AssemblyConnectionDescription::
+count_externalReference(void) const
+{
+return externalReference_.size ();
+}
+}
+}
 
-    SatisfierPropertyKind const SatisfierPropertyKind::Quantity (SatisfierPropertyKind::Quantity_l);
-    SatisfierPropertyKind const SatisfierPropertyKind::Capacity (SatisfierPropertyKind::Capacity_l);
-    SatisfierPropertyKind const SatisfierPropertyKind::Minimum (SatisfierPropertyKind::Minimum_l);
-    SatisfierPropertyKind const SatisfierPropertyKind::Maximum (SatisfierPropertyKind::Maximum_l);
-    SatisfierPropertyKind const SatisfierPropertyKind::Attribute (SatisfierPropertyKind::Attribute_l);
-    SatisfierPropertyKind const SatisfierPropertyKind::Selection (SatisfierPropertyKind::Selection_l);
+namespace CIAO
+{
+namespace Config_Handlers
+{
+// TCKind
+//
 
-    // SatisfierProperty
-    //
+TCKind::
+TCKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+: ::XSCRT::Type (e)
+{
+::std::basic_string< ACE_TCHAR > v (e.value ());
+
+if (v == "tk_null") v_ = tk_null_l;
+else if (v == "tk_void") v_ = tk_void_l;
+else if (v == "tk_short") v_ = tk_short_l;
+else if (v == "tk_long") v_ = tk_long_l;
+else if (v == "tk_ushort") v_ = tk_ushort_l;
+else if (v == "tk_ulong") v_ = tk_ulong_l;
+else if (v == "tk_float") v_ = tk_float_l;
+else if (v == "tk_double") v_ = tk_double_l;
+else if (v == "tk_boolean") v_ = tk_boolean_l;
+else if (v == "tk_char") v_ = tk_char_l;
+else if (v == "tk_octet") v_ = tk_octet_l;
+else if (v == "tk_any") v_ = tk_any_l;
+else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
+else if (v == "tk_Principal") v_ = tk_Principal_l;
+else if (v == "tk_objref") v_ = tk_objref_l;
+else if (v == "tk_struct") v_ = tk_struct_l;
+else if (v == "tk_union") v_ = tk_union_l;
+else if (v == "tk_enum") v_ = tk_enum_l;
+else if (v == "tk_string") v_ = tk_string_l;
+else if (v == "tk_sequence") v_ = tk_sequence_l;
+else if (v == "tk_array") v_ = tk_array_l;
+else if (v == "tk_alias") v_ = tk_alias_l;
+else if (v == "tk_except") v_ = tk_except_l;
+else if (v == "tk_longlong") v_ = tk_longlong_l;
+else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
+else if (v == "tk_longdouble") v_ = tk_longdouble_l;
+else if (v == "tk_wchar") v_ = tk_wchar_l;
+else if (v == "tk_wstring") v_ = tk_wstring_l;
+else if (v == "tk_wfixed") v_ = tk_wfixed_l;
+else if (v == "tk_value") v_ = tk_value_l;
+else if (v == "tk_value_box") v_ = tk_value_box_l;
+else if (v == "tk_native") v_ = tk_native_l;
+else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
+else if (v == "tk_local_interface") v_ = tk_local_interface_l;
+else if (v == "tk_component") v_ = tk_component_l;
+else if (v == "tk_home") v_ = tk_home_l;
+else if (v == "tk_event") v_ = tk_event_l;
+else
+{
+}
+}
 
-    SatisfierProperty::
-    SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+TCKind::
+TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+: ::XSCRT::Type (a)
+{
+::std::basic_string< ACE_TCHAR > v (a.value ());
+
+if (v == "tk_null") v_ = tk_null_l;
+else if (v == "tk_void") v_ = tk_void_l;
+else if (v == "tk_short") v_ = tk_short_l;
+else if (v == "tk_long") v_ = tk_long_l;
+else if (v == "tk_ushort") v_ = tk_ushort_l;
+else if (v == "tk_ulong") v_ = tk_ulong_l;
+else if (v == "tk_float") v_ = tk_float_l;
+else if (v == "tk_double") v_ = tk_double_l;
+else if (v == "tk_boolean") v_ = tk_boolean_l;
+else if (v == "tk_char") v_ = tk_char_l;
+else if (v == "tk_octet") v_ = tk_octet_l;
+else if (v == "tk_any") v_ = tk_any_l;
+else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
+else if (v == "tk_Principal") v_ = tk_Principal_l;
+else if (v == "tk_objref") v_ = tk_objref_l;
+else if (v == "tk_struct") v_ = tk_struct_l;
+else if (v == "tk_union") v_ = tk_union_l;
+else if (v == "tk_enum") v_ = tk_enum_l;
+else if (v == "tk_string") v_ = tk_string_l;
+else if (v == "tk_sequence") v_ = tk_sequence_l;
+else if (v == "tk_array") v_ = tk_array_l;
+else if (v == "tk_alias") v_ = tk_alias_l;
+else if (v == "tk_except") v_ = tk_except_l;
+else if (v == "tk_longlong") v_ = tk_longlong_l;
+else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
+else if (v == "tk_longdouble") v_ = tk_longdouble_l;
+else if (v == "tk_wchar") v_ = tk_wchar_l;
+else if (v == "tk_wstring") v_ = tk_wstring_l;
+else if (v == "tk_wfixed") v_ = tk_wfixed_l;
+else if (v == "tk_value") v_ = tk_value_l;
+else if (v == "tk_value_box") v_ = tk_value_box_l;
+else if (v == "tk_native") v_ = tk_native_l;
+else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
+else if (v == "tk_local_interface") v_ = tk_local_interface_l;
+else if (v == "tk_component") v_ = tk_component_l;
+else if (v == "tk_home") v_ = tk_home_l;
+else if (v == "tk_event") v_ = tk_event_l;
+else
+{
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+TCKind const TCKind::tk_null (TCKind::tk_null_l);
+TCKind const TCKind::tk_void (TCKind::tk_void_l);
+TCKind const TCKind::tk_short (TCKind::tk_short_l);
+TCKind const TCKind::tk_long (TCKind::tk_long_l);
+TCKind const TCKind::tk_ushort (TCKind::tk_ushort_l);
+TCKind const TCKind::tk_ulong (TCKind::tk_ulong_l);
+TCKind const TCKind::tk_float (TCKind::tk_float_l);
+TCKind const TCKind::tk_double (TCKind::tk_double_l);
+TCKind const TCKind::tk_boolean (TCKind::tk_boolean_l);
+TCKind const TCKind::tk_char (TCKind::tk_char_l);
+TCKind const TCKind::tk_octet (TCKind::tk_octet_l);
+TCKind const TCKind::tk_any (TCKind::tk_any_l);
+TCKind const TCKind::tk_TypeCode (TCKind::tk_TypeCode_l);
+TCKind const TCKind::tk_Principal (TCKind::tk_Principal_l);
+TCKind const TCKind::tk_objref (TCKind::tk_objref_l);
+TCKind const TCKind::tk_struct (TCKind::tk_struct_l);
+TCKind const TCKind::tk_union (TCKind::tk_union_l);
+TCKind const TCKind::tk_enum (TCKind::tk_enum_l);
+TCKind const TCKind::tk_string (TCKind::tk_string_l);
+TCKind const TCKind::tk_sequence (TCKind::tk_sequence_l);
+TCKind const TCKind::tk_array (TCKind::tk_array_l);
+TCKind const TCKind::tk_alias (TCKind::tk_alias_l);
+TCKind const TCKind::tk_except (TCKind::tk_except_l);
+TCKind const TCKind::tk_longlong (TCKind::tk_longlong_l);
+TCKind const TCKind::tk_ulonglong (TCKind::tk_ulonglong_l);
+TCKind const TCKind::tk_longdouble (TCKind::tk_longdouble_l);
+TCKind const TCKind::tk_wchar (TCKind::tk_wchar_l);
+TCKind const TCKind::tk_wstring (TCKind::tk_wstring_l);
+TCKind const TCKind::tk_wfixed (TCKind::tk_wfixed_l);
+TCKind const TCKind::tk_value (TCKind::tk_value_l);
+TCKind const TCKind::tk_value_box (TCKind::tk_value_box_l);
+TCKind const TCKind::tk_native (TCKind::tk_native_l);
+TCKind const TCKind::tk_abstract_interface (TCKind::tk_abstract_interface_l);
+TCKind const TCKind::tk_local_interface (TCKind::tk_local_interface_l);
+TCKind const TCKind::tk_component (TCKind::tk_component_l);
+TCKind const TCKind::tk_home (TCKind::tk_home_l);
+TCKind const TCKind::tk_event (TCKind::tk_event_l);
+
+// DataType
+//
+
+DataType::
+DataType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "kind")
-        {
-          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (e));
-          kind_->container (this);
-        }
+if (n == "kind")
+{
+kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
+kind_->container (this);
+}
 
-        else if (n == "value")
-        {
-          value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          value_->container (this);
-        }
+else if (n == "enum")
+{
+::CIAO::Config_Handlers::EnumType t (e);
+enum_ (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // Resource
-    //
+// DataValue
+//
 
-    Resource::
-    Resource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+DataValue::
+DataValue (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+if (n == "short")
+{
+::XMLSchema::short_ t (e);
+add_short (t);
+}
 
-        else if (n == "resourceType")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_resourceType (t);
-        }
+else if (n == "long")
+{
+::XMLSchema::int_ t (e);
+add_long (t);
+}
 
-        else if (n == "property")
-        {
-          ::CIAO::Config_Handlers::SatisfierProperty t (e);
-          add_property (t);
-        }
+else if (n == "ushort")
+{
+::XMLSchema::unsignedShort t (e);
+add_ushort (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "ulong")
+{
+::XMLSchema::unsignedInt t (e);
+add_ulong (t);
+}
 
-    // Requirement
-    //
+else if (n == "float")
+{
+::XMLSchema::float_ t (e);
+add_float (t);
+}
 
-    Requirement::
-    Requirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "double")
+{
+::XMLSchema::double_ t (e);
+add_double (t);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else if (n == "boolean")
+{
+::XMLSchema::boolean t (e);
+add_boolean (t);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+else if (n == "octet")
+{
+::XMLSchema::unsignedByte t (e);
+add_octet (t);
+}
 
-        if (n == "resourceType")
-        {
-          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceType_->container (this);
-        }
+else if (n == "enum")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_enum (t);
+}
 
-        else if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else if (n == "string")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_string (t);
+}
 
-        else if (n == "property")
-        {
-          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-          property_->container (this);
-        }
+else if (n == "longlong")
+{
+::XMLSchema::long_ t (e);
+add_longlong (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "ulonglong")
+{
+::XMLSchema::unsignedLong t (e);
+add_ulonglong (t);
+}
 
-    // ResourceDeploymentDescription
-    //
+else if (n == "longdouble")
+{
+::XMLSchema::double_ t (e);
+add_longdouble (t);
+}
 
-    ResourceDeploymentDescription::
-    ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// EnumType
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+EnumType::
+EnumType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "requirementName")
-        {
-          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requirementName_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "resourceName")
-        {
-          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceName_->container (this);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "resourceValue")
-        {
-          resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          resourceValue_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "typeId")
+{
+typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+typeId_->container (this);
+}
 
-    // ArtifactDeploymentDescription
-    //
+else if (n == "member")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_member (t);
+}
 
-    ArtifactDeploymentDescription::
-    ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// Any
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+Any::
+Any (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "source")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_source (t);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "node")
-        {
-          node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          node_->container (this);
-        }
+if (n == "type")
+{
+type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+type_->container (this);
+}
 
-        else if (n == "location")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_location (t);
-        }
+else if (n == "value")
+{
+value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
+value_->container (this);
+}
 
-        else if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_execParameter (t);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          add_deployRequirement (t);
-        }
+// Property
+//
 
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
-          add_deployedResource (t);
-        }
+Property::
+Property (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else 
-        {
-        }
-      }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< ACE_TCHAR > t (a);
-          id (t);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else 
-        {
-        }
-      }
-    }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-    // MonolithicDeploymentDescription
-    //
+else if (n == "value")
+{
+value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
+value_->container (this);
+}
 
-    MonolithicDeploymentDescription::
-    MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// SatisfierPropertyKind
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+SatisfierPropertyKind::
+SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+: ::XSCRT::Type (e)
+{
+::std::basic_string< ACE_TCHAR > v (e.value ());
+
+if (v == "Quantity") v_ = Quantity_l;
+else if (v == "Capacity") v_ = Capacity_l;
+else if (v == "Minimum") v_ = Minimum_l;
+else if (v == "Maximum") v_ = Maximum_l;
+else if (v == "Attribute") v_ = Attribute_l;
+else if (v == "Selection") v_ = Selection_l;
+else
+{
+}
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+SatisfierPropertyKind::
+SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+: ::XSCRT::Type (a)
+{
+::std::basic_string< ACE_TCHAR > v (a.value ());
+
+if (v == "Quantity") v_ = Quantity_l;
+else if (v == "Capacity") v_ = Capacity_l;
+else if (v == "Minimum") v_ = Minimum_l;
+else if (v == "Maximum") v_ = Maximum_l;
+else if (v == "Attribute") v_ = Attribute_l;
+else if (v == "Selection") v_ = Selection_l;
+else
+{
+}
+}
 
-        else if (n == "source")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_source (t);
-        }
+SatisfierPropertyKind const SatisfierPropertyKind::Quantity (SatisfierPropertyKind::Quantity_l);
+SatisfierPropertyKind const SatisfierPropertyKind::Capacity (SatisfierPropertyKind::Capacity_l);
+SatisfierPropertyKind const SatisfierPropertyKind::Minimum (SatisfierPropertyKind::Minimum_l);
+SatisfierPropertyKind const SatisfierPropertyKind::Maximum (SatisfierPropertyKind::Maximum_l);
+SatisfierPropertyKind const SatisfierPropertyKind::Attribute (SatisfierPropertyKind::Attribute_l);
+SatisfierPropertyKind const SatisfierPropertyKind::Selection (SatisfierPropertyKind::Selection_l);
 
-        else if (n == "artifact")
-        {
-          ::XMLSchema::IDREF< ACE_TCHAR > t (e);
-          add_artifact (t);
-        }
+// SatisfierProperty
+//
 
-        else if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_execParameter (t);
-        }
+SatisfierProperty::
+SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          add_deployRequirement (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else 
-        {
-        }
-      }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< ACE_TCHAR > t (a);
-          id (t);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "kind")
+{
+kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (e));
+kind_->container (this);
+}
 
-    // ResourceUsageKind
-    //
+else if (n == "dynamic")
+{
+dynamic_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+dynamic_->container (this);
+}
 
-    ResourceUsageKind::
-    ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    : ::XSCRT::Type (e)
-    {
-      ::std::basic_string< ACE_TCHAR > v (e.value ());
-
-      if (v == "None") v_ = None_l;
-      else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
-      else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
-      else if (v == "PortUsesResource") v_ = PortUsesResource_l;
-      else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
-      else 
-      {
-      }
-    }
+else if (n == "value")
+{
+value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
+value_->container (this);
+}
 
-    ResourceUsageKind::
-    ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-    : ::XSCRT::Type (a)
-    {
-      ::std::basic_string< ACE_TCHAR > v (a.value ());
-
-      if (v == "None") v_ = None_l;
-      else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
-      else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
-      else if (v == "PortUsesResource") v_ = PortUsesResource_l;
-      else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
-      else 
-      {
-      }
-    }
+else
+{
+}
+}
+}
 
-    ResourceUsageKind const ResourceUsageKind::None (ResourceUsageKind::None_l);
-    ResourceUsageKind const ResourceUsageKind::InstanceUsesResource (ResourceUsageKind::InstanceUsesResource_l);
-    ResourceUsageKind const ResourceUsageKind::ResourceUsesInstance (ResourceUsageKind::ResourceUsesInstance_l);
-    ResourceUsageKind const ResourceUsageKind::PortUsesResource (ResourceUsageKind::PortUsesResource_l);
-    ResourceUsageKind const ResourceUsageKind::ResourceUsesPort (ResourceUsageKind::ResourceUsesPort_l);
+// Resource
+//
 
-    // InstanceResourceDeploymentDescription
-    //
+Resource::
+Resource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    InstanceResourceDeploymentDescription::
-    InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        if (n == "resourceUsage")
-        {
-          resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
-          resourceUsage_->container (this);
-        }
+else if (n == "resourceType")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_resourceType (t);
+}
 
-        else if (n == "requirementName")
-        {
-          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requirementName_->container (this);
-        }
+else if (n == "property")
+{
+::CIAO::Config_Handlers::SatisfierProperty t (e);
+add_property (t);
+}
 
-        else if (n == "resourceName")
-        {
-          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceName_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "resourceValue")
-        {
-          resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          resourceValue_->container (this);
-        }
+// Requirement
+//
 
-        else 
-        {
-        }
-      }
-    }
+Requirement::
+Requirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    // InstanceDeploymentDescription
-    //
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    InstanceDeploymentDescription::
-    InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+if (n == "resourceType")
+{
+resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceType_->container (this);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+else if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
 
-        else if (n == "node")
-        {
-          node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          node_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "source")
-        {
-          source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          source_->container (this);
-        }
+// ResourceDeploymentDescription
+//
 
-        else if (n == "implementation")
-        {
-          implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-          implementation_->container (this);
-        }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_configProperty (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-          deployedResource (t);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "deployedSharedResource")
-        {
-          ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-          deployedSharedResource (t);
-        }
+if (n == "requirementName")
+{
+requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requirementName_->container (this);
+}
 
-        else 
-        {
-        }
-      }
+else if (n == "resourceName")
+{
+resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceName_->container (this);
+}
 
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< ACE_TCHAR > t (a);
-          id (t);
-        }
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // CCMComponentPortKind
-    //
+// ArtifactDeploymentDescription
+//
 
-    CCMComponentPortKind::
-    CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    : ::XSCRT::Type (e)
-    {
-      ::std::basic_string< ACE_TCHAR > v (e.value ());
-
-      if (v == "Facet") v_ = Facet_l;
-      else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
-      else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
-      else if (v == "EventEmitter") v_ = EventEmitter_l;
-      else if (v == "EventPublisher") v_ = EventPublisher_l;
-      else if (v == "EventConsumer") v_ = EventConsumer_l;
-      else 
-      {
-      }
-    }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    CCMComponentPortKind::
-    CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-    : ::XSCRT::Type (a)
-    {
-      ::std::basic_string< ACE_TCHAR > v (a.value ());
-
-      if (v == "Facet") v_ = Facet_l;
-      else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
-      else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
-      else if (v == "EventEmitter") v_ = EventEmitter_l;
-      else if (v == "EventPublisher") v_ = EventPublisher_l;
-      else if (v == "EventConsumer") v_ = EventConsumer_l;
-      else 
-      {
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    CCMComponentPortKind const CCMComponentPortKind::Facet (CCMComponentPortKind::Facet_l);
-    CCMComponentPortKind const CCMComponentPortKind::SimplexReceptacle (CCMComponentPortKind::SimplexReceptacle_l);
-    CCMComponentPortKind const CCMComponentPortKind::MultiplexReceptacle (CCMComponentPortKind::MultiplexReceptacle_l);
-    CCMComponentPortKind const CCMComponentPortKind::EventEmitter (CCMComponentPortKind::EventEmitter_l);
-    CCMComponentPortKind const CCMComponentPortKind::EventPublisher (CCMComponentPortKind::EventPublisher_l);
-    CCMComponentPortKind const CCMComponentPortKind::EventConsumer (CCMComponentPortKind::EventConsumer_l);
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-    // ComponentPortDescription
-    //
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-    ComponentPortDescription::
-    ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "source")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_source (t);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else if (n == "node")
+{
+node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+node_->container (this);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+else if (n == "location")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_location (t);
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else if (n == "execParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_execParameter (t);
+}
 
-        else if (n == "specificType")
-        {
-          specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          specificType_->container (this);
-        }
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_deployRequirement (t);
+}
 
-        else if (n == "supportedType")
-        {
-          supportedType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          supportedType_->container (this);
-        }
+else if (n == "deployedResource")
+{
+::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
+add_deployedResource (t);
+}
 
-        else if (n == "provider")
-        {
-          provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          provider_->container (this);
-        }
+else
+{
+}
+}
 
-        else if (n == "exclusiveProvider")
-        {
-          exclusiveProvider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          exclusiveProvider_->container (this);
-        }
+while (p.more_attributes ())
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+if (n == "id")
+{
+::XMLSchema::ID< ACE_TCHAR > t (a);
+id (t);
+}
 
-        else if (n == "exclusiveUser")
-        {
-          exclusiveUser_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          exclusiveUser_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "optional")
-        {
-          optional_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          optional_->container (this);
-        }
+// MonolithicDeploymentDescription
+//
 
-        else if (n == "kind")
-        {
-          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
-          kind_->container (this);
-        }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else 
-        {
-        }
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    // ComponentPropertyDescription
-    //
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-    ComponentPropertyDescription::
-    ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else if (n == "source")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_source (t);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+else if (n == "artifact")
+{
+::XMLSchema::IDREF< ACE_TCHAR > t (e);
+add_artifact (t);
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else if (n == "execParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_execParameter (t);
+}
 
-        else if (n == "type")
-        {
-          type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
-          type_->container (this);
-        }
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_deployRequirement (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
 
-    // ComponentExternalPortEndpoint
-    //
+while (p.more_attributes ())
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+if (n == "id")
+{
+::XMLSchema::ID< ACE_TCHAR > t (a);
+id (t);
+}
 
-    ComponentExternalPortEndpoint::
-    ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// ResourceUsageKind
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+ResourceUsageKind::
+ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+: ::XSCRT::Type (e)
+{
+::std::basic_string< ACE_TCHAR > v (e.value ());
+
+if (v == "None") v_ = None_l;
+else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
+else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
+else if (v == "PortUsesResource") v_ = PortUsesResource_l;
+else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
+else
+{
+}
+}
 
-        if (n == "portName")
-        {
-          portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          portName_->container (this);
-        }
+ResourceUsageKind::
+ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+: ::XSCRT::Type (a)
+{
+::std::basic_string< ACE_TCHAR > v (a.value ());
+
+if (v == "None") v_ = None_l;
+else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
+else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
+else if (v == "PortUsesResource") v_ = PortUsesResource_l;
+else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
+else
+{
+}
+}
 
-        else 
-        {
-        }
-      }
-    }
+ResourceUsageKind const ResourceUsageKind::None (ResourceUsageKind::None_l);
+ResourceUsageKind const ResourceUsageKind::InstanceUsesResource (ResourceUsageKind::InstanceUsesResource_l);
+ResourceUsageKind const ResourceUsageKind::ResourceUsesInstance (ResourceUsageKind::ResourceUsesInstance_l);
+ResourceUsageKind const ResourceUsageKind::PortUsesResource (ResourceUsageKind::PortUsesResource_l);
+ResourceUsageKind const ResourceUsageKind::ResourceUsesPort (ResourceUsageKind::ResourceUsesPort_l);
 
-    // PlanSubcomponentPortEndpoint
-    //
+// InstanceResourceDeploymentDescription
+//
 
-    PlanSubcomponentPortEndpoint::
-    PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "portName")
-        {
-          portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          portName_->container (this);
-        }
+if (n == "resourceUsage")
+{
+resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
+resourceUsage_->container (this);
+}
 
-        else if (n == "provider")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          provider (t);
-        }
+else if (n == "requirementName")
+{
+requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requirementName_->container (this);
+}
 
-        else if (n == "kind")
-        {
-          kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
-          kind_->container (this);
-        }
+else if (n == "resourceName")
+{
+resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceName_->container (this);
+}
 
-        else if (n == "instance")
-        {
-          instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-          instance_->container (this);
-        }
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // ExternalReferenceEndpoint
-    //
+// InstanceDeploymentDescription
+//
 
-    ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+InstanceDeploymentDescription::
+InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "location")
-        {
-          location_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          location_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "node")
+{
+node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+node_->container (this);
+}
 
-    // ConnectionResourceDeploymentDescription
-    //
+else if (n == "source")
+{
+source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+source_->container (this);
+}
 
-    ConnectionResourceDeploymentDescription::
-    ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "implementation")
+{
+implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+implementation_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else if (n == "configProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_configProperty (t);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+else if (n == "deployedResource")
+{
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
+deployedResource (t);
+}
 
-        if (n == "targetName")
-        {
-          targetName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          targetName_->container (this);
-        }
+else if (n == "deployedSharedResource")
+{
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
+deployedSharedResource (t);
+}
 
-        else if (n == "requirementName")
-        {
-          requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requirementName_->container (this);
-        }
+else
+{
+}
+}
 
-        else if (n == "resourceName")
-        {
-          resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceName_->container (this);
-        }
+while (p.more_attributes ())
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+if (n == "id")
+{
+::XMLSchema::ID< ACE_TCHAR > t (a);
+id (t);
+}
 
-        else if (n == "resourceValue")
-        {
-          resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
-          resourceValue_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else 
-        {
-        }
-      }
-    }
+// CCMComponentPortKind
+//
 
-    // PlanConnectionDescription
-    //
+CCMComponentPortKind::
+CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+: ::XSCRT::Type (e)
+{
+::std::basic_string< ACE_TCHAR > v (e.value ());
+
+if (v == "Facet") v_ = Facet_l;
+else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
+else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
+else if (v == "EventEmitter") v_ = EventEmitter_l;
+else if (v == "EventPublisher") v_ = EventPublisher_l;
+else if (v == "EventConsumer") v_ = EventConsumer_l;
+else
+{
+}
+}
 
-    PlanConnectionDescription::
-    PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+CCMComponentPortKind::
+CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+: ::XSCRT::Type (a)
+{
+::std::basic_string< ACE_TCHAR > v (a.value ());
+
+if (v == "Facet") v_ = Facet_l;
+else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
+else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
+else if (v == "EventEmitter") v_ = EventEmitter_l;
+else if (v == "EventPublisher") v_ = EventPublisher_l;
+else if (v == "EventConsumer") v_ = EventConsumer_l;
+else
+{
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+CCMComponentPortKind const CCMComponentPortKind::Facet (CCMComponentPortKind::Facet_l);
+CCMComponentPortKind const CCMComponentPortKind::SimplexReceptacle (CCMComponentPortKind::SimplexReceptacle_l);
+CCMComponentPortKind const CCMComponentPortKind::MultiplexReceptacle (CCMComponentPortKind::MultiplexReceptacle_l);
+CCMComponentPortKind const CCMComponentPortKind::EventEmitter (CCMComponentPortKind::EventEmitter_l);
+CCMComponentPortKind const CCMComponentPortKind::EventPublisher (CCMComponentPortKind::EventPublisher_l);
+CCMComponentPortKind const CCMComponentPortKind::EventConsumer (CCMComponentPortKind::EventConsumer_l);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+// ComponentPortDescription
+//
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+ComponentPortDescription::
+ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "source")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          source (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          add_deployRequirement (t);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "externalEndpoint")
-        {
-          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
-          add_externalEndpoint (t);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else if (n == "internalEndpoint")
-        {
-          ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint t (e);
-          add_internalEndpoint (t);
-        }
+else if (n == "specificType")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+specificType (t);
+}
 
-        else if (n == "externalReference")
-        {
-          ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
-          add_externalReference (t);
-        }
+else if (n == "supportedType")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_supportedType (t);
+}
 
-        else if (n == "deployedResource")
-        {
-          ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription t (e);
-          add_deployedResource (t);
-        }
+else if (n == "provider")
+{
+provider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+provider_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "exclusiveProvider")
+{
+exclusiveProvider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+exclusiveProvider_->container (this);
+}
 
-    // ImplementationDependency
-    //
+else if (n == "exclusiveUser")
+{
+exclusiveUser_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+exclusiveUser_->container (this);
+}
 
-    ImplementationDependency::
-    ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "optional")
+{
+optional_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+optional_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else if (n == "kind")
+{
+kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
+kind_->container (this);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+else
+{
+}
+}
+}
 
-        if (n == "requiredType")
-        {
-          requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredType_->container (this);
-        }
+// ComponentPropertyDescription
+//
 
-        else 
-        {
-        }
-      }
-    }
+ComponentPropertyDescription::
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    // Capability
-    //
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    Capability::
-    Capability (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+else if (n == "type")
+{
+type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+type_->container (this);
+}
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else if (n == "resourceType")
-        {
-          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceType_->container (this);
-        }
+// ComponentExternalPortEndpoint
+//
 
-        else if (n == "property")
-        {
-          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
-          property_->container (this);
-        }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else 
-        {
-        }
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    // ImplementationRequirement
-    //
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-    ImplementationRequirement::
-    ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+if (n == "portName")
+{
+portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+portName_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else
+{
+}
+}
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+// PlanSubcomponentPortEndpoint
+//
 
-        if (n == "resourceUsage")
-        {
-          resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
-          resourceUsage_->container (this);
-        }
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "resourcePort")
-        {
-          resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourcePort_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "componentPort")
-        {
-          componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          componentPort_->container (this);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "resourceType")
-        {
-          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceType_->container (this);
-        }
+if (n == "portName")
+{
+portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+portName_->container (this);
+}
 
-        else if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+else if (n == "provider")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+provider (t);
+}
 
-        else if (n == "property")
-        {
-          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-          property_->container (this);
-        }
+else if (n == "kind")
+{
+kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
+kind_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "instance")
+{
+instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+instance_->container (this);
+}
 
-    // ComponentPackageReference
-    //
+else
+{
+}
+}
+}
 
-    ComponentPackageReference::
-    ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+// ExternalReferenceEndpoint
+//
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        if (n == "requiredUUID")
-        {
-          requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredUUID_->container (this);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "requiredName")
-        {
-          requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredName_->container (this);
-        }
+if (n == "location")
+{
+location_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+location_->container (this);
+}
 
-        else if (n == "requiredType")
-        {
-          requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredType_->container (this);
-        }
+else
+{
+}
+}
+}
 
-        else 
-        {
-        }
-      }
-    }
+// ConnectionResourceDeploymentDescription
+//
 
-    // SubcomponentPortEndpoint
-    //
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-    SubcomponentPortEndpoint::
-    SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+if (n == "targetName")
+{
+targetName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+targetName_->container (this);
+}
 
-        if (n == "portName")
-        {
-          portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          portName_->container (this);
-        }
+else if (n == "requirementName")
+{
+requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requirementName_->container (this);
+}
 
-        else if (n == "instance")
-        {
-          instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
-          instance_->container (this);
-        }
+else if (n == "resourceName")
+{
+resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceName_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
 
-    // AssemblyConnectionDescription
-    //
+else
+{
+}
+}
+}
 
-    AssemblyConnectionDescription::
-    AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+// PlanConnectionDescription
+//
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+PlanConnectionDescription::
+PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else if (n == "externalEndpoint")
-        {
-          ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
-          add_externalEndpoint (t);
-        }
+else if (n == "source")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+source (t);
+}
 
-        else if (n == "internalEndpoint")
-        {
-          ::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e);
-          add_internalEndpoint (t);
-        }
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_deployRequirement (t);
+}
 
-        else if (n == "externalReference")
-        {
-          ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
-          add_externalReference (t);
-        }
+else if (n == "externalEndpoint")
+{
+::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
+add_externalEndpoint (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
-  }
+else if (n == "internalEndpoint")
+{
+::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint t (e);
+add_internalEndpoint (t);
+}
+
+else if (n == "externalReference")
+{
+::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
+add_externalReference (t);
+}
+
+else if (n == "deployedResource")
+{
+::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription t (e);
+add_deployedResource (t);
+}
+
+else
+{
+}
+}
+}
+
+// ImplementationDependency
+//
+
+ImplementationDependency::
+ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "requiredType")
+{
+requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requiredType_->container (this);
+}
+
+else
+{
+}
+}
+}
+
+// Capability
+//
+
+Capability::
+Capability (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
+
+else if (n == "resourceType")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_resourceType (t);
+}
+
+else if (n == "property")
+{
+::CIAO::Config_Handlers::SatisfierProperty t (e);
+add_property (t);
+}
+
+else
+{
+}
+}
+}
+
+// ImplementationRequirement
+//
+
+ImplementationRequirement::
+ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "resourceUsage")
+{
+::CIAO::Config_Handlers::ResourceUsageKind t (e);
+resourceUsage (t);
+}
+
+else if (n == "resourcePort")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+resourcePort (t);
+}
+
+else if (n == "componentPort")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+componentPort (t);
+}
+
+else if (n == "resourceType")
+{
+resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceType_->container (this);
+}
+
+else if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
+
+else if (n == "property")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_property (t);
+}
+
+else
+{
+}
+}
+}
+
+// ComponentPackageReference
+//
+
+ComponentPackageReference::
+ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "requiredUUID")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+requiredUUID (t);
+}
+
+else if (n == "requiredName")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+requiredName (t);
+}
+
+else if (n == "requiredType")
+{
+requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+requiredType_->container (this);
+}
+
+else
+{
+}
+}
+}
+
+// SubcomponentPortEndpoint
+//
+
+SubcomponentPortEndpoint::
+SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "portName")
+{
+portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+portName_->container (this);
+}
+
+else if (n == "instance")
+{
+instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+instance_->container (this);
+}
+
+else
+{
+}
+}
+}
+
+// AssemblyConnectionDescription
+//
+
+AssemblyConnectionDescription::
+AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
+
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_deployRequirement (t);
+}
+
+else if (n == "internalEndpoint")
+{
+::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e);
+add_internalEndpoint (t);
+}
+
+else if (n == "externalEndpoint")
+{
+::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
+add_externalEndpoint (t);
+}
+
+else if (n == "externalReference")
+{
+::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
+add_externalReference (t);
+}
+
+else
+{
+}
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+namespace Config_Handlers
+{
+namespace
+{
+::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
-      struct TCKindTypeInfoInitializer
-      {
-        TCKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (TCKind));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct TCKindTypeInfoInitializer
+{
+TCKindTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (TCKind));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      TCKindTypeInfoInitializer TCKindTypeInfoInitializer_;
+TCKindTypeInfoInitializer TCKindTypeInfoInitializer_;
 
-      struct DataTypeTypeInfoInitializer
-      {
-        DataTypeTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (DataType));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct DataTypeTypeInfoInitializer
+{
+DataTypeTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (DataType));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      DataTypeTypeInfoInitializer DataTypeTypeInfoInitializer_;
+DataTypeTypeInfoInitializer DataTypeTypeInfoInitializer_;
 
-      struct DataValueTypeInfoInitializer
-      {
-        DataValueTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (DataValue));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct DataValueTypeInfoInitializer
+{
+DataValueTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (DataValue));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      DataValueTypeInfoInitializer DataValueTypeInfoInitializer_;
+DataValueTypeInfoInitializer DataValueTypeInfoInitializer_;
 
-      struct EnumTypeTypeInfoInitializer
-      {
-        EnumTypeTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (EnumType));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct EnumTypeTypeInfoInitializer
+{
+EnumTypeTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (EnumType));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      EnumTypeTypeInfoInitializer EnumTypeTypeInfoInitializer_;
+EnumTypeTypeInfoInitializer EnumTypeTypeInfoInitializer_;
 
-      struct AnyTypeInfoInitializer
-      {
-        AnyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Any));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct AnyTypeInfoInitializer
+{
+AnyTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Any));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      AnyTypeInfoInitializer AnyTypeInfoInitializer_;
+AnyTypeInfoInitializer AnyTypeInfoInitializer_;
 
-      struct PropertyTypeInfoInitializer
-      {
-        PropertyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Property));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct PropertyTypeInfoInitializer
+{
+PropertyTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Property));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      PropertyTypeInfoInitializer PropertyTypeInfoInitializer_;
+PropertyTypeInfoInitializer PropertyTypeInfoInitializer_;
 
-      struct SatisfierPropertyKindTypeInfoInitializer
-      {
-        SatisfierPropertyKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SatisfierPropertyKind));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct SatisfierPropertyKindTypeInfoInitializer
+{
+SatisfierPropertyKindTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (SatisfierPropertyKind));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      SatisfierPropertyKindTypeInfoInitializer SatisfierPropertyKindTypeInfoInitializer_;
+SatisfierPropertyKindTypeInfoInitializer SatisfierPropertyKindTypeInfoInitializer_;
 
-      struct SatisfierPropertyTypeInfoInitializer
-      {
-        SatisfierPropertyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SatisfierProperty));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct SatisfierPropertyTypeInfoInitializer
+{
+SatisfierPropertyTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (SatisfierProperty));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      SatisfierPropertyTypeInfoInitializer SatisfierPropertyTypeInfoInitializer_;
+SatisfierPropertyTypeInfoInitializer SatisfierPropertyTypeInfoInitializer_;
 
-      struct ResourceTypeInfoInitializer
-      {
-        ResourceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Resource));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ResourceTypeInfoInitializer
+{
+ResourceTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Resource));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ResourceTypeInfoInitializer ResourceTypeInfoInitializer_;
+ResourceTypeInfoInitializer ResourceTypeInfoInitializer_;
 
-      struct RequirementTypeInfoInitializer
-      {
-        RequirementTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Requirement));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct RequirementTypeInfoInitializer
+{
+RequirementTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Requirement));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      RequirementTypeInfoInitializer RequirementTypeInfoInitializer_;
+RequirementTypeInfoInitializer RequirementTypeInfoInitializer_;
 
-      struct ResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        ResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ResourceDeploymentDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ResourceDeploymentDescriptionTypeInfoInitializer
+{
+ResourceDeploymentDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ResourceDeploymentDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ResourceDeploymentDescriptionTypeInfoInitializer ResourceDeploymentDescriptionTypeInfoInitializer_;
+ResourceDeploymentDescriptionTypeInfoInitializer ResourceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct ArtifactDeploymentDescriptionTypeInfoInitializer
-      {
-        ArtifactDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ArtifactDeploymentDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ArtifactDeploymentDescriptionTypeInfoInitializer
+{
+ArtifactDeploymentDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ArtifactDeploymentDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ArtifactDeploymentDescriptionTypeInfoInitializer ArtifactDeploymentDescriptionTypeInfoInitializer_;
+ArtifactDeploymentDescriptionTypeInfoInitializer ArtifactDeploymentDescriptionTypeInfoInitializer_;
 
-      struct MonolithicDeploymentDescriptionTypeInfoInitializer
-      {
-        MonolithicDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (MonolithicDeploymentDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct MonolithicDeploymentDescriptionTypeInfoInitializer
+{
+MonolithicDeploymentDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (MonolithicDeploymentDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      MonolithicDeploymentDescriptionTypeInfoInitializer MonolithicDeploymentDescriptionTypeInfoInitializer_;
+MonolithicDeploymentDescriptionTypeInfoInitializer MonolithicDeploymentDescriptionTypeInfoInitializer_;
 
-      struct ResourceUsageKindTypeInfoInitializer
-      {
-        ResourceUsageKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ResourceUsageKind));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ResourceUsageKindTypeInfoInitializer
+{
+ResourceUsageKindTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ResourceUsageKind));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ResourceUsageKindTypeInfoInitializer ResourceUsageKindTypeInfoInitializer_;
+ResourceUsageKindTypeInfoInitializer ResourceUsageKindTypeInfoInitializer_;
 
-      struct InstanceResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        InstanceResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (InstanceResourceDeploymentDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct InstanceResourceDeploymentDescriptionTypeInfoInitializer
+{
+InstanceResourceDeploymentDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (InstanceResourceDeploymentDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      InstanceResourceDeploymentDescriptionTypeInfoInitializer InstanceResourceDeploymentDescriptionTypeInfoInitializer_;
+InstanceResourceDeploymentDescriptionTypeInfoInitializer InstanceResourceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct InstanceDeploymentDescriptionTypeInfoInitializer
-      {
-        InstanceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (InstanceDeploymentDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct InstanceDeploymentDescriptionTypeInfoInitializer
+{
+InstanceDeploymentDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (InstanceDeploymentDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      InstanceDeploymentDescriptionTypeInfoInitializer InstanceDeploymentDescriptionTypeInfoInitializer_;
+InstanceDeploymentDescriptionTypeInfoInitializer InstanceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct CCMComponentPortKindTypeInfoInitializer
-      {
-        CCMComponentPortKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (CCMComponentPortKind));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct CCMComponentPortKindTypeInfoInitializer
+{
+CCMComponentPortKindTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (CCMComponentPortKind));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
 
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      CCMComponentPortKindTypeInfoInitializer CCMComponentPortKindTypeInfoInitializer_;
+CCMComponentPortKindTypeInfoInitializer CCMComponentPortKindTypeInfoInitializer_;
 
-      struct ComponentPortDescriptionTypeInfoInitializer
-      {
-        ComponentPortDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPortDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ComponentPortDescriptionTypeInfoInitializer
+{
+ComponentPortDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ComponentPortDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ComponentPortDescriptionTypeInfoInitializer ComponentPortDescriptionTypeInfoInitializer_;
+ComponentPortDescriptionTypeInfoInitializer ComponentPortDescriptionTypeInfoInitializer_;
 
-      struct ComponentPropertyDescriptionTypeInfoInitializer
-      {
-        ComponentPropertyDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPropertyDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ComponentPropertyDescriptionTypeInfoInitializer
+{
+ComponentPropertyDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ComponentPropertyDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ComponentPropertyDescriptionTypeInfoInitializer ComponentPropertyDescriptionTypeInfoInitializer_;
+ComponentPropertyDescriptionTypeInfoInitializer ComponentPropertyDescriptionTypeInfoInitializer_;
 
-      struct ComponentExternalPortEndpointTypeInfoInitializer
-      {
-        ComponentExternalPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentExternalPortEndpoint));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ComponentExternalPortEndpointTypeInfoInitializer
+{
+ComponentExternalPortEndpointTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ComponentExternalPortEndpoint));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ComponentExternalPortEndpointTypeInfoInitializer ComponentExternalPortEndpointTypeInfoInitializer_;
+ComponentExternalPortEndpointTypeInfoInitializer ComponentExternalPortEndpointTypeInfoInitializer_;
 
-      struct PlanSubcomponentPortEndpointTypeInfoInitializer
-      {
-        PlanSubcomponentPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PlanSubcomponentPortEndpoint));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct PlanSubcomponentPortEndpointTypeInfoInitializer
+{
+PlanSubcomponentPortEndpointTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (PlanSubcomponentPortEndpoint));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      PlanSubcomponentPortEndpointTypeInfoInitializer PlanSubcomponentPortEndpointTypeInfoInitializer_;
+PlanSubcomponentPortEndpointTypeInfoInitializer PlanSubcomponentPortEndpointTypeInfoInitializer_;
 
-      struct ExternalReferenceEndpointTypeInfoInitializer
-      {
-        ExternalReferenceEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ExternalReferenceEndpoint));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ExternalReferenceEndpointTypeInfoInitializer
+{
+ExternalReferenceEndpointTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ExternalReferenceEndpoint));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ExternalReferenceEndpointTypeInfoInitializer ExternalReferenceEndpointTypeInfoInitializer_;
+ExternalReferenceEndpointTypeInfoInitializer ExternalReferenceEndpointTypeInfoInitializer_;
 
-      struct ConnectionResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        ConnectionResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ConnectionResourceDeploymentDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ConnectionResourceDeploymentDescriptionTypeInfoInitializer
+{
+ConnectionResourceDeploymentDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ConnectionResourceDeploymentDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ConnectionResourceDeploymentDescriptionTypeInfoInitializer ConnectionResourceDeploymentDescriptionTypeInfoInitializer_;
+ConnectionResourceDeploymentDescriptionTypeInfoInitializer ConnectionResourceDeploymentDescriptionTypeInfoInitializer_;
 
-      struct PlanConnectionDescriptionTypeInfoInitializer
-      {
-        PlanConnectionDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PlanConnectionDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct PlanConnectionDescriptionTypeInfoInitializer
+{
+PlanConnectionDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (PlanConnectionDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      PlanConnectionDescriptionTypeInfoInitializer PlanConnectionDescriptionTypeInfoInitializer_;
+PlanConnectionDescriptionTypeInfoInitializer PlanConnectionDescriptionTypeInfoInitializer_;
 
-      struct ImplementationDependencyTypeInfoInitializer
-      {
-        ImplementationDependencyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationDependency));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ImplementationDependencyTypeInfoInitializer
+{
+ImplementationDependencyTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ImplementationDependency));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ImplementationDependencyTypeInfoInitializer ImplementationDependencyTypeInfoInitializer_;
+ImplementationDependencyTypeInfoInitializer ImplementationDependencyTypeInfoInitializer_;
 
-      struct CapabilityTypeInfoInitializer
-      {
-        CapabilityTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Capability));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct CapabilityTypeInfoInitializer
+{
+CapabilityTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Capability));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      CapabilityTypeInfoInitializer CapabilityTypeInfoInitializer_;
+CapabilityTypeInfoInitializer CapabilityTypeInfoInitializer_;
 
-      struct ImplementationRequirementTypeInfoInitializer
-      {
-        ImplementationRequirementTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationRequirement));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ImplementationRequirementTypeInfoInitializer
+{
+ImplementationRequirementTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ImplementationRequirement));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
+ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
 
-      struct ComponentPackageReferenceTypeInfoInitializer
-      {
-        ComponentPackageReferenceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPackageReference));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ComponentPackageReferenceTypeInfoInitializer
+{
+ComponentPackageReferenceTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ComponentPackageReference));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
+ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
 
-      struct SubcomponentPortEndpointTypeInfoInitializer
-      {
-        SubcomponentPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct SubcomponentPortEndpointTypeInfoInitializer
+{
+SubcomponentPortEndpointTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
+SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
 
-      struct AssemblyConnectionDescriptionTypeInfoInitializer
-      {
-        AssemblyConnectionDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct AssemblyConnectionDescriptionTypeInfoInitializer
+{
+AssemblyConnectionDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      AssemblyConnectionDescriptionTypeInfoInitializer AssemblyConnectionDescriptionTypeInfoInitializer_;
-    }
-  }
+AssemblyConnectionDescriptionTypeInfoInitializer AssemblyConnectionDescriptionTypeInfoInitializer_;
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // DataType
-      //
-      //
+namespace Config_Handlers
+{
+namespace Traversal
+{
+// DataType
+//
+//
 
-      void DataType::
-      traverse (Type& o)
-      {
-        pre (o);
-        kind (o);
-        if (o.enum_p ()) enum_ (o);
-        else enum_none (o);
-        post (o);
-      }
+void DataType::
+traverse (Type& o)
+{
+pre (o);
+kind (o);
+if (o.enum_p ()) enum_ (o);
+else enum_none (o);
+post (o);
+}
 
-      void DataType::
-      traverse (Type const& o)
-      {
-        pre (o);
-        kind (o);
-        if (o.enum_p ()) enum_ (o);
-        else enum_none (o);
-        post (o);
-      }
+void DataType::
+traverse (Type const& o)
+{
+pre (o);
+kind (o);
+if (o.enum_p ()) enum_ (o);
+else enum_none (o);
+post (o);
+}
 
-      void DataType::
-      pre (Type&)
-      {
-      }
+void DataType::
+pre (Type&)
+{
+}
 
-      void DataType::
-      pre (Type const&)
-      {
-      }
+void DataType::
+pre (Type const&)
+{
+}
 
-      void DataType::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
+void DataType::
+kind (Type& o)
+{
+dispatch (o.kind ());
+}
 
-      void DataType::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
+void DataType::
+kind (Type const& o)
+{
+dispatch (o.kind ());
+}
 
-      void DataType::
-      enum_ (Type& o)
-      {
-        dispatch (o.enum_ ());
-      }
+void DataType::
+enum_ (Type& o)
+{
+dispatch (o.enum_ ());
+}
 
-      void DataType::
-      enum_ (Type const& o)
-      {
-        dispatch (o.enum_ ());
-      }
+void DataType::
+enum_ (Type const& o)
+{
+dispatch (o.enum_ ());
+}
 
-      void DataType::
-      enum_none (Type&)
-      {
-      }
+void DataType::
+enum_none (Type&)
+{
+}
 
-      void DataType::
-      enum_none (Type const&)
-      {
-      }
+void DataType::
+enum_none (Type const&)
+{
+}
 
-      void DataType::
-      post (Type&)
-      {
-      }
+void DataType::
+post (Type&)
+{
+}
 
-      void DataType::
-      post (Type const&)
-      {
-      }
+void DataType::
+post (Type const&)
+{
+}
 
-      // DataValue
-      //
-      //
+// DataValue
+//
+//
 
-      void DataValue::
-      traverse (Type& o)
-      {
-        pre (o);
-        short_ (o);
-        long_ (o);
-        ushort (o);
-        ulong (o);
-        float_ (o);
-        double_ (o);
-        boolean (o);
-        octet (o);
-        enum_ (o);
-        string (o);
-        longlong (o);
-        ulonglong (o);
-        longdouble (o);
-        post (o);
-      }
+void DataValue::
+traverse (Type& o)
+{
+pre (o);
+short_ (o);
+long_ (o);
+ushort (o);
+ulong (o);
+float_ (o);
+double_ (o);
+boolean (o);
+octet (o);
+enum_ (o);
+string (o);
+longlong (o);
+ulonglong (o);
+longdouble (o);
+post (o);
+}
 
-      void DataValue::
-      traverse (Type const& o)
-      {
-        pre (o);
-        short_ (o);
-        long_ (o);
-        ushort (o);
-        ulong (o);
-        float_ (o);
-        double_ (o);
-        boolean (o);
-        octet (o);
-        enum_ (o);
-        string (o);
-        longlong (o);
-        ulonglong (o);
-        longdouble (o);
-        post (o);
-      }
+void DataValue::
+traverse (Type const& o)
+{
+pre (o);
+short_ (o);
+long_ (o);
+ushort (o);
+ulong (o);
+float_ (o);
+double_ (o);
+boolean (o);
+octet (o);
+enum_ (o);
+string (o);
+longlong (o);
+ulonglong (o);
+longdouble (o);
+post (o);
+}
 
-      void DataValue::
-      pre (Type&)
-      {
-      }
+void DataValue::
+pre (Type&)
+{
+}
 
-      void DataValue::
-      pre (Type const&)
-      {
-      }
+void DataValue::
+pre (Type const&)
+{
+}
 
-      void DataValue::
-      short_ (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::short_iterator b (o.begin_short()), e (o.end_short());
+void DataValue::
+short_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::short_iterator b (o.begin_short()), e (o.end_short());
 
-        if (b != e)
-        {
-          short_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) short_next (o);
-          }
-
-          short_post (o);
-        }
+if (b != e)
+{
+short_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) short_next (o);
+}
 
-        else short_none (o);
-      }
+short_post (o);
+}
 
-      void DataValue::
-      short_ (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::short_const_iterator b (o.begin_short()), e (o.end_short());
+else short_none (o);
+}
 
-        if (b != e)
-        {
-          short_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) short_next (o);
-          }
-
-          short_post (o);
-        }
+void DataValue::
+short_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::short_const_iterator b (o.begin_short()), e (o.end_short());
 
-        else short_none (o);
-      }
+if (b != e)
+{
+short_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) short_next (o);
+}
 
-      void DataValue::
-      short_pre (Type&)
-      {
-      }
+short_post (o);
+}
 
-      void DataValue::
-      short_pre (Type const&)
-      {
-      }
+else short_none (o);
+}
 
-      void DataValue::
-      short_next (Type&)
-      {
-      }
+void DataValue::
+short_pre (Type&)
+{
+}
 
-      void DataValue::
-      short_next (Type const&)
-      {
-      }
+void DataValue::
+short_pre (Type const&)
+{
+}
 
-      void DataValue::
-      short_post (Type&)
-      {
-      }
+void DataValue::
+short_next (Type&)
+{
+}
 
-      void DataValue::
-      short_post (Type const&)
-      {
-      }
+void DataValue::
+short_next (Type const&)
+{
+}
 
-      void DataValue::
-      short_none (Type&)
-      {
-      }
+void DataValue::
+short_post (Type&)
+{
+}
 
-      void DataValue::
-      short_none (Type const&)
-      {
-      }
+void DataValue::
+short_post (Type const&)
+{
+}
 
-      void DataValue::
-      long_ (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::long_iterator b (o.begin_long()), e (o.end_long());
+void DataValue::
+short_none (Type&)
+{
+}
 
-        if (b != e)
-        {
-          long_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) long_next (o);
-          }
-
-          long_post (o);
-        }
+void DataValue::
+short_none (Type const&)
+{
+}
 
-        else long_none (o);
-      }
+void DataValue::
+long_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::long_iterator b (o.begin_long()), e (o.end_long());
 
-      void DataValue::
-      long_ (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::long_const_iterator b (o.begin_long()), e (o.end_long());
+if (b != e)
+{
+long_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) long_next (o);
+}
 
-        if (b != e)
-        {
-          long_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) long_next (o);
-          }
-
-          long_post (o);
-        }
+long_post (o);
+}
 
-        else long_none (o);
-      }
+else long_none (o);
+}
 
-      void DataValue::
-      long_pre (Type&)
-      {
-      }
+void DataValue::
+long_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::long_const_iterator b (o.begin_long()), e (o.end_long());
 
-      void DataValue::
-      long_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+long_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) long_next (o);
+}
 
-      void DataValue::
-      long_next (Type&)
-      {
-      }
+long_post (o);
+}
 
-      void DataValue::
-      long_next (Type const&)
-      {
-      }
+else long_none (o);
+}
 
-      void DataValue::
-      long_post (Type&)
-      {
-      }
+void DataValue::
+long_pre (Type&)
+{
+}
 
-      void DataValue::
-      long_post (Type const&)
-      {
-      }
+void DataValue::
+long_pre (Type const&)
+{
+}
 
-      void DataValue::
-      long_none (Type&)
-      {
-      }
+void DataValue::
+long_next (Type&)
+{
+}
 
-      void DataValue::
-      long_none (Type const&)
-      {
-      }
+void DataValue::
+long_next (Type const&)
+{
+}
 
-      void DataValue::
-      ushort (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ushort_iterator b (o.begin_ushort()), e (o.end_ushort());
+void DataValue::
+long_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          ushort_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) ushort_next (o);
-          }
-
-          ushort_post (o);
-        }
+void DataValue::
+long_post (Type const&)
+{
+}
 
-        else ushort_none (o);
-      }
+void DataValue::
+long_none (Type&)
+{
+}
 
-      void DataValue::
-      ushort (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ushort_const_iterator b (o.begin_ushort()), e (o.end_ushort());
+void DataValue::
+long_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          ushort_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) ushort_next (o);
-          }
-
-          ushort_post (o);
-        }
+void DataValue::
+ushort (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::ushort_iterator b (o.begin_ushort()), e (o.end_ushort());
 
-        else ushort_none (o);
-      }
+if (b != e)
+{
+ushort_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ushort_next (o);
+}
 
-      void DataValue::
-      ushort_pre (Type&)
-      {
-      }
+ushort_post (o);
+}
 
-      void DataValue::
-      ushort_pre (Type const&)
-      {
-      }
+else ushort_none (o);
+}
 
-      void DataValue::
-      ushort_next (Type&)
-      {
-      }
+void DataValue::
+ushort (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::ushort_const_iterator b (o.begin_ushort()), e (o.end_ushort());
 
-      void DataValue::
-      ushort_next (Type const&)
-      {
-      }
+if (b != e)
+{
+ushort_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ushort_next (o);
+}
 
-      void DataValue::
-      ushort_post (Type&)
-      {
-      }
+ushort_post (o);
+}
 
-      void DataValue::
-      ushort_post (Type const&)
-      {
-      }
+else ushort_none (o);
+}
 
-      void DataValue::
-      ushort_none (Type&)
-      {
-      }
+void DataValue::
+ushort_pre (Type&)
+{
+}
 
-      void DataValue::
-      ushort_none (Type const&)
-      {
-      }
+void DataValue::
+ushort_pre (Type const&)
+{
+}
 
-      void DataValue::
-      ulong (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ulong_iterator b (o.begin_ulong()), e (o.end_ulong());
+void DataValue::
+ushort_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          ulong_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) ulong_next (o);
-          }
-
-          ulong_post (o);
-        }
+void DataValue::
+ushort_next (Type const&)
+{
+}
 
-        else ulong_none (o);
-      }
+void DataValue::
+ushort_post (Type&)
+{
+}
 
-      void DataValue::
-      ulong (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ulong_const_iterator b (o.begin_ulong()), e (o.end_ulong());
+void DataValue::
+ushort_post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          ulong_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) ulong_next (o);
-          }
-
-          ulong_post (o);
-        }
+void DataValue::
+ushort_none (Type&)
+{
+}
 
-        else ulong_none (o);
-      }
+void DataValue::
+ushort_none (Type const&)
+{
+}
 
-      void DataValue::
-      ulong_pre (Type&)
-      {
-      }
+void DataValue::
+ulong (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::ulong_iterator b (o.begin_ulong()), e (o.end_ulong());
 
-      void DataValue::
-      ulong_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+ulong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulong_next (o);
+}
 
-      void DataValue::
-      ulong_next (Type&)
-      {
-      }
+ulong_post (o);
+}
 
-      void DataValue::
-      ulong_next (Type const&)
-      {
-      }
+else ulong_none (o);
+}
 
-      void DataValue::
-      ulong_post (Type&)
-      {
-      }
+void DataValue::
+ulong (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::ulong_const_iterator b (o.begin_ulong()), e (o.end_ulong());
 
-      void DataValue::
-      ulong_post (Type const&)
-      {
-      }
+if (b != e)
+{
+ulong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulong_next (o);
+}
 
-      void DataValue::
-      ulong_none (Type&)
-      {
-      }
+ulong_post (o);
+}
 
-      void DataValue::
-      ulong_none (Type const&)
-      {
-      }
+else ulong_none (o);
+}
 
-      void DataValue::
-      float_ (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::float_iterator b (o.begin_float()), e (o.end_float());
+void DataValue::
+ulong_pre (Type&)
+{
+}
 
-        if (b != e)
-        {
-          float_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) float_next (o);
-          }
-
-          float_post (o);
-        }
+void DataValue::
+ulong_pre (Type const&)
+{
+}
 
-        else float_none (o);
-      }
+void DataValue::
+ulong_next (Type&)
+{
+}
 
-      void DataValue::
-      float_ (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::float_const_iterator b (o.begin_float()), e (o.end_float());
+void DataValue::
+ulong_next (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          float_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) float_next (o);
-          }
-
-          float_post (o);
-        }
+void DataValue::
+ulong_post (Type&)
+{
+}
 
-        else float_none (o);
-      }
+void DataValue::
+ulong_post (Type const&)
+{
+}
 
-      void DataValue::
-      float_pre (Type&)
-      {
-      }
+void DataValue::
+ulong_none (Type&)
+{
+}
 
-      void DataValue::
-      float_pre (Type const&)
-      {
-      }
+void DataValue::
+ulong_none (Type const&)
+{
+}
 
-      void DataValue::
-      float_next (Type&)
-      {
-      }
+void DataValue::
+float_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::float_iterator b (o.begin_float()), e (o.end_float());
 
-      void DataValue::
-      float_next (Type const&)
-      {
-      }
+if (b != e)
+{
+float_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) float_next (o);
+}
 
-      void DataValue::
-      float_post (Type&)
-      {
-      }
+float_post (o);
+}
 
-      void DataValue::
-      float_post (Type const&)
-      {
-      }
+else float_none (o);
+}
 
-      void DataValue::
-      float_none (Type&)
-      {
-      }
+void DataValue::
+float_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::float_const_iterator b (o.begin_float()), e (o.end_float());
 
-      void DataValue::
-      float_none (Type const&)
-      {
-      }
+if (b != e)
+{
+float_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) float_next (o);
+}
 
-      void DataValue::
-      double_ (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::double_iterator b (o.begin_double()), e (o.end_double());
+float_post (o);
+}
 
-        if (b != e)
-        {
-          double_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) double_next (o);
-          }
-
-          double_post (o);
-        }
+else float_none (o);
+}
 
-        else double_none (o);
-      }
+void DataValue::
+float_pre (Type&)
+{
+}
 
-      void DataValue::
-      double_ (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::double_const_iterator b (o.begin_double()), e (o.end_double());
+void DataValue::
+float_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          double_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) double_next (o);
-          }
-
-          double_post (o);
-        }
+void DataValue::
+float_next (Type&)
+{
+}
 
-        else double_none (o);
-      }
+void DataValue::
+float_next (Type const&)
+{
+}
 
-      void DataValue::
-      double_pre (Type&)
-      {
-      }
+void DataValue::
+float_post (Type&)
+{
+}
 
-      void DataValue::
-      double_pre (Type const&)
-      {
-      }
+void DataValue::
+float_post (Type const&)
+{
+}
 
-      void DataValue::
-      double_next (Type&)
-      {
-      }
+void DataValue::
+float_none (Type&)
+{
+}
 
-      void DataValue::
-      double_next (Type const&)
-      {
-      }
+void DataValue::
+float_none (Type const&)
+{
+}
 
-      void DataValue::
-      double_post (Type&)
-      {
-      }
+void DataValue::
+double_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::double_iterator b (o.begin_double()), e (o.end_double());
 
-      void DataValue::
-      double_post (Type const&)
-      {
-      }
+if (b != e)
+{
+double_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) double_next (o);
+}
 
-      void DataValue::
-      double_none (Type&)
-      {
-      }
+double_post (o);
+}
 
-      void DataValue::
-      double_none (Type const&)
-      {
-      }
+else double_none (o);
+}
 
-      void DataValue::
-      boolean (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::boolean_iterator b (o.begin_boolean()), e (o.end_boolean());
+void DataValue::
+double_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::double_const_iterator b (o.begin_double()), e (o.end_double());
 
-        if (b != e)
-        {
-          boolean_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) boolean_next (o);
-          }
-
-          boolean_post (o);
-        }
+if (b != e)
+{
+double_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) double_next (o);
+}
 
-        else boolean_none (o);
-      }
+double_post (o);
+}
 
-      void DataValue::
-      boolean (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::boolean_const_iterator b (o.begin_boolean()), e (o.end_boolean());
+else double_none (o);
+}
 
-        if (b != e)
-        {
-          boolean_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) boolean_next (o);
-          }
-
-          boolean_post (o);
-        }
+void DataValue::
+double_pre (Type&)
+{
+}
 
-        else boolean_none (o);
-      }
+void DataValue::
+double_pre (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_pre (Type&)
-      {
-      }
+void DataValue::
+double_next (Type&)
+{
+}
 
-      void DataValue::
-      boolean_pre (Type const&)
-      {
-      }
+void DataValue::
+double_next (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_next (Type&)
-      {
-      }
+void DataValue::
+double_post (Type&)
+{
+}
 
-      void DataValue::
-      boolean_next (Type const&)
-      {
-      }
+void DataValue::
+double_post (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_post (Type&)
-      {
-      }
+void DataValue::
+double_none (Type&)
+{
+}
 
-      void DataValue::
-      boolean_post (Type const&)
-      {
-      }
+void DataValue::
+double_none (Type const&)
+{
+}
 
-      void DataValue::
-      boolean_none (Type&)
-      {
-      }
+void DataValue::
+boolean (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::boolean_iterator b (o.begin_boolean()), e (o.end_boolean());
 
-      void DataValue::
-      boolean_none (Type const&)
-      {
-      }
+if (b != e)
+{
+boolean_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) boolean_next (o);
+}
 
-      void DataValue::
-      octet (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::octet_iterator b (o.begin_octet()), e (o.end_octet());
+boolean_post (o);
+}
 
-        if (b != e)
-        {
-          octet_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) octet_next (o);
-          }
-
-          octet_post (o);
-        }
+else boolean_none (o);
+}
 
-        else octet_none (o);
-      }
+void DataValue::
+boolean (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::boolean_const_iterator b (o.begin_boolean()), e (o.end_boolean());
 
-      void DataValue::
-      octet (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::octet_const_iterator b (o.begin_octet()), e (o.end_octet());
+if (b != e)
+{
+boolean_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) boolean_next (o);
+}
 
-        if (b != e)
-        {
-          octet_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) octet_next (o);
-          }
-
-          octet_post (o);
-        }
+boolean_post (o);
+}
 
-        else octet_none (o);
-      }
+else boolean_none (o);
+}
 
-      void DataValue::
-      octet_pre (Type&)
-      {
-      }
+void DataValue::
+boolean_pre (Type&)
+{
+}
 
-      void DataValue::
-      octet_pre (Type const&)
-      {
-      }
+void DataValue::
+boolean_pre (Type const&)
+{
+}
 
-      void DataValue::
-      octet_next (Type&)
-      {
-      }
+void DataValue::
+boolean_next (Type&)
+{
+}
 
-      void DataValue::
-      octet_next (Type const&)
-      {
-      }
+void DataValue::
+boolean_next (Type const&)
+{
+}
 
-      void DataValue::
-      octet_post (Type&)
-      {
-      }
+void DataValue::
+boolean_post (Type&)
+{
+}
 
-      void DataValue::
-      octet_post (Type const&)
-      {
-      }
+void DataValue::
+boolean_post (Type const&)
+{
+}
 
-      void DataValue::
-      octet_none (Type&)
-      {
-      }
+void DataValue::
+boolean_none (Type&)
+{
+}
 
-      void DataValue::
-      octet_none (Type const&)
-      {
-      }
+void DataValue::
+boolean_none (Type const&)
+{
+}
 
-      void DataValue::
-      enum_ (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::enum_iterator b (o.begin_enum()), e (o.end_enum());
+void DataValue::
+octet (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::octet_iterator b (o.begin_octet()), e (o.end_octet());
 
-        if (b != e)
-        {
-          enum_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) enum_next (o);
-          }
-
-          enum_post (o);
-        }
+if (b != e)
+{
+octet_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) octet_next (o);
+}
 
-        else enum_none (o);
-      }
+octet_post (o);
+}
 
-      void DataValue::
-      enum_ (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::enum_const_iterator b (o.begin_enum()), e (o.end_enum());
+else octet_none (o);
+}
 
-        if (b != e)
-        {
-          enum_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) enum_next (o);
-          }
-
-          enum_post (o);
-        }
+void DataValue::
+octet (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::octet_const_iterator b (o.begin_octet()), e (o.end_octet());
 
-        else enum_none (o);
-      }
+if (b != e)
+{
+octet_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) octet_next (o);
+}
 
-      void DataValue::
-      enum_pre (Type&)
-      {
-      }
+octet_post (o);
+}
 
-      void DataValue::
-      enum_pre (Type const&)
-      {
-      }
+else octet_none (o);
+}
 
-      void DataValue::
-      enum_next (Type&)
-      {
-      }
+void DataValue::
+octet_pre (Type&)
+{
+}
 
-      void DataValue::
-      enum_next (Type const&)
-      {
-      }
+void DataValue::
+octet_pre (Type const&)
+{
+}
 
-      void DataValue::
-      enum_post (Type&)
-      {
-      }
+void DataValue::
+octet_next (Type&)
+{
+}
 
-      void DataValue::
-      enum_post (Type const&)
-      {
-      }
+void DataValue::
+octet_next (Type const&)
+{
+}
 
-      void DataValue::
-      enum_none (Type&)
-      {
-      }
+void DataValue::
+octet_post (Type&)
+{
+}
 
-      void DataValue::
-      enum_none (Type const&)
-      {
-      }
+void DataValue::
+octet_post (Type const&)
+{
+}
 
-      void DataValue::
-      string (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::string_iterator b (o.begin_string()), e (o.end_string());
+void DataValue::
+octet_none (Type&)
+{
+}
 
-        if (b != e)
-        {
-          string_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) string_next (o);
-          }
-
-          string_post (o);
-        }
+void DataValue::
+octet_none (Type const&)
+{
+}
 
-        else string_none (o);
-      }
+void DataValue::
+enum_ (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::enum_iterator b (o.begin_enum()), e (o.end_enum());
 
-      void DataValue::
-      string (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::string_const_iterator b (o.begin_string()), e (o.end_string());
+if (b != e)
+{
+enum_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) enum_next (o);
+}
 
-        if (b != e)
-        {
-          string_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) string_next (o);
-          }
-
-          string_post (o);
-        }
+enum_post (o);
+}
 
-        else string_none (o);
-      }
+else enum_none (o);
+}
 
-      void DataValue::
-      string_pre (Type&)
-      {
-      }
+void DataValue::
+enum_ (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::enum_const_iterator b (o.begin_enum()), e (o.end_enum());
 
-      void DataValue::
-      string_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+enum_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) enum_next (o);
+}
 
-      void DataValue::
-      string_next (Type&)
-      {
-      }
+enum_post (o);
+}
 
-      void DataValue::
-      string_next (Type const&)
-      {
-      }
+else enum_none (o);
+}
 
-      void DataValue::
-      string_post (Type&)
-      {
-      }
+void DataValue::
+enum_pre (Type&)
+{
+}
 
-      void DataValue::
-      string_post (Type const&)
-      {
-      }
+void DataValue::
+enum_pre (Type const&)
+{
+}
 
-      void DataValue::
-      string_none (Type&)
-      {
-      }
+void DataValue::
+enum_next (Type&)
+{
+}
 
-      void DataValue::
-      string_none (Type const&)
-      {
-      }
+void DataValue::
+enum_next (Type const&)
+{
+}
 
-      void DataValue::
-      longlong (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::longlong_iterator b (o.begin_longlong()), e (o.end_longlong());
+void DataValue::
+enum_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          longlong_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) longlong_next (o);
-          }
-
-          longlong_post (o);
-        }
+void DataValue::
+enum_post (Type const&)
+{
+}
 
-        else longlong_none (o);
-      }
+void DataValue::
+enum_none (Type&)
+{
+}
 
-      void DataValue::
-      longlong (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::longlong_const_iterator b (o.begin_longlong()), e (o.end_longlong());
+void DataValue::
+enum_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          longlong_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) longlong_next (o);
-          }
-
-          longlong_post (o);
-        }
+void DataValue::
+string (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::string_iterator b (o.begin_string()), e (o.end_string());
 
-        else longlong_none (o);
-      }
+if (b != e)
+{
+string_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) string_next (o);
+}
 
-      void DataValue::
-      longlong_pre (Type&)
-      {
-      }
+string_post (o);
+}
 
-      void DataValue::
-      longlong_pre (Type const&)
-      {
-      }
+else string_none (o);
+}
 
-      void DataValue::
-      longlong_next (Type&)
-      {
-      }
+void DataValue::
+string (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::string_const_iterator b (o.begin_string()), e (o.end_string());
 
-      void DataValue::
-      longlong_next (Type const&)
-      {
-      }
+if (b != e)
+{
+string_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) string_next (o);
+}
 
-      void DataValue::
-      longlong_post (Type&)
-      {
-      }
+string_post (o);
+}
 
-      void DataValue::
-      longlong_post (Type const&)
-      {
-      }
+else string_none (o);
+}
 
-      void DataValue::
-      longlong_none (Type&)
-      {
-      }
+void DataValue::
+string_pre (Type&)
+{
+}
 
-      void DataValue::
-      longlong_none (Type const&)
-      {
-      }
+void DataValue::
+string_pre (Type const&)
+{
+}
 
-      void DataValue::
-      ulonglong (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ulonglong_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
+void DataValue::
+string_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          ulonglong_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) ulonglong_next (o);
-          }
-
-          ulonglong_post (o);
-        }
+void DataValue::
+string_next (Type const&)
+{
+}
 
-        else ulonglong_none (o);
-      }
+void DataValue::
+string_post (Type&)
+{
+}
 
-      void DataValue::
-      ulonglong (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::ulonglong_const_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
+void DataValue::
+string_post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          ulonglong_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) ulonglong_next (o);
-          }
-
-          ulonglong_post (o);
-        }
+void DataValue::
+string_none (Type&)
+{
+}
 
-        else ulonglong_none (o);
-      }
+void DataValue::
+string_none (Type const&)
+{
+}
 
-      void DataValue::
-      ulonglong_pre (Type&)
-      {
-      }
+void DataValue::
+longlong (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::longlong_iterator b (o.begin_longlong()), e (o.end_longlong());
 
-      void DataValue::
-      ulonglong_pre (Type const&)
-      {
-      }
+if (b != e)
+{
+longlong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longlong_next (o);
+}
 
-      void DataValue::
-      ulonglong_next (Type&)
-      {
-      }
+longlong_post (o);
+}
 
-      void DataValue::
-      ulonglong_next (Type const&)
-      {
-      }
+else longlong_none (o);
+}
 
-      void DataValue::
-      ulonglong_post (Type&)
-      {
-      }
+void DataValue::
+longlong (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::longlong_const_iterator b (o.begin_longlong()), e (o.end_longlong());
 
-      void DataValue::
-      ulonglong_post (Type const&)
-      {
-      }
+if (b != e)
+{
+longlong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longlong_next (o);
+}
 
-      void DataValue::
-      ulonglong_none (Type&)
-      {
-      }
+longlong_post (o);
+}
 
-      void DataValue::
-      ulonglong_none (Type const&)
-      {
-      }
+else longlong_none (o);
+}
 
-      void DataValue::
-      longdouble (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble());
+void DataValue::
+longlong_pre (Type&)
+{
+}
 
-        if (b != e)
-        {
-          longdouble_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) longdouble_next (o);
-          }
-
-          longdouble_post (o);
-        }
+void DataValue::
+longlong_pre (Type const&)
+{
+}
 
-        else longdouble_none (o);
-      }
+void DataValue::
+longlong_next (Type&)
+{
+}
 
-      void DataValue::
-      longdouble (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DataValue::Type::longdouble_const_iterator b (o.begin_longdouble()), e (o.end_longdouble());
+void DataValue::
+longlong_next (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          longdouble_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) longdouble_next (o);
-          }
-
-          longdouble_post (o);
-        }
+void DataValue::
+longlong_post (Type&)
+{
+}
 
-        else longdouble_none (o);
-      }
+void DataValue::
+longlong_post (Type const&)
+{
+}
 
-      void DataValue::
-      longdouble_pre (Type&)
-      {
-      }
+void DataValue::
+longlong_none (Type&)
+{
+}
 
-      void DataValue::
-      longdouble_pre (Type const&)
-      {
-      }
+void DataValue::
+longlong_none (Type const&)
+{
+}
 
-      void DataValue::
-      longdouble_next (Type&)
-      {
-      }
+void DataValue::
+ulonglong (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::ulonglong_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
 
-      void DataValue::
-      longdouble_next (Type const&)
-      {
-      }
+if (b != e)
+{
+ulonglong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulonglong_next (o);
+}
 
-      void DataValue::
-      longdouble_post (Type&)
-      {
-      }
+ulonglong_post (o);
+}
 
-      void DataValue::
-      longdouble_post (Type const&)
-      {
-      }
+else ulonglong_none (o);
+}
 
-      void DataValue::
-      longdouble_none (Type&)
-      {
-      }
+void DataValue::
+ulonglong (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::ulonglong_const_iterator b (o.begin_ulonglong()), e (o.end_ulonglong());
 
-      void DataValue::
-      longdouble_none (Type const&)
-      {
-      }
+if (b != e)
+{
+ulonglong_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) ulonglong_next (o);
+}
 
-      void DataValue::
-      post (Type&)
-      {
-      }
+ulonglong_post (o);
+}
 
-      void DataValue::
-      post (Type const&)
-      {
-      }
+else ulonglong_none (o);
+}
 
-      // EnumType
-      //
-      //
+void DataValue::
+ulonglong_pre (Type&)
+{
+}
 
-      void EnumType::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        typeId (o);
-        member (o);
-        post (o);
-      }
+void DataValue::
+ulonglong_pre (Type const&)
+{
+}
 
-      void EnumType::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        typeId (o);
-        member (o);
-        post (o);
-      }
+void DataValue::
+ulonglong_next (Type&)
+{
+}
 
-      void EnumType::
-      pre (Type&)
-      {
-      }
+void DataValue::
+ulonglong_next (Type const&)
+{
+}
 
-      void EnumType::
-      pre (Type const&)
-      {
-      }
+void DataValue::
+ulonglong_post (Type&)
+{
+}
 
-      void EnumType::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void DataValue::
+ulonglong_post (Type const&)
+{
+}
 
-      void EnumType::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void DataValue::
+ulonglong_none (Type&)
+{
+}
 
-      void EnumType::
-      typeId (Type& o)
-      {
-        dispatch (o.typeId ());
-      }
+void DataValue::
+ulonglong_none (Type const&)
+{
+}
 
-      void EnumType::
-      typeId (Type const& o)
-      {
-        dispatch (o.typeId ());
-      }
+void DataValue::
+longdouble (Type& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble());
 
-      void EnumType::
-      member (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        EnumType::Type::member_iterator b (o.begin_member()), e (o.end_member());
+if (b != e)
+{
+longdouble_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longdouble_next (o);
+}
 
-        if (b != e)
-        {
-          member_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) member_next (o);
-          }
-
-          member_post (o);
-        }
-      }
+longdouble_post (o);
+}
 
-      void EnumType::
-      member (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        EnumType::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
+else longdouble_none (o);
+}
 
-        if (b != e)
-        {
-          member_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) member_next (o);
-          }
-
-          member_post (o);
-        }
-      }
+void DataValue::
+longdouble (Type const& o)
+{
+// VC6 anathema strikes again
+//
+DataValue::Type::longdouble_const_iterator b (o.begin_longdouble()), e (o.end_longdouble());
 
-      void EnumType::
-      member_pre (Type&)
-      {
-      }
+if (b != e)
+{
+longdouble_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) longdouble_next (o);
+}
 
-      void EnumType::
-      member_pre (Type const&)
-      {
-      }
+longdouble_post (o);
+}
 
-      void EnumType::
-      member_next (Type&)
-      {
-      }
+else longdouble_none (o);
+}
 
-      void EnumType::
-      member_next (Type const&)
-      {
-      }
+void DataValue::
+longdouble_pre (Type&)
+{
+}
 
-      void EnumType::
-      member_post (Type&)
-      {
-      }
+void DataValue::
+longdouble_pre (Type const&)
+{
+}
 
-      void EnumType::
-      member_post (Type const&)
-      {
-      }
+void DataValue::
+longdouble_next (Type&)
+{
+}
 
-      void EnumType::
-      post (Type&)
-      {
-      }
+void DataValue::
+longdouble_next (Type const&)
+{
+}
 
-      void EnumType::
-      post (Type const&)
-      {
-      }
+void DataValue::
+longdouble_post (Type&)
+{
+}
 
-      // Any
-      //
-      //
+void DataValue::
+longdouble_post (Type const&)
+{
+}
 
-      void Any::
-      traverse (Type& o)
-      {
-        pre (o);
-        type (o);
-        value (o);
-        post (o);
-      }
+void DataValue::
+longdouble_none (Type&)
+{
+}
 
-      void Any::
-      traverse (Type const& o)
-      {
-        pre (o);
-        type (o);
-        value (o);
-        post (o);
-      }
+void DataValue::
+longdouble_none (Type const&)
+{
+}
 
-      void Any::
-      pre (Type&)
-      {
-      }
+void DataValue::
+post (Type&)
+{
+}
 
-      void Any::
-      pre (Type const&)
-      {
-      }
+void DataValue::
+post (Type const&)
+{
+}
 
-      void Any::
-      type (Type& o)
-      {
-        dispatch (o.type ());
-      }
+// EnumType
+//
+//
 
-      void Any::
-      type (Type const& o)
-      {
-        dispatch (o.type ());
-      }
+void EnumType::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+typeId (o);
+member (o);
+post (o);
+}
 
-      void Any::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
+void EnumType::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+typeId (o);
+member (o);
+post (o);
+}
 
-      void Any::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
+void EnumType::
+pre (Type&)
+{
+}
 
-      void Any::
-      post (Type&)
-      {
-      }
+void EnumType::
+pre (Type const&)
+{
+}
 
-      void Any::
-      post (Type const&)
-      {
-      }
+void EnumType::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      // Property
-      //
-      //
+void EnumType::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Property::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+typeId (Type& o)
+{
+dispatch (o.typeId ());
+}
 
-      void Property::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+typeId (Type const& o)
+{
+dispatch (o.typeId ());
+}
 
-      void Property::
-      pre (Type&)
-      {
-      }
+void EnumType::
+member (Type& o)
+{
+// VC6 anathema strikes again
+//
+EnumType::Type::member_iterator b (o.begin_member()), e (o.end_member());
 
-      void Property::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+member_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) member_next (o);
+}
 
-      void Property::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+member_post (o);
+}
+}
 
-      void Property::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void EnumType::
+member (Type const& o)
+{
+// VC6 anathema strikes again
+//
+EnumType::Type::member_const_iterator b (o.begin_member()), e (o.end_member());
 
-      void Property::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
+if (b != e)
+{
+member_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) member_next (o);
+}
 
-      void Property::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
+member_post (o);
+}
+}
 
-      void Property::
-      post (Type&)
-      {
-      }
+void EnumType::
+member_pre (Type&)
+{
+}
 
-      void Property::
-      post (Type const&)
-      {
-      }
+void EnumType::
+member_pre (Type const&)
+{
+}
 
-      // SatisfierProperty
-      //
-      //
+void EnumType::
+member_next (Type&)
+{
+}
 
-      void SatisfierProperty::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        kind (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+member_next (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        kind (o);
-        value (o);
-        post (o);
-      }
+void EnumType::
+member_post (Type&)
+{
+}
 
-      void SatisfierProperty::
-      pre (Type&)
-      {
-      }
+void EnumType::
+member_post (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      pre (Type const&)
-      {
-      }
+void EnumType::
+post (Type&)
+{
+}
 
-      void SatisfierProperty::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void EnumType::
+post (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+// Any
+//
+//
 
-      void SatisfierProperty::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
+void Any::
+traverse (Type& o)
+{
+pre (o);
+type (o);
+value (o);
+post (o);
+}
 
-      void SatisfierProperty::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
+void Any::
+traverse (Type const& o)
+{
+pre (o);
+type (o);
+value (o);
+post (o);
+}
 
-      void SatisfierProperty::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
+void Any::
+pre (Type&)
+{
+}
 
-      void SatisfierProperty::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
+void Any::
+pre (Type const&)
+{
+}
 
-      void SatisfierProperty::
-      post (Type&)
-      {
-      }
+void Any::
+type (Type& o)
+{
+dispatch (o.type ());
+}
 
-      void SatisfierProperty::
-      post (Type const&)
-      {
-      }
+void Any::
+type (Type const& o)
+{
+dispatch (o.type ());
+}
 
-      // Resource
-      //
-      //
+void Any::
+value (Type& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void Any::
+value (Type const& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void Any::
+post (Type&)
+{
+}
 
-      void Resource::
-      pre (Type&)
-      {
-      }
+void Any::
+post (Type const&)
+{
+}
 
-      void Resource::
-      pre (Type const&)
-      {
-      }
+// Property
+//
+//
 
-      void Resource::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Property::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+value (o);
+post (o);
+}
 
-      void Resource::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Property::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+value (o);
+post (o);
+}
 
-      void Resource::
-      resourceType (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Resource::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+void Property::
+pre (Type&)
+{
+}
 
-        if (b != e)
-        {
-          resourceType_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resourceType_next (o);
-          }
-
-          resourceType_post (o);
-        }
-      }
+void Property::
+pre (Type const&)
+{
+}
 
-      void Resource::
-      resourceType (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Resource::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+void Property::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-        if (b != e)
-        {
-          resourceType_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resourceType_next (o);
-          }
-
-          resourceType_post (o);
-        }
-      }
+void Property::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Resource::
-      resourceType_pre (Type&)
-      {
-      }
+void Property::
+value (Type& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      resourceType_pre (Type const&)
-      {
-      }
+void Property::
+value (Type const& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      resourceType_next (Type&)
-      {
-      }
+void Property::
+post (Type&)
+{
+}
 
-      void Resource::
-      resourceType_next (Type const&)
-      {
-      }
+void Property::
+post (Type const&)
+{
+}
 
-      void Resource::
-      resourceType_post (Type&)
-      {
-      }
+// SatisfierProperty
+//
+//
 
-      void Resource::
-      resourceType_post (Type const&)
-      {
-      }
+void SatisfierProperty::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+kind (o);
+dynamic (o);
+value (o);
+post (o);
+}
 
-      void Resource::
-      property (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Resource::Type::property_iterator b (o.begin_property()), e (o.end_property());
+void SatisfierProperty::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+kind (o);
+dynamic (o);
+value (o);
+post (o);
+}
 
-        if (b != e)
-        {
-          property_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) property_next (o);
-          }
-
-          property_post (o);
-        }
+void SatisfierProperty::
+pre (Type&)
+{
+}
 
-        else property_none (o);
-      }
+void SatisfierProperty::
+pre (Type const&)
+{
+}
 
-      void Resource::
-      property (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Resource::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+void SatisfierProperty::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-        if (b != e)
-        {
-          property_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) property_next (o);
-          }
-
-          property_post (o);
-        }
+void SatisfierProperty::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-        else property_none (o);
-      }
+void SatisfierProperty::
+kind (Type& o)
+{
+dispatch (o.kind ());
+}
 
-      void Resource::
-      property_pre (Type&)
-      {
-      }
+void SatisfierProperty::
+kind (Type const& o)
+{
+dispatch (o.kind ());
+}
 
-      void Resource::
-      property_pre (Type const&)
-      {
-      }
+void SatisfierProperty::
+dynamic (Type& o)
+{
+dispatch (o.dynamic ());
+}
 
-      void Resource::
-      property_next (Type&)
-      {
-      }
+void SatisfierProperty::
+dynamic (Type const& o)
+{
+dispatch (o.dynamic ());
+}
 
-      void Resource::
-      property_next (Type const&)
-      {
-      }
+void SatisfierProperty::
+value (Type& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      property_post (Type&)
-      {
-      }
+void SatisfierProperty::
+value (Type const& o)
+{
+dispatch (o.value ());
+}
 
-      void Resource::
-      property_post (Type const&)
-      {
-      }
+void SatisfierProperty::
+post (Type&)
+{
+}
 
-      void Resource::
-      property_none (Type&)
-      {
-      }
+void SatisfierProperty::
+post (Type const&)
+{
+}
 
-      void Resource::
-      property_none (Type const&)
-      {
-      }
+// Resource
+//
+//
 
-      void Resource::
-      post (Type&)
-      {
-      }
+void Resource::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
 
-      void Resource::
-      post (Type const&)
-      {
-      }
+void Resource::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
 
-      // Requirement
-      //
-      //
+void Resource::
+pre (Type&)
+{
+}
 
-      void Requirement::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+void Resource::
+pre (Type const&)
+{
+}
 
-      void Requirement::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+void Resource::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void Requirement::
-      pre (Type&)
-      {
-      }
+void Resource::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Requirement::
-      pre (Type const&)
-      {
-      }
+void Resource::
+resourceType (Type& o)
+{
+// VC6 anathema strikes again
+//
+Resource::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-      void Requirement::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+if (b != e)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_next (o);
+}
 
-      void Requirement::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+resourceType_post (o);
+}
+}
 
-      void Requirement::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Resource::
+resourceType (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Resource::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
 
-      void Requirement::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+if (b != e)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_next (o);
+}
 
-      void Requirement::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+resourceType_post (o);
+}
+}
 
-      void Requirement::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void Resource::
+resourceType_pre (Type&)
+{
+}
 
-      void Requirement::
-      post (Type&)
-      {
-      }
+void Resource::
+resourceType_pre (Type const&)
+{
+}
 
-      void Requirement::
-      post (Type const&)
-      {
-      }
+void Resource::
+resourceType_next (Type&)
+{
+}
 
-      // ResourceDeploymentDescription
-      //
-      //
+void Resource::
+resourceType_next (Type const&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void Resource::
+resourceType_post (Type&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void Resource::
+resourceType_post (Type const&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void Resource::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+Resource::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void ResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
+property_post (o);
+}
 
-      void ResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
+else property_none (o);
+}
 
-      void ResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void Resource::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Resource::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-      void ResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+property_post (o);
+}
 
-      void ResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+else property_none (o);
+}
 
-      void ResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
+void Resource::
+property_pre (Type&)
+{
+}
 
-      void ResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void Resource::
+property_pre (Type const&)
+{
+}
 
-      // ArtifactDeploymentDescription
-      //
-      //
+void Resource::
+property_next (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        node (o);
-        location (o);
-        execParameter (o);
-        deployRequirement (o);
-        deployedResource (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void Resource::
+property_next (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        node (o);
-        location (o);
-        execParameter (o);
-        deployRequirement (o);
-        deployedResource (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void Resource::
+property_post (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void Resource::
+property_post (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+void Resource::
+property_none (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Resource::
+property_none (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Resource::
+post (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      source (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
+void Resource::
+post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+// Requirement
+//
+//
 
-      void ArtifactDeploymentDescription::
-      source (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
+void Requirement::
+traverse (Type& o)
+{
+pre (o);
+resourceType (o);
+name (o);
+property (o);
+post (o);
+}
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+void Requirement::
+traverse (Type const& o)
+{
+pre (o);
+resourceType (o);
+name (o);
+property (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      source_pre (Type&)
-      {
-      }
+void Requirement::
+pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      source_pre (Type const&)
-      {
-      }
+void Requirement::
+pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      source_next (Type&)
-      {
-      }
+void Requirement::
+resourceType (Type& o)
+{
+dispatch (o.resourceType ());
+}
 
-      void ArtifactDeploymentDescription::
-      source_next (Type const&)
-      {
-      }
+void Requirement::
+resourceType (Type const& o)
+{
+dispatch (o.resourceType ());
+}
 
-      void ArtifactDeploymentDescription::
-      source_post (Type&)
-      {
-      }
+void Requirement::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ArtifactDeploymentDescription::
-      source_post (Type const&)
-      {
-      }
+void Requirement::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ArtifactDeploymentDescription::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
+void Requirement::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+Requirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void ArtifactDeploymentDescription::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      location (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
+property_post (o);
+}
 
-        if (b != e)
-        {
-          location_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      location (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
+void Requirement::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Requirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-        if (b != e)
-        {
-          location_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      location_pre (Type&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      location_pre (Type const&)
-      {
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      location_next (Type&)
-      {
-      }
+void Requirement::
+property_pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_next (Type const&)
-      {
-      }
+void Requirement::
+property_pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_post (Type&)
-      {
-      }
+void Requirement::
+property_next (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      location_post (Type const&)
-      {
-      }
+void Requirement::
+property_next (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+void Requirement::
+property_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
+void Requirement::
+property_post (Type const&)
+{
+}
 
-        else execParameter_none (o);
-      }
+void Requirement::
+property_none (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+void Requirement::
+property_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
+void Requirement::
+post (Type&)
+{
+}
 
-        else execParameter_none (o);
-      }
+void Requirement::
+post (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type&)
-      {
-      }
+// ResourceDeploymentDescription
+//
+//
 
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+requirementName (Type& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_none (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_none (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+resourceName (Type& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+void ResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+dispatch (o.resourceName ());
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void ResourceDeploymentDescription::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+ResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-        else deployRequirement_none (o);
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+property_post (o);
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+else property_none (o);
+}
 
-        else deployRequirement_none (o);
-      }
+void ResourceDeploymentDescription::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
+property_post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type&)
-      {
-      }
+else property_none (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_next (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_next (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+void ResourceDeploymentDescription::
+property_post (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+void ResourceDeploymentDescription::
+property_post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+void ResourceDeploymentDescription::
+property_none (Type&)
+{
+}
 
-        else deployedResource_none (o);
-      }
+void ResourceDeploymentDescription::
+property_none (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+void ResourceDeploymentDescription::
+post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+void ResourceDeploymentDescription::
+post (Type const&)
+{
+}
 
-        else deployedResource_none (o);
-      }
+// ArtifactDeploymentDescription
+//
+//
 
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+source (o);
+node (o);
+location (o);
+execParameter (o);
+deployRequirement (o);
+deployedResource (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+source (o);
+node (o);
+location (o);
+execParameter (o);
+deployRequirement (o);
+deployedResource (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_post (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_post (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_none (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+source (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
 
-      void ArtifactDeploymentDescription::
-      deployedResource_none (Type const&)
-      {
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+source_post (o);
+}
+}
 
-      void ArtifactDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+void ArtifactDeploymentDescription::
+source (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
 
-      void ArtifactDeploymentDescription::
-      id_none (Type&)
-      {
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void ArtifactDeploymentDescription::
-      id_none (Type const&)
-      {
-      }
+source_post (o);
+}
+}
 
-      void ArtifactDeploymentDescription::
-      post (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+source_pre (Type&)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+source_pre (Type const&)
+{
+}
 
-      // MonolithicDeploymentDescription
-      //
-      //
+void ArtifactDeploymentDescription::
+source_next (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        artifact (o);
-        execParameter (o);
-        deployRequirement (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void ArtifactDeploymentDescription::
+source_next (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        artifact (o);
-        execParameter (o);
-        deployRequirement (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void ArtifactDeploymentDescription::
+source_post (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+source_post (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+node (Type& o)
+{
+dispatch (o.node ());
+}
 
-      void MonolithicDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void ArtifactDeploymentDescription::
+node (Type const& o)
+{
+dispatch (o.node ());
+}
 
-      void MonolithicDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void ArtifactDeploymentDescription::
+location (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
 
-      void MonolithicDeploymentDescription::
-      source (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
+if (b != e)
+{
+location_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) location_next (o);
+}
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+location_post (o);
+}
+}
 
-      void MonolithicDeploymentDescription::
-      source (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
+void ArtifactDeploymentDescription::
+location (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
 
-        if (b != e)
-        {
-          source_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
+if (b != e)
+{
+location_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) location_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      source_pre (Type&)
-      {
-      }
+location_post (o);
+}
+}
 
-      void MonolithicDeploymentDescription::
-      source_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_pre (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      source_next (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_pre (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      source_next (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_next (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      source_post (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_next (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      source_post (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+location_post (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      artifact (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
+void ArtifactDeploymentDescription::
+location_post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          artifact_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
-          }
-
-          artifact_post (o);
-        }
-      }
+void ArtifactDeploymentDescription::
+execParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-      void MonolithicDeploymentDescription::
-      artifact (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-        if (b != e)
-        {
-          artifact_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
-          }
-
-          artifact_post (o);
-        }
-      }
+execParameter_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type&)
-      {
-      }
+else execParameter_none (o);
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-      void MonolithicDeploymentDescription::
-      artifact_next (Type&)
-      {
-      }
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_next (Type const&)
-      {
-      }
+execParameter_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_post (Type&)
-      {
-      }
+else execParameter_none (o);
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_post (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_pre (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+void ArtifactDeploymentDescription::
+execParameter_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
+void ArtifactDeploymentDescription::
+execParameter_next (Type&)
+{
+}
 
-        else execParameter_none (o);
-      }
+void ArtifactDeploymentDescription::
+execParameter_next (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+void ArtifactDeploymentDescription::
+execParameter_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
+void ArtifactDeploymentDescription::
+execParameter_post (Type const&)
+{
+}
 
-        else execParameter_none (o);
-      }
+void ArtifactDeploymentDescription::
+execParameter_none (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+execParameter_none (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type const&)
-      {
-      }
+deployRequirement_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type&)
-      {
-      }
+else deployRequirement_none (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void MonolithicDeploymentDescription::
-      execParameter_none (Type&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_none (Type const&)
-      {
-      }
+deployRequirement_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+else deployRequirement_none (o);
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void ArtifactDeploymentDescription::
+deployRequirement_pre (Type&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+void ArtifactDeploymentDescription::
+deployRequirement_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void ArtifactDeploymentDescription::
+deployRequirement_next (Type const&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_post (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_none (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_none (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource (Type& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type&)
-      {
-      }
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
+deployedResource_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+else deployedResource_none (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ArtifactDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-      void MonolithicDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
 
-      void MonolithicDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+deployedResource_post (o);
+}
 
-      void MonolithicDeploymentDescription::
-      id_none (Type&)
-      {
-      }
+else deployedResource_none (o);
+}
 
-      void MonolithicDeploymentDescription::
-      id_none (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_pre (Type&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      post (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_pre (Type const&)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_next (Type&)
+{
+}
 
-      // InstanceResourceDeploymentDescription
-      //
-      //
+void ArtifactDeploymentDescription::
+deployedResource_next (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void ArtifactDeploymentDescription::
+deployedResource_post (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void ArtifactDeploymentDescription::
+deployedResource_post (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_none (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_none (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+void ArtifactDeploymentDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type const& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+void ArtifactDeploymentDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void ArtifactDeploymentDescription::
+id_none (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void ArtifactDeploymentDescription::
+id_none (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void ArtifactDeploymentDescription::
+post (Type&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void ArtifactDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+// MonolithicDeploymentDescription
+//
+//
 
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+void MonolithicDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+source (o);
+artifact (o);
+execParameter (o);
+deployRequirement (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void InstanceResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+source (o);
+artifact (o);
+execParameter (o);
+deployRequirement (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void InstanceResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+pre (Type&)
+{
+}
 
-      // InstanceDeploymentDescription
-      //
-      //
+void MonolithicDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        node (o);
-        source (o);
-        implementation (o);
-        configProperty (o);
-        if (o.deployedResource_p ()) deployedResource (o);
-        else deployedResource_none (o);
-        if (o.deployedSharedResource_p ()) deployedSharedResource (o);
-        else deployedSharedResource_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void InstanceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        node (o);
-        source (o);
-        implementation (o);
-        configProperty (o);
-        if (o.deployedResource_p ()) deployedResource (o);
-        else deployedResource_none (o);
-        if (o.deployedSharedResource_p ()) deployedSharedResource (o);
-        else deployedSharedResource_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void InstanceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+source (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
 
-      void InstanceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+source_post (o);
+}
+}
 
-      void InstanceDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void MonolithicDeploymentDescription::
+source (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
 
-      void InstanceDeploymentDescription::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
+if (b != e)
+{
+source_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) source_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
+source_post (o);
+}
+}
 
-      void InstanceDeploymentDescription::
-      source (Type& o)
-      {
-        dispatch (o.source ());
-      }
+void MonolithicDeploymentDescription::
+source_pre (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      source (Type const& o)
-      {
-        dispatch (o.source ());
-      }
+void MonolithicDeploymentDescription::
+source_pre (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      implementation (Type& o)
-      {
-        dispatch (o.implementation ());
-      }
+void MonolithicDeploymentDescription::
+source_next (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      implementation (Type const& o)
-      {
-        dispatch (o.implementation ());
-      }
+void MonolithicDeploymentDescription::
+source_next (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+void MonolithicDeploymentDescription::
+source_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
+void MonolithicDeploymentDescription::
+source_post (Type const&)
+{
+}
 
-        else configProperty_none (o);
-      }
+void MonolithicDeploymentDescription::
+artifact (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
 
-      void InstanceDeploymentDescription::
-      configProperty (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+if (b != e)
+{
+artifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) artifact_next (o);
+}
 
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
+artifact_post (o);
+}
+}
 
-        else configProperty_none (o);
-      }
+void MonolithicDeploymentDescription::
+artifact (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
 
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type&)
-      {
-      }
+if (b != e)
+{
+artifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) artifact_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type const&)
-      {
-      }
+artifact_post (o);
+}
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_next (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_pre (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_next (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_pre (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_post (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_next (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_post (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_next (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_none (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_post (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_none (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+artifact_post (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource (Type& o)
-      {
-        dispatch (o.deployedResource ());
-      }
+void MonolithicDeploymentDescription::
+execParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-      void InstanceDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        dispatch (o.deployedResource ());
-      }
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource_none (Type&)
-      {
-      }
+execParameter_post (o);
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource_none (Type const&)
-      {
-      }
+else execParameter_none (o);
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type& o)
-      {
-        dispatch (o.deployedSharedResource ());
-      }
+void MonolithicDeploymentDescription::
+execParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type const& o)
-      {
-        dispatch (o.deployedSharedResource ());
-      }
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource_none (Type&)
-      {
-      }
+execParameter_post (o);
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource_none (Type const&)
-      {
-      }
+else execParameter_none (o);
+}
 
-      void InstanceDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_pre (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+void MonolithicDeploymentDescription::
+execParameter_pre (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      id_none (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+execParameter_next (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      id_none (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+execParameter_next (Type const&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      post (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+execParameter_post (Type&)
+{
+}
 
-      void InstanceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+execParameter_post (Type const&)
+{
+}
 
-      // ComponentPortDescription
-      //
-      //
+void MonolithicDeploymentDescription::
+execParameter_none (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        specificType (o);
-        supportedType (o);
-        provider (o);
-        exclusiveProvider (o);
-        exclusiveUser (o);
-        optional (o);
-        kind (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+execParameter_none (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        specificType (o);
-        supportedType (o);
-        provider (o);
-        exclusiveProvider (o);
-        exclusiveUser (o);
-        optional (o);
-        kind (o);
-        post (o);
-      }
+void MonolithicDeploymentDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void ComponentPortDescription::
-      pre (Type&)
-      {
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void ComponentPortDescription::
-      pre (Type const&)
-      {
-      }
+deployRequirement_post (o);
+}
 
-      void ComponentPortDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+else deployRequirement_none (o);
+}
 
-      void ComponentPortDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void ComponentPortDescription::
-      specificType (Type& o)
-      {
-        dispatch (o.specificType ());
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void ComponentPortDescription::
-      specificType (Type const& o)
-      {
-        dispatch (o.specificType ());
-      }
+deployRequirement_post (o);
+}
 
-      void ComponentPortDescription::
-      supportedType (Type& o)
-      {
-        dispatch (o.supportedType ());
-      }
+else deployRequirement_none (o);
+}
 
-      void ComponentPortDescription::
-      supportedType (Type const& o)
-      {
-        dispatch (o.supportedType ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_pre (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      provider (Type& o)
-      {
-        dispatch (o.provider ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      provider (Type const& o)
-      {
-        dispatch (o.provider ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_next (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveProvider (Type& o)
-      {
-        dispatch (o.exclusiveProvider ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_next (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveProvider (Type const& o)
-      {
-        dispatch (o.exclusiveProvider ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_post (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveUser (Type& o)
-      {
-        dispatch (o.exclusiveUser ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveUser (Type const& o)
-      {
-        dispatch (o.exclusiveUser ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_none (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      optional (Type& o)
-      {
-        dispatch (o.optional ());
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_none (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      optional (Type const& o)
-      {
-        dispatch (o.optional ());
-      }
+void MonolithicDeploymentDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-      void ComponentPortDescription::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
+void MonolithicDeploymentDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-      void ComponentPortDescription::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
+void MonolithicDeploymentDescription::
+id_none (Type&)
+{
+}
 
-      void ComponentPortDescription::
-      post (Type&)
-      {
-      }
+void MonolithicDeploymentDescription::
+id_none (Type const&)
+{
+}
 
-      void ComponentPortDescription::
-      post (Type const&)
-      {
-      }
+void MonolithicDeploymentDescription::
+post (Type&)
+{
+}
 
-      // ComponentPropertyDescription
-      //
-      //
+void MonolithicDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void ComponentPropertyDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        type (o);
-        post (o);
-      }
+// InstanceResourceDeploymentDescription
+//
+//
 
-      void ComponentPropertyDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        type (o);
-        post (o);
-      }
+void InstanceResourceDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+resourceUsage (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ComponentPropertyDescription::
-      pre (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+resourceUsage (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void ComponentPropertyDescription::
-      pre (Type const&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void ComponentPropertyDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void InstanceResourceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void ComponentPropertyDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void InstanceResourceDeploymentDescription::
+resourceUsage (Type& o)
+{
+dispatch (o.resourceUsage ());
+}
 
-      void ComponentPropertyDescription::
-      type (Type& o)
-      {
-        dispatch (o.type ());
-      }
+void InstanceResourceDeploymentDescription::
+resourceUsage (Type const& o)
+{
+dispatch (o.resourceUsage ());
+}
 
-      void ComponentPropertyDescription::
-      type (Type const& o)
-      {
-        dispatch (o.type ());
-      }
+void InstanceResourceDeploymentDescription::
+requirementName (Type& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void ComponentPropertyDescription::
-      post (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void ComponentPropertyDescription::
-      post (Type const&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+resourceName (Type& o)
+{
+dispatch (o.resourceName ());
+}
 
-      // ComponentExternalPortEndpoint
-      //
-      //
+void InstanceResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void ComponentExternalPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        post (o);
-      }
+void InstanceResourceDeploymentDescription::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+InstanceResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void ComponentExternalPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        post (o);
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ComponentExternalPortEndpoint::
-      pre (Type&)
-      {
-      }
+property_post (o);
+}
 
-      void ComponentExternalPortEndpoint::
-      pre (Type const&)
-      {
-      }
+else property_none (o);
+}
 
-      void ComponentExternalPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
+void InstanceResourceDeploymentDescription::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+InstanceResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-      void ComponentExternalPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ComponentExternalPortEndpoint::
-      post (Type&)
-      {
-      }
+property_post (o);
+}
 
-      void ComponentExternalPortEndpoint::
-      post (Type const&)
-      {
-      }
+else property_none (o);
+}
 
-      // PlanSubcomponentPortEndpoint
-      //
-      //
+void InstanceResourceDeploymentDescription::
+property_pre (Type&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        if (o.provider_p ()) provider (o);
-        else provider_none (o);
-        kind (o);
-        instance (o);
-        post (o);
-      }
+void InstanceResourceDeploymentDescription::
+property_pre (Type const&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        if (o.provider_p ()) provider (o);
-        else provider_none (o);
-        kind (o);
-        instance (o);
-        post (o);
-      }
+void InstanceResourceDeploymentDescription::
+property_next (Type&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      pre (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+property_next (Type const&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      pre (Type const&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+property_post (Type&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
+void InstanceResourceDeploymentDescription::
+property_post (Type const&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
+void InstanceResourceDeploymentDescription::
+property_none (Type&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider (Type& o)
-      {
-        dispatch (o.provider ());
-      }
+void InstanceResourceDeploymentDescription::
+property_none (Type const&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider (Type const& o)
-      {
-        dispatch (o.provider ());
-      }
+void InstanceResourceDeploymentDescription::
+post (Type&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider_none (Type&)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      provider_none (Type const&)
-      {
-      }
+// InstanceDeploymentDescription
+//
+//
 
-      void PlanSubcomponentPortEndpoint::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
+void InstanceDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+node (o);
+source (o);
+implementation (o);
+configProperty (o);
+if (o.deployedResource_p ()) deployedResource (o);
+else deployedResource_none (o);
+if (o.deployedSharedResource_p ()) deployedSharedResource (o);
+else deployedSharedResource_none (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void PlanSubcomponentPortEndpoint::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
+void InstanceDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+node (o);
+source (o);
+implementation (o);
+configProperty (o);
+if (o.deployedResource_p ()) deployedResource (o);
+else deployedResource_none (o);
+if (o.deployedSharedResource_p ()) deployedSharedResource (o);
+else deployedSharedResource_none (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void PlanSubcomponentPortEndpoint::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
+void InstanceDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
+void InstanceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      post (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void PlanSubcomponentPortEndpoint::
-      post (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      // ExternalReferenceEndpoint
-      //
-      //
+void InstanceDeploymentDescription::
+node (Type& o)
+{
+dispatch (o.node ());
+}
 
-      void ExternalReferenceEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        location (o);
-        post (o);
-      }
+void InstanceDeploymentDescription::
+node (Type const& o)
+{
+dispatch (o.node ());
+}
 
-      void ExternalReferenceEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        location (o);
-        post (o);
-      }
+void InstanceDeploymentDescription::
+source (Type& o)
+{
+dispatch (o.source ());
+}
 
-      void ExternalReferenceEndpoint::
-      pre (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+source (Type const& o)
+{
+dispatch (o.source ());
+}
 
-      void ExternalReferenceEndpoint::
-      pre (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+implementation (Type& o)
+{
+dispatch (o.implementation ());
+}
 
-      void ExternalReferenceEndpoint::
-      location (Type& o)
-      {
-        dispatch (o.location ());
-      }
+void InstanceDeploymentDescription::
+implementation (Type const& o)
+{
+dispatch (o.implementation ());
+}
 
-      void ExternalReferenceEndpoint::
-      location (Type const& o)
-      {
-        dispatch (o.location ());
-      }
+void InstanceDeploymentDescription::
+configProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      void ExternalReferenceEndpoint::
-      post (Type&)
-      {
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void ExternalReferenceEndpoint::
-      post (Type const&)
-      {
-      }
+configProperty_post (o);
+}
 
-      // ConnectionResourceDeploymentDescription
-      //
-      //
+else configProperty_none (o);
+}
 
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        targetName (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+void InstanceDeploymentDescription::
+configProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        targetName (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void ConnectionResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
+configProperty_post (o);
+}
 
-      void ConnectionResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
+else configProperty_none (o);
+}
 
-      void ConnectionResourceDeploymentDescription::
-      targetName (Type& o)
-      {
-        dispatch (o.targetName ());
-      }
+void InstanceDeploymentDescription::
+configProperty_pre (Type&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      targetName (Type const& o)
-      {
-        dispatch (o.targetName ());
-      }
+void InstanceDeploymentDescription::
+configProperty_pre (Type const&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void InstanceDeploymentDescription::
+configProperty_next (Type&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
+void InstanceDeploymentDescription::
+configProperty_next (Type const&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void InstanceDeploymentDescription::
+configProperty_post (Type&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
+void InstanceDeploymentDescription::
+configProperty_post (Type const&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+void InstanceDeploymentDescription::
+configProperty_none (Type&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
+void InstanceDeploymentDescription::
+configProperty_none (Type const&)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedResource (Type& o)
+{
+dispatch (o.deployedResource ());
+}
 
-      void ConnectionResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedResource (Type const& o)
+{
+dispatch (o.deployedResource ());
+}
 
-      // PlanConnectionDescription
-      //
-      //
+void InstanceDeploymentDescription::
+deployedResource_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.source_p ()) source (o);
-        else source_none (o);
-        deployRequirement (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        deployedResource (o);
-        post (o);
-      }
+void InstanceDeploymentDescription::
+deployedResource_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.source_p ()) source (o);
-        else source_none (o);
-        deployRequirement (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        deployedResource (o);
-        post (o);
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource (Type& o)
+{
+dispatch (o.deployedSharedResource ());
+}
 
-      void PlanConnectionDescription::
-      pre (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource (Type const& o)
+{
+dispatch (o.deployedSharedResource ());
+}
 
-      void PlanConnectionDescription::
-      pre (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void InstanceDeploymentDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-      void PlanConnectionDescription::
-      source (Type& o)
-      {
-        dispatch (o.source ());
-      }
+void InstanceDeploymentDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-      void PlanConnectionDescription::
-      source (Type const& o)
-      {
-        dispatch (o.source ());
-      }
+void InstanceDeploymentDescription::
+id_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      source_none (Type&)
-      {
-      }
+void InstanceDeploymentDescription::
+id_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      source_none (Type const&)
-      {
-      }
+void InstanceDeploymentDescription::
+post (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+void InstanceDeploymentDescription::
+post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+// ComponentPortDescription
+//
+//
 
-        else deployRequirement_none (o);
-      }
+void ComponentPortDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+if (o.specificType_p ()) specificType (o);
+else specificType_none (o);
+supportedType (o);
+provider (o);
+exclusiveProvider (o);
+exclusiveUser (o);
+optional (o);
+kind (o);
+post (o);
+}
 
-      void PlanConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+void ComponentPortDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+if (o.specificType_p ()) specificType (o);
+else specificType_none (o);
+supportedType (o);
+provider (o);
+exclusiveProvider (o);
+exclusiveUser (o);
+optional (o);
+kind (o);
+post (o);
+}
 
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
+void ComponentPortDescription::
+pre (Type&)
+{
+}
 
-        else deployRequirement_none (o);
-      }
+void ComponentPortDescription::
+pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
+void ComponentPortDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
+void ComponentPortDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_next (Type&)
-      {
-      }
+void ComponentPortDescription::
+specificType (Type& o)
+{
+dispatch (o.specificType ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
+void ComponentPortDescription::
+specificType (Type const& o)
+{
+dispatch (o.specificType ());
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_post (Type&)
-      {
-      }
+void ComponentPortDescription::
+specificType_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
+void ComponentPortDescription::
+specificType_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+void ComponentPortDescription::
+supportedType (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPortDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
-      void PlanConnectionDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+if (b != e)
+{
+supportedType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) supportedType_next (o);
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+supportedType_post (o);
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
+else supportedType_none (o);
+}
 
-        else externalEndpoint_none (o);
-      }
+void ComponentPortDescription::
+supportedType (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPortDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
-      void PlanConnectionDescription::
-      externalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+if (b != e)
+{
+supportedType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) supportedType_next (o);
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
+supportedType_post (o);
+}
 
-        else externalEndpoint_none (o);
-      }
+else supportedType_none (o);
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_pre (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_next (Type&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_next (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_next (Type const&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_next (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_post (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_post (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_none (Type&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_none (Type const&)
-      {
-      }
+void ComponentPortDescription::
+supportedType_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+void ComponentPortDescription::
+provider (Type& o)
+{
+dispatch (o.provider ());
+}
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+void ComponentPortDescription::
+provider (Type const& o)
+{
+dispatch (o.provider ());
+}
 
-        else internalEndpoint_none (o);
-      }
+void ComponentPortDescription::
+exclusiveProvider (Type& o)
+{
+dispatch (o.exclusiveProvider ());
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+void ComponentPortDescription::
+exclusiveProvider (Type const& o)
+{
+dispatch (o.exclusiveProvider ());
+}
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+void ComponentPortDescription::
+exclusiveUser (Type& o)
+{
+dispatch (o.exclusiveUser ());
+}
 
-        else internalEndpoint_none (o);
-      }
+void ComponentPortDescription::
+exclusiveUser (Type const& o)
+{
+dispatch (o.exclusiveUser ());
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type&)
-      {
-      }
+void ComponentPortDescription::
+optional (Type& o)
+{
+dispatch (o.optional ());
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-      }
+void ComponentPortDescription::
+optional (Type const& o)
+{
+dispatch (o.optional ());
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type&)
-      {
-      }
+void ComponentPortDescription::
+kind (Type& o)
+{
+dispatch (o.kind ());
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type const&)
-      {
-      }
+void ComponentPortDescription::
+kind (Type const& o)
+{
+dispatch (o.kind ());
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type&)
-      {
-      }
+void ComponentPortDescription::
+post (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-      }
+void ComponentPortDescription::
+post (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_none (Type&)
-      {
-      }
+// ComponentPropertyDescription
+//
+//
 
-      void PlanConnectionDescription::
-      internalEndpoint_none (Type const&)
-      {
-      }
+void ComponentPropertyDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+type (o);
+post (o);
+}
 
-      void PlanConnectionDescription::
-      externalReference (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+void ComponentPropertyDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+type (o);
+post (o);
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+void ComponentPropertyDescription::
+pre (Type&)
+{
+}
 
-        else externalReference_none (o);
-      }
+void ComponentPropertyDescription::
+pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalReference (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+void ComponentPropertyDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+void ComponentPropertyDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-        else externalReference_none (o);
-      }
+void ComponentPropertyDescription::
+type (Type& o)
+{
+dispatch (o.type ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_pre (Type&)
-      {
-      }
+void ComponentPropertyDescription::
+type (Type const& o)
+{
+dispatch (o.type ());
+}
 
-      void PlanConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-      }
+void ComponentPropertyDescription::
+post (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalReference_next (Type&)
-      {
-      }
+void ComponentPropertyDescription::
+post (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalReference_next (Type const&)
-      {
-      }
+// ComponentExternalPortEndpoint
+//
+//
 
-      void PlanConnectionDescription::
-      externalReference_post (Type&)
-      {
-      }
+void ComponentExternalPortEndpoint::
+traverse (Type& o)
+{
+pre (o);
+portName (o);
+post (o);
+}
 
-      void PlanConnectionDescription::
-      externalReference_post (Type const&)
-      {
-      }
+void ComponentExternalPortEndpoint::
+traverse (Type const& o)
+{
+pre (o);
+portName (o);
+post (o);
+}
 
-      void PlanConnectionDescription::
-      externalReference_none (Type&)
-      {
-      }
+void ComponentExternalPortEndpoint::
+pre (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      externalReference_none (Type const&)
-      {
-      }
+void ComponentExternalPortEndpoint::
+pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+void ComponentExternalPortEndpoint::
+portName (Type& o)
+{
+dispatch (o.portName ());
+}
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+void ComponentExternalPortEndpoint::
+portName (Type const& o)
+{
+dispatch (o.portName ());
+}
 
-        else deployedResource_none (o);
-      }
+void ComponentExternalPortEndpoint::
+post (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+void ComponentExternalPortEndpoint::
+post (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
+// PlanSubcomponentPortEndpoint
+//
+//
 
-        else deployedResource_none (o);
-      }
+void PlanSubcomponentPortEndpoint::
+traverse (Type& o)
+{
+pre (o);
+portName (o);
+if (o.provider_p ()) provider (o);
+else provider_none (o);
+kind (o);
+instance (o);
+post (o);
+}
 
-      void PlanConnectionDescription::
-      deployedResource_pre (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+traverse (Type const& o)
+{
+pre (o);
+portName (o);
+if (o.provider_p ()) provider (o);
+else provider_none (o);
+kind (o);
+instance (o);
+post (o);
+}
 
-      void PlanConnectionDescription::
-      deployedResource_pre (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+pre (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource_next (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+pre (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      deployedResource_next (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+portName (Type& o)
+{
+dispatch (o.portName ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_post (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+portName (Type const& o)
+{
+dispatch (o.portName ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_post (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+provider (Type& o)
+{
+dispatch (o.provider ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_none (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+provider (Type const& o)
+{
+dispatch (o.provider ());
+}
 
-      void PlanConnectionDescription::
-      deployedResource_none (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+provider_none (Type&)
+{
+}
 
-      void PlanConnectionDescription::
-      post (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+provider_none (Type const&)
+{
+}
 
-      void PlanConnectionDescription::
-      post (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+kind (Type& o)
+{
+dispatch (o.kind ());
+}
 
-      // ImplementationDependency
-      //
-      //
+void PlanSubcomponentPortEndpoint::
+kind (Type const& o)
+{
+dispatch (o.kind ());
+}
 
-      void ImplementationDependency::
-      traverse (Type& o)
-      {
-        pre (o);
-        requiredType (o);
-        post (o);
-      }
+void PlanSubcomponentPortEndpoint::
+instance (Type& o)
+{
+dispatch (o.instance ());
+}
 
-      void ImplementationDependency::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requiredType (o);
-        post (o);
-      }
+void PlanSubcomponentPortEndpoint::
+instance (Type const& o)
+{
+dispatch (o.instance ());
+}
 
-      void ImplementationDependency::
-      pre (Type&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+post (Type&)
+{
+}
 
-      void ImplementationDependency::
-      pre (Type const&)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+post (Type const&)
+{
+}
 
-      void ImplementationDependency::
-      requiredType (Type& o)
-      {
-        dispatch (o.requiredType ());
-      }
+// ExternalReferenceEndpoint
+//
+//
 
-      void ImplementationDependency::
-      requiredType (Type const& o)
-      {
-        dispatch (o.requiredType ());
-      }
+void ExternalReferenceEndpoint::
+traverse (Type& o)
+{
+pre (o);
+location (o);
+post (o);
+}
 
-      void ImplementationDependency::
-      post (Type&)
-      {
-      }
+void ExternalReferenceEndpoint::
+traverse (Type const& o)
+{
+pre (o);
+location (o);
+post (o);
+}
 
-      void ImplementationDependency::
-      post (Type const&)
-      {
-      }
+void ExternalReferenceEndpoint::
+pre (Type&)
+{
+}
 
-      // Capability
-      //
-      //
+void ExternalReferenceEndpoint::
+pre (Type const&)
+{
+}
 
-      void Capability::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void ExternalReferenceEndpoint::
+location (Type& o)
+{
+dispatch (o.location ());
+}
 
-      void Capability::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
+void ExternalReferenceEndpoint::
+location (Type const& o)
+{
+dispatch (o.location ());
+}
 
-      void Capability::
-      pre (Type&)
-      {
-      }
+void ExternalReferenceEndpoint::
+post (Type&)
+{
+}
 
-      void Capability::
-      pre (Type const&)
-      {
-      }
+void ExternalReferenceEndpoint::
+post (Type const&)
+{
+}
 
-      void Capability::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+// ConnectionResourceDeploymentDescription
+//
+//
 
-      void Capability::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void ConnectionResourceDeploymentDescription::
+traverse (Type& o)
+{
+pre (o);
+targetName (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void Capability::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void ConnectionResourceDeploymentDescription::
+traverse (Type const& o)
+{
+pre (o);
+targetName (o);
+requirementName (o);
+resourceName (o);
+property (o);
+post (o);
+}
 
-      void Capability::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void ConnectionResourceDeploymentDescription::
+pre (Type&)
+{
+}
 
-      void Capability::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void ConnectionResourceDeploymentDescription::
+pre (Type const&)
+{
+}
 
-      void Capability::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void ConnectionResourceDeploymentDescription::
+targetName (Type& o)
+{
+dispatch (o.targetName ());
+}
 
-      void Capability::
-      post (Type&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+targetName (Type const& o)
+{
+dispatch (o.targetName ());
+}
 
-      void Capability::
-      post (Type const&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+requirementName (Type& o)
+{
+dispatch (o.requirementName ());
+}
 
-      // ImplementationRequirement
-      //
-      //
+void ConnectionResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+dispatch (o.requirementName ());
+}
 
-      void ImplementationRequirement::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        resourcePort (o);
-        componentPort (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+void ConnectionResourceDeploymentDescription::
+resourceName (Type& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void ImplementationRequirement::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        resourcePort (o);
-        componentPort (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
+void ConnectionResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+dispatch (o.resourceName ());
+}
 
-      void ImplementationRequirement::
-      pre (Type&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+ConnectionResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
-      void ImplementationRequirement::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ImplementationRequirement::
-      resourceUsage (Type& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+property_post (o);
+}
 
-      void ImplementationRequirement::
-      resourceUsage (Type const& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
+else property_none (o);
+}
 
-      void ImplementationRequirement::
-      resourcePort (Type& o)
-      {
-        dispatch (o.resourcePort ());
-      }
+void ConnectionResourceDeploymentDescription::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ConnectionResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
-      void ImplementationRequirement::
-      resourcePort (Type const& o)
-      {
-        dispatch (o.resourcePort ());
-      }
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
 
-      void ImplementationRequirement::
-      componentPort (Type& o)
-      {
-        dispatch (o.componentPort ());
-      }
+property_post (o);
+}
 
-      void ImplementationRequirement::
-      componentPort (Type const& o)
-      {
-        dispatch (o.componentPort ());
-      }
+else property_none (o);
+}
 
-      void ImplementationRequirement::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void ConnectionResourceDeploymentDescription::
+property_pre (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void ConnectionResourceDeploymentDescription::
+property_pre (Type const&)
+{
+}
 
-      void ImplementationRequirement::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void ConnectionResourceDeploymentDescription::
+property_next (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void ConnectionResourceDeploymentDescription::
+property_next (Type const&)
+{
+}
 
-      void ImplementationRequirement::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void ConnectionResourceDeploymentDescription::
+property_post (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void ConnectionResourceDeploymentDescription::
+property_post (Type const&)
+{
+}
 
-      void ImplementationRequirement::
-      post (Type&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property_none (Type&)
+{
+}
 
-      void ImplementationRequirement::
-      post (Type const&)
-      {
-      }
+void ConnectionResourceDeploymentDescription::
+property_none (Type const&)
+{
+}
 
-      // ComponentPackageReference
-      //
-      //
+void ConnectionResourceDeploymentDescription::
+post (Type&)
+{
+}
 
-      void ComponentPackageReference::
-      traverse (Type& o)
-      {
-        pre (o);
-        requiredUUID (o);
-        requiredName (o);
-        requiredType (o);
-        post (o);
-      }
+void ConnectionResourceDeploymentDescription::
+post (Type const&)
+{
+}
 
-      void ComponentPackageReference::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requiredUUID (o);
-        requiredName (o);
-        requiredType (o);
-        post (o);
-      }
+// PlanConnectionDescription
+//
+//
 
-      void ComponentPackageReference::
-      pre (Type&)
-      {
-      }
+void PlanConnectionDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+if (o.source_p ()) source (o);
+else source_none (o);
+deployRequirement (o);
+externalEndpoint (o);
+internalEndpoint (o);
+externalReference (o);
+deployedResource (o);
+post (o);
+}
 
-      void ComponentPackageReference::
-      pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+if (o.source_p ()) source (o);
+else source_none (o);
+deployRequirement (o);
+externalEndpoint (o);
+internalEndpoint (o);
+externalReference (o);
+deployedResource (o);
+post (o);
+}
 
-      void ComponentPackageReference::
-      requiredUUID (Type& o)
-      {
-        dispatch (o.requiredUUID ());
-      }
+void PlanConnectionDescription::
+pre (Type&)
+{
+}
 
-      void ComponentPackageReference::
-      requiredUUID (Type const& o)
-      {
-        dispatch (o.requiredUUID ());
-      }
+void PlanConnectionDescription::
+pre (Type const&)
+{
+}
 
-      void ComponentPackageReference::
-      requiredName (Type& o)
-      {
-        dispatch (o.requiredName ());
-      }
+void PlanConnectionDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ComponentPackageReference::
-      requiredName (Type const& o)
-      {
-        dispatch (o.requiredName ());
-      }
+void PlanConnectionDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ComponentPackageReference::
-      requiredType (Type& o)
-      {
-        dispatch (o.requiredType ());
-      }
+void PlanConnectionDescription::
+source (Type& o)
+{
+dispatch (o.source ());
+}
 
-      void ComponentPackageReference::
-      requiredType (Type const& o)
-      {
-        dispatch (o.requiredType ());
-      }
+void PlanConnectionDescription::
+source (Type const& o)
+{
+dispatch (o.source ());
+}
 
-      void ComponentPackageReference::
-      post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+source_none (Type&)
+{
+}
 
-      void ComponentPackageReference::
-      post (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+source_none (Type const&)
+{
+}
 
-      // SubcomponentPortEndpoint
-      //
-      //
+void PlanConnectionDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void SubcomponentPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        instance (o);
-        post (o);
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void SubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        instance (o);
-        post (o);
-      }
+deployRequirement_post (o);
+}
 
-      void SubcomponentPortEndpoint::
-      pre (Type&)
-      {
-      }
+else deployRequirement_none (o);
+}
 
-      void SubcomponentPortEndpoint::
-      pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
 
-      void SubcomponentPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
 
-      void SubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
+deployRequirement_post (o);
+}
 
-      void SubcomponentPortEndpoint::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
+else deployRequirement_none (o);
+}
 
-      void SubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
+void PlanConnectionDescription::
+deployRequirement_pre (Type&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_pre (Type const&)
+{
+}
 
-      void SubcomponentPortEndpoint::
-      post (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_next (Type&)
+{
+}
 
-      // AssemblyConnectionDescription
-      //
-      //
+void PlanConnectionDescription::
+deployRequirement_next (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        post (o);
-      }
+void PlanConnectionDescription::
+deployRequirement_post (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        post (o);
-      }
+void PlanConnectionDescription::
+deployRequirement_post (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      pre (Type&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_none (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+deployRequirement_none (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void PlanConnectionDescription::
+externalEndpoint (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
 
-      void AssemblyConnectionDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+if (b != e)
+{
+externalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalEndpoint_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+externalEndpoint_post (o);
+}
 
-      void AssemblyConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+else externalEndpoint_none (o);
+}
 
-      void AssemblyConnectionDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
 
-      void AssemblyConnectionDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+if (b != e)
+{
+externalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalEndpoint_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+externalEndpoint_post (o);
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
+else externalEndpoint_none (o);
+}
 
-        else externalEndpoint_none (o);
-      }
+void PlanConnectionDescription::
+externalEndpoint_pre (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+void PlanConnectionDescription::
+externalEndpoint_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
+void PlanConnectionDescription::
+externalEndpoint_next (Type&)
+{
+}
 
-        else externalEndpoint_none (o);
-      }
+void PlanConnectionDescription::
+externalEndpoint_next (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_post (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_post (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_none (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_none (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-      }
+if (b != e)
+{
+internalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) internalEndpoint_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_none (Type&)
-      {
-      }
+internalEndpoint_post (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_none (Type const&)
-      {
-      }
+else internalEndpoint_none (o);
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+void PlanConnectionDescription::
+internalEndpoint (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+if (b != e)
+{
+internalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) internalEndpoint_next (o);
+}
 
-        else internalEndpoint_none (o);
-      }
+internalEndpoint_post (o);
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+else internalEndpoint_none (o);
+}
 
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
+void PlanConnectionDescription::
+internalEndpoint_pre (Type&)
+{
+}
 
-        else internalEndpoint_none (o);
-      }
+void PlanConnectionDescription::
+internalEndpoint_pre (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_next (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_next (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_post (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_post (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_none (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_none (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_none (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_none (Type const&)
-      {
-      }
+if (b != e)
+{
+externalReference_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalReference_next (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalReference (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+externalReference_post (o);
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+else externalReference_none (o);
+}
 
-        else externalReference_none (o);
-      }
+void PlanConnectionDescription::
+externalReference (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
 
-      void AssemblyConnectionDescription::
-      externalReference (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+if (b != e)
+{
+externalReference_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalReference_next (o);
+}
 
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
+externalReference_post (o);
+}
 
-        else externalReference_none (o);
-      }
+else externalReference_none (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_pre (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_pre (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_next (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_next (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_next (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_next (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_post (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_post (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_post (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_none (Type&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_none (Type&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_none (Type const&)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_none (Type const&)
+{
+}
 
-      void AssemblyConnectionDescription::
-      post (Type&)
-      {
-      }
+void PlanConnectionDescription::
+deployedResource (Type& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
-      void AssemblyConnectionDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
+
+deployedResource_post (o);
+}
+
+else deployedResource_none (o);
+}
+
+void PlanConnectionDescription::
+deployedResource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+
+if (b != e)
+{
+deployedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployedResource_next (o);
+}
+
+deployedResource_post (o);
+}
+
+else deployedResource_none (o);
+}
+
+void PlanConnectionDescription::
+deployedResource_pre (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_pre (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_next (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_next (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_post (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_post (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_none (Type&)
+{
+}
+
+void PlanConnectionDescription::
+deployedResource_none (Type const&)
+{
+}
+
+void PlanConnectionDescription::
+post (Type&)
+{
+}
+
+void PlanConnectionDescription::
+post (Type const&)
+{
+}
+
+// ImplementationDependency
+//
+//
+
+void ImplementationDependency::
+traverse (Type& o)
+{
+pre (o);
+requiredType (o);
+post (o);
+}
+
+void ImplementationDependency::
+traverse (Type const& o)
+{
+pre (o);
+requiredType (o);
+post (o);
+}
+
+void ImplementationDependency::
+pre (Type&)
+{
+}
+
+void ImplementationDependency::
+pre (Type const&)
+{
+}
+
+void ImplementationDependency::
+requiredType (Type& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ImplementationDependency::
+requiredType (Type const& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ImplementationDependency::
+post (Type&)
+{
+}
+
+void ImplementationDependency::
+post (Type const&)
+{
+}
+
+// Capability
+//
+//
+
+void Capability::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
+
+void Capability::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+property (o);
+post (o);
+}
+
+void Capability::
+pre (Type&)
+{
+}
+
+void Capability::
+pre (Type const&)
+{
+}
+
+void Capability::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void Capability::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void Capability::
+resourceType (Type& o)
+{
+// VC6 anathema strikes again
+//
+Capability::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+
+if (b != e)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_next (o);
+}
+
+resourceType_post (o);
+}
+}
+
+void Capability::
+resourceType (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Capability::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType());
+
+if (b != e)
+{
+resourceType_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resourceType_next (o);
+}
+
+resourceType_post (o);
+}
+}
+
+void Capability::
+resourceType_pre (Type&)
+{
+}
+
+void Capability::
+resourceType_pre (Type const&)
+{
+}
+
+void Capability::
+resourceType_next (Type&)
+{
+}
+
+void Capability::
+resourceType_next (Type const&)
+{
+}
+
+void Capability::
+resourceType_post (Type&)
+{
+}
+
+void Capability::
+resourceType_post (Type const&)
+{
+}
+
+void Capability::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+Capability::Type::property_iterator b (o.begin_property()), e (o.end_property());
+
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_none (o);
+}
+
+void Capability::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Capability::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_none (o);
+}
+
+void Capability::
+property_pre (Type&)
+{
+}
+
+void Capability::
+property_pre (Type const&)
+{
+}
+
+void Capability::
+property_next (Type&)
+{
+}
+
+void Capability::
+property_next (Type const&)
+{
+}
+
+void Capability::
+property_post (Type&)
+{
+}
+
+void Capability::
+property_post (Type const&)
+{
+}
+
+void Capability::
+property_none (Type&)
+{
+}
+
+void Capability::
+property_none (Type const&)
+{
+}
+
+void Capability::
+post (Type&)
+{
+}
+
+void Capability::
+post (Type const&)
+{
+}
+
+// ImplementationRequirement
+//
+//
+
+void ImplementationRequirement::
+traverse (Type& o)
+{
+pre (o);
+if (o.resourceUsage_p ()) resourceUsage (o);
+else resourceUsage_none (o);
+if (o.resourcePort_p ()) resourcePort (o);
+else resourcePort_none (o);
+if (o.componentPort_p ()) componentPort (o);
+else componentPort_none (o);
+resourceType (o);
+name (o);
+property (o);
+post (o);
+}
+
+void ImplementationRequirement::
+traverse (Type const& o)
+{
+pre (o);
+if (o.resourceUsage_p ()) resourceUsage (o);
+else resourceUsage_none (o);
+if (o.resourcePort_p ()) resourcePort (o);
+else resourcePort_none (o);
+if (o.componentPort_p ()) componentPort (o);
+else componentPort_none (o);
+resourceType (o);
+name (o);
+property (o);
+post (o);
+}
+
+void ImplementationRequirement::
+pre (Type&)
+{
+}
+
+void ImplementationRequirement::
+pre (Type const&)
+{
+}
+
+void ImplementationRequirement::
+resourceUsage (Type& o)
+{
+dispatch (o.resourceUsage ());
+}
+
+void ImplementationRequirement::
+resourceUsage (Type const& o)
+{
+dispatch (o.resourceUsage ());
+}
+
+void ImplementationRequirement::
+resourceUsage_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+resourceUsage_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+resourcePort (Type& o)
+{
+dispatch (o.resourcePort ());
+}
+
+void ImplementationRequirement::
+resourcePort (Type const& o)
+{
+dispatch (o.resourcePort ());
+}
+
+void ImplementationRequirement::
+resourcePort_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+resourcePort_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+componentPort (Type& o)
+{
+dispatch (o.componentPort ());
+}
+
+void ImplementationRequirement::
+componentPort (Type const& o)
+{
+dispatch (o.componentPort ());
+}
+
+void ImplementationRequirement::
+componentPort_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+componentPort_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+resourceType (Type& o)
+{
+dispatch (o.resourceType ());
+}
+
+void ImplementationRequirement::
+resourceType (Type const& o)
+{
+dispatch (o.resourceType ());
+}
+
+void ImplementationRequirement::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void ImplementationRequirement::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void ImplementationRequirement::
+property (Type& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationRequirement::Type::property_iterator b (o.begin_property()), e (o.end_property());
+
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_none (o);
+}
+
+void ImplementationRequirement::
+property (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationRequirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
+
+if (b != e)
+{
+property_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) property_next (o);
+}
+
+property_post (o);
+}
+
+else property_none (o);
+}
+
+void ImplementationRequirement::
+property_pre (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_pre (Type const&)
+{
+}
+
+void ImplementationRequirement::
+property_next (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_next (Type const&)
+{
+}
+
+void ImplementationRequirement::
+property_post (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_post (Type const&)
+{
+}
+
+void ImplementationRequirement::
+property_none (Type&)
+{
+}
+
+void ImplementationRequirement::
+property_none (Type const&)
+{
+}
+
+void ImplementationRequirement::
+post (Type&)
+{
+}
+
+void ImplementationRequirement::
+post (Type const&)
+{
+}
+
+// ComponentPackageReference
+//
+//
+
+void ComponentPackageReference::
+traverse (Type& o)
+{
+pre (o);
+if (o.requiredUUID_p ()) requiredUUID (o);
+else requiredUUID_none (o);
+if (o.requiredName_p ()) requiredName (o);
+else requiredName_none (o);
+requiredType (o);
+post (o);
+}
+
+void ComponentPackageReference::
+traverse (Type const& o)
+{
+pre (o);
+if (o.requiredUUID_p ()) requiredUUID (o);
+else requiredUUID_none (o);
+if (o.requiredName_p ()) requiredName (o);
+else requiredName_none (o);
+requiredType (o);
+post (o);
+}
+
+void ComponentPackageReference::
+pre (Type&)
+{
+}
+
+void ComponentPackageReference::
+pre (Type const&)
+{
+}
+
+void ComponentPackageReference::
+requiredUUID (Type& o)
+{
+dispatch (o.requiredUUID ());
+}
+
+void ComponentPackageReference::
+requiredUUID (Type const& o)
+{
+dispatch (o.requiredUUID ());
+}
+
+void ComponentPackageReference::
+requiredUUID_none (Type&)
+{
+}
+
+void ComponentPackageReference::
+requiredUUID_none (Type const&)
+{
+}
+
+void ComponentPackageReference::
+requiredName (Type& o)
+{
+dispatch (o.requiredName ());
+}
+
+void ComponentPackageReference::
+requiredName (Type const& o)
+{
+dispatch (o.requiredName ());
+}
+
+void ComponentPackageReference::
+requiredName_none (Type&)
+{
+}
+
+void ComponentPackageReference::
+requiredName_none (Type const&)
+{
+}
+
+void ComponentPackageReference::
+requiredType (Type& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ComponentPackageReference::
+requiredType (Type const& o)
+{
+dispatch (o.requiredType ());
+}
+
+void ComponentPackageReference::
+post (Type&)
+{
+}
+
+void ComponentPackageReference::
+post (Type const&)
+{
+}
+
+// SubcomponentPortEndpoint
+//
+//
+
+void SubcomponentPortEndpoint::
+traverse (Type& o)
+{
+pre (o);
+portName (o);
+instance (o);
+post (o);
+}
+
+void SubcomponentPortEndpoint::
+traverse (Type const& o)
+{
+pre (o);
+portName (o);
+instance (o);
+post (o);
+}
+
+void SubcomponentPortEndpoint::
+pre (Type&)
+{
+}
+
+void SubcomponentPortEndpoint::
+pre (Type const&)
+{
+}
+
+void SubcomponentPortEndpoint::
+portName (Type& o)
+{
+dispatch (o.portName ());
+}
+
+void SubcomponentPortEndpoint::
+portName (Type const& o)
+{
+dispatch (o.portName ());
+}
+
+void SubcomponentPortEndpoint::
+instance (Type& o)
+{
+dispatch (o.instance ());
+}
+
+void SubcomponentPortEndpoint::
+instance (Type const& o)
+{
+dispatch (o.instance ());
+}
+
+void SubcomponentPortEndpoint::
+post (Type&)
+{
+}
+
+void SubcomponentPortEndpoint::
+post (Type const&)
+{
+}
+
+// AssemblyConnectionDescription
+//
+//
+
+void AssemblyConnectionDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+deployRequirement (o);
+internalEndpoint (o);
+externalEndpoint (o);
+externalReference (o);
+post (o);
+}
+
+void AssemblyConnectionDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+deployRequirement (o);
+internalEndpoint (o);
+externalEndpoint (o);
+externalReference (o);
+post (o);
+}
+
+void AssemblyConnectionDescription::
+pre (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+pre (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void AssemblyConnectionDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void AssemblyConnectionDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
+
+deployRequirement_post (o);
+}
+
+else deployRequirement_none (o);
+}
+
+void AssemblyConnectionDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
+
+deployRequirement_post (o);
+}
+
+else deployRequirement_none (o);
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_pre (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_pre (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_next (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_next (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_post (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_post (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_none (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_none (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint (Type& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+
+if (b != e)
+{
+internalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) internalEndpoint_next (o);
+}
+
+internalEndpoint_post (o);
+}
+
+else internalEndpoint_none (o);
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint (Type const& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
+
+if (b != e)
+{
+internalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) internalEndpoint_next (o);
+}
+
+internalEndpoint_post (o);
+}
+
+else internalEndpoint_none (o);
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_pre (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_pre (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_next (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_next (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_post (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_post (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_none (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_none (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint (Type& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+
+if (b != e)
+{
+externalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalEndpoint_next (o);
+}
+
+externalEndpoint_post (o);
+}
+
+else externalEndpoint_none (o);
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint (Type const& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
+
+if (b != e)
+{
+externalEndpoint_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalEndpoint_next (o);
+}
+
+externalEndpoint_post (o);
+}
+
+else externalEndpoint_none (o);
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_pre (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_pre (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_next (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_next (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_post (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_post (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_none (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_none (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference (Type& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+
+if (b != e)
+{
+externalReference_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalReference_next (o);
+}
+
+externalReference_post (o);
+}
+
+else externalReference_none (o);
+}
+
+void AssemblyConnectionDescription::
+externalReference (Type const& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
+
+if (b != e)
+{
+externalReference_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalReference_next (o);
+}
+
+externalReference_post (o);
+}
+
+else externalReference_none (o);
+}
+
+void AssemblyConnectionDescription::
+externalReference_pre (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference_pre (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference_next (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference_next (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference_post (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference_post (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference_none (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+externalReference_none (Type const&)
+{
+}
+
+void AssemblyConnectionDescription::
+post (Type&)
+{
+}
+
+void AssemblyConnectionDescription::
+post (Type const&)
+{
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // TCKind
-      //
-      //
+namespace Config_Handlers
+{
+namespace Writer
+{
+// TCKind
+//
+//
 
-      TCKind::
-      TCKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+TCKind::
+TCKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      TCKind::
-      TCKind ()
-      {
-      }
+TCKind::
+TCKind ()
+{
+}
 
-      void TCKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< ACE_TCHAR > s;
-
-        if (o == ::CIAO::Config_Handlers::TCKind::tk_null) s = "tk_null";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_void) s = "tk_void";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_short) s = "tk_short";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_long) s = "tk_long";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ushort) s = "tk_ushort";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulong) s = "tk_ulong";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_float) s = "tk_float";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_double) s = "tk_double";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_boolean) s = "tk_boolean";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_char) s = "tk_char";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_octet) s = "tk_octet";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_any) s = "tk_any";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_TypeCode) s = "tk_TypeCode";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_Principal) s = "tk_Principal";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_objref) s = "tk_objref";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_struct) s = "tk_struct";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_union) s = "tk_union";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_enum) s = "tk_enum";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_string) s = "tk_string";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_sequence) s = "tk_sequence";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_array) s = "tk_array";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_alias) s = "tk_alias";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_except) s = "tk_except";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longlong) s = "tk_longlong";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulonglong) s = "tk_ulonglong";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longdouble) s = "tk_longdouble";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wchar) s = "tk_wchar";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wstring) s = "tk_wstring";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wfixed) s = "tk_wfixed";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value) s = "tk_value";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value_box) s = "tk_value_box";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_native) s = "tk_native";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_abstract_interface) s = "tk_abstract_interface";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_local_interface) s = "tk_local_interface";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_component) s = "tk_component";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_home) s = "tk_home";
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_event) s = "tk_event";
-        else 
-        {
-        }
+void TCKind::
+traverse (Type const& o)
+{
+::std::basic_string< ACE_TCHAR > s;
+
+if (o == ::CIAO::Config_Handlers::TCKind::tk_null) s = "tk_null";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_void) s = "tk_void";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_short) s = "tk_short";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_long) s = "tk_long";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_ushort) s = "tk_ushort";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulong) s = "tk_ulong";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_float) s = "tk_float";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_double) s = "tk_double";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_boolean) s = "tk_boolean";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_char) s = "tk_char";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_octet) s = "tk_octet";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_any) s = "tk_any";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_TypeCode) s = "tk_TypeCode";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_Principal) s = "tk_Principal";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_objref) s = "tk_objref";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_struct) s = "tk_struct";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_union) s = "tk_union";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_enum) s = "tk_enum";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_string) s = "tk_string";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_sequence) s = "tk_sequence";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_array) s = "tk_array";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_alias) s = "tk_alias";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_except) s = "tk_except";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_longlong) s = "tk_longlong";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulonglong) s = "tk_ulonglong";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_longdouble) s = "tk_longdouble";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_wchar) s = "tk_wchar";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_wstring) s = "tk_wstring";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_wfixed) s = "tk_wfixed";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_value) s = "tk_value";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_value_box) s = "tk_value_box";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_native) s = "tk_native";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_abstract_interface) s = "tk_abstract_interface";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_local_interface) s = "tk_local_interface";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_component) s = "tk_component";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_home) s = "tk_home";
+else if (o == ::CIAO::Config_Handlers::TCKind::tk_event) s = "tk_event";
+else
+{
+}
 
-        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-        {
-          a->value (s);
-        }
+if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+{
+a->value (s);
+}
 
-        else
-        {
-          top_().value (s);
-        }
-      }
+else
+{
+top_().value (s);
+}
+}
 
-      // DataType
-      //
-      //
+// DataType
+//
+//
 
-      DataType::
-      DataType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+DataType::
+DataType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      DataType::
-      DataType ()
-      {
-      }
+DataType::
+DataType ()
+{
+}
 
-      void DataType::
-      traverse (Type const& o)
-      {
-        Traversal::DataType::traverse (o);
-      }
+void DataType::
+traverse (Type const& o)
+{
+Traversal::DataType::traverse (o);
+}
 
-      void DataType::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-        Traversal::DataType::kind (o);
-        pop_ ();
-      }
+void DataType::
+kind (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+Traversal::DataType::kind (o);
+pop_ ();
+}
 
-      void DataType::
-      enum_ (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
-        Traversal::DataType::enum_ (o);
-        pop_ ();
-      }
+void DataType::
+enum_ (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
+Traversal::DataType::enum_ (o);
+pop_ ();
+}
 
-      // DataValue
-      //
-      //
+// DataValue
+//
+//
 
-      DataValue::
-      DataValue (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+DataValue::
+DataValue (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      DataValue::
-      DataValue ()
-      {
-      }
+DataValue::
+DataValue ()
+{
+}
 
-      void DataValue::
-      traverse (Type const& o)
-      {
-        Traversal::DataValue::traverse (o);
-      }
+void DataValue::
+traverse (Type const& o)
+{
+Traversal::DataValue::traverse (o);
+}
 
-      void DataValue::
-      short_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("short", top_ ()));
-      }
+void DataValue::
+short_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("short", top_ ()));
+}
 
-      void DataValue::
-      short_next (Type const& o)
-      {
-        short_post (o);
-        short_pre (o);
-      }
+void DataValue::
+short_next (Type const& o)
+{
+short_post (o);
+short_pre (o);
+}
 
-      void DataValue::
-      short_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+short_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      long_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("long", top_ ()));
-      }
+void DataValue::
+long_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("long", top_ ()));
+}
 
-      void DataValue::
-      long_next (Type const& o)
-      {
-        long_post (o);
-        long_pre (o);
-      }
+void DataValue::
+long_next (Type const& o)
+{
+long_post (o);
+long_pre (o);
+}
 
-      void DataValue::
-      long_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+long_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      ushort_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ushort", top_ ()));
-      }
+void DataValue::
+ushort_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ushort", top_ ()));
+}
 
-      void DataValue::
-      ushort_next (Type const& o)
-      {
-        ushort_post (o);
-        ushort_pre (o);
-      }
+void DataValue::
+ushort_next (Type const& o)
+{
+ushort_post (o);
+ushort_pre (o);
+}
 
-      void DataValue::
-      ushort_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+ushort_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      ulong_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulong", top_ ()));
-      }
+void DataValue::
+ulong_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulong", top_ ()));
+}
 
-      void DataValue::
-      ulong_next (Type const& o)
-      {
-        ulong_post (o);
-        ulong_pre (o);
-      }
+void DataValue::
+ulong_next (Type const& o)
+{
+ulong_post (o);
+ulong_pre (o);
+}
 
-      void DataValue::
-      ulong_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+ulong_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      float_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("float", top_ ()));
-      }
+void DataValue::
+float_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("float", top_ ()));
+}
 
-      void DataValue::
-      float_next (Type const& o)
-      {
-        float_post (o);
-        float_pre (o);
-      }
+void DataValue::
+float_next (Type const& o)
+{
+float_post (o);
+float_pre (o);
+}
 
-      void DataValue::
-      float_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+float_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      double_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("double", top_ ()));
-      }
+void DataValue::
+double_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("double", top_ ()));
+}
 
-      void DataValue::
-      double_next (Type const& o)
-      {
-        double_post (o);
-        double_pre (o);
-      }
+void DataValue::
+double_next (Type const& o)
+{
+double_post (o);
+double_pre (o);
+}
 
-      void DataValue::
-      double_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+double_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      boolean_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("boolean", top_ ()));
-      }
+void DataValue::
+boolean_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("boolean", top_ ()));
+}
 
-      void DataValue::
-      boolean_next (Type const& o)
-      {
-        boolean_post (o);
-        boolean_pre (o);
-      }
+void DataValue::
+boolean_next (Type const& o)
+{
+boolean_post (o);
+boolean_pre (o);
+}
 
-      void DataValue::
-      boolean_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+boolean_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      octet_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("octet", top_ ()));
-      }
+void DataValue::
+octet_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("octet", top_ ()));
+}
 
-      void DataValue::
-      octet_next (Type const& o)
-      {
-        octet_post (o);
-        octet_pre (o);
-      }
+void DataValue::
+octet_next (Type const& o)
+{
+octet_post (o);
+octet_pre (o);
+}
 
-      void DataValue::
-      octet_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+octet_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      enum_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
-      }
+void DataValue::
+enum_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
+}
 
-      void DataValue::
-      enum_next (Type const& o)
-      {
-        enum_post (o);
-        enum_pre (o);
-      }
+void DataValue::
+enum_next (Type const& o)
+{
+enum_post (o);
+enum_pre (o);
+}
 
-      void DataValue::
-      enum_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+enum_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      string_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("string", top_ ()));
-      }
+void DataValue::
+string_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("string", top_ ()));
+}
 
-      void DataValue::
-      string_next (Type const& o)
-      {
-        string_post (o);
-        string_pre (o);
-      }
+void DataValue::
+string_next (Type const& o)
+{
+string_post (o);
+string_pre (o);
+}
 
-      void DataValue::
-      string_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+string_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      longlong_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longlong", top_ ()));
-      }
+void DataValue::
+longlong_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longlong", top_ ()));
+}
 
-      void DataValue::
-      longlong_next (Type const& o)
-      {
-        longlong_post (o);
-        longlong_pre (o);
-      }
+void DataValue::
+longlong_next (Type const& o)
+{
+longlong_post (o);
+longlong_pre (o);
+}
 
-      void DataValue::
-      longlong_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+longlong_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      ulonglong_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulonglong", top_ ()));
-      }
+void DataValue::
+ulonglong_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulonglong", top_ ()));
+}
 
-      void DataValue::
-      ulonglong_next (Type const& o)
-      {
-        ulonglong_post (o);
-        ulonglong_pre (o);
-      }
+void DataValue::
+ulonglong_next (Type const& o)
+{
+ulonglong_post (o);
+ulonglong_pre (o);
+}
 
-      void DataValue::
-      ulonglong_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+ulonglong_post (Type const&)
+{
+pop_ ();
+}
 
-      void DataValue::
-      longdouble_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longdouble", top_ ()));
-      }
+void DataValue::
+longdouble_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longdouble", top_ ()));
+}
 
-      void DataValue::
-      longdouble_next (Type const& o)
-      {
-        longdouble_post (o);
-        longdouble_pre (o);
-      }
+void DataValue::
+longdouble_next (Type const& o)
+{
+longdouble_post (o);
+longdouble_pre (o);
+}
 
-      void DataValue::
-      longdouble_post (Type const&)
-      {
-        pop_ ();
-      }
+void DataValue::
+longdouble_post (Type const&)
+{
+pop_ ();
+}
 
-      // EnumType
-      //
-      //
+// EnumType
+//
+//
 
-      EnumType::
-      EnumType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+EnumType::
+EnumType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      EnumType::
-      EnumType ()
-      {
-      }
+EnumType::
+EnumType ()
+{
+}
 
-      void EnumType::
-      traverse (Type const& o)
-      {
-        Traversal::EnumType::traverse (o);
-      }
+void EnumType::
+traverse (Type const& o)
+{
+Traversal::EnumType::traverse (o);
+}
 
-      void EnumType::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::EnumType::name (o);
-        pop_ ();
-      }
+void EnumType::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::EnumType::name (o);
+pop_ ();
+}
 
-      void EnumType::
-      typeId (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
-        Traversal::EnumType::typeId (o);
-        pop_ ();
-      }
+void EnumType::
+typeId (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
+Traversal::EnumType::typeId (o);
+pop_ ();
+}
 
-      void EnumType::
-      member_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
-      }
+void EnumType::
+member_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
+}
 
-      void EnumType::
-      member_next (Type const& o)
-      {
-        member_post (o);
-        member_pre (o);
-      }
+void EnumType::
+member_next (Type const& o)
+{
+member_post (o);
+member_pre (o);
+}
 
-      void EnumType::
-      member_post (Type const&)
-      {
-        pop_ ();
-      }
+void EnumType::
+member_post (Type const&)
+{
+pop_ ();
+}
 
-      // Any
-      //
-      //
+// Any
+//
+//
 
-      Any::
-      Any (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+Any::
+Any (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      Any::
-      Any ()
-      {
-      }
+Any::
+Any ()
+{
+}
 
-      void Any::
-      traverse (Type const& o)
-      {
-        Traversal::Any::traverse (o);
-      }
+void Any::
+traverse (Type const& o)
+{
+Traversal::Any::traverse (o);
+}
 
-      void Any::
-      type (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-        Traversal::Any::type (o);
-        pop_ ();
-      }
+void Any::
+type (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+Traversal::Any::type (o);
+pop_ ();
+}
 
-      void Any::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-        Traversal::Any::value (o);
-        pop_ ();
-      }
+void Any::
+value (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+Traversal::Any::value (o);
+pop_ ();
+}
 
-      // Property
-      //
-      //
+// Property
+//
+//
 
-      Property::
-      Property (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+Property::
+Property (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      Property::
-      Property ()
-      {
-      }
+Property::
+Property ()
+{
+}
 
-      void Property::
-      traverse (Type const& o)
-      {
-        Traversal::Property::traverse (o);
-      }
+void Property::
+traverse (Type const& o)
+{
+Traversal::Property::traverse (o);
+}
 
-      void Property::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Property::name (o);
-        pop_ ();
-      }
+void Property::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Property::name (o);
+pop_ ();
+}
 
-      void Property::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-        Traversal::Property::value (o);
-        pop_ ();
-      }
+void Property::
+value (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+Traversal::Property::value (o);
+pop_ ();
+}
 
-      // SatisfierPropertyKind
-      //
-      //
+// SatisfierPropertyKind
+//
+//
 
-      SatisfierPropertyKind::
-      SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+SatisfierPropertyKind::
+SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      SatisfierPropertyKind::
-      SatisfierPropertyKind ()
-      {
-      }
+SatisfierPropertyKind::
+SatisfierPropertyKind ()
+{
+}
 
-      void SatisfierPropertyKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< ACE_TCHAR > s;
-
-        if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Quantity) s = "Quantity";
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Capacity) s = "Capacity";
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Minimum) s = "Minimum";
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Maximum) s = "Maximum";
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Attribute) s = "Attribute";
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Selection) s = "Selection";
-        else 
-        {
-        }
+void SatisfierPropertyKind::
+traverse (Type const& o)
+{
+::std::basic_string< ACE_TCHAR > s;
+
+if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Quantity) s = "Quantity";
+else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Capacity) s = "Capacity";
+else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Minimum) s = "Minimum";
+else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Maximum) s = "Maximum";
+else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Attribute) s = "Attribute";
+else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Selection) s = "Selection";
+else
+{
+}
 
-        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-        {
-          a->value (s);
-        }
+if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+{
+a->value (s);
+}
 
-        else
-        {
-          top_().value (s);
-        }
-      }
+else
+{
+top_().value (s);
+}
+}
 
-      // SatisfierProperty
-      //
-      //
+// SatisfierProperty
+//
+//
 
-      SatisfierProperty::
-      SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+SatisfierProperty::
+SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      SatisfierProperty::
-      SatisfierProperty ()
-      {
-      }
+SatisfierProperty::
+SatisfierProperty ()
+{
+}
 
-      void SatisfierProperty::
-      traverse (Type const& o)
-      {
-        Traversal::SatisfierProperty::traverse (o);
-      }
+void SatisfierProperty::
+traverse (Type const& o)
+{
+Traversal::SatisfierProperty::traverse (o);
+}
 
-      void SatisfierProperty::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::SatisfierProperty::name (o);
-        pop_ ();
-      }
+void SatisfierProperty::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::SatisfierProperty::name (o);
+pop_ ();
+}
 
-      void SatisfierProperty::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-        Traversal::SatisfierProperty::kind (o);
-        pop_ ();
-      }
+void SatisfierProperty::
+kind (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+Traversal::SatisfierProperty::kind (o);
+pop_ ();
+}
 
-      void SatisfierProperty::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
-        Traversal::SatisfierProperty::value (o);
-        pop_ ();
-      }
+void SatisfierProperty::
+dynamic (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic", top_ ()));
+Traversal::SatisfierProperty::dynamic (o);
+pop_ ();
+}
 
-      // Resource
-      //
-      //
+void SatisfierProperty::
+value (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
+Traversal::SatisfierProperty::value (o);
+pop_ ();
+}
 
-      Resource::
-      Resource (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// Resource
+//
+//
 
-      Resource::
-      Resource ()
-      {
-      }
+Resource::
+Resource (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Resource::
-      traverse (Type const& o)
-      {
-        Traversal::Resource::traverse (o);
-      }
+Resource::
+Resource ()
+{
+}
 
-      void Resource::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Resource::name (o);
-        pop_ ();
-      }
+void Resource::
+traverse (Type const& o)
+{
+Traversal::Resource::traverse (o);
+}
 
-      void Resource::
-      resourceType_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-      }
+void Resource::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Resource::name (o);
+pop_ ();
+}
 
-      void Resource::
-      resourceType_next (Type const& o)
-      {
-        resourceType_post (o);
-        resourceType_pre (o);
-      }
+void Resource::
+resourceType_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+}
 
-      void Resource::
-      resourceType_post (Type const&)
-      {
-        pop_ ();
-      }
+void Resource::
+resourceType_next (Type const& o)
+{
+resourceType_post (o);
+resourceType_pre (o);
+}
 
-      void Resource::
-      property_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-      }
+void Resource::
+resourceType_post (Type const&)
+{
+pop_ ();
+}
 
-      void Resource::
-      property_next (Type const& o)
-      {
-        property_post (o);
-        property_pre (o);
-      }
+void Resource::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void Resource::
-      property_post (Type const&)
-      {
-        pop_ ();
-      }
+void Resource::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      // Requirement
-      //
-      //
+void Resource::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      Requirement::
-      Requirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// Requirement
+//
+//
 
-      Requirement::
-      Requirement ()
-      {
-      }
+Requirement::
+Requirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Requirement::
-      traverse (Type const& o)
-      {
-        Traversal::Requirement::traverse (o);
-      }
+Requirement::
+Requirement ()
+{
+}
 
-      void Requirement::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::Requirement::resourceType (o);
-        pop_ ();
-      }
+void Requirement::
+traverse (Type const& o)
+{
+Traversal::Requirement::traverse (o);
+}
 
-      void Requirement::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Requirement::name (o);
-        pop_ ();
-      }
+void Requirement::
+resourceType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+Traversal::Requirement::resourceType (o);
+pop_ ();
+}
 
-      void Requirement::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::Requirement::property (o);
-        pop_ ();
-      }
+void Requirement::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Requirement::name (o);
+pop_ ();
+}
 
-      // ResourceDeploymentDescription
-      //
-      //
+void Requirement::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      ResourceDeploymentDescription::
-      ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Requirement::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      ResourceDeploymentDescription::
-      ResourceDeploymentDescription ()
-      {
-      }
+void Requirement::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void ResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ResourceDeploymentDescription::traverse (o);
-      }
+// ResourceDeploymentDescription
+//
+//
 
-      void ResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-        Traversal::ResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-        Traversal::ResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
+ResourceDeploymentDescription::
+ResourceDeploymentDescription ()
+{
+}
 
-      void ResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceValue", top_ ()));
-        Traversal::ResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
+void ResourceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::ResourceDeploymentDescription::traverse (o);
+}
 
-      // ArtifactDeploymentDescription
-      //
-      //
+void ResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+Traversal::ResourceDeploymentDescription::requirementName (o);
+pop_ ();
+}
 
-      ArtifactDeploymentDescription::
-      ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+Traversal::ResourceDeploymentDescription::resourceName (o);
+pop_ ();
+}
 
-      ArtifactDeploymentDescription::
-      ArtifactDeploymentDescription ()
-      {
-      }
+void ResourceDeploymentDescription::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ArtifactDeploymentDescription::traverse (o);
-      }
+void ResourceDeploymentDescription::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void ArtifactDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ArtifactDeploymentDescription::name (o);
-        pop_ ();
-      }
+void ResourceDeploymentDescription::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      source_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-      }
+// ArtifactDeploymentDescription
+//
+//
 
-      void ArtifactDeploymentDescription::
-      source_next (Type const& o)
-      {
-        source_post (o);
-        source_pre (o);
-      }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ArtifactDeploymentDescription::
-      source_post (Type const&)
-      {
-        pop_ ();
-      }
+ArtifactDeploymentDescription::
+ArtifactDeploymentDescription ()
+{
+}
 
-      void ArtifactDeploymentDescription::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-        Traversal::ArtifactDeploymentDescription::node (o);
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::ArtifactDeploymentDescription::traverse (o);
+}
 
-      void ArtifactDeploymentDescription::
-      location_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ArtifactDeploymentDescription::name (o);
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      location_next (Type const& o)
-      {
-        location_post (o);
-        location_pre (o);
-      }
+void ArtifactDeploymentDescription::
+source_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      location_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+source_next (Type const& o)
+{
+source_post (o);
+source_pre (o);
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+source_post (Type const&)
+{
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type const& o)
-      {
-        execParameter_post (o);
-        execParameter_pre (o);
-      }
+void ArtifactDeploymentDescription::
+node (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+Traversal::ArtifactDeploymentDescription::node (o);
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+location_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+location_next (Type const& o)
+{
+location_post (o);
+location_pre (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
+void ArtifactDeploymentDescription::
+location_post (Type const&)
+{
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+execParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-      }
+void ArtifactDeploymentDescription::
+execParameter_next (Type const& o)
+{
+execParameter_post (o);
+execParameter_pre (o);
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type const& o)
-      {
-        deployedResource_post (o);
-        deployedResource_pre (o);
-      }
+void ArtifactDeploymentDescription::
+execParameter_post (Type const&)
+{
+pop_ ();
+}
 
-      void ArtifactDeploymentDescription::
-      deployedResource_post (Type const&)
-      {
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      void ArtifactDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::ArtifactDeploymentDescription::id (o);
-        attr_ (0);
-      }
+void ArtifactDeploymentDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      // MonolithicDeploymentDescription
-      //
-      //
+void ArtifactDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      MonolithicDeploymentDescription::
-      MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+}
 
-      MonolithicDeploymentDescription::
-      MonolithicDeploymentDescription ()
-      {
-      }
+void ArtifactDeploymentDescription::
+deployedResource_next (Type const& o)
+{
+deployedResource_post (o);
+deployedResource_pre (o);
+}
 
-      void MonolithicDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::MonolithicDeploymentDescription::traverse (o);
-      }
+void ArtifactDeploymentDescription::
+deployedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::MonolithicDeploymentDescription::name (o);
-        pop_ ();
-      }
+void ArtifactDeploymentDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::ArtifactDeploymentDescription::id (o);
+attr_ (0);
+}
 
-      void MonolithicDeploymentDescription::
-      source_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-      }
+// MonolithicDeploymentDescription
+//
+//
 
-      void MonolithicDeploymentDescription::
-      source_next (Type const& o)
-      {
-        source_post (o);
-        source_pre (o);
-      }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void MonolithicDeploymentDescription::
-      source_post (Type const&)
-      {
-        pop_ ();
-      }
+MonolithicDeploymentDescription::
+MonolithicDeploymentDescription ()
+{
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
-      }
+void MonolithicDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::MonolithicDeploymentDescription::traverse (o);
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_next (Type const& o)
-      {
-        artifact_post (o);
-        artifact_pre (o);
-      }
+void MonolithicDeploymentDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::MonolithicDeploymentDescription::name (o);
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      artifact_post (Type const&)
-      {
-        pop_ ();
-      }
+void MonolithicDeploymentDescription::
+source_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-      }
+void MonolithicDeploymentDescription::
+source_next (Type const& o)
+{
+source_post (o);
+source_pre (o);
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type const& o)
-      {
-        execParameter_post (o);
-        execParameter_pre (o);
-      }
+void MonolithicDeploymentDescription::
+source_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-        pop_ ();
-      }
+void MonolithicDeploymentDescription::
+artifact_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-      }
+void MonolithicDeploymentDescription::
+artifact_next (Type const& o)
+{
+artifact_post (o);
+artifact_pre (o);
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
+void MonolithicDeploymentDescription::
+artifact_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
+void MonolithicDeploymentDescription::
+execParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+}
 
-      void MonolithicDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::MonolithicDeploymentDescription::id (o);
-        attr_ (0);
-      }
+void MonolithicDeploymentDescription::
+execParameter_next (Type const& o)
+{
+execParameter_post (o);
+execParameter_pre (o);
+}
 
-      // ResourceUsageKind
-      //
-      //
+void MonolithicDeploymentDescription::
+execParameter_post (Type const&)
+{
+pop_ ();
+}
 
-      ResourceUsageKind::
-      ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      ResourceUsageKind::
-      ResourceUsageKind ()
-      {
-      }
+void MonolithicDeploymentDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      void ResourceUsageKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< ACE_TCHAR > s;
-
-        if (o == ::CIAO::Config_Handlers::ResourceUsageKind::None) s = "None";
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::InstanceUsesResource) s = "InstanceUsesResource";
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesInstance) s = "ResourceUsesInstance";
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::PortUsesResource) s = "PortUsesResource";
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesPort) s = "ResourceUsesPort";
-        else 
-        {
-        }
+void MonolithicDeploymentDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-        {
-          a->value (s);
-        }
+void MonolithicDeploymentDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::MonolithicDeploymentDescription::id (o);
+attr_ (0);
+}
 
-        else
-        {
-          top_().value (s);
-        }
-      }
+// ResourceUsageKind
+//
+//
 
-      // InstanceResourceDeploymentDescription
-      //
-      //
+ResourceUsageKind::
+ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      InstanceResourceDeploymentDescription::
-      InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+ResourceUsageKind::
+ResourceUsageKind ()
+{
+}
 
-      InstanceResourceDeploymentDescription::
-      InstanceResourceDeploymentDescription ()
-      {
-      }
+void ResourceUsageKind::
+traverse (Type const& o)
+{
+::std::basic_string< ACE_TCHAR > s;
+
+if (o == ::CIAO::Config_Handlers::ResourceUsageKind::None) s = "None";
+else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::InstanceUsesResource) s = "InstanceUsesResource";
+else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesInstance) s = "ResourceUsesInstance";
+else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::PortUsesResource) s = "PortUsesResource";
+else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesPort) s = "ResourceUsesPort";
+else
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::InstanceResourceDeploymentDescription::traverse (o);
-      }
+if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+{
+a->value (s);
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
-        pop_ ();
-      }
+else
+{
+top_().value (s);
+}
+}
 
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
+// InstanceResourceDeploymentDescription
+//
+//
 
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceValue", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
+InstanceResourceDeploymentDescription::
+InstanceResourceDeploymentDescription ()
+{
+}
 
-      // InstanceDeploymentDescription
-      //
-      //
+void InstanceResourceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::InstanceResourceDeploymentDescription::traverse (o);
+}
 
-      InstanceDeploymentDescription::
-      InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void InstanceResourceDeploymentDescription::
+resourceUsage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
+Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
+pop_ ();
+}
 
-      InstanceDeploymentDescription::
-      InstanceDeploymentDescription ()
-      {
-      }
+void InstanceResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+Traversal::InstanceResourceDeploymentDescription::requirementName (o);
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::InstanceDeploymentDescription::traverse (o);
-      }
+void InstanceResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+Traversal::InstanceResourceDeploymentDescription::resourceName (o);
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::InstanceDeploymentDescription::name (o);
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void InstanceDeploymentDescription::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-        Traversal::InstanceDeploymentDescription::node (o);
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void InstanceDeploymentDescription::
-      source (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-        Traversal::InstanceDeploymentDescription::source (o);
-        pop_ ();
-      }
+void InstanceResourceDeploymentDescription::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      implementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
-        Traversal::InstanceDeploymentDescription::implementation (o);
-        pop_ ();
-      }
+// InstanceDeploymentDescription
+//
+//
 
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-      }
+InstanceDeploymentDescription::
+InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_next (Type const& o)
-      {
-        configProperty_post (o);
-        configProperty_pre (o);
-      }
+InstanceDeploymentDescription::
+InstanceDeploymentDescription ()
+{
+}
 
-      void InstanceDeploymentDescription::
-      configProperty_post (Type const&)
-      {
-        pop_ ();
-      }
+void InstanceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::InstanceDeploymentDescription::traverse (o);
+}
 
-      void InstanceDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-        Traversal::InstanceDeploymentDescription::deployedResource (o);
-        pop_ ();
-      }
+void InstanceDeploymentDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::InstanceDeploymentDescription::name (o);
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedSharedResource", top_ ()));
-        Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
-        pop_ ();
-      }
+void InstanceDeploymentDescription::
+node (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+Traversal::InstanceDeploymentDescription::node (o);
+pop_ ();
+}
 
-      void InstanceDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::InstanceDeploymentDescription::id (o);
-        attr_ (0);
-      }
+void InstanceDeploymentDescription::
+source (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+Traversal::InstanceDeploymentDescription::source (o);
+pop_ ();
+}
 
-      // CCMComponentPortKind
-      //
-      //
+void InstanceDeploymentDescription::
+implementation (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
+Traversal::InstanceDeploymentDescription::implementation (o);
+pop_ ();
+}
 
-      CCMComponentPortKind::
-      CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void InstanceDeploymentDescription::
+configProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+}
 
-      CCMComponentPortKind::
-      CCMComponentPortKind ()
-      {
-      }
+void InstanceDeploymentDescription::
+configProperty_next (Type const& o)
+{
+configProperty_post (o);
+configProperty_pre (o);
+}
 
-      void CCMComponentPortKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< ACE_TCHAR > s;
-
-        if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::Facet) s = "Facet";
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::SimplexReceptacle) s = "SimplexReceptacle";
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::MultiplexReceptacle) s = "MultiplexReceptacle";
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = "EventEmitter";
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventPublisher) s = "EventPublisher";
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventConsumer) s = "EventConsumer";
-        else 
-        {
-        }
+void InstanceDeploymentDescription::
+configProperty_post (Type const&)
+{
+pop_ ();
+}
 
-        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-        {
-          a->value (s);
-        }
+void InstanceDeploymentDescription::
+deployedResource (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+Traversal::InstanceDeploymentDescription::deployedResource (o);
+pop_ ();
+}
 
-        else
-        {
-          top_().value (s);
-        }
-      }
+void InstanceDeploymentDescription::
+deployedSharedResource (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedSharedResource", top_ ()));
+Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
+pop_ ();
+}
 
-      // ComponentPortDescription
-      //
-      //
+void InstanceDeploymentDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::InstanceDeploymentDescription::id (o);
+attr_ (0);
+}
 
-      ComponentPortDescription::
-      ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// CCMComponentPortKind
+//
+//
 
-      ComponentPortDescription::
-      ComponentPortDescription ()
-      {
-      }
+CCMComponentPortKind::
+CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ComponentPortDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPortDescription::traverse (o);
-      }
+CCMComponentPortKind::
+CCMComponentPortKind ()
+{
+}
 
-      void ComponentPortDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ComponentPortDescription::name (o);
-        pop_ ();
-      }
+void CCMComponentPortKind::
+traverse (Type const& o)
+{
+::std::basic_string< ACE_TCHAR > s;
+
+if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::Facet) s = "Facet";
+else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::SimplexReceptacle) s = "SimplexReceptacle";
+else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::MultiplexReceptacle) s = "MultiplexReceptacle";
+else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = "EventEmitter";
+else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventPublisher) s = "EventPublisher";
+else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventConsumer) s = "EventConsumer";
+else
+{
+}
 
-      void ComponentPortDescription::
-      specificType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
-        Traversal::ComponentPortDescription::specificType (o);
-        pop_ ();
-      }
+if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+{
+a->value (s);
+}
 
-      void ComponentPortDescription::
-      supportedType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
-        Traversal::ComponentPortDescription::supportedType (o);
-        pop_ ();
-      }
+else
+{
+top_().value (s);
+}
+}
 
-      void ComponentPortDescription::
-      provider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
-        Traversal::ComponentPortDescription::provider (o);
-        pop_ ();
-      }
+// ComponentPortDescription
+//
+//
 
-      void ComponentPortDescription::
-      exclusiveProvider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveProvider", top_ ()));
-        Traversal::ComponentPortDescription::exclusiveProvider (o);
-        pop_ ();
-      }
+ComponentPortDescription::
+ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ComponentPortDescription::
-      exclusiveUser (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveUser", top_ ()));
-        Traversal::ComponentPortDescription::exclusiveUser (o);
-        pop_ ();
-      }
+ComponentPortDescription::
+ComponentPortDescription ()
+{
+}
 
-      void ComponentPortDescription::
-      optional (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("optional", top_ ()));
-        Traversal::ComponentPortDescription::optional (o);
-        pop_ ();
-      }
+void ComponentPortDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentPortDescription::traverse (o);
+}
 
-      void ComponentPortDescription::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-        Traversal::ComponentPortDescription::kind (o);
-        pop_ ();
-      }
+void ComponentPortDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ComponentPortDescription::name (o);
+pop_ ();
+}
 
-      // ComponentPropertyDescription
-      //
-      //
+void ComponentPortDescription::
+specificType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
+Traversal::ComponentPortDescription::specificType (o);
+pop_ ();
+}
 
-      ComponentPropertyDescription::
-      ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ComponentPortDescription::
+supportedType_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
+}
 
-      ComponentPropertyDescription::
-      ComponentPropertyDescription ()
-      {
-      }
+void ComponentPortDescription::
+supportedType_next (Type const& o)
+{
+supportedType_post (o);
+supportedType_pre (o);
+}
 
-      void ComponentPropertyDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPropertyDescription::traverse (o);
-      }
+void ComponentPortDescription::
+supportedType_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentPropertyDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ComponentPropertyDescription::name (o);
-        pop_ ();
-      }
+void ComponentPortDescription::
+provider (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
+Traversal::ComponentPortDescription::provider (o);
+pop_ ();
+}
 
-      void ComponentPropertyDescription::
-      type (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-        Traversal::ComponentPropertyDescription::type (o);
-        pop_ ();
-      }
+void ComponentPortDescription::
+exclusiveProvider (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveProvider", top_ ()));
+Traversal::ComponentPortDescription::exclusiveProvider (o);
+pop_ ();
+}
 
-      // ComponentExternalPortEndpoint
-      //
-      //
+void ComponentPortDescription::
+exclusiveUser (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveUser", top_ ()));
+Traversal::ComponentPortDescription::exclusiveUser (o);
+pop_ ();
+}
 
-      ComponentExternalPortEndpoint::
-      ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ComponentPortDescription::
+optional (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("optional", top_ ()));
+Traversal::ComponentPortDescription::optional (o);
+pop_ ();
+}
 
-      ComponentExternalPortEndpoint::
-      ComponentExternalPortEndpoint ()
-      {
-      }
+void ComponentPortDescription::
+kind (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+Traversal::ComponentPortDescription::kind (o);
+pop_ ();
+}
 
-      void ComponentExternalPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentExternalPortEndpoint::traverse (o);
-      }
+// ComponentPropertyDescription
+//
+//
 
-      void ComponentExternalPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-        Traversal::ComponentExternalPortEndpoint::portName (o);
-        pop_ ();
-      }
+ComponentPropertyDescription::
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      // PlanSubcomponentPortEndpoint
-      //
-      //
+ComponentPropertyDescription::
+ComponentPropertyDescription ()
+{
+}
 
-      PlanSubcomponentPortEndpoint::
-      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ComponentPropertyDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentPropertyDescription::traverse (o);
+}
 
-      PlanSubcomponentPortEndpoint::
-      PlanSubcomponentPortEndpoint ()
-      {
-      }
+void ComponentPropertyDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ComponentPropertyDescription::name (o);
+pop_ ();
+}
 
-      void PlanSubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::PlanSubcomponentPortEndpoint::traverse (o);
-      }
+void ComponentPropertyDescription::
+type (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
+Traversal::ComponentPropertyDescription::type (o);
+pop_ ();
+}
 
-      void PlanSubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::portName (o);
-        pop_ ();
-      }
+// ComponentExternalPortEndpoint
+//
+//
 
-      void PlanSubcomponentPortEndpoint::
-      provider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::provider (o);
-        pop_ ();
-      }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::kind (o);
-        pop_ ();
-      }
+ComponentExternalPortEndpoint::
+ComponentExternalPortEndpoint ()
+{
+}
 
-      void PlanSubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::instance (o);
-        pop_ ();
-      }
+void ComponentExternalPortEndpoint::
+traverse (Type const& o)
+{
+Traversal::ComponentExternalPortEndpoint::traverse (o);
+}
 
-      // ExternalReferenceEndpoint
-      //
-      //
+void ComponentExternalPortEndpoint::
+portName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+Traversal::ComponentExternalPortEndpoint::portName (o);
+pop_ ();
+}
 
-      ExternalReferenceEndpoint::
-      ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// PlanSubcomponentPortEndpoint
+//
+//
 
-      ExternalReferenceEndpoint::
-      ExternalReferenceEndpoint ()
-      {
-      }
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ExternalReferenceEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::ExternalReferenceEndpoint::traverse (o);
-      }
+PlanSubcomponentPortEndpoint::
+PlanSubcomponentPortEndpoint ()
+{
+}
 
-      void ExternalReferenceEndpoint::
-      location (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-        Traversal::ExternalReferenceEndpoint::location (o);
-        pop_ ();
-      }
+void PlanSubcomponentPortEndpoint::
+traverse (Type const& o)
+{
+Traversal::PlanSubcomponentPortEndpoint::traverse (o);
+}
 
-      // ConnectionResourceDeploymentDescription
-      //
-      //
+void PlanSubcomponentPortEndpoint::
+portName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::portName (o);
+pop_ ();
+}
 
-      ConnectionResourceDeploymentDescription::
-      ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+provider (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::provider (o);
+pop_ ();
+}
 
-      ConnectionResourceDeploymentDescription::
-      ConnectionResourceDeploymentDescription ()
-      {
-      }
+void PlanSubcomponentPortEndpoint::
+kind (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::kind (o);
+pop_ ();
+}
 
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ConnectionResourceDeploymentDescription::traverse (o);
-      }
+void PlanSubcomponentPortEndpoint::
+instance (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+Traversal::PlanSubcomponentPortEndpoint::instance (o);
+pop_ ();
+}
 
-      void ConnectionResourceDeploymentDescription::
-      targetName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("targetName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::targetName (o);
-        pop_ ();
-      }
+// ExternalReferenceEndpoint
+//
+//
 
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
+ExternalReferenceEndpoint::
+ExternalReferenceEndpoint ()
+{
+}
 
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceValue", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
+void ExternalReferenceEndpoint::
+traverse (Type const& o)
+{
+Traversal::ExternalReferenceEndpoint::traverse (o);
+}
 
-      // PlanConnectionDescription
-      //
-      //
+void ExternalReferenceEndpoint::
+location (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+Traversal::ExternalReferenceEndpoint::location (o);
+pop_ ();
+}
 
-      PlanConnectionDescription::
-      PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// ConnectionResourceDeploymentDescription
+//
+//
 
-      PlanConnectionDescription::
-      PlanConnectionDescription ()
-      {
-      }
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void PlanConnectionDescription::
-      traverse (Type const& o)
-      {
-        Traversal::PlanConnectionDescription::traverse (o);
-      }
+ConnectionResourceDeploymentDescription::
+ConnectionResourceDeploymentDescription ()
+{
+}
 
-      void PlanConnectionDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::PlanConnectionDescription::name (o);
-        pop_ ();
-      }
+void ConnectionResourceDeploymentDescription::
+traverse (Type const& o)
+{
+Traversal::ConnectionResourceDeploymentDescription::traverse (o);
+}
 
-      void PlanConnectionDescription::
-      source (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-        Traversal::PlanConnectionDescription::source (o);
-        pop_ ();
-      }
+void ConnectionResourceDeploymentDescription::
+targetName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("targetName", top_ ()));
+Traversal::ConnectionResourceDeploymentDescription::targetName (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-      }
+void ConnectionResourceDeploymentDescription::
+requirementName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
+Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
+void ConnectionResourceDeploymentDescription::
+resourceName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
+Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
+void ConnectionResourceDeploymentDescription::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
-      }
+void ConnectionResourceDeploymentDescription::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_next (Type const& o)
-      {
-        externalEndpoint_post (o);
-        externalEndpoint_pre (o);
-      }
+void ConnectionResourceDeploymentDescription::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+// PlanConnectionDescription
+//
+//
 
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
-      }
+PlanConnectionDescription::
+PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type const& o)
-      {
-        internalEndpoint_post (o);
-        internalEndpoint_pre (o);
-      }
+PlanConnectionDescription::
+PlanConnectionDescription ()
+{
+}
 
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+void PlanConnectionDescription::
+traverse (Type const& o)
+{
+Traversal::PlanConnectionDescription::traverse (o);
+}
 
-      void PlanConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
-      }
+void PlanConnectionDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::PlanConnectionDescription::name (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      externalReference_next (Type const& o)
-      {
-        externalReference_post (o);
-        externalReference_pre (o);
-      }
+void PlanConnectionDescription::
+source (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
+Traversal::PlanConnectionDescription::source (o);
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      externalReference_post (Type const&)
-      {
-        pop_ ();
-      }
+void PlanConnectionDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      void PlanConnectionDescription::
-      deployedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-      }
+void PlanConnectionDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      void PlanConnectionDescription::
-      deployedResource_next (Type const& o)
-      {
-        deployedResource_post (o);
-        deployedResource_pre (o);
-      }
+void PlanConnectionDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      void PlanConnectionDescription::
-      deployedResource_post (Type const&)
-      {
-        pop_ ();
-      }
+void PlanConnectionDescription::
+externalEndpoint_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
+}
 
-      // ImplementationDependency
-      //
-      //
+void PlanConnectionDescription::
+externalEndpoint_next (Type const& o)
+{
+externalEndpoint_post (o);
+externalEndpoint_pre (o);
+}
 
-      ImplementationDependency::
-      ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void PlanConnectionDescription::
+externalEndpoint_post (Type const&)
+{
+pop_ ();
+}
 
-      ImplementationDependency::
-      ImplementationDependency ()
-      {
-      }
+void PlanConnectionDescription::
+internalEndpoint_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
+}
 
-      void ImplementationDependency::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationDependency::traverse (o);
-      }
+void PlanConnectionDescription::
+internalEndpoint_next (Type const& o)
+{
+internalEndpoint_post (o);
+internalEndpoint_pre (o);
+}
 
-      void ImplementationDependency::
-      requiredType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
-        Traversal::ImplementationDependency::requiredType (o);
-        pop_ ();
-      }
+void PlanConnectionDescription::
+internalEndpoint_post (Type const&)
+{
+pop_ ();
+}
 
-      // Capability
-      //
-      //
+void PlanConnectionDescription::
+externalReference_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
+}
 
-      Capability::
-      Capability (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void PlanConnectionDescription::
+externalReference_next (Type const& o)
+{
+externalReference_post (o);
+externalReference_pre (o);
+}
 
-      Capability::
-      Capability ()
-      {
-      }
+void PlanConnectionDescription::
+externalReference_post (Type const&)
+{
+pop_ ();
+}
 
-      void Capability::
-      traverse (Type const& o)
-      {
-        Traversal::Capability::traverse (o);
-      }
+void PlanConnectionDescription::
+deployedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
+}
 
-      void Capability::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Capability::name (o);
-        pop_ ();
-      }
+void PlanConnectionDescription::
+deployedResource_next (Type const& o)
+{
+deployedResource_post (o);
+deployedResource_pre (o);
+}
 
-      void Capability::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::Capability::resourceType (o);
-        pop_ ();
-      }
+void PlanConnectionDescription::
+deployedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void Capability::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::Capability::property (o);
-        pop_ ();
-      }
+// ImplementationDependency
+//
+//
 
-      // ImplementationRequirement
-      //
-      //
+ImplementationDependency::
+ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      ImplementationRequirement::
-      ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+ImplementationDependency::
+ImplementationDependency ()
+{
+}
 
-      ImplementationRequirement::
-      ImplementationRequirement ()
-      {
-      }
+void ImplementationDependency::
+traverse (Type const& o)
+{
+Traversal::ImplementationDependency::traverse (o);
+}
 
-      void ImplementationRequirement::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationRequirement::traverse (o);
-      }
+void ImplementationDependency::
+requiredType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
+Traversal::ImplementationDependency::requiredType (o);
+pop_ ();
+}
 
-      void ImplementationRequirement::
-      resourceUsage (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
-        Traversal::ImplementationRequirement::resourceUsage (o);
-        pop_ ();
-      }
+// Capability
+//
+//
 
-      void ImplementationRequirement::
-      resourcePort (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourcePort", top_ ()));
-        Traversal::ImplementationRequirement::resourcePort (o);
-        pop_ ();
-      }
+Capability::
+Capability (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ImplementationRequirement::
-      componentPort (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentPort", top_ ()));
-        Traversal::ImplementationRequirement::componentPort (o);
-        pop_ ();
-      }
+Capability::
+Capability ()
+{
+}
 
-      void ImplementationRequirement::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::ImplementationRequirement::resourceType (o);
-        pop_ ();
-      }
+void Capability::
+traverse (Type const& o)
+{
+Traversal::Capability::traverse (o);
+}
 
-      void ImplementationRequirement::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::ImplementationRequirement::name (o);
-        pop_ ();
-      }
+void Capability::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Capability::name (o);
+pop_ ();
+}
 
-      void ImplementationRequirement::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::ImplementationRequirement::property (o);
-        pop_ ();
-      }
+void Capability::
+resourceType_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+}
 
-      // ComponentPackageReference
-      //
-      //
+void Capability::
+resourceType_next (Type const& o)
+{
+resourceType_post (o);
+resourceType_pre (o);
+}
 
-      ComponentPackageReference::
-      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Capability::
+resourceType_post (Type const&)
+{
+pop_ ();
+}
 
-      ComponentPackageReference::
-      ComponentPackageReference ()
-      {
-      }
+void Capability::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      void ComponentPackageReference::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPackageReference::traverse (o);
-      }
+void Capability::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void ComponentPackageReference::
-      requiredUUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredUUID", top_ ()));
-        Traversal::ComponentPackageReference::requiredUUID (o);
-        pop_ ();
-      }
+void Capability::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentPackageReference::
-      requiredName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredName", top_ ()));
-        Traversal::ComponentPackageReference::requiredName (o);
-        pop_ ();
-      }
+// ImplementationRequirement
+//
+//
 
-      void ComponentPackageReference::
-      requiredType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
-        Traversal::ComponentPackageReference::requiredType (o);
-        pop_ ();
-      }
+ImplementationRequirement::
+ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      // SubcomponentPortEndpoint
-      //
-      //
+ImplementationRequirement::
+ImplementationRequirement ()
+{
+}
 
-      SubcomponentPortEndpoint::
-      SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ImplementationRequirement::
+traverse (Type const& o)
+{
+Traversal::ImplementationRequirement::traverse (o);
+}
 
-      SubcomponentPortEndpoint::
-      SubcomponentPortEndpoint ()
-      {
-      }
+void ImplementationRequirement::
+resourceUsage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
+Traversal::ImplementationRequirement::resourceUsage (o);
+pop_ ();
+}
 
-      void SubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentPortEndpoint::traverse (o);
-      }
+void ImplementationRequirement::
+resourcePort (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourcePort", top_ ()));
+Traversal::ImplementationRequirement::resourcePort (o);
+pop_ ();
+}
 
-      void SubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
-        Traversal::SubcomponentPortEndpoint::portName (o);
-        pop_ ();
-      }
+void ImplementationRequirement::
+componentPort (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentPort", top_ ()));
+Traversal::ImplementationRequirement::componentPort (o);
+pop_ ();
+}
 
-      void SubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-        Traversal::SubcomponentPortEndpoint::instance (o);
-        pop_ ();
-      }
+void ImplementationRequirement::
+resourceType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+Traversal::ImplementationRequirement::resourceType (o);
+pop_ ();
+}
 
-      // AssemblyConnectionDescription
-      //
-      //
+void ImplementationRequirement::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::ImplementationRequirement::name (o);
+pop_ ();
+}
 
-      AssemblyConnectionDescription::
-      AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ImplementationRequirement::
+property_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+}
 
-      AssemblyConnectionDescription::
-      AssemblyConnectionDescription ()
-      {
-      }
+void ImplementationRequirement::
+property_next (Type const& o)
+{
+property_post (o);
+property_pre (o);
+}
 
-      void AssemblyConnectionDescription::
-      traverse (Type const& o)
-      {
-        Traversal::AssemblyConnectionDescription::traverse (o);
-      }
+void ImplementationRequirement::
+property_post (Type const&)
+{
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::AssemblyConnectionDescription::name (o);
-        pop_ ();
-      }
+// ComponentPackageReference
+//
+//
 
-      void AssemblyConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-        Traversal::AssemblyConnectionDescription::deployRequirement (o);
-        pop_ ();
-      }
+ComponentPackageReference::
+ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
-      }
+ComponentPackageReference::
+ComponentPackageReference ()
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type const& o)
-      {
-        externalEndpoint_post (o);
-        externalEndpoint_pre (o);
-      }
+void ComponentPackageReference::
+traverse (Type const& o)
+{
+Traversal::ComponentPackageReference::traverse (o);
+}
 
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+void ComponentPackageReference::
+requiredUUID (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredUUID", top_ ()));
+Traversal::ComponentPackageReference::requiredUUID (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
-      }
+void ComponentPackageReference::
+requiredName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredName", top_ ()));
+Traversal::ComponentPackageReference::requiredName (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type const& o)
-      {
-        internalEndpoint_post (o);
-        internalEndpoint_pre (o);
-      }
+void ComponentPackageReference::
+requiredType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
+Traversal::ComponentPackageReference::requiredType (o);
+pop_ ();
+}
 
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
+// SubcomponentPortEndpoint
+//
+//
 
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
-      }
+SubcomponentPortEndpoint::
+SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_next (Type const& o)
-      {
-        externalReference_post (o);
-        externalReference_pre (o);
-      }
+SubcomponentPortEndpoint::
+SubcomponentPortEndpoint ()
+{
+}
 
-      void AssemblyConnectionDescription::
-      externalReference_post (Type const&)
-      {
-        pop_ ();
-      }
-    }
-  }
+void SubcomponentPortEndpoint::
+traverse (Type const& o)
+{
+Traversal::SubcomponentPortEndpoint::traverse (o);
+}
+
+void SubcomponentPortEndpoint::
+portName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+Traversal::SubcomponentPortEndpoint::portName (o);
+pop_ ();
+}
+
+void SubcomponentPortEndpoint::
+instance (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+Traversal::SubcomponentPortEndpoint::instance (o);
+pop_ ();
+}
+
+// AssemblyConnectionDescription
+//
+//
+
+AssemblyConnectionDescription::
+AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+AssemblyConnectionDescription::
+AssemblyConnectionDescription ()
+{
+}
+
+void AssemblyConnectionDescription::
+traverse (Type const& o)
+{
+Traversal::AssemblyConnectionDescription::traverse (o);
+}
+
+void AssemblyConnectionDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::AssemblyConnectionDescription::name (o);
+pop_ ();
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
+
+void AssemblyConnectionDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_next (Type const& o)
+{
+internalEndpoint_post (o);
+internalEndpoint_pre (o);
+}
+
+void AssemblyConnectionDescription::
+internalEndpoint_post (Type const&)
+{
+pop_ ();
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_next (Type const& o)
+{
+externalEndpoint_post (o);
+externalEndpoint_pre (o);
+}
+
+void AssemblyConnectionDescription::
+externalEndpoint_post (Type const&)
+{
+pop_ ();
+}
+
+void AssemblyConnectionDescription::
+externalReference_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
+}
+
+void AssemblyConnectionDescription::
+externalReference_next (Type const& o)
+{
+externalReference_post (o);
+externalReference_pre (o);
+}
+
+void AssemblyConnectionDescription::
+externalReference_post (Type const&)
+{
+pop_ ();
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index abde5866a0d..5de9f070653 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,39 +27,39 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class TCKind;
-    class DataType;
-    class DataValue;
-    class EnumType;
-    class Any;
-    class Property;
-    class SatisfierPropertyKind;
-    class SatisfierProperty;
-    class Resource;
-    class Requirement;
-    class ResourceDeploymentDescription;
-    class ArtifactDeploymentDescription;
-    class MonolithicDeploymentDescription;
-    class ResourceUsageKind;
-    class InstanceResourceDeploymentDescription;
-    class InstanceDeploymentDescription;
-    class CCMComponentPortKind;
-    class ComponentPortDescription;
-    class ComponentPropertyDescription;
-    class ComponentExternalPortEndpoint;
-    class PlanSubcomponentPortEndpoint;
-    class ExternalReferenceEndpoint;
-    class ConnectionResourceDeploymentDescription;
-    class PlanConnectionDescription;
-    class ImplementationDependency;
-    class Capability;
-    class ImplementationRequirement;
-    class ComponentPackageReference;
-    class SubcomponentPortEndpoint;
-    class AssemblyConnectionDescription;
-  }
+namespace Config_Handlers
+{
+class TCKind;
+class DataType;
+class DataValue;
+class EnumType;
+class Any;
+class Property;
+class SatisfierPropertyKind;
+class SatisfierProperty;
+class Resource;
+class Requirement;
+class ResourceDeploymentDescription;
+class ArtifactDeploymentDescription;
+class MonolithicDeploymentDescription;
+class ResourceUsageKind;
+class InstanceResourceDeploymentDescription;
+class InstanceDeploymentDescription;
+class CCMComponentPortKind;
+class ComponentPortDescription;
+class ComponentPropertyDescription;
+class ComponentExternalPortEndpoint;
+class PlanSubcomponentPortEndpoint;
+class ExternalReferenceEndpoint;
+class ConnectionResourceDeploymentDescription;
+class PlanConnectionDescription;
+class ImplementationDependency;
+class Capability;
+class ImplementationRequirement;
+class ComponentPackageReference;
+class SubcomponentPortEndpoint;
+class AssemblyConnectionDescription;
+}
 }
 
 #include <memory>
@@ -68,6522 +68,7032 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export TCKind : public ::XSCRT::Type
-    {
-      public:
-      TCKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-      static TCKind const tk_null;
-      static TCKind const tk_void;
-      static TCKind const tk_short;
-      static TCKind const tk_long;
-      static TCKind const tk_ushort;
-      static TCKind const tk_ulong;
-      static TCKind const tk_float;
-      static TCKind const tk_double;
-      static TCKind const tk_boolean;
-      static TCKind const tk_char;
-      static TCKind const tk_octet;
-      static TCKind const tk_any;
-      static TCKind const tk_TypeCode;
-      static TCKind const tk_Principal;
-      static TCKind const tk_objref;
-      static TCKind const tk_struct;
-      static TCKind const tk_union;
-      static TCKind const tk_enum;
-      static TCKind const tk_string;
-      static TCKind const tk_sequence;
-      static TCKind const tk_array;
-      static TCKind const tk_alias;
-      static TCKind const tk_except;
-      static TCKind const tk_longlong;
-      static TCKind const tk_ulonglong;
-      static TCKind const tk_longdouble;
-      static TCKind const tk_wchar;
-      static TCKind const tk_wstring;
-      static TCKind const tk_wfixed;
-      static TCKind const tk_value;
-      static TCKind const tk_value_box;
-      static TCKind const tk_native;
-      static TCKind const tk_abstract_interface;
-      static TCKind const tk_local_interface;
-      static TCKind const tk_component;
-      static TCKind const tk_home;
-      static TCKind const tk_event;
-
-      enum Value
-      {
-        tk_null_l,tk_void_l,tk_short_l,tk_long_l,tk_ushort_l,tk_ulong_l,tk_float_l,tk_double_l,tk_boolean_l,tk_char_l,tk_octet_l,tk_any_l,tk_TypeCode_l,tk_Principal_l,tk_objref_l,tk_struct_l,tk_union_l,tk_enum_l,tk_string_l,tk_sequence_l,tk_array_l,tk_alias_l,tk_except_l,tk_longlong_l,tk_ulonglong_l,tk_longdouble_l,tk_wchar_l,tk_wstring_l,tk_wfixed_l,tk_value_l,tk_value_box_l,tk_native_l,tk_abstract_interface_l,tk_local_interface_l,tk_component_l,tk_home_l,tk_event_l
-      };
-
-
-      Value
-      integral () const;
-
-      friend bool XSC_XML_Handlers_Export 
-      operator== (TCKind const& a, TCKind const& b);
-
-      friend bool XSC_XML_Handlers_Export 
-      operator!= (TCKind const& a, TCKind const& b);
-
-      private:
-      TCKind (Value v);
-
-      Value v_;
-    };
-
-    bool XSC_XML_Handlers_Export operator== (TCKind const &a, TCKind const &b);
-
-    bool XSC_XML_Handlers_Export operator!= (TCKind const &a, TCKind const &b);
-
-
-    class XSC_XML_Handlers_Export DataType : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // kind
-      // 
-      public:
-      ::CIAO::Config_Handlers::TCKind const& kind () const;
-      void kind (::CIAO::Config_Handlers::TCKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > kind_;
-
-      // enum
-      // 
-      public:
-      bool enum_p () const;
-      ::CIAO::Config_Handlers::EnumType const& enum_ () const;
-      void enum_ (::CIAO::Config_Handlers::EnumType const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > enum__;
-
-      public:
-      DataType (::CIAO::Config_Handlers::TCKind const& kind__);
-
-      DataType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      DataType (DataType const& s);
-
-      DataType&
-      operator= (DataType const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export DataValue : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // short
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::short_ >::iterator short_iterator;
-      typedef ::std::list< ::XMLSchema::short_ >::const_iterator short_const_iterator;
-      short_iterator begin_short ();
-      short_iterator end_short ();
-      short_const_iterator begin_short () const;
-      short_const_iterator end_short () const;
-      void add_short (::XMLSchema::short_ const& );
-      size_t count_short (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::short_ > short_;
-
-      // long
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::int_ >::iterator long_iterator;
-      typedef ::std::list< ::XMLSchema::int_ >::const_iterator long_const_iterator;
-      long_iterator begin_long ();
-      long_iterator end_long ();
-      long_const_iterator begin_long () const;
-      long_const_iterator end_long () const;
-      void add_long (::XMLSchema::int_ const& );
-      size_t count_long (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::int_ > long_;
-
-      // ushort
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::unsignedShort >::iterator ushort_iterator;
-      typedef ::std::list< ::XMLSchema::unsignedShort >::const_iterator ushort_const_iterator;
-      ushort_iterator begin_ushort ();
-      ushort_iterator end_ushort ();
-      ushort_const_iterator begin_ushort () const;
-      ushort_const_iterator end_ushort () const;
-      void add_ushort (::XMLSchema::unsignedShort const& );
-      size_t count_ushort (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::unsignedShort > ushort_;
-
-      // ulong
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::unsignedInt >::iterator ulong_iterator;
-      typedef ::std::list< ::XMLSchema::unsignedInt >::const_iterator ulong_const_iterator;
-      ulong_iterator begin_ulong ();
-      ulong_iterator end_ulong ();
-      ulong_const_iterator begin_ulong () const;
-      ulong_const_iterator end_ulong () const;
-      void add_ulong (::XMLSchema::unsignedInt const& );
-      size_t count_ulong (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::unsignedInt > ulong_;
-
-      // float
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::float_ >::iterator float_iterator;
-      typedef ::std::list< ::XMLSchema::float_ >::const_iterator float_const_iterator;
-      float_iterator begin_float ();
-      float_iterator end_float ();
-      float_const_iterator begin_float () const;
-      float_const_iterator end_float () const;
-      void add_float (::XMLSchema::float_ const& );
-      size_t count_float (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::float_ > float_;
-
-      // double
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::double_ >::iterator double_iterator;
-      typedef ::std::list< ::XMLSchema::double_ >::const_iterator double_const_iterator;
-      double_iterator begin_double ();
-      double_iterator end_double ();
-      double_const_iterator begin_double () const;
-      double_const_iterator end_double () const;
-      void add_double (::XMLSchema::double_ const& );
-      size_t count_double (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::double_ > double_;
-
-      // boolean
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::boolean >::iterator boolean_iterator;
-      typedef ::std::list< ::XMLSchema::boolean >::const_iterator boolean_const_iterator;
-      boolean_iterator begin_boolean ();
-      boolean_iterator end_boolean ();
-      boolean_const_iterator begin_boolean () const;
-      boolean_const_iterator end_boolean () const;
-      void add_boolean (::XMLSchema::boolean const& );
-      size_t count_boolean (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::boolean > boolean_;
-
-      // octet
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::unsignedByte >::iterator octet_iterator;
-      typedef ::std::list< ::XMLSchema::unsignedByte >::const_iterator octet_const_iterator;
-      octet_iterator begin_octet ();
-      octet_iterator end_octet ();
-      octet_const_iterator begin_octet () const;
-      octet_const_iterator end_octet () const;
-      void add_octet (::XMLSchema::unsignedByte const& );
-      size_t count_octet (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::unsignedByte > octet_;
-
-      // enum
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator enum_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator enum_const_iterator;
-      enum_iterator begin_enum ();
-      enum_iterator end_enum ();
-      enum_const_iterator begin_enum () const;
-      enum_const_iterator end_enum () const;
-      void add_enum (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_enum (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > enum_;
-
-      // string
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator string_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator string_const_iterator;
-      string_iterator begin_string ();
-      string_iterator end_string ();
-      string_const_iterator begin_string () const;
-      string_const_iterator end_string () const;
-      void add_string (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_string (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > string_;
-
-      // longlong
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::long_ >::iterator longlong_iterator;
-      typedef ::std::list< ::XMLSchema::long_ >::const_iterator longlong_const_iterator;
-      longlong_iterator begin_longlong ();
-      longlong_iterator end_longlong ();
-      longlong_const_iterator begin_longlong () const;
-      longlong_const_iterator end_longlong () const;
-      void add_longlong (::XMLSchema::long_ const& );
-      size_t count_longlong (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::long_ > longlong_;
-
-      // ulonglong
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::unsignedLong >::iterator ulonglong_iterator;
-      typedef ::std::list< ::XMLSchema::unsignedLong >::const_iterator ulonglong_const_iterator;
-      ulonglong_iterator begin_ulonglong ();
-      ulonglong_iterator end_ulonglong ();
-      ulonglong_const_iterator begin_ulonglong () const;
-      ulonglong_const_iterator end_ulonglong () const;
-      void add_ulonglong (::XMLSchema::unsignedLong const& );
-      size_t count_ulonglong (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::unsignedLong > ulonglong_;
-
-      // longdouble
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::double_ >::iterator longdouble_iterator;
-      typedef ::std::list< ::XMLSchema::double_ >::const_iterator longdouble_const_iterator;
-      longdouble_iterator begin_longdouble ();
-      longdouble_iterator end_longdouble ();
-      longdouble_const_iterator begin_longdouble () const;
-      longdouble_const_iterator end_longdouble () const;
-      void add_longdouble (::XMLSchema::double_ const& );
-      size_t count_longdouble (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::double_ > longdouble_;
-
-      public:
-      DataValue ();
-
-      DataValue (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      DataValue (DataValue const& s);
-
-      DataValue&
-      operator= (DataValue const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export EnumType : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // typeId
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& typeId () const;
-      void typeId (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_;
-
-      // member
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator member_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator member_const_iterator;
-      member_iterator begin_member ();
-      member_iterator end_member ();
-      member_const_iterator begin_member () const;
-      member_const_iterator end_member () const;
-      void add_member (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_member (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > member_;
-
-      public:
-      EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::XMLSchema::string< ACE_TCHAR > const& typeId__);
-
-      EnumType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      EnumType (EnumType const& s);
-
-      EnumType&
-      operator= (EnumType const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export Any : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // type
-      // 
-      public:
-      ::CIAO::Config_Handlers::DataType const& type () const;
-      void type (::CIAO::Config_Handlers::DataType const& );
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export TCKind : public ::XSCRT::Type
+{
+public:
+TCKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+TCKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+static TCKind const tk_null;
+static TCKind const tk_void;
+static TCKind const tk_short;
+static TCKind const tk_long;
+static TCKind const tk_ushort;
+static TCKind const tk_ulong;
+static TCKind const tk_float;
+static TCKind const tk_double;
+static TCKind const tk_boolean;
+static TCKind const tk_char;
+static TCKind const tk_octet;
+static TCKind const tk_any;
+static TCKind const tk_TypeCode;
+static TCKind const tk_Principal;
+static TCKind const tk_objref;
+static TCKind const tk_struct;
+static TCKind const tk_union;
+static TCKind const tk_enum;
+static TCKind const tk_string;
+static TCKind const tk_sequence;
+static TCKind const tk_array;
+static TCKind const tk_alias;
+static TCKind const tk_except;
+static TCKind const tk_longlong;
+static TCKind const tk_ulonglong;
+static TCKind const tk_longdouble;
+static TCKind const tk_wchar;
+static TCKind const tk_wstring;
+static TCKind const tk_wfixed;
+static TCKind const tk_value;
+static TCKind const tk_value_box;
+static TCKind const tk_native;
+static TCKind const tk_abstract_interface;
+static TCKind const tk_local_interface;
+static TCKind const tk_component;
+static TCKind const tk_home;
+static TCKind const tk_event;
+
+enum Value
+{
+tk_null_l,tk_void_l,tk_short_l,tk_long_l,tk_ushort_l,tk_ulong_l,tk_float_l,tk_double_l,tk_boolean_l,tk_char_l,tk_octet_l,tk_any_l,tk_TypeCode_l,tk_Principal_l,tk_objref_l,tk_struct_l,tk_union_l,tk_enum_l,tk_string_l,tk_sequence_l,tk_array_l,tk_alias_l,tk_except_l,tk_longlong_l,tk_ulonglong_l,tk_longdouble_l,tk_wchar_l,tk_wstring_l,tk_wfixed_l,tk_value_l,tk_value_box_l,tk_native_l,tk_abstract_interface_l,tk_local_interface_l,tk_component_l,tk_home_l,tk_event_l,
+};
+
+
+Value
+integral () const;
+
+friend bool XSC_XML_Handlers_Export
+operator== (TCKind const& a, TCKind const& b);
+
+friend bool XSC_XML_Handlers_Export
+operator!= (TCKind const& a, TCKind const& b);
+
+private:
+TCKind (Value v);
+
+Value v_;
+};
+
+bool XSC_XML_Handlers_Export operator== (TCKind const &a, TCKind const &b);
+
+bool XSC_XML_Handlers_Export operator!= (TCKind const &a, TCKind const &b);
+
+
+class XSC_XML_Handlers_Export DataType : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// kind
+//
+public:
+::CIAO::Config_Handlers::TCKind const& kind () const;
+void kind (::CIAO::Config_Handlers::TCKind const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > kind_;
+
+// enum
+//
+public:
+bool enum_p () const;
+::CIAO::Config_Handlers::EnumType const& enum_ () const;
+void enum_ (::CIAO::Config_Handlers::EnumType const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > enum__;
+
+public:
+DataType (::CIAO::Config_Handlers::TCKind const& kind__);
+
+DataType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+DataType (DataType const& s);
+
+DataType&
+operator= (DataType const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export DataValue : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// short
+//
+public:
+typedef ::std::list< ::XMLSchema::short_ >::iterator short_iterator;
+typedef ::std::list< ::XMLSchema::short_ >::const_iterator short_const_iterator;
+short_iterator begin_short ();
+short_iterator end_short ();
+short_const_iterator begin_short () const;
+short_const_iterator end_short () const;
+void add_short (::XMLSchema::short_ const& );
+size_t count_short (void) const;
+
+protected:
+::std::list< ::XMLSchema::short_ > short_;
+
+// long
+//
+public:
+typedef ::std::list< ::XMLSchema::int_ >::iterator long_iterator;
+typedef ::std::list< ::XMLSchema::int_ >::const_iterator long_const_iterator;
+long_iterator begin_long ();
+long_iterator end_long ();
+long_const_iterator begin_long () const;
+long_const_iterator end_long () const;
+void add_long (::XMLSchema::int_ const& );
+size_t count_long (void) const;
+
+protected:
+::std::list< ::XMLSchema::int_ > long_;
+
+// ushort
+//
+public:
+typedef ::std::list< ::XMLSchema::unsignedShort >::iterator ushort_iterator;
+typedef ::std::list< ::XMLSchema::unsignedShort >::const_iterator ushort_const_iterator;
+ushort_iterator begin_ushort ();
+ushort_iterator end_ushort ();
+ushort_const_iterator begin_ushort () const;
+ushort_const_iterator end_ushort () const;
+void add_ushort (::XMLSchema::unsignedShort const& );
+size_t count_ushort (void) const;
+
+protected:
+::std::list< ::XMLSchema::unsignedShort > ushort_;
+
+// ulong
+//
+public:
+typedef ::std::list< ::XMLSchema::unsignedInt >::iterator ulong_iterator;
+typedef ::std::list< ::XMLSchema::unsignedInt >::const_iterator ulong_const_iterator;
+ulong_iterator begin_ulong ();
+ulong_iterator end_ulong ();
+ulong_const_iterator begin_ulong () const;
+ulong_const_iterator end_ulong () const;
+void add_ulong (::XMLSchema::unsignedInt const& );
+size_t count_ulong (void) const;
+
+protected:
+::std::list< ::XMLSchema::unsignedInt > ulong_;
+
+// float
+//
+public:
+typedef ::std::list< ::XMLSchema::float_ >::iterator float_iterator;
+typedef ::std::list< ::XMLSchema::float_ >::const_iterator float_const_iterator;
+float_iterator begin_float ();
+float_iterator end_float ();
+float_const_iterator begin_float () const;
+float_const_iterator end_float () const;
+void add_float (::XMLSchema::float_ const& );
+size_t count_float (void) const;
+
+protected:
+::std::list< ::XMLSchema::float_ > float_;
+
+// double
+//
+public:
+typedef ::std::list< ::XMLSchema::double_ >::iterator double_iterator;
+typedef ::std::list< ::XMLSchema::double_ >::const_iterator double_const_iterator;
+double_iterator begin_double ();
+double_iterator end_double ();
+double_const_iterator begin_double () const;
+double_const_iterator end_double () const;
+void add_double (::XMLSchema::double_ const& );
+size_t count_double (void) const;
+
+protected:
+::std::list< ::XMLSchema::double_ > double_;
+
+// boolean
+//
+public:
+typedef ::std::list< ::XMLSchema::boolean >::iterator boolean_iterator;
+typedef ::std::list< ::XMLSchema::boolean >::const_iterator boolean_const_iterator;
+boolean_iterator begin_boolean ();
+boolean_iterator end_boolean ();
+boolean_const_iterator begin_boolean () const;
+boolean_const_iterator end_boolean () const;
+void add_boolean (::XMLSchema::boolean const& );
+size_t count_boolean (void) const;
+
+protected:
+::std::list< ::XMLSchema::boolean > boolean_;
+
+// octet
+//
+public:
+typedef ::std::list< ::XMLSchema::unsignedByte >::iterator octet_iterator;
+typedef ::std::list< ::XMLSchema::unsignedByte >::const_iterator octet_const_iterator;
+octet_iterator begin_octet ();
+octet_iterator end_octet ();
+octet_const_iterator begin_octet () const;
+octet_const_iterator end_octet () const;
+void add_octet (::XMLSchema::unsignedByte const& );
+size_t count_octet (void) const;
+
+protected:
+::std::list< ::XMLSchema::unsignedByte > octet_;
+
+// enum
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator enum_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator enum_const_iterator;
+enum_iterator begin_enum ();
+enum_iterator end_enum ();
+enum_const_iterator begin_enum () const;
+enum_const_iterator end_enum () const;
+void add_enum (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_enum (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > enum_;
+
+// string
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator string_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator string_const_iterator;
+string_iterator begin_string ();
+string_iterator end_string ();
+string_const_iterator begin_string () const;
+string_const_iterator end_string () const;
+void add_string (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_string (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > string_;
+
+// longlong
+//
+public:
+typedef ::std::list< ::XMLSchema::long_ >::iterator longlong_iterator;
+typedef ::std::list< ::XMLSchema::long_ >::const_iterator longlong_const_iterator;
+longlong_iterator begin_longlong ();
+longlong_iterator end_longlong ();
+longlong_const_iterator begin_longlong () const;
+longlong_const_iterator end_longlong () const;
+void add_longlong (::XMLSchema::long_ const& );
+size_t count_longlong (void) const;
+
+protected:
+::std::list< ::XMLSchema::long_ > longlong_;
+
+// ulonglong
+//
+public:
+typedef ::std::list< ::XMLSchema::unsignedLong >::iterator ulonglong_iterator;
+typedef ::std::list< ::XMLSchema::unsignedLong >::const_iterator ulonglong_const_iterator;
+ulonglong_iterator begin_ulonglong ();
+ulonglong_iterator end_ulonglong ();
+ulonglong_const_iterator begin_ulonglong () const;
+ulonglong_const_iterator end_ulonglong () const;
+void add_ulonglong (::XMLSchema::unsignedLong const& );
+size_t count_ulonglong (void) const;
+
+protected:
+::std::list< ::XMLSchema::unsignedLong > ulonglong_;
+
+// longdouble
+//
+public:
+typedef ::std::list< ::XMLSchema::double_ >::iterator longdouble_iterator;
+typedef ::std::list< ::XMLSchema::double_ >::const_iterator longdouble_const_iterator;
+longdouble_iterator begin_longdouble ();
+longdouble_iterator end_longdouble ();
+longdouble_const_iterator begin_longdouble () const;
+longdouble_const_iterator end_longdouble () const;
+void add_longdouble (::XMLSchema::double_ const& );
+size_t count_longdouble (void) const;
+
+protected:
+::std::list< ::XMLSchema::double_ > longdouble_;
+
+public:
+DataValue ();
+
+DataValue (::XSCRT::XML::Element< ACE_TCHAR > const&);
+DataValue (DataValue const& s);
+
+DataValue&
+operator= (DataValue const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export EnumType : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// typeId
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& typeId () const;
+void typeId (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_;
+
+// member
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator member_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator member_const_iterator;
+member_iterator begin_member ();
+member_iterator end_member ();
+member_const_iterator begin_member () const;
+member_const_iterator end_member () const;
+void add_member (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_member (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > member_;
+
+public:
+EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& typeId__);
+
+EnumType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+EnumType (EnumType const& s);
+
+EnumType&
+operator= (EnumType const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export Any : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
+// type
+//
+public:
+::CIAO::Config_Handlers::DataType const& type () const;
+void type (::CIAO::Config_Handlers::DataType const& );
 
-      // value
-      // 
-      public:
-      ::CIAO::Config_Handlers::DataValue const& value () const;
-      void value (::CIAO::Config_Handlers::DataValue const& );
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
+// value
+//
+public:
+::CIAO::Config_Handlers::DataValue const& value () const;
+void value (::CIAO::Config_Handlers::DataValue const& );
 
-      public:
-      Any (::CIAO::Config_Handlers::DataType const& type__,
-           ::CIAO::Config_Handlers::DataValue const& value__);
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_;
 
-      Any (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Any (Any const& s);
+public:
+Any (::CIAO::Config_Handlers::DataType const& type__,
+::CIAO::Config_Handlers::DataValue const& value__);
 
-      Any&
-      operator= (Any const& s);
+Any (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Any (Any const& s);
 
-      private:
-      char regulator__;
-    };
+Any&
+operator= (Any const& s);
 
+private:
+char regulator__;
+};
 
-    class XSC_XML_Handlers_Export Property : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
 
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
+class XSC_XML_Handlers_Export Property : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      // value
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& value () const;
-      void value (::CIAO::Config_Handlers::Any const& );
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+// value
+//
+public:
+::CIAO::Config_Handlers::Any const& value () const;
+void value (::CIAO::Config_Handlers::Any const& );
 
-      public:
-      Property (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::CIAO::Config_Handlers::Any const& value__);
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
 
-      Property (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Property (Property const& s);
+public:
+Property (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::Any const& value__);
 
-      Property&
-      operator= (Property const& s);
+Property (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Property (Property const& s);
 
-      private:
-      char regulator__;
-    };
+Property&
+operator= (Property const& s);
 
+private:
+char regulator__;
+};
 
-    class XSC_XML_Handlers_Export SatisfierPropertyKind : public ::XSCRT::Type
-    {
-      public:
-      SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
 
-      static SatisfierPropertyKind const Quantity;
-      static SatisfierPropertyKind const Capacity;
-      static SatisfierPropertyKind const Minimum;
-      static SatisfierPropertyKind const Maximum;
-      static SatisfierPropertyKind const Attribute;
-      static SatisfierPropertyKind const Selection;
+class XSC_XML_Handlers_Export SatisfierPropertyKind : public ::XSCRT::Type
+{
+public:
+SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+SatisfierPropertyKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+static SatisfierPropertyKind const Quantity;
+static SatisfierPropertyKind const Capacity;
+static SatisfierPropertyKind const Minimum;
+static SatisfierPropertyKind const Maximum;
+static SatisfierPropertyKind const Attribute;
+static SatisfierPropertyKind const Selection;
+
+enum Value
+{
+Quantity_l,Capacity_l,Minimum_l,Maximum_l,Attribute_l,Selection_l,
+};
 
-      enum Value
-      {
-        Quantity_l,Capacity_l,Minimum_l,Maximum_l,Attribute_l,Selection_l
-      };
 
+Value
+integral () const;
 
-      Value
-      integral () const;
+friend bool XSC_XML_Handlers_Export
+operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
-      friend bool XSC_XML_Handlers_Export 
-      operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
-
-      friend bool XSC_XML_Handlers_Export 
-      operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
+friend bool XSC_XML_Handlers_Export
+operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
-      private:
-      SatisfierPropertyKind (Value v);
+private:
+SatisfierPropertyKind (Value v);
 
-      Value v_;
-    };
+Value v_;
+};
 
-    bool XSC_XML_Handlers_Export operator== (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
+bool XSC_XML_Handlers_Export operator== (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
-    bool XSC_XML_Handlers_Export operator!= (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
+bool XSC_XML_Handlers_Export operator!= (SatisfierPropertyKind const &a, SatisfierPropertyKind const &b);
 
 
-    class XSC_XML_Handlers_Export SatisfierProperty : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+class XSC_XML_Handlers_Export SatisfierProperty : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-      // kind
-      // 
-      public:
-      ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
-      void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
+// kind
+//
+public:
+::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
+void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
 
-      // value
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& value () const;
-      void value (::CIAO::Config_Handlers::Any const& );
+// dynamic
+//
+public:
+::XMLSchema::boolean const& dynamic () const;
+void dynamic (::XMLSchema::boolean const& );
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > dynamic_;
 
-      public:
-      SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-                         ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-                         ::CIAO::Config_Handlers::Any const& value__);
+// value
+//
+public:
+::CIAO::Config_Handlers::Any const& value () const;
+void value (::CIAO::Config_Handlers::Any const& );
 
-      SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SatisfierProperty (SatisfierProperty const& s);
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_;
 
-      SatisfierProperty&
-      operator= (SatisfierProperty const& s);
+public:
+SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
+::XMLSchema::boolean const& dynamic__,
+::CIAO::Config_Handlers::Any const& value__);
 
-      private:
-      char regulator__;
-    };
+SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const&);
+SatisfierProperty (SatisfierProperty const& s);
 
+SatisfierProperty&
+operator= (SatisfierProperty const& s);
 
-    class XSC_XML_Handlers_Export Resource : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+private:
+char regulator__;
+};
 
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // resourceType
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator;
-      resourceType_iterator begin_resourceType ();
-      resourceType_iterator end_resourceType ();
-      resourceType_const_iterator begin_resourceType () const;
-      resourceType_const_iterator end_resourceType () const;
-      void add_resourceType (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_resourceType (void) const;
+class XSC_XML_Handlers_Export Resource : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      // property
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator;
-      property_iterator begin_property ();
-      property_iterator end_property ();
-      property_const_iterator begin_property () const;
-      property_const_iterator end_property () const;
-      void add_property (::CIAO::Config_Handlers::SatisfierProperty const& );
-      size_t count_property (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
-
-      public:
-      Resource (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-      Resource (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Resource (Resource const& s);
-
-      Resource&
-      operator= (Resource const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export Requirement : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // resourceType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // property
-      // 
-      public:
-      ::CIAO::Config_Handlers::Property const& property () const;
-      void property (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_;
-
-      public:
-      Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                   ::XMLSchema::string< ACE_TCHAR > const& name__,
-                   ::CIAO::Config_Handlers::Property const& property__);
-
-      Requirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Requirement (Requirement const& s);
-
-      Requirement&
-      operator= (Requirement const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ResourceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // requirementName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
-      void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
-
-      // resourceName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
-      void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
-
-      // resourceValue
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                     ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                     ::CIAO::Config_Handlers::Any const& resourceValue__);
-
-      ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ResourceDeploymentDescription (ResourceDeploymentDescription const& s);
-
-      ResourceDeploymentDescription&
-      operator= (ResourceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ArtifactDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // source
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
-      source_iterator begin_source ();
-      source_iterator end_source ();
-      source_const_iterator begin_source () const;
-      source_const_iterator end_source () const;
-      void add_source (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_source (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-      // node
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& node () const;
-      void node (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
-
-      // location
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
-      location_iterator begin_location ();
-      location_iterator end_location ();
-      location_const_iterator begin_location () const;
-      location_const_iterator end_location () const;
-      void add_location (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_location (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
-
-      // execParameter
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
-      execParameter_iterator begin_execParameter ();
-      execParameter_iterator end_execParameter ();
-      execParameter_const_iterator begin_execParameter () const;
-      execParameter_const_iterator end_execParameter () const;
-      void add_execParameter (::CIAO::Config_Handlers::Property const& );
-      size_t count_execParameter (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-      deployRequirement_iterator begin_deployRequirement ();
-      deployRequirement_iterator end_deployRequirement ();
-      deployRequirement_const_iterator begin_deployRequirement () const;
-      deployRequirement_const_iterator end_deployRequirement () const;
-      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-      size_t count_deployRequirement (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // deployedResource
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::iterator deployedResource_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
-      deployedResource_iterator begin_deployedResource ();
-      deployedResource_iterator end_deployedResource ();
-      deployedResource_const_iterator begin_deployedResource () const;
-      deployedResource_const_iterator end_deployedResource () const;
-      void add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& );
-      size_t count_deployedResource (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
-
-      // id
-      // 
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-      public:
-      ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                     ::XMLSchema::string< ACE_TCHAR > const& node__);
-
-      ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s);
-
-      ArtifactDeploymentDescription&
-      operator= (ArtifactDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export MonolithicDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // source
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
-      source_iterator begin_source ();
-      source_iterator end_source ();
-      source_const_iterator begin_source () const;
-      source_const_iterator end_source () const;
-      void add_source (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_source (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-      // artifact
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator artifact_iterator;
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator artifact_const_iterator;
-      artifact_iterator begin_artifact ();
-      artifact_iterator end_artifact ();
-      artifact_const_iterator begin_artifact () const;
-      artifact_const_iterator end_artifact () const;
-      void add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& );
-      size_t count_artifact (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > artifact_;
-
-      // execParameter
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
-      execParameter_iterator begin_execParameter ();
-      execParameter_iterator end_execParameter ();
-      execParameter_const_iterator begin_execParameter () const;
-      execParameter_const_iterator end_execParameter () const;
-      void add_execParameter (::CIAO::Config_Handlers::Property const& );
-      size_t count_execParameter (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-      deployRequirement_iterator begin_deployRequirement ();
-      deployRequirement_iterator end_deployRequirement ();
-      deployRequirement_const_iterator begin_deployRequirement () const;
-      deployRequirement_const_iterator end_deployRequirement () const;
-      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-      size_t count_deployRequirement (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // id
-      // 
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-      public:
-      MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-      MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      MonolithicDeploymentDescription (MonolithicDeploymentDescription const& s);
-
-      MonolithicDeploymentDescription&
-      operator= (MonolithicDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ResourceUsageKind : public ::XSCRT::Type
-    {
-      public:
-      ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-      static ResourceUsageKind const None;
-      static ResourceUsageKind const InstanceUsesResource;
-      static ResourceUsageKind const ResourceUsesInstance;
-      static ResourceUsageKind const PortUsesResource;
-      static ResourceUsageKind const ResourceUsesPort;
-
-      enum Value
-      {
-        None_l,InstanceUsesResource_l,ResourceUsesInstance_l,PortUsesResource_l,ResourceUsesPort_l
-      };
-
-
-      Value
-      integral () const;
-
-      friend bool XSC_XML_Handlers_Export 
-      operator== (ResourceUsageKind const& a, ResourceUsageKind const& b);
-
-      friend bool XSC_XML_Handlers_Export 
-      operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b);
-
-      private:
-      ResourceUsageKind (Value v);
-
-      Value v_;
-    };
-
-    bool XSC_XML_Handlers_Export operator== (ResourceUsageKind const &a, ResourceUsageKind const &b);
-
-    bool XSC_XML_Handlers_Export operator!= (ResourceUsageKind const &a, ResourceUsageKind const &b);
-
-
-    class XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // resourceUsage
-      // 
-      public:
-      ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
-      void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
-
-      // requirementName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
-      void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
-
-      // resourceName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
-      void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
-
-      // resourceValue
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-                                             ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                             ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                             ::CIAO::Config_Handlers::Any const& resourceValue__);
-
-      InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      InstanceResourceDeploymentDescription (InstanceResourceDeploymentDescription const& s);
-
-      InstanceResourceDeploymentDescription&
-      operator= (InstanceResourceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export InstanceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // node
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& node () const;
-      void node (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
-
-      // source
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& source () const;
-      void source (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-      // implementation
-      // 
-      public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& implementation () const;
-      void implementation (::XMLSchema::IDREF< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > implementation_;
-
-      // configProperty
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-      configProperty_iterator begin_configProperty ();
-      configProperty_iterator end_configProperty ();
-      configProperty_const_iterator begin_configProperty () const;
-      configProperty_const_iterator end_configProperty () const;
-      void add_configProperty (::CIAO::Config_Handlers::Property const& );
-      size_t count_configProperty (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // deployedResource
-      // 
-      public:
-      bool deployedResource_p () const;
-      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
-      void deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
-
-      // deployedSharedResource
-      // 
-      public:
-      bool deployedSharedResource_p () const;
-      ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
-      void deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
-
-      // id
-      // 
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-      public:
-      InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                     ::XMLSchema::string< ACE_TCHAR > const& node__,
-                                     ::XMLSchema::string< ACE_TCHAR > const& source__,
-                                     ::XMLSchema::IDREF< ACE_TCHAR > const& implementation__);
-
-      InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      InstanceDeploymentDescription (InstanceDeploymentDescription const& s);
-
-      InstanceDeploymentDescription&
-      operator= (InstanceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export CCMComponentPortKind : public ::XSCRT::Type
-    {
-      public:
-      CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-      static CCMComponentPortKind const Facet;
-      static CCMComponentPortKind const SimplexReceptacle;
-      static CCMComponentPortKind const MultiplexReceptacle;
-      static CCMComponentPortKind const EventEmitter;
-      static CCMComponentPortKind const EventPublisher;
-      static CCMComponentPortKind const EventConsumer;
-
-      enum Value
-      {
-        Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l
-      };
-
-
-      Value
-      integral () const;
-
-      friend bool XSC_XML_Handlers_Export 
-      operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
-
-      friend bool XSC_XML_Handlers_Export 
-      operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
-
-      private:
-      CCMComponentPortKind (Value v);
-
-      Value v_;
-    };
-
-    bool XSC_XML_Handlers_Export operator== (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
-
-    bool XSC_XML_Handlers_Export operator!= (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
-
-
-    class XSC_XML_Handlers_Export ComponentPortDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // specificType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& specificType () const;
-      void specificType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
-
-      // supportedType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& supportedType () const;
-      void supportedType (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
+// resourceType
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator;
+resourceType_iterator begin_resourceType ();
+resourceType_iterator end_resourceType ();
+resourceType_const_iterator begin_resourceType () const;
+resourceType_const_iterator end_resourceType () const;
+void add_resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_resourceType (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::SatisfierProperty const& );
+size_t count_property (void) const;
 
-      // provider
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& provider () const;
-      void provider (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
+public:
+Resource (::XMLSchema::string< ACE_TCHAR > const& name__);
 
-      // exclusiveProvider
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& exclusiveProvider () const;
-      void exclusiveProvider (::XMLSchema::string< ACE_TCHAR > const& );
+Resource (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Resource (Resource const& s);
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > exclusiveProvider_;
+Resource&
+operator= (Resource const& s);
 
-      // exclusiveUser
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& exclusiveUser () const;
-      void exclusiveUser (::XMLSchema::string< ACE_TCHAR > const& );
+private:
+char regulator__;
+};
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > exclusiveUser_;
 
-      // optional
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& optional () const;
-      void optional (::XMLSchema::string< ACE_TCHAR > const& );
+class XSC_XML_Handlers_Export Requirement : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > optional_;
+// resourceType
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
+void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
 
-      // kind
-      // 
-      public:
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      public:
-      ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                ::XMLSchema::string< ACE_TCHAR > const& specificType__,
-                                ::XMLSchema::string< ACE_TCHAR > const& supportedType__,
-                                ::XMLSchema::string< ACE_TCHAR > const& provider__,
-                                ::XMLSchema::string< ACE_TCHAR > const& exclusiveProvider__,
-                                ::XMLSchema::string< ACE_TCHAR > const& exclusiveUser__,
-                                ::XMLSchema::string< ACE_TCHAR > const& optional__,
-                                ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-      ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentPortDescription (ComponentPortDescription const& s);
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::Property const& );
+size_t count_property (void) const;
 
-      ComponentPortDescription&
-      operator= (ComponentPortDescription const& s);
-
-      private:
-      char regulator__;
-    };
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > property_;
 
+public:
+Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+::XMLSchema::string< ACE_TCHAR > const& name__);
 
-    class XSC_XML_Handlers_Export ComponentPropertyDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // type
-      // 
-      public:
-      ::CIAO::Config_Handlers::DataType const& type () const;
-      void type (::CIAO::Config_Handlers::DataType const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
-
-      public:
-      ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                    ::CIAO::Config_Handlers::DataType const& type__);
-
-      ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentPropertyDescription (ComponentPropertyDescription const& s);
-
-      ComponentPropertyDescription&
-      operator= (ComponentPropertyDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
+Requirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Requirement (Requirement const& s);
 
-    class XSC_XML_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+Requirement&
+operator= (Requirement const& s);
 
-      // portName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
-      void portName (::XMLSchema::string< ACE_TCHAR > const& );
+private:
+char regulator__;
+};
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
 
-      public:
-      ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__);
+class XSC_XML_Handlers_Export ResourceDeploymentDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s);
+// requirementName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
 
-      ComponentExternalPortEndpoint&
-      operator= (ComponentExternalPortEndpoint const& s);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
 
-      private:
-      char regulator__;
-    };
+// resourceName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
+void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
 
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
 
-    class XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::Property const& );
+size_t count_property (void) const;
 
-      // portName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
-      void portName (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > property_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+public:
+ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+::XMLSchema::string< ACE_TCHAR > const& resourceName__);
 
-      // provider
-      // 
-      public:
-      bool provider_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& provider () const;
-      void provider (::XMLSchema::string< ACE_TCHAR > const& );
+ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ResourceDeploymentDescription (ResourceDeploymentDescription const& s);
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
+ResourceDeploymentDescription&
+operator= (ResourceDeploymentDescription const& s);
 
-      // kind
-      // 
-      public:
-      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
-      void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+private:
+char regulator__;
+};
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
-      // instance
-      // 
-      public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+class XSC_XML_Handlers_Export ArtifactDeploymentDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      public:
-      PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                                    ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-                                    ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
-      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
+// source
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
+source_iterator begin_source ();
+source_iterator end_source ();
+source_const_iterator begin_source () const;
+source_const_iterator end_source () const;
+void add_source (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_source (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+// node
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& node () const;
+void node (::XMLSchema::string< ACE_TCHAR > const& );
 
-      PlanSubcomponentPortEndpoint&
-      operator= (PlanSubcomponentPortEndpoint const& s);
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
 
-      private:
-      char regulator__;
-    };
+// location
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
+location_iterator begin_location ();
+location_iterator end_location ();
+location_const_iterator begin_location () const;
+location_const_iterator end_location () const;
+void add_location (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_location (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+// execParameter
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
+execParameter_iterator begin_execParameter ();
+execParameter_iterator end_execParameter ();
+execParameter_const_iterator begin_execParameter () const;
+execParameter_const_iterator end_execParameter () const;
+void add_execParameter (::CIAO::Config_Handlers::Property const& );
+size_t count_execParameter (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
+
+// deployRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+deployRequirement_iterator begin_deployRequirement ();
+deployRequirement_iterator end_deployRequirement ();
+deployRequirement_const_iterator begin_deployRequirement () const;
+deployRequirement_const_iterator end_deployRequirement () const;
+void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+size_t count_deployRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+// deployedResource
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::iterator deployedResource_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
+deployedResource_iterator begin_deployedResource ();
+deployedResource_iterator end_deployedResource ();
+deployedResource_const_iterator begin_deployedResource () const;
+deployedResource_const_iterator end_deployedResource () const;
+void add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& );
+size_t count_deployedResource (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
+
+// id
+//
+public:
+bool id_p () const;
+::XMLSchema::ID< ACE_TCHAR > const& id () const;
+::XMLSchema::ID< ACE_TCHAR >& id ();
+void id (::XMLSchema::ID< ACE_TCHAR > const& );
 
+protected:
+::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
 
-    class XSC_XML_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+public:
+ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& node__);
 
-      // location
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& location () const;
-      void location (::XMLSchema::string< ACE_TCHAR > const& );
+ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s);
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_;
+ArtifactDeploymentDescription&
+operator= (ArtifactDeploymentDescription const& s);
 
-      public:
-      ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__);
-
-      ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s);
-
-      ExternalReferenceEndpoint&
-      operator= (ExternalReferenceEndpoint const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // targetName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& targetName () const;
-      void targetName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > targetName_;
-
-      // requirementName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
-      void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
-
-      // resourceName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
-      void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
-
-      // resourceValue
-      // 
-      public:
-      ::CIAO::Config_Handlers::Any const& resourceValue () const;
-      void resourceValue (::CIAO::Config_Handlers::Any const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_;
-
-      public:
-      ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
-                                               ::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                               ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                               ::CIAO::Config_Handlers::Any const& resourceValue__);
-
-      ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s);
-
-      ConnectionResourceDeploymentDescription&
-      operator= (ConnectionResourceDeploymentDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export PlanConnectionDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // source
-      // 
-      public:
-      bool source_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& source () const;
-      void source (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
-
-      // deployRequirement
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
-      deployRequirement_iterator begin_deployRequirement ();
-      deployRequirement_iterator end_deployRequirement ();
-      deployRequirement_const_iterator begin_deployRequirement () const;
-      deployRequirement_const_iterator end_deployRequirement () const;
-      void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-      size_t count_deployRequirement (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // externalEndpoint
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
-      externalEndpoint_iterator begin_externalEndpoint ();
-      externalEndpoint_iterator end_externalEndpoint ();
-      externalEndpoint_const_iterator begin_externalEndpoint () const;
-      externalEndpoint_const_iterator end_externalEndpoint () const;
-      void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
-      size_t count_externalEndpoint (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
-
-      // internalEndpoint
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
-      internalEndpoint_iterator begin_internalEndpoint ();
-      internalEndpoint_iterator end_internalEndpoint ();
-      internalEndpoint_const_iterator begin_internalEndpoint () const;
-      internalEndpoint_const_iterator end_internalEndpoint () const;
-      void add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& );
-      size_t count_internalEndpoint (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_;
-
-      // externalReference
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
-      externalReference_iterator begin_externalReference ();
-      externalReference_iterator end_externalReference ();
-      externalReference_const_iterator begin_externalReference () const;
-      externalReference_const_iterator end_externalReference () const;
-      void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
-      size_t count_externalReference (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
-
-      // deployedResource
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::iterator deployedResource_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
-      deployedResource_iterator begin_deployedResource ();
-      deployedResource_iterator end_deployedResource ();
-      deployedResource_const_iterator begin_deployedResource () const;
-      deployedResource_const_iterator end_deployedResource () const;
-      void add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& );
-      size_t count_deployedResource (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > deployedResource_;
-
-      public:
-      PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-      PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      PlanConnectionDescription (PlanConnectionDescription const& s);
-
-      PlanConnectionDescription&
-      operator= (PlanConnectionDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ImplementationDependency : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // requiredType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
-      void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
-
-      public:
-      ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
-
-      ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ImplementationDependency (ImplementationDependency const& s);
-
-      ImplementationDependency&
-      operator= (ImplementationDependency const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export Capability : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // resourceType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
-
-      // property
-      // 
-      public:
-      ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
-      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
-
-      public:
-      Capability (::XMLSchema::string< ACE_TCHAR > const& name__,
-                  ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                  ::CIAO::Config_Handlers::SatisfierProperty const& property__);
-
-      Capability (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Capability (Capability const& s);
+private:
+char regulator__;
+};
 
-      Capability&
-      operator= (Capability const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ImplementationRequirement : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
 
-      // resourceUsage
-      // 
-      public:
-      ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
-      void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+class XSC_XML_Handlers_Export MonolithicDeploymentDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
 
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
-
-      // resourcePort
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourcePort () const;
-      void resourcePort (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourcePort_;
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// source
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator;
+source_iterator begin_source ();
+source_iterator end_source ();
+source_const_iterator begin_source () const;
+source_const_iterator end_source () const;
+void add_source (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_source (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+// artifact
+//
+public:
+typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator artifact_iterator;
+typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator artifact_const_iterator;
+artifact_iterator begin_artifact ();
+artifact_iterator end_artifact ();
+artifact_const_iterator begin_artifact () const;
+artifact_const_iterator end_artifact () const;
+void add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& );
+size_t count_artifact (void) const;
+
+protected:
+::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > artifact_;
+
+// execParameter
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
+execParameter_iterator begin_execParameter ();
+execParameter_iterator end_execParameter ();
+execParameter_const_iterator begin_execParameter () const;
+execParameter_const_iterator end_execParameter () const;
+void add_execParameter (::CIAO::Config_Handlers::Property const& );
+size_t count_execParameter (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
+
+// deployRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+deployRequirement_iterator begin_deployRequirement ();
+deployRequirement_iterator end_deployRequirement ();
+deployRequirement_const_iterator begin_deployRequirement () const;
+deployRequirement_const_iterator end_deployRequirement () const;
+void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+size_t count_deployRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+// id
+//
+public:
+bool id_p () const;
+::XMLSchema::ID< ACE_TCHAR > const& id () const;
+::XMLSchema::ID< ACE_TCHAR >& id ();
+void id (::XMLSchema::ID< ACE_TCHAR > const& );
 
-      // componentPort
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& componentPort () const;
-      void componentPort (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > componentPort_;
+public:
+MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
 
-      // resourceType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+MonolithicDeploymentDescription (MonolithicDeploymentDescription const& s);
+
+MonolithicDeploymentDescription&
+operator= (MonolithicDeploymentDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ResourceUsageKind : public ::XSCRT::Type
+{
+public:
+ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ResourceUsageKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+static ResourceUsageKind const None;
+static ResourceUsageKind const InstanceUsesResource;
+static ResourceUsageKind const ResourceUsesInstance;
+static ResourceUsageKind const PortUsesResource;
+static ResourceUsageKind const ResourceUsesPort;
+
+enum Value
+{
+None_l,InstanceUsesResource_l,ResourceUsesInstance_l,PortUsesResource_l,ResourceUsesPort_l,
+};
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
 
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // property
-      // 
-      public:
-      ::CIAO::Config_Handlers::Property const& property () const;
-      void property (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_;
-
-      public:
-      ImplementationRequirement (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& resourcePort__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& componentPort__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& name__,
-                                 ::CIAO::Config_Handlers::Property const& property__);
-
-      ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ImplementationRequirement (ImplementationRequirement const& s);
-
-      ImplementationRequirement&
-      operator= (ImplementationRequirement const& s);
-
-      private:
-      char regulator__;
-    };
+Value
+integral () const;
 
+friend bool XSC_XML_Handlers_Export
+operator== (ResourceUsageKind const& a, ResourceUsageKind const& b);
+
+friend bool XSC_XML_Handlers_Export
+operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b);
+
+private:
+ResourceUsageKind (Value v);
+
+Value v_;
+};
+
+bool XSC_XML_Handlers_Export operator== (ResourceUsageKind const &a, ResourceUsageKind const &b);
+
+bool XSC_XML_Handlers_Export operator!= (ResourceUsageKind const &a, ResourceUsageKind const &b);
+
+
+class XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// resourceUsage
+//
+public:
+::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
+void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
+
+// requirementName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+
+// resourceName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
+void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
 
-    class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // requiredUUID
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requiredUUID () const;
-      void requiredUUID (::XMLSchema::string< ACE_TCHAR > const& );
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
 
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredUUID_;
-
-      // requiredName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requiredName () const;
-      void requiredName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredName_;
-
-      // requiredType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
-      void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
-
-      public:
-      ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredUUID__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& requiredType__);
-
-      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentPackageReference (ComponentPackageReference const& s);
-
-      ComponentPackageReference&
-      operator= (ComponentPackageReference const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export SubcomponentPortEndpoint : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // portName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
-      void portName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
-
-      // instance
-      // 
-      public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
-
-      public:
-      SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                                ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
-
-      SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s);
-
-      SubcomponentPortEndpoint&
-      operator= (SubcomponentPortEndpoint const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export AssemblyConnectionDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // externalEndpoint
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
-      externalEndpoint_iterator begin_externalEndpoint ();
-      externalEndpoint_iterator end_externalEndpoint ();
-      externalEndpoint_const_iterator begin_externalEndpoint () const;
-      externalEndpoint_const_iterator end_externalEndpoint () const;
-      void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
-      size_t count_externalEndpoint (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
-
-      // internalEndpoint
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
-      internalEndpoint_iterator begin_internalEndpoint ();
-      internalEndpoint_iterator end_internalEndpoint ();
-      internalEndpoint_const_iterator begin_internalEndpoint () const;
-      internalEndpoint_const_iterator end_internalEndpoint () const;
-      void add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& );
-      size_t count_internalEndpoint (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_;
-
-      // externalReference
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
-      externalReference_iterator begin_externalReference ();
-      externalReference_iterator end_externalReference ();
-      externalReference_const_iterator begin_externalReference () const;
-      externalReference_const_iterator end_externalReference () const;
-      void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
-      size_t count_externalReference (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
-
-      public:
-      AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-      AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      AssemblyConnectionDescription (AssemblyConnectionDescription const& s);
-
-      AssemblyConnectionDescription&
-      operator= (AssemblyConnectionDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::Property const& );
+size_t count_property (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+public:
+InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__,
+::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+
+InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+InstanceResourceDeploymentDescription (InstanceResourceDeploymentDescription const& s);
+
+InstanceResourceDeploymentDescription&
+operator= (InstanceResourceDeploymentDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export InstanceDeploymentDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// node
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& node () const;
+void node (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
+
+// source
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& source () const;
+void source (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+// implementation
+//
+public:
+::XMLSchema::IDREF< ACE_TCHAR > const& implementation () const;
+void implementation (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > implementation_;
+
+// configProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+configProperty_iterator begin_configProperty ();
+configProperty_iterator end_configProperty ();
+configProperty_const_iterator begin_configProperty () const;
+configProperty_const_iterator end_configProperty () const;
+void add_configProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_configProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+// deployedResource
+//
+public:
+bool deployedResource_p () const;
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
+void deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
+
+// deployedSharedResource
+//
+public:
+bool deployedSharedResource_p () const;
+::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
+void deployedSharedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
+
+// id
+//
+public:
+bool id_p () const;
+::XMLSchema::ID< ACE_TCHAR > const& id () const;
+::XMLSchema::ID< ACE_TCHAR >& id ();
+void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+public:
+InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& node__,
+::XMLSchema::string< ACE_TCHAR > const& source__,
+::XMLSchema::IDREF< ACE_TCHAR > const& implementation__);
+
+InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+InstanceDeploymentDescription (InstanceDeploymentDescription const& s);
+
+InstanceDeploymentDescription&
+operator= (InstanceDeploymentDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export CCMComponentPortKind : public ::XSCRT::Type
+{
+public:
+CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+static CCMComponentPortKind const Facet;
+static CCMComponentPortKind const SimplexReceptacle;
+static CCMComponentPortKind const MultiplexReceptacle;
+static CCMComponentPortKind const EventEmitter;
+static CCMComponentPortKind const EventPublisher;
+static CCMComponentPortKind const EventConsumer;
+
+enum Value
+{
+Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l,
+};
+
+
+Value
+integral () const;
+
+friend bool XSC_XML_Handlers_Export
+operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
+
+friend bool XSC_XML_Handlers_Export
+operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
+
+private:
+CCMComponentPortKind (Value v);
+
+Value v_;
+};
+
+bool XSC_XML_Handlers_Export operator== (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+
+bool XSC_XML_Handlers_Export operator!= (CCMComponentPortKind const &a, CCMComponentPortKind const &b);
+
+
+class XSC_XML_Handlers_Export ComponentPortDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// specificType
+//
+public:
+bool specificType_p () const;
+::XMLSchema::string< ACE_TCHAR > const& specificType () const;
+void specificType (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
+
+// supportedType
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator;
+supportedType_iterator begin_supportedType ();
+supportedType_iterator end_supportedType ();
+supportedType_const_iterator begin_supportedType () const;
+supportedType_const_iterator end_supportedType () const;
+void add_supportedType (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_supportedType (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
+
+// provider
+//
+public:
+::XMLSchema::boolean const& provider () const;
+void provider (::XMLSchema::boolean const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > provider_;
+
+// exclusiveProvider
+//
+public:
+::XMLSchema::boolean const& exclusiveProvider () const;
+void exclusiveProvider (::XMLSchema::boolean const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > exclusiveProvider_;
+
+// exclusiveUser
+//
+public:
+::XMLSchema::boolean const& exclusiveUser () const;
+void exclusiveUser (::XMLSchema::boolean const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > exclusiveUser_;
+
+// optional
+//
+public:
+::XMLSchema::boolean const& optional () const;
+void optional (::XMLSchema::boolean const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::boolean > optional_;
+
+// kind
+//
+public:
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
+void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
+
+public:
+ComponentPortDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::boolean const& provider__,
+::XMLSchema::boolean const& exclusiveProvider__,
+::XMLSchema::boolean const& exclusiveUser__,
+::XMLSchema::boolean const& optional__,
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind__);
+
+ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentPortDescription (ComponentPortDescription const& s);
+
+ComponentPortDescription&
+operator= (ComponentPortDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ComponentPropertyDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// type
+//
+public:
+::CIAO::Config_Handlers::DataType const& type () const;
+void type (::CIAO::Config_Handlers::DataType const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
+
+public:
+ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::DataType const& type__);
+
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentPropertyDescription (ComponentPropertyDescription const& s);
+
+ComponentPropertyDescription&
+operator= (ComponentPropertyDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ComponentExternalPortEndpoint : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// portName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& portName () const;
+void portName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+
+public:
+ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__);
+
+ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s);
+
+ComponentExternalPortEndpoint&
+operator= (ComponentExternalPortEndpoint const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// portName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& portName () const;
+void portName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+
+// provider
+//
+public:
+bool provider_p () const;
+::XMLSchema::string< ACE_TCHAR > const& provider () const;
+void provider (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
+
+// kind
+//
+public:
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
+void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
+
+// instance
+//
+public:
+::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
+void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+
+public:
+PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
+::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+
+PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
+
+PlanSubcomponentPortEndpoint&
+operator= (PlanSubcomponentPortEndpoint const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ExternalReferenceEndpoint : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// location
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& location () const;
+void location (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+public:
+ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__);
+
+ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s);
+
+ExternalReferenceEndpoint&
+operator= (ExternalReferenceEndpoint const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// targetName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& targetName () const;
+void targetName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > targetName_;
+
+// requirementName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
+void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
+
+// resourceName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
+void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
+
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::Property const& );
+size_t count_property (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+public:
+ConnectionResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& targetName__,
+::XMLSchema::string< ACE_TCHAR > const& requirementName__,
+::XMLSchema::string< ACE_TCHAR > const& resourceName__);
+
+ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s);
+
+ConnectionResourceDeploymentDescription&
+operator= (ConnectionResourceDeploymentDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export PlanConnectionDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// source
+//
+public:
+bool source_p () const;
+::XMLSchema::string< ACE_TCHAR > const& source () const;
+void source (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
+
+// deployRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+deployRequirement_iterator begin_deployRequirement ();
+deployRequirement_iterator end_deployRequirement ();
+deployRequirement_const_iterator begin_deployRequirement () const;
+deployRequirement_const_iterator end_deployRequirement () const;
+void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+size_t count_deployRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+// externalEndpoint
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
+externalEndpoint_iterator begin_externalEndpoint ();
+externalEndpoint_iterator end_externalEndpoint ();
+externalEndpoint_const_iterator begin_externalEndpoint () const;
+externalEndpoint_const_iterator end_externalEndpoint () const;
+void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
+size_t count_externalEndpoint (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
+
+// internalEndpoint
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
+internalEndpoint_iterator begin_internalEndpoint ();
+internalEndpoint_iterator end_internalEndpoint ();
+internalEndpoint_const_iterator begin_internalEndpoint () const;
+internalEndpoint_const_iterator end_internalEndpoint () const;
+void add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& );
+size_t count_internalEndpoint (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_;
+
+// externalReference
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
+externalReference_iterator begin_externalReference ();
+externalReference_iterator end_externalReference ();
+externalReference_const_iterator begin_externalReference () const;
+externalReference_const_iterator end_externalReference () const;
+void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
+size_t count_externalReference (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
+
+// deployedResource
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::iterator deployedResource_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::const_iterator deployedResource_const_iterator;
+deployedResource_iterator begin_deployedResource ();
+deployedResource_iterator end_deployedResource ();
+deployedResource_const_iterator begin_deployedResource () const;
+deployedResource_const_iterator end_deployedResource () const;
+void add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& );
+size_t count_deployedResource (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > deployedResource_;
+
+public:
+PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+PlanConnectionDescription (PlanConnectionDescription const& s);
+
+PlanConnectionDescription&
+operator= (PlanConnectionDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ImplementationDependency : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// requiredType
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
+void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
+
+public:
+ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
+
+ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ImplementationDependency (ImplementationDependency const& s);
+
+ImplementationDependency&
+operator= (ImplementationDependency const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export Capability : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// resourceType
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator;
+resourceType_iterator begin_resourceType ();
+resourceType_iterator end_resourceType ();
+resourceType_const_iterator begin_resourceType () const;
+resourceType_const_iterator end_resourceType () const;
+void add_resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_resourceType (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::SatisfierProperty const& );
+size_t count_property (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+
+public:
+Capability (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+Capability (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Capability (Capability const& s);
+
+Capability&
+operator= (Capability const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ImplementationRequirement : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// resourceUsage
+//
+public:
+bool resourceUsage_p () const;
+::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
+void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
+
+// resourcePort
+//
+public:
+bool resourcePort_p () const;
+::XMLSchema::string< ACE_TCHAR > const& resourcePort () const;
+void resourcePort (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourcePort_;
+
+// componentPort
+//
+public:
+bool componentPort_p () const;
+::XMLSchema::string< ACE_TCHAR > const& componentPort () const;
+void componentPort (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > componentPort_;
+
+// resourceType
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
+void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::Property const& );
+size_t count_property (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > property_;
+
+public:
+ImplementationRequirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+::XMLSchema::string< ACE_TCHAR > const& name__);
+
+ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ImplementationRequirement (ImplementationRequirement const& s);
+
+ImplementationRequirement&
+operator= (ImplementationRequirement const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// requiredUUID
+//
+public:
+bool requiredUUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& requiredUUID () const;
+void requiredUUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredUUID_;
+
+// requiredName
+//
+public:
+bool requiredName_p () const;
+::XMLSchema::string< ACE_TCHAR > const& requiredName () const;
+void requiredName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredName_;
+
+// requiredType
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
+void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
+
+public:
+ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
+
+ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentPackageReference (ComponentPackageReference const& s);
+
+ComponentPackageReference&
+operator= (ComponentPackageReference const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export SubcomponentPortEndpoint : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// portName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& portName () const;
+void portName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+
+// instance
+//
+public:
+::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
+void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+
+public:
+SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
+::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+
+SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
+SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s);
+
+SubcomponentPortEndpoint&
+operator= (SubcomponentPortEndpoint const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export AssemblyConnectionDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// deployRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+deployRequirement_iterator begin_deployRequirement ();
+deployRequirement_iterator end_deployRequirement ();
+deployRequirement_const_iterator begin_deployRequirement () const;
+deployRequirement_const_iterator end_deployRequirement () const;
+void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+size_t count_deployRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+// internalEndpoint
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
+internalEndpoint_iterator begin_internalEndpoint ();
+internalEndpoint_iterator end_internalEndpoint ();
+internalEndpoint_const_iterator begin_internalEndpoint () const;
+internalEndpoint_const_iterator end_internalEndpoint () const;
+void add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& );
+size_t count_internalEndpoint (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_;
+
+// externalEndpoint
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
+externalEndpoint_iterator begin_externalEndpoint ();
+externalEndpoint_iterator end_externalEndpoint ();
+externalEndpoint_const_iterator begin_externalEndpoint () const;
+externalEndpoint_const_iterator end_externalEndpoint () const;
+void add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& );
+size_t count_externalEndpoint (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
+
+// externalReference
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
+externalReference_iterator begin_externalReference ();
+externalReference_iterator end_externalReference ();
+externalReference_const_iterator begin_externalReference () const;
+externalReference_const_iterator end_externalReference () const;
+void add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& );
+size_t count_externalReference (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
+
+public:
+AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+AssemblyConnectionDescription (AssemblyConnectionDescription const& s);
+
+AssemblyConnectionDescription&
+operator= (AssemblyConnectionDescription const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
-      TCKind;
+namespace Config_Handlers
+{
+namespace Traversal
+{
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
+TCKind;
+
+struct XSC_XML_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+kind (Type&);
+
+virtual void
+kind (Type const&);
+
+virtual void
+enum_ (Type&);
+
+virtual void
+enum_ (Type const&);
+
+virtual void
+enum_none (Type&);
+
+virtual void
+enum_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
 
-      struct XSC_XML_Handlers_Export DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+short_ (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+short_ (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+short_pre (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+short_pre (Type const&);
 
-        virtual void
-        kind (Type&);
+virtual void
+short_next (Type&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+short_next (Type const&);
 
-        virtual void
-        enum_ (Type&);
+virtual void
+short_post (Type&);
 
-        virtual void
-        enum_ (Type const&);
+virtual void
+short_post (Type const&);
 
-        virtual void
-        enum_none (Type&);
+virtual void
+short_none (Type&);
 
-        virtual void
-        enum_none (Type const&);
+virtual void
+short_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+long_ (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+long_ (Type const&);
 
-      struct XSC_XML_Handlers_Export DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+long_pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+long_pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+long_next (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+long_next (Type const&);
 
-        virtual void
-        short_ (Type&);
+virtual void
+long_post (Type&);
 
-        virtual void
-        short_ (Type const&);
+virtual void
+long_post (Type const&);
 
-        virtual void
-        short_pre (Type&);
+virtual void
+long_none (Type&);
 
-        virtual void
-        short_pre (Type const&);
+virtual void
+long_none (Type const&);
 
-        virtual void
-        short_next (Type&);
+virtual void
+ushort (Type&);
 
-        virtual void
-        short_next (Type const&);
+virtual void
+ushort (Type const&);
 
-        virtual void
-        short_post (Type&);
+virtual void
+ushort_pre (Type&);
 
-        virtual void
-        short_post (Type const&);
+virtual void
+ushort_pre (Type const&);
 
-        virtual void
-        short_none (Type&);
+virtual void
+ushort_next (Type&);
 
-        virtual void
-        short_none (Type const&);
+virtual void
+ushort_next (Type const&);
 
-        virtual void
-        long_ (Type&);
+virtual void
+ushort_post (Type&);
 
-        virtual void
-        long_ (Type const&);
+virtual void
+ushort_post (Type const&);
 
-        virtual void
-        long_pre (Type&);
+virtual void
+ushort_none (Type&);
 
-        virtual void
-        long_pre (Type const&);
+virtual void
+ushort_none (Type const&);
 
-        virtual void
-        long_next (Type&);
+virtual void
+ulong (Type&);
 
-        virtual void
-        long_next (Type const&);
+virtual void
+ulong (Type const&);
 
-        virtual void
-        long_post (Type&);
+virtual void
+ulong_pre (Type&);
 
-        virtual void
-        long_post (Type const&);
+virtual void
+ulong_pre (Type const&);
 
-        virtual void
-        long_none (Type&);
+virtual void
+ulong_next (Type&);
 
-        virtual void
-        long_none (Type const&);
+virtual void
+ulong_next (Type const&);
 
-        virtual void
-        ushort (Type&);
+virtual void
+ulong_post (Type&);
 
-        virtual void
-        ushort (Type const&);
+virtual void
+ulong_post (Type const&);
 
-        virtual void
-        ushort_pre (Type&);
+virtual void
+ulong_none (Type&);
 
-        virtual void
-        ushort_pre (Type const&);
+virtual void
+ulong_none (Type const&);
 
-        virtual void
-        ushort_next (Type&);
+virtual void
+float_ (Type&);
 
-        virtual void
-        ushort_next (Type const&);
+virtual void
+float_ (Type const&);
 
-        virtual void
-        ushort_post (Type&);
+virtual void
+float_pre (Type&);
 
-        virtual void
-        ushort_post (Type const&);
+virtual void
+float_pre (Type const&);
 
-        virtual void
-        ushort_none (Type&);
+virtual void
+float_next (Type&);
 
-        virtual void
-        ushort_none (Type const&);
+virtual void
+float_next (Type const&);
 
-        virtual void
-        ulong (Type&);
+virtual void
+float_post (Type&);
 
-        virtual void
-        ulong (Type const&);
+virtual void
+float_post (Type const&);
 
-        virtual void
-        ulong_pre (Type&);
+virtual void
+float_none (Type&);
 
-        virtual void
-        ulong_pre (Type const&);
+virtual void
+float_none (Type const&);
 
-        virtual void
-        ulong_next (Type&);
+virtual void
+double_ (Type&);
 
-        virtual void
-        ulong_next (Type const&);
+virtual void
+double_ (Type const&);
 
-        virtual void
-        ulong_post (Type&);
+virtual void
+double_pre (Type&);
 
-        virtual void
-        ulong_post (Type const&);
+virtual void
+double_pre (Type const&);
 
-        virtual void
-        ulong_none (Type&);
+virtual void
+double_next (Type&);
 
-        virtual void
-        ulong_none (Type const&);
+virtual void
+double_next (Type const&);
 
-        virtual void
-        float_ (Type&);
+virtual void
+double_post (Type&);
 
-        virtual void
-        float_ (Type const&);
+virtual void
+double_post (Type const&);
 
-        virtual void
-        float_pre (Type&);
+virtual void
+double_none (Type&);
 
-        virtual void
-        float_pre (Type const&);
+virtual void
+double_none (Type const&);
 
-        virtual void
-        float_next (Type&);
+virtual void
+boolean (Type&);
 
-        virtual void
-        float_next (Type const&);
+virtual void
+boolean (Type const&);
 
-        virtual void
-        float_post (Type&);
+virtual void
+boolean_pre (Type&);
 
-        virtual void
-        float_post (Type const&);
+virtual void
+boolean_pre (Type const&);
 
-        virtual void
-        float_none (Type&);
+virtual void
+boolean_next (Type&);
 
-        virtual void
-        float_none (Type const&);
+virtual void
+boolean_next (Type const&);
 
-        virtual void
-        double_ (Type&);
+virtual void
+boolean_post (Type&);
 
-        virtual void
-        double_ (Type const&);
+virtual void
+boolean_post (Type const&);
 
-        virtual void
-        double_pre (Type&);
+virtual void
+boolean_none (Type&);
 
-        virtual void
-        double_pre (Type const&);
+virtual void
+boolean_none (Type const&);
 
-        virtual void
-        double_next (Type&);
+virtual void
+octet (Type&);
 
-        virtual void
-        double_next (Type const&);
+virtual void
+octet (Type const&);
 
-        virtual void
-        double_post (Type&);
+virtual void
+octet_pre (Type&);
 
-        virtual void
-        double_post (Type const&);
+virtual void
+octet_pre (Type const&);
 
-        virtual void
-        double_none (Type&);
+virtual void
+octet_next (Type&);
 
-        virtual void
-        double_none (Type const&);
+virtual void
+octet_next (Type const&);
 
-        virtual void
-        boolean (Type&);
+virtual void
+octet_post (Type&);
 
-        virtual void
-        boolean (Type const&);
+virtual void
+octet_post (Type const&);
 
-        virtual void
-        boolean_pre (Type&);
+virtual void
+octet_none (Type&);
 
-        virtual void
-        boolean_pre (Type const&);
+virtual void
+octet_none (Type const&);
 
-        virtual void
-        boolean_next (Type&);
+virtual void
+enum_ (Type&);
 
-        virtual void
-        boolean_next (Type const&);
+virtual void
+enum_ (Type const&);
 
-        virtual void
-        boolean_post (Type&);
+virtual void
+enum_pre (Type&);
 
-        virtual void
-        boolean_post (Type const&);
+virtual void
+enum_pre (Type const&);
 
-        virtual void
-        boolean_none (Type&);
+virtual void
+enum_next (Type&);
 
-        virtual void
-        boolean_none (Type const&);
+virtual void
+enum_next (Type const&);
 
-        virtual void
-        octet (Type&);
+virtual void
+enum_post (Type&);
 
-        virtual void
-        octet (Type const&);
+virtual void
+enum_post (Type const&);
 
-        virtual void
-        octet_pre (Type&);
+virtual void
+enum_none (Type&);
 
-        virtual void
-        octet_pre (Type const&);
+virtual void
+enum_none (Type const&);
 
-        virtual void
-        octet_next (Type&);
+virtual void
+string (Type&);
 
-        virtual void
-        octet_next (Type const&);
+virtual void
+string (Type const&);
 
-        virtual void
-        octet_post (Type&);
+virtual void
+string_pre (Type&);
 
-        virtual void
-        octet_post (Type const&);
+virtual void
+string_pre (Type const&);
 
-        virtual void
-        octet_none (Type&);
+virtual void
+string_next (Type&);
 
-        virtual void
-        octet_none (Type const&);
+virtual void
+string_next (Type const&);
 
-        virtual void
-        enum_ (Type&);
+virtual void
+string_post (Type&);
 
-        virtual void
-        enum_ (Type const&);
+virtual void
+string_post (Type const&);
 
-        virtual void
-        enum_pre (Type&);
+virtual void
+string_none (Type&);
 
-        virtual void
-        enum_pre (Type const&);
+virtual void
+string_none (Type const&);
 
-        virtual void
-        enum_next (Type&);
+virtual void
+longlong (Type&);
 
-        virtual void
-        enum_next (Type const&);
+virtual void
+longlong (Type const&);
 
-        virtual void
-        enum_post (Type&);
+virtual void
+longlong_pre (Type&);
 
-        virtual void
-        enum_post (Type const&);
+virtual void
+longlong_pre (Type const&);
 
-        virtual void
-        enum_none (Type&);
+virtual void
+longlong_next (Type&);
 
-        virtual void
-        enum_none (Type const&);
+virtual void
+longlong_next (Type const&);
 
-        virtual void
-        string (Type&);
+virtual void
+longlong_post (Type&);
 
-        virtual void
-        string (Type const&);
+virtual void
+longlong_post (Type const&);
 
-        virtual void
-        string_pre (Type&);
+virtual void
+longlong_none (Type&);
 
-        virtual void
-        string_pre (Type const&);
+virtual void
+longlong_none (Type const&);
 
-        virtual void
-        string_next (Type&);
+virtual void
+ulonglong (Type&);
 
-        virtual void
-        string_next (Type const&);
+virtual void
+ulonglong (Type const&);
 
-        virtual void
-        string_post (Type&);
+virtual void
+ulonglong_pre (Type&);
 
-        virtual void
-        string_post (Type const&);
+virtual void
+ulonglong_pre (Type const&);
 
-        virtual void
-        string_none (Type&);
+virtual void
+ulonglong_next (Type&);
 
-        virtual void
-        string_none (Type const&);
+virtual void
+ulonglong_next (Type const&);
 
-        virtual void
-        longlong (Type&);
+virtual void
+ulonglong_post (Type&);
 
-        virtual void
-        longlong (Type const&);
+virtual void
+ulonglong_post (Type const&);
 
-        virtual void
-        longlong_pre (Type&);
+virtual void
+ulonglong_none (Type&);
 
-        virtual void
-        longlong_pre (Type const&);
+virtual void
+ulonglong_none (Type const&);
 
-        virtual void
-        longlong_next (Type&);
+virtual void
+longdouble (Type&);
 
-        virtual void
-        longlong_next (Type const&);
+virtual void
+longdouble (Type const&);
 
-        virtual void
-        longlong_post (Type&);
+virtual void
+longdouble_pre (Type&);
 
-        virtual void
-        longlong_post (Type const&);
+virtual void
+longdouble_pre (Type const&);
 
-        virtual void
-        longlong_none (Type&);
+virtual void
+longdouble_next (Type&);
 
-        virtual void
-        longlong_none (Type const&);
+virtual void
+longdouble_next (Type const&);
 
-        virtual void
-        ulonglong (Type&);
+virtual void
+longdouble_post (Type&);
 
-        virtual void
-        ulonglong (Type const&);
+virtual void
+longdouble_post (Type const&);
 
-        virtual void
-        ulonglong_pre (Type&);
+virtual void
+longdouble_none (Type&);
 
-        virtual void
-        ulonglong_pre (Type const&);
+virtual void
+longdouble_none (Type const&);
 
-        virtual void
-        ulonglong_next (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        ulonglong_next (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        ulonglong_post (Type&);
+struct XSC_XML_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        ulonglong_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        ulonglong_none (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        ulonglong_none (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        longdouble (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        longdouble (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        longdouble_pre (Type&);
+virtual void
+typeId (Type&);
 
-        virtual void
-        longdouble_pre (Type const&);
+virtual void
+typeId (Type const&);
 
-        virtual void
-        longdouble_next (Type&);
+virtual void
+member (Type&);
 
-        virtual void
-        longdouble_next (Type const&);
+virtual void
+member (Type const&);
 
-        virtual void
-        longdouble_post (Type&);
+virtual void
+member_pre (Type&);
 
-        virtual void
-        longdouble_post (Type const&);
+virtual void
+member_pre (Type const&);
 
-        virtual void
-        longdouble_none (Type&);
+virtual void
+member_next (Type&);
 
-        virtual void
-        longdouble_none (Type const&);
+virtual void
+member_next (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+member_post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+member_post (Type const&);
 
-      struct XSC_XML_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        pre (Type&);
+struct XSC_XML_Handlers_Export Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        typeId (Type&);
+virtual void
+type (Type&);
 
-        virtual void
-        typeId (Type const&);
+virtual void
+type (Type const&);
 
-        virtual void
-        member (Type&);
+virtual void
+value (Type&);
 
-        virtual void
-        member (Type const&);
+virtual void
+value (Type const&);
 
-        virtual void
-        member_pre (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        member_pre (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        member_next (Type&);
+struct XSC_XML_Handlers_Export Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        member_next (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        member_post (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        member_post (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+name (Type const&);
 
-      struct XSC_XML_Handlers_Export Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+value (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+value (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        type (Type&);
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
+SatisfierPropertyKind;
 
-        virtual void
-        type (Type const&);
+struct XSC_XML_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        value (Type&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        value (Type const&);
+virtual void
+pre (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+name (Type&);
 
-      struct XSC_XML_Handlers_Export Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+name (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+kind (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+kind (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+dynamic (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+dynamic (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+value (Type&);
 
-        virtual void
-        value (Type&);
+virtual void
+value (Type const&);
 
-        virtual void
-        value (Type const&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        post (Type const&);
-      };
+struct XSC_XML_Handlers_Export Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
+{
+virtual void
+traverse (Type&);
 
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
-      SatisfierPropertyKind;
+virtual void
+traverse (Type const&);
 
-      struct XSC_XML_Handlers_Export SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void
-        kind (Type&);
+virtual void
+resourceType_pre (Type&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+resourceType_pre (Type const&);
 
-        virtual void
-        value (Type&);
+virtual void
+resourceType_next (Type&);
 
-        virtual void
-        value (Type const&);
+virtual void
+resourceType_next (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+resourceType_post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+resourceType_post (Type const&);
 
-      struct XSC_XML_Handlers_Export Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        resourceType_pre (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        resourceType_pre (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        resourceType_next (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        resourceType_next (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        resourceType_post (Type&);
+struct XSC_XML_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        resourceType_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        property_pre (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        property_pre (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void
-        property_next (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        property_next (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        property_post (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        property_post (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        property_none (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        property_none (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+property_next (Type const&);
 
-      struct XSC_XML_Handlers_Export Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        name (Type&);
+struct XSC_XML_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+requirementName (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+requirementName (Type const&);
 
-      struct XSC_XML_Handlers_Export ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+resourceName (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+resourceName (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        requirementName (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        requirementName (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        resourceName (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        resourceName (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        resourceValue (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        resourceValue (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+property_none (Type const&);
 
-      struct XSC_XML_Handlers_Export ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        pre (Type&);
+struct XSC_XML_Handlers_Export ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        source (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        source (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        source_pre (Type&);
+virtual void
+source (Type&);
 
-        virtual void
-        source_pre (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void
-        source_next (Type&);
+virtual void
+source_pre (Type&);
 
-        virtual void
-        source_next (Type const&);
+virtual void
+source_pre (Type const&);
 
-        virtual void
-        source_post (Type&);
+virtual void
+source_next (Type&);
 
-        virtual void
-        source_post (Type const&);
+virtual void
+source_next (Type const&);
 
-        virtual void
-        node (Type&);
+virtual void
+source_post (Type&);
 
-        virtual void
-        node (Type const&);
+virtual void
+source_post (Type const&);
 
-        virtual void
-        location (Type&);
+virtual void
+node (Type&);
 
-        virtual void
-        location (Type const&);
+virtual void
+node (Type const&);
 
-        virtual void
-        location_pre (Type&);
+virtual void
+location (Type&);
 
-        virtual void
-        location_pre (Type const&);
+virtual void
+location (Type const&);
 
-        virtual void
-        location_next (Type&);
+virtual void
+location_pre (Type&);
 
-        virtual void
-        location_next (Type const&);
+virtual void
+location_pre (Type const&);
 
-        virtual void
-        location_post (Type&);
+virtual void
+location_next (Type&);
 
-        virtual void
-        location_post (Type const&);
+virtual void
+location_next (Type const&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+location_post (Type&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+location_post (Type const&);
 
-        virtual void
-        execParameter_pre (Type&);
+virtual void
+execParameter (Type&);
 
-        virtual void
-        execParameter_pre (Type const&);
+virtual void
+execParameter (Type const&);
 
-        virtual void
-        execParameter_next (Type&);
+virtual void
+execParameter_pre (Type&);
 
-        virtual void
-        execParameter_next (Type const&);
+virtual void
+execParameter_pre (Type const&);
 
-        virtual void
-        execParameter_post (Type&);
+virtual void
+execParameter_next (Type&);
 
-        virtual void
-        execParameter_post (Type const&);
+virtual void
+execParameter_next (Type const&);
 
-        virtual void
-        execParameter_none (Type&);
+virtual void
+execParameter_post (Type&);
 
-        virtual void
-        execParameter_none (Type const&);
+virtual void
+execParameter_post (Type const&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+execParameter_none (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+execParameter_none (Type const&);
 
-        virtual void
-        deployRequirement_pre (Type&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+deployRequirement (Type const&);
 
-        virtual void
-        deployRequirement_next (Type&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        deployRequirement_post (Type&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        deployedResource (Type&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        deployedResource (Type const&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        deployedResource_pre (Type&);
+virtual void
+deployedResource (Type&);
 
-        virtual void
-        deployedResource_pre (Type const&);
+virtual void
+deployedResource (Type const&);
 
-        virtual void
-        deployedResource_next (Type&);
+virtual void
+deployedResource_pre (Type&);
 
-        virtual void
-        deployedResource_next (Type const&);
+virtual void
+deployedResource_pre (Type const&);
 
-        virtual void
-        deployedResource_post (Type&);
+virtual void
+deployedResource_next (Type&);
 
-        virtual void
-        deployedResource_post (Type const&);
+virtual void
+deployedResource_next (Type const&);
 
-        virtual void
-        deployedResource_none (Type&);
+virtual void
+deployedResource_post (Type&);
 
-        virtual void
-        deployedResource_none (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        virtual void
-        id (Type&);
+virtual void
+deployedResource_none (Type&);
 
-        virtual void
-        id (Type const&);
+virtual void
+deployedResource_none (Type const&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+id (Type&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+id (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+id_none (Type const&);
 
-      struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        pre (Type&);
+struct XSC_XML_Handlers_Export MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        source (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        source (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        source_pre (Type&);
+virtual void
+source (Type&);
 
-        virtual void
-        source_pre (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void
-        source_next (Type&);
+virtual void
+source_pre (Type&);
 
-        virtual void
-        source_next (Type const&);
+virtual void
+source_pre (Type const&);
 
-        virtual void
-        source_post (Type&);
+virtual void
+source_next (Type&);
 
-        virtual void
-        source_post (Type const&);
+virtual void
+source_next (Type const&);
 
-        virtual void
-        artifact (Type&);
+virtual void
+source_post (Type&);
 
-        virtual void
-        artifact (Type const&);
+virtual void
+source_post (Type const&);
 
-        virtual void
-        artifact_pre (Type&);
+virtual void
+artifact (Type&);
 
-        virtual void
-        artifact_pre (Type const&);
+virtual void
+artifact (Type const&);
 
-        virtual void
-        artifact_next (Type&);
+virtual void
+artifact_pre (Type&);
 
-        virtual void
-        artifact_next (Type const&);
+virtual void
+artifact_pre (Type const&);
 
-        virtual void
-        artifact_post (Type&);
+virtual void
+artifact_next (Type&);
 
-        virtual void
-        artifact_post (Type const&);
+virtual void
+artifact_next (Type const&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+artifact_post (Type&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+artifact_post (Type const&);
 
-        virtual void
-        execParameter_pre (Type&);
+virtual void
+execParameter (Type&);
 
-        virtual void
-        execParameter_pre (Type const&);
+virtual void
+execParameter (Type const&);
 
-        virtual void
-        execParameter_next (Type&);
+virtual void
+execParameter_pre (Type&);
 
-        virtual void
-        execParameter_next (Type const&);
+virtual void
+execParameter_pre (Type const&);
 
-        virtual void
-        execParameter_post (Type&);
+virtual void
+execParameter_next (Type&);
 
-        virtual void
-        execParameter_post (Type const&);
+virtual void
+execParameter_next (Type const&);
 
-        virtual void
-        execParameter_none (Type&);
+virtual void
+execParameter_post (Type&);
 
-        virtual void
-        execParameter_none (Type const&);
+virtual void
+execParameter_post (Type const&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+execParameter_none (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+execParameter_none (Type const&);
 
-        virtual void
-        deployRequirement_pre (Type&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+deployRequirement (Type const&);
 
-        virtual void
-        deployRequirement_next (Type&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        deployRequirement_post (Type&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        id (Type&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        id (Type const&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+id (Type&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+id (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+id_none (Type const&);
 
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
-      ResourceUsageKind;
+virtual void
+post (Type&);
 
-      struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        traverse (Type const&);
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
+ResourceUsageKind;
 
-        virtual void
-        pre (Type&);
+struct XSC_XML_Handlers_Export InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        resourceUsage (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        resourceUsage (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        requirementName (Type&);
+virtual void
+resourceUsage (Type&);
 
-        virtual void
-        requirementName (Type const&);
+virtual void
+resourceUsage (Type const&);
 
-        virtual void
-        resourceName (Type&);
+virtual void
+requirementName (Type&);
 
-        virtual void
-        resourceName (Type const&);
+virtual void
+requirementName (Type const&);
 
-        virtual void
-        resourceValue (Type&);
+virtual void
+resourceName (Type&);
 
-        virtual void
-        resourceValue (Type const&);
+virtual void
+resourceName (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+property (Type const&);
 
-      struct XSC_XML_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        node (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        node (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        source (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        source (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        implementation (Type&);
+struct XSC_XML_Handlers_Export InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        implementation (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        configProperty_pre (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        configProperty_pre (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        configProperty_next (Type&);
+virtual void
+node (Type&);
 
-        virtual void
-        configProperty_next (Type const&);
+virtual void
+node (Type const&);
 
-        virtual void
-        configProperty_post (Type&);
+virtual void
+source (Type&);
 
-        virtual void
-        configProperty_post (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+implementation (Type&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+implementation (Type const&);
 
-        virtual void
-        deployedResource (Type&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        deployedResource (Type const&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        deployedResource_none (Type&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        deployedResource_none (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        deployedSharedResource (Type&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        deployedSharedResource (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        deployedSharedResource_none (Type&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        deployedSharedResource_none (Type const&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        id (Type&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        id (Type const&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+deployedResource (Type&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+deployedResource (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+deployedResource_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+deployedResource_none (Type const&);
 
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
-      CCMComponentPortKind;
+virtual void
+deployedSharedResource (Type&);
 
-      struct XSC_XML_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+deployedSharedResource (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+deployedSharedResource_none (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+deployedSharedResource_none (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+id (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+id (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        specificType (Type&);
+virtual void
+id_none (Type const&);
 
-        virtual void
-        specificType (Type const&);
+virtual void
+post (Type&);
 
-        virtual void
-        supportedType (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        supportedType (Type const&);
+typedef
+::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
+CCMComponentPortKind;
 
-        virtual void
-        provider (Type&);
+struct XSC_XML_Handlers_Export ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        provider (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        exclusiveProvider (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        exclusiveProvider (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        exclusiveUser (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        exclusiveUser (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        optional (Type&);
+virtual void
+specificType (Type&);
 
-        virtual void
-        optional (Type const&);
+virtual void
+specificType (Type const&);
 
-        virtual void
-        kind (Type&);
+virtual void
+specificType_none (Type&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+specificType_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+supportedType (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+supportedType (Type const&);
 
-      struct XSC_XML_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+supportedType_pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+supportedType_pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+supportedType_next (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+supportedType_next (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+supportedType_post (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+supportedType_post (Type const&);
 
-        virtual void
-        type (Type&);
+virtual void
+supportedType_none (Type&);
 
-        virtual void
-        type (Type const&);
+virtual void
+supportedType_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+provider (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+provider (Type const&);
 
-      struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+exclusiveProvider (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+exclusiveProvider (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+exclusiveUser (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+exclusiveUser (Type const&);
 
-        virtual void
-        portName (Type&);
+virtual void
+optional (Type&);
 
-        virtual void
-        portName (Type const&);
+virtual void
+optional (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+kind (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+kind (Type const&);
 
-      struct XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        pre (Type&);
+struct XSC_XML_Handlers_Export ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        portName (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        portName (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        provider (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        provider (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        provider_none (Type&);
+virtual void
+type (Type&);
 
-        virtual void
-        provider_none (Type const&);
+virtual void
+type (Type const&);
 
-        virtual void
-        kind (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        kind (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        instance (Type&);
+struct XSC_XML_Handlers_Export ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+pre (Type const&);
 
-      struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+portName (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+portName (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        location (Type&);
+struct XSC_XML_Handlers_Export PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        location (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+pre (Type const&);
 
-      struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+portName (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+portName (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+provider (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+provider (Type const&);
 
-        virtual void
-        targetName (Type&);
+virtual void
+provider_none (Type&);
 
-        virtual void
-        targetName (Type const&);
+virtual void
+provider_none (Type const&);
 
-        virtual void
-        requirementName (Type&);
+virtual void
+kind (Type&);
 
-        virtual void
-        requirementName (Type const&);
+virtual void
+kind (Type const&);
 
-        virtual void
-        resourceName (Type&);
+virtual void
+instance (Type&);
 
-        virtual void
-        resourceName (Type const&);
+virtual void
+instance (Type const&);
 
-        virtual void
-        resourceValue (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        resourceValue (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        post (Type&);
+struct XSC_XML_Handlers_Export ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+traverse (Type const&);
 
-      struct XSC_XML_Handlers_Export PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+location (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+location (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        source (Type&);
+struct XSC_XML_Handlers_Export ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        source (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        source_none (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        source_none (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+targetName (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+targetName (Type const&);
 
-        virtual void
-        deployRequirement_pre (Type&);
+virtual void
+requirementName (Type&);
 
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+requirementName (Type const&);
 
-        virtual void
-        deployRequirement_next (Type&);
+virtual void
+resourceName (Type&);
 
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+resourceName (Type const&);
 
-        virtual void
-        deployRequirement_post (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        externalEndpoint (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        externalEndpoint (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        externalEndpoint_pre (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        externalEndpoint_next (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        externalEndpoint_post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        externalEndpoint_none (Type&);
+struct XSC_XML_Handlers_Export PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        externalEndpoint_none (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        internalEndpoint (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        internalEndpoint (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        internalEndpoint_pre (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        internalEndpoint_next (Type&);
+virtual void
+source (Type&);
 
-        virtual void
-        internalEndpoint_next (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void
-        internalEndpoint_post (Type&);
+virtual void
+source_none (Type&);
 
-        virtual void
-        internalEndpoint_post (Type const&);
+virtual void
+source_none (Type const&);
 
-        virtual void
-        internalEndpoint_none (Type&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        internalEndpoint_none (Type const&);
+virtual void
+deployRequirement (Type const&);
 
-        virtual void
-        externalReference (Type&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        externalReference (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        externalReference_pre (Type&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        externalReference_pre (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        externalReference_next (Type&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        externalReference_post (Type&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        externalReference_none (Type&);
+virtual void
+externalEndpoint (Type&);
 
-        virtual void
-        externalReference_none (Type const&);
+virtual void
+externalEndpoint (Type const&);
 
-        virtual void
-        deployedResource (Type&);
+virtual void
+externalEndpoint_pre (Type&);
 
-        virtual void
-        deployedResource (Type const&);
+virtual void
+externalEndpoint_pre (Type const&);
 
-        virtual void
-        deployedResource_pre (Type&);
+virtual void
+externalEndpoint_next (Type&);
 
-        virtual void
-        deployedResource_pre (Type const&);
+virtual void
+externalEndpoint_next (Type const&);
 
-        virtual void
-        deployedResource_next (Type&);
+virtual void
+externalEndpoint_post (Type&);
 
-        virtual void
-        deployedResource_next (Type const&);
+virtual void
+externalEndpoint_post (Type const&);
 
-        virtual void
-        deployedResource_post (Type&);
+virtual void
+externalEndpoint_none (Type&);
 
-        virtual void
-        deployedResource_post (Type const&);
+virtual void
+externalEndpoint_none (Type const&);
 
-        virtual void
-        deployedResource_none (Type&);
+virtual void
+internalEndpoint (Type&);
 
-        virtual void
-        deployedResource_none (Type const&);
+virtual void
+internalEndpoint (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+internalEndpoint_pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+internalEndpoint_pre (Type const&);
 
-      struct XSC_XML_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+internalEndpoint_next (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+internalEndpoint_next (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+internalEndpoint_post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+internalEndpoint_post (Type const&);
 
-        virtual void
-        requiredType (Type&);
+virtual void
+internalEndpoint_none (Type&);
 
-        virtual void
-        requiredType (Type const&);
+virtual void
+internalEndpoint_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+externalReference (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+externalReference (Type const&);
 
-      struct XSC_XML_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+externalReference_pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+externalReference_pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+externalReference_next (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+externalReference_next (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+externalReference_post (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+externalReference_post (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+externalReference_none (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+externalReference_none (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+deployedResource (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+deployedResource (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+deployedResource_pre (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+deployedResource_pre (Type const&);
 
-      struct XSC_XML_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+deployedResource_next (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+deployedResource_next (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+deployedResource_post (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        virtual void
-        resourceUsage (Type&);
+virtual void
+deployedResource_none (Type&);
 
-        virtual void
-        resourceUsage (Type const&);
+virtual void
+deployedResource_none (Type const&);
 
-        virtual void
-        resourcePort (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        resourcePort (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        componentPort (Type&);
+struct XSC_XML_Handlers_Export ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        componentPort (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+requiredType (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+requiredType (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        post (Type&);
+struct XSC_XML_Handlers_Export Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+traverse (Type const&);
 
-      struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        requiredUUID (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        requiredUUID (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void
-        requiredName (Type&);
+virtual void
+resourceType_pre (Type&);
 
-        virtual void
-        requiredName (Type const&);
+virtual void
+resourceType_pre (Type const&);
 
-        virtual void
-        requiredType (Type&);
+virtual void
+resourceType_next (Type&);
 
-        virtual void
-        requiredType (Type const&);
+virtual void
+resourceType_next (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+resourceType_post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+resourceType_post (Type const&);
 
-      struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        portName (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        portName (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        instance (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+property_none (Type const&);
 
-      struct XSC_XML_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        pre (Type&);
+struct XSC_XML_Handlers_Export ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+resourceUsage (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+resourceUsage (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+resourceUsage_none (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+resourceUsage_none (Type const&);
 
-        virtual void
-        externalEndpoint (Type&);
+virtual void
+resourcePort (Type&);
 
-        virtual void
-        externalEndpoint (Type const&);
+virtual void
+resourcePort (Type const&);
 
-        virtual void
-        externalEndpoint_pre (Type&);
+virtual void
+resourcePort_none (Type&);
 
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+resourcePort_none (Type const&);
 
-        virtual void
-        externalEndpoint_next (Type&);
+virtual void
+componentPort (Type&);
 
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+componentPort (Type const&);
 
-        virtual void
-        externalEndpoint_post (Type&);
+virtual void
+componentPort_none (Type&);
 
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+componentPort_none (Type const&);
 
-        virtual void
-        externalEndpoint_none (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        externalEndpoint_none (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void
-        internalEndpoint (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        internalEndpoint (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        internalEndpoint_pre (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        internalEndpoint_next (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        internalEndpoint_next (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        internalEndpoint_post (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        internalEndpoint_post (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        internalEndpoint_none (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        internalEndpoint_none (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        externalReference (Type&);
+virtual void
+property_none (Type&);
+
+virtual void
+property_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+requiredUUID (Type&);
+
+virtual void
+requiredUUID (Type const&);
+
+virtual void
+requiredUUID_none (Type&);
+
+virtual void
+requiredUUID_none (Type const&);
+
+virtual void
+requiredName (Type&);
+
+virtual void
+requiredName (Type const&);
+
+virtual void
+requiredName_none (Type&);
+
+virtual void
+requiredName_none (Type const&);
+
+virtual void
+requiredType (Type&);
+
+virtual void
+requiredType (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+portName (Type&);
+
+virtual void
+portName (Type const&);
+
+virtual void
+instance (Type&);
+
+virtual void
+instance (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        externalReference (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        externalReference_pre (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        externalReference_pre (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        externalReference_next (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        externalReference_post (Type&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+deployRequirement (Type const&);
 
-        virtual void
-        externalReference_none (Type&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        externalReference_none (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+deployRequirement_next (Type const&);
+
+virtual void
+deployRequirement_post (Type&);
+
+virtual void
+deployRequirement_post (Type const&);
+
+virtual void
+deployRequirement_none (Type&);
+
+virtual void
+deployRequirement_none (Type const&);
+
+virtual void
+internalEndpoint (Type&);
+
+virtual void
+internalEndpoint (Type const&);
+
+virtual void
+internalEndpoint_pre (Type&);
+
+virtual void
+internalEndpoint_pre (Type const&);
+
+virtual void
+internalEndpoint_next (Type&);
+
+virtual void
+internalEndpoint_next (Type const&);
+
+virtual void
+internalEndpoint_post (Type&);
+
+virtual void
+internalEndpoint_post (Type const&);
+
+virtual void
+internalEndpoint_none (Type&);
+
+virtual void
+internalEndpoint_none (Type const&);
+
+virtual void
+externalEndpoint (Type&);
+
+virtual void
+externalEndpoint (Type const&);
+
+virtual void
+externalEndpoint_pre (Type&);
+
+virtual void
+externalEndpoint_pre (Type const&);
+
+virtual void
+externalEndpoint_next (Type&);
+
+virtual void
+externalEndpoint_next (Type const&);
+
+virtual void
+externalEndpoint_post (Type&);
+
+virtual void
+externalEndpoint_post (Type const&);
+
+virtual void
+externalEndpoint_none (Type&);
+
+virtual void
+externalEndpoint_none (Type const&);
+
+virtual void
+externalReference (Type&);
+
+virtual void
+externalReference (Type const&);
+
+virtual void
+externalReference_pre (Type&);
+
+virtual void
+externalReference_pre (Type const&);
+
+virtual void
+externalReference_next (Type&);
+
+virtual void
+externalReference_next (Type const&);
+
+virtual void
+externalReference_post (Type&);
+
+virtual void
+externalReference_post (Type const&);
+
+virtual void
+externalReference_none (Type&);
+
+virtual void
+externalReference_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct TCKind : Traversal::TCKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct TCKind : Traversal::TCKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type &o)
+{
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        protected:
-        TCKind ();
-      };
+protected:
+TCKind ();
+};
 
-      struct DataType : Traversal::DataType, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::DataType Type;
-        DataType (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct DataType : Traversal::DataType,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::DataType Type;
+DataType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        kind (Type &o)
-        {
+virtual void
+kind (Type &o)
+{
 
-          this->kind (const_cast <Type const &> (o));
-        }
+this->kind (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        kind (Type const&);
+virtual void
+kind (Type const&);
 
-        virtual void 
-        enum_ (Type &o)
-        {
+virtual void
+enum_ (Type &o)
+{
 
-          this->enum_ (const_cast <Type const &> (o));
-        }
+this->enum_ (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        enum_ (Type const&);
+virtual void
+enum_ (Type const&);
 
-        protected:
-        DataType ();
-      };
+protected:
+DataType ();
+};
 
-      struct DataValue : Traversal::DataValue, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::DataValue Type;
-        DataValue (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct DataValue : Traversal::DataValue,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::DataValue Type;
+DataValue (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        short_pre (Type &o)
-        {
+virtual void
+short_pre (Type &o)
+{
 
-          this->short_pre (const_cast <Type const &> (o));
-        }
+this->short_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        short_pre (Type const&);
+virtual void
+short_pre (Type const&);
 
-        virtual void 
-        short_next (Type &o)
-        {
+virtual void
+short_next (Type &o)
+{
 
-          this->short_next (const_cast <Type const &> (o));
-        }
+this->short_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        short_next (Type const&);
+virtual void
+short_next (Type const&);
 
-        virtual void 
-        short_post (Type &o)
-        {
+virtual void
+short_post (Type &o)
+{
 
-          this->short_post (const_cast <Type const &> (o));
-        }
+this->short_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        short_post (Type const&);
+virtual void
+short_post (Type const&);
 
-        virtual void 
-        long_pre (Type &o)
-        {
+virtual void
+long_pre (Type &o)
+{
 
-          this->long_pre (const_cast <Type const &> (o));
-        }
+this->long_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        long_pre (Type const&);
+virtual void
+long_pre (Type const&);
 
-        virtual void 
-        long_next (Type &o)
-        {
+virtual void
+long_next (Type &o)
+{
 
-          this->long_next (const_cast <Type const &> (o));
-        }
+this->long_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        long_next (Type const&);
+virtual void
+long_next (Type const&);
 
-        virtual void 
-        long_post (Type &o)
-        {
+virtual void
+long_post (Type &o)
+{
 
-          this->long_post (const_cast <Type const &> (o));
-        }
+this->long_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        long_post (Type const&);
+virtual void
+long_post (Type const&);
 
-        virtual void 
-        ushort_pre (Type &o)
-        {
+virtual void
+ushort_pre (Type &o)
+{
 
-          this->ushort_pre (const_cast <Type const &> (o));
-        }
+this->ushort_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+ushort_pre (Type const&);
+
+virtual void
+ushort_next (Type &o)
+{
+
+this->ushort_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+ushort_next (Type const&);
+
+virtual void
+ushort_post (Type &o)
+{
+
+this->ushort_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+ushort_post (Type const&);
+
+virtual void
+ulong_pre (Type &o)
+{
 
+this->ulong_pre (const_cast <Type const &> (o));
+}
 
-        virtual void
-        ushort_pre (Type const&);
 
-        virtual void 
-        ushort_next (Type &o)
-        {
+virtual void
+ulong_pre (Type const&);
 
-          this->ushort_next (const_cast <Type const &> (o));
-        }
+virtual void
+ulong_next (Type &o)
+{
 
+this->ulong_next (const_cast <Type const &> (o));
+}
 
-        virtual void
-        ushort_next (Type const&);
 
-        virtual void 
-        ushort_post (Type &o)
-        {
+virtual void
+ulong_next (Type const&);
 
-          this->ushort_post (const_cast <Type const &> (o));
-        }
+virtual void
+ulong_post (Type &o)
+{
 
+this->ulong_post (const_cast <Type const &> (o));
+}
 
-        virtual void
-        ushort_post (Type const&);
 
-        virtual void 
-        ulong_pre (Type &o)
-        {
+virtual void
+ulong_post (Type const&);
 
-          this->ulong_pre (const_cast <Type const &> (o));
-        }
+virtual void
+float_pre (Type &o)
+{
 
+this->float_pre (const_cast <Type const &> (o));
+}
 
-        virtual void
-        ulong_pre (Type const&);
 
-        virtual void 
-        ulong_next (Type &o)
-        {
+virtual void
+float_pre (Type const&);
 
-          this->ulong_next (const_cast <Type const &> (o));
-        }
+virtual void
+float_next (Type &o)
+{
 
+this->float_next (const_cast <Type const &> (o));
+}
 
-        virtual void
-        ulong_next (Type const&);
 
-        virtual void 
-        ulong_post (Type &o)
-        {
+virtual void
+float_next (Type const&);
 
-          this->ulong_post (const_cast <Type const &> (o));
-        }
+virtual void
+float_post (Type &o)
+{
 
+this->float_post (const_cast <Type const &> (o));
+}
 
-        virtual void
-        ulong_post (Type const&);
 
-        virtual void 
-        float_pre (Type &o)
-        {
+virtual void
+float_post (Type const&);
 
-          this->float_pre (const_cast <Type const &> (o));
-        }
+virtual void
+double_pre (Type &o)
+{
 
+this->double_pre (const_cast <Type const &> (o));
+}
 
-        virtual void
-        float_pre (Type const&);
 
-        virtual void 
-        float_next (Type &o)
-        {
+virtual void
+double_pre (Type const&);
 
-          this->float_next (const_cast <Type const &> (o));
-        }
+virtual void
+double_next (Type &o)
+{
 
+this->double_next (const_cast <Type const &> (o));
+}
 
-        virtual void
-        float_next (Type const&);
 
-        virtual void 
-        float_post (Type &o)
-        {
+virtual void
+double_next (Type const&);
 
-          this->float_post (const_cast <Type const &> (o));
-        }
+virtual void
+double_post (Type &o)
+{
 
+this->double_post (const_cast <Type const &> (o));
+}
 
-        virtual void
-        float_post (Type const&);
 
-        virtual void 
-        double_pre (Type &o)
-        {
+virtual void
+double_post (Type const&);
 
-          this->double_pre (const_cast <Type const &> (o));
-        }
+virtual void
+boolean_pre (Type &o)
+{
+
+this->boolean_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+boolean_pre (Type const&);
+
+virtual void
+boolean_next (Type &o)
+{
+
+this->boolean_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+boolean_next (Type const&);
+
+virtual void
+boolean_post (Type &o)
+{
+
+this->boolean_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+boolean_post (Type const&);
+
+virtual void
+octet_pre (Type &o)
+{
+
+this->octet_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+octet_pre (Type const&);
+
+virtual void
+octet_next (Type &o)
+{
+
+this->octet_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+octet_next (Type const&);
+
+virtual void
+octet_post (Type &o)
+{
+
+this->octet_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+octet_post (Type const&);
+
+virtual void
+enum_pre (Type &o)
+{
+
+this->enum_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+enum_pre (Type const&);
+
+virtual void
+enum_next (Type &o)
+{
+
+this->enum_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+enum_next (Type const&);
+
+virtual void
+enum_post (Type &o)
+{
+
+this->enum_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+enum_post (Type const&);
+
+virtual void
+string_pre (Type &o)
+{
+
+this->string_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+string_pre (Type const&);
+
+virtual void
+string_next (Type &o)
+{
+
+this->string_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+string_next (Type const&);
+
+virtual void
+string_post (Type &o)
+{
+
+this->string_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+string_post (Type const&);
+
+virtual void
+longlong_pre (Type &o)
+{
+
+this->longlong_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+longlong_pre (Type const&);
+
+virtual void
+longlong_next (Type &o)
+{
+
+this->longlong_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+longlong_next (Type const&);
+
+virtual void
+longlong_post (Type &o)
+{
+
+this->longlong_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+longlong_post (Type const&);
+
+virtual void
+ulonglong_pre (Type &o)
+{
+
+this->ulonglong_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+ulonglong_pre (Type const&);
+
+virtual void
+ulonglong_next (Type &o)
+{
+
+this->ulonglong_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        double_pre (Type const&);
+virtual void
+ulonglong_next (Type const&);
 
-        virtual void 
-        double_next (Type &o)
-        {
+virtual void
+ulonglong_post (Type &o)
+{
 
-          this->double_next (const_cast <Type const &> (o));
-        }
+this->ulonglong_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        double_next (Type const&);
+virtual void
+ulonglong_post (Type const&);
 
-        virtual void 
-        double_post (Type &o)
-        {
+virtual void
+longdouble_pre (Type &o)
+{
 
-          this->double_post (const_cast <Type const &> (o));
-        }
+this->longdouble_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        double_post (Type const&);
+virtual void
+longdouble_pre (Type const&);
 
-        virtual void 
-        boolean_pre (Type &o)
-        {
+virtual void
+longdouble_next (Type &o)
+{
 
-          this->boolean_pre (const_cast <Type const &> (o));
-        }
+this->longdouble_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        boolean_pre (Type const&);
+virtual void
+longdouble_next (Type const&);
 
-        virtual void 
-        boolean_next (Type &o)
-        {
+virtual void
+longdouble_post (Type &o)
+{
 
-          this->boolean_next (const_cast <Type const &> (o));
-        }
+this->longdouble_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        boolean_next (Type const&);
+virtual void
+longdouble_post (Type const&);
 
-        virtual void 
-        boolean_post (Type &o)
-        {
+protected:
+DataValue ();
+};
 
-          this->boolean_post (const_cast <Type const &> (o));
-        }
+struct EnumType : Traversal::EnumType,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::EnumType Type;
+EnumType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        boolean_post (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        octet_pre (Type &o)
-        {
 
-          this->octet_pre (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        octet_pre (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        octet_next (Type &o)
-        {
 
-          this->octet_next (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+typeId (Type &o)
+{
 
-        virtual void
-        octet_next (Type const&);
+this->typeId (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        octet_post (Type &o)
-        {
 
-          this->octet_post (const_cast <Type const &> (o));
-        }
+virtual void
+typeId (Type const&);
 
+virtual void
+member_pre (Type &o)
+{
 
-        virtual void
-        octet_post (Type const&);
+this->member_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        enum_pre (Type &o)
-        {
 
-          this->enum_pre (const_cast <Type const &> (o));
-        }
+virtual void
+member_pre (Type const&);
 
+virtual void
+member_next (Type &o)
+{
 
-        virtual void
-        enum_pre (Type const&);
+this->member_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        enum_next (Type &o)
-        {
 
-          this->enum_next (const_cast <Type const &> (o));
-        }
+virtual void
+member_next (Type const&);
 
+virtual void
+member_post (Type &o)
+{
 
-        virtual void
-        enum_next (Type const&);
+this->member_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        enum_post (Type &o)
-        {
 
-          this->enum_post (const_cast <Type const &> (o));
-        }
+virtual void
+member_post (Type const&);
 
+protected:
+EnumType ();
+};
 
-        virtual void
-        enum_post (Type const&);
+struct Any : Traversal::Any,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Any Type;
+Any (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        string_pre (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->string_pre (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        string_pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        string_next (Type &o)
-        {
+virtual void
+type (Type &o)
+{
 
-          this->string_next (const_cast <Type const &> (o));
-        }
+this->type (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        string_next (Type const&);
+virtual void
+type (Type const&);
 
-        virtual void 
-        string_post (Type &o)
-        {
+virtual void
+value (Type &o)
+{
 
-          this->string_post (const_cast <Type const &> (o));
-        }
+this->value (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        string_post (Type const&);
+virtual void
+value (Type const&);
 
-        virtual void 
-        longlong_pre (Type &o)
-        {
+protected:
+Any ();
+};
 
-          this->longlong_pre (const_cast <Type const &> (o));
-        }
+struct Property : Traversal::Property,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Property Type;
+Property (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        longlong_pre (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        longlong_next (Type &o)
-        {
 
-          this->longlong_next (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        longlong_next (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        longlong_post (Type &o)
-        {
 
-          this->longlong_post (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+value (Type &o)
+{
 
-        virtual void
-        longlong_post (Type const&);
+this->value (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        ulonglong_pre (Type &o)
-        {
 
-          this->ulonglong_pre (const_cast <Type const &> (o));
-        }
+virtual void
+value (Type const&);
 
+protected:
+Property ();
+};
 
-        virtual void
-        ulonglong_pre (Type const&);
+struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        ulonglong_next (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->ulonglong_next (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+protected:
+SatisfierPropertyKind ();
+};
 
-        virtual void
-        ulonglong_next (Type const&);
+struct SatisfierProperty : Traversal::SatisfierProperty,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
+SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        ulonglong_post (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->ulonglong_post (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        ulonglong_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        longdouble_pre (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->longdouble_pre (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        longdouble_pre (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        longdouble_next (Type &o)
-        {
+virtual void
+kind (Type &o)
+{
 
-          this->longdouble_next (const_cast <Type const &> (o));
-        }
+this->kind (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        longdouble_next (Type const&);
+virtual void
+kind (Type const&);
 
-        virtual void 
-        longdouble_post (Type &o)
-        {
+virtual void
+dynamic (Type &o)
+{
 
-          this->longdouble_post (const_cast <Type const &> (o));
-        }
+this->dynamic (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        longdouble_post (Type const&);
+virtual void
+dynamic (Type const&);
 
-        protected:
-        DataValue ();
-      };
+virtual void
+value (Type &o)
+{
 
-      struct EnumType : Traversal::EnumType, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::EnumType Type;
-        EnumType (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->value (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+value (Type const&);
 
+protected:
+SatisfierProperty ();
+};
 
-        virtual void
-        traverse (Type const&);
+struct Resource : Traversal::Resource,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Resource Type;
+Resource (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        typeId (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->typeId (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        typeId (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        member_pre (Type &o)
-        {
+virtual void
+resourceType_pre (Type &o)
+{
 
-          this->member_pre (const_cast <Type const &> (o));
-        }
+this->resourceType_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        member_pre (Type const&);
+virtual void
+resourceType_pre (Type const&);
 
-        virtual void 
-        member_next (Type &o)
-        {
+virtual void
+resourceType_next (Type &o)
+{
 
-          this->member_next (const_cast <Type const &> (o));
-        }
+this->resourceType_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        member_next (Type const&);
+virtual void
+resourceType_next (Type const&);
 
-        virtual void 
-        member_post (Type &o)
-        {
+virtual void
+resourceType_post (Type &o)
+{
 
-          this->member_post (const_cast <Type const &> (o));
-        }
+this->resourceType_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        member_post (Type const&);
+virtual void
+resourceType_post (Type const&);
 
-        protected:
-        EnumType ();
-      };
+virtual void
+property_pre (Type &o)
+{
 
-      struct Any : Traversal::Any, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Any Type;
-        Any (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->property_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+property_pre (Type const&);
 
+virtual void
+property_next (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->property_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        type (Type &o)
-        {
 
-          this->type (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type const&);
 
+virtual void
+property_post (Type &o)
+{
 
-        virtual void
-        type (Type const&);
+this->property_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        value (Type &o)
-        {
 
-          this->value (const_cast <Type const &> (o));
-        }
+virtual void
+property_post (Type const&);
 
+protected:
+Resource ();
+};
 
-        virtual void
-        value (Type const&);
+struct Requirement : Traversal::Requirement,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Requirement Type;
+Requirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        Any ();
-      };
+virtual void
+traverse (Type &o)
+{
 
-      struct Property : Traversal::Property, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Property Type;
-        Property (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+resourceType (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->resourceType (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+resourceType (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        value (Type &o)
-        {
 
-          this->value (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+property_pre (Type &o)
+{
 
-        virtual void
-        value (Type const&);
+this->property_pre (const_cast <Type const &> (o));
+}
 
-        protected:
-        Property ();
-      };
 
-      struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->property_next (const_cast <Type const &> (o));
+}
 
-        protected:
-        SatisfierPropertyKind ();
-      };
 
-      struct SatisfierProperty : Traversal::SatisfierProperty, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
-        SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+property_next (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+property_post (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->property_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+protected:
+Requirement ();
+};
 
-          this->name (const_cast <Type const &> (o));
-        }
+struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
+ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        kind (Type &o)
-        {
 
-          this->kind (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+requirementName (Type &o)
+{
 
-        virtual void
-        kind (Type const&);
+this->requirementName (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        value (Type &o)
-        {
 
-          this->value (const_cast <Type const &> (o));
-        }
+virtual void
+requirementName (Type const&);
 
+virtual void
+resourceName (Type &o)
+{
 
-        virtual void
-        value (Type const&);
+this->resourceName (const_cast <Type const &> (o));
+}
 
-        protected:
-        SatisfierProperty ();
-      };
 
-      struct Resource : Traversal::Resource, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Resource Type;
-        Resource (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+resourceName (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+property_next (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->property_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void 
-        resourceType_pre (Type &o)
-        {
+virtual void
+property_post (Type &o)
+{
 
-          this->resourceType_pre (const_cast <Type const &> (o));
-        }
+this->property_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resourceType_pre (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void 
-        resourceType_next (Type &o)
-        {
+protected:
+ResourceDeploymentDescription ();
+};
 
-          this->resourceType_next (const_cast <Type const &> (o));
-        }
+struct ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type;
+ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        resourceType_next (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceType_post (Type &o)
-        {
 
-          this->resourceType_post (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        resourceType_post (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        property_pre (Type &o)
-        {
 
-          this->property_pre (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+source_pre (Type &o)
+{
 
-        virtual void
-        property_pre (Type const&);
+this->source_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        property_next (Type &o)
-        {
 
-          this->property_next (const_cast <Type const &> (o));
-        }
+virtual void
+source_pre (Type const&);
 
+virtual void
+source_next (Type &o)
+{
 
-        virtual void
-        property_next (Type const&);
+this->source_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        property_post (Type &o)
-        {
 
-          this->property_post (const_cast <Type const &> (o));
-        }
+virtual void
+source_next (Type const&);
 
+virtual void
+source_post (Type &o)
+{
 
-        virtual void
-        property_post (Type const&);
+this->source_post (const_cast <Type const &> (o));
+}
 
-        protected:
-        Resource ();
-      };
 
-      struct Requirement : Traversal::Requirement, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Requirement Type;
-        Requirement (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+source_post (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+node (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->node (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+node (Type const&);
 
-        virtual void 
-        resourceType (Type &o)
-        {
+virtual void
+location_pre (Type &o)
+{
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+this->location_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+location_pre (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+location_next (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->location_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+location_next (Type const&);
 
-        virtual void 
-        property (Type &o)
-        {
+virtual void
+location_post (Type &o)
+{
 
-          this->property (const_cast <Type const &> (o));
-        }
+this->location_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        property (Type const&);
+virtual void
+location_post (Type const&);
 
-        protected:
-        Requirement ();
-      };
+virtual void
+execParameter_pre (Type &o)
+{
 
-      struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
-        ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->execParameter_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_pre (Type const&);
 
+virtual void
+execParameter_next (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->execParameter_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        requirementName (Type &o)
-        {
 
-          this->requirementName (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_next (Type const&);
 
+virtual void
+execParameter_post (Type &o)
+{
 
-        virtual void
-        requirementName (Type const&);
+this->execParameter_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceName (Type &o)
-        {
 
-          this->resourceName (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_post (Type const&);
 
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-        virtual void
-        resourceName (Type const&);
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceValue (Type &o)
-        {
 
-          this->resourceValue (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_pre (Type const&);
 
+virtual void
+deployRequirement_next (Type &o)
+{
 
-        virtual void
-        resourceValue (Type const&);
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
-        protected:
-        ResourceDeploymentDescription ();
-      };
 
-      struct ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type;
-        ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+deployRequirement_post (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+deployedResource_pre (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->deployedResource_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+deployedResource_pre (Type const&);
 
-        virtual void 
-        source_pre (Type &o)
-        {
+virtual void
+deployedResource_next (Type &o)
+{
 
-          this->source_pre (const_cast <Type const &> (o));
-        }
+this->deployedResource_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        source_pre (Type const&);
+virtual void
+deployedResource_next (Type const&);
 
-        virtual void 
-        source_next (Type &o)
-        {
+virtual void
+deployedResource_post (Type &o)
+{
 
-          this->source_next (const_cast <Type const &> (o));
-        }
+this->deployedResource_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        source_next (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        virtual void 
-        source_post (Type &o)
-        {
+virtual void
+id (Type &o)
+{
 
-          this->source_post (const_cast <Type const &> (o));
-        }
+this->id (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        source_post (Type const&);
+virtual void
+id (Type const&);
 
-        virtual void 
-        node (Type &o)
-        {
+protected:
+ArtifactDeploymentDescription ();
+};
 
-          this->node (const_cast <Type const &> (o));
-        }
+struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
+MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        node (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        location_pre (Type &o)
-        {
 
-          this->location_pre (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        location_pre (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        location_next (Type &o)
-        {
 
-          this->location_next (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+source_pre (Type &o)
+{
 
-        virtual void
-        location_next (Type const&);
+this->source_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        location_post (Type &o)
-        {
 
-          this->location_post (const_cast <Type const &> (o));
-        }
+virtual void
+source_pre (Type const&);
 
+virtual void
+source_next (Type &o)
+{
 
-        virtual void
-        location_post (Type const&);
+this->source_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        execParameter_pre (Type &o)
-        {
 
-          this->execParameter_pre (const_cast <Type const &> (o));
-        }
+virtual void
+source_next (Type const&);
 
+virtual void
+source_post (Type &o)
+{
 
-        virtual void
-        execParameter_pre (Type const&);
+this->source_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        execParameter_next (Type &o)
-        {
 
-          this->execParameter_next (const_cast <Type const &> (o));
-        }
+virtual void
+source_post (Type const&);
 
+virtual void
+artifact_pre (Type &o)
+{
 
-        virtual void
-        execParameter_next (Type const&);
+this->artifact_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        execParameter_post (Type &o)
-        {
 
-          this->execParameter_post (const_cast <Type const &> (o));
-        }
+virtual void
+artifact_pre (Type const&);
 
+virtual void
+artifact_next (Type &o)
+{
 
-        virtual void
-        execParameter_post (Type const&);
+this->artifact_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployRequirement_pre (Type &o)
-        {
 
-          this->deployRequirement_pre (const_cast <Type const &> (o));
-        }
+virtual void
+artifact_next (Type const&);
 
+virtual void
+artifact_post (Type &o)
+{
 
-        virtual void
-        deployRequirement_pre (Type const&);
+this->artifact_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployRequirement_next (Type &o)
-        {
 
-          this->deployRequirement_next (const_cast <Type const &> (o));
-        }
+virtual void
+artifact_post (Type const&);
 
+virtual void
+execParameter_pre (Type &o)
+{
 
-        virtual void
-        deployRequirement_next (Type const&);
+this->execParameter_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployRequirement_post (Type &o)
-        {
 
-          this->deployRequirement_post (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_pre (Type const&);
 
+virtual void
+execParameter_next (Type &o)
+{
 
-        virtual void
-        deployRequirement_post (Type const&);
+this->execParameter_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployedResource_pre (Type &o)
-        {
 
-          this->deployedResource_pre (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_next (Type const&);
 
+virtual void
+execParameter_post (Type &o)
+{
 
-        virtual void
-        deployedResource_pre (Type const&);
+this->execParameter_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployedResource_next (Type &o)
-        {
 
-          this->deployedResource_next (const_cast <Type const &> (o));
-        }
+virtual void
+execParameter_post (Type const&);
 
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-        virtual void
-        deployedResource_next (Type const&);
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployedResource_post (Type &o)
-        {
 
-          this->deployedResource_post (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_pre (Type const&);
 
+virtual void
+deployRequirement_next (Type &o)
+{
 
-        virtual void
-        deployedResource_post (Type const&);
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        id (Type &o)
-        {
 
-          this->id (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_next (Type const&);
 
+virtual void
+deployRequirement_post (Type &o)
+{
 
-        virtual void
-        id (Type const&);
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
-        protected:
-        ArtifactDeploymentDescription ();
-      };
 
-      struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
-        MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+id (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->id (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+id (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+protected:
+MonolithicDeploymentDescription ();
+};
 
-          this->name (const_cast <Type const &> (o));
-        }
+struct ResourceUsageKind : Traversal::ResourceUsageKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void
-        name (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        source_pre (Type &o)
-        {
+protected:
+ResourceUsageKind ();
+};
 
-          this->source_pre (const_cast <Type const &> (o));
-        }
+struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
+InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        source_pre (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        source_next (Type &o)
-        {
 
-          this->source_next (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+resourceUsage (Type &o)
+{
 
-        virtual void
-        source_next (Type const&);
+this->resourceUsage (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        source_post (Type &o)
-        {
 
-          this->source_post (const_cast <Type const &> (o));
-        }
+virtual void
+resourceUsage (Type const&);
 
+virtual void
+requirementName (Type &o)
+{
 
-        virtual void
-        source_post (Type const&);
+this->requirementName (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        artifact_pre (Type &o)
-        {
 
-          this->artifact_pre (const_cast <Type const &> (o));
-        }
+virtual void
+requirementName (Type const&);
 
+virtual void
+resourceName (Type &o)
+{
 
-        virtual void
-        artifact_pre (Type const&);
+this->resourceName (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        artifact_next (Type &o)
-        {
 
-          this->artifact_next (const_cast <Type const &> (o));
-        }
+virtual void
+resourceName (Type const&);
 
+virtual void
+property_pre (Type &o)
+{
 
-        virtual void
-        artifact_next (Type const&);
+this->property_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        artifact_post (Type &o)
-        {
 
-          this->artifact_post (const_cast <Type const &> (o));
-        }
+virtual void
+property_pre (Type const&);
 
+virtual void
+property_next (Type &o)
+{
 
-        virtual void
-        artifact_post (Type const&);
+this->property_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        execParameter_pre (Type &o)
-        {
 
-          this->execParameter_pre (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type const&);
 
+virtual void
+property_post (Type &o)
+{
 
-        virtual void
-        execParameter_pre (Type const&);
+this->property_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        execParameter_next (Type &o)
-        {
 
-          this->execParameter_next (const_cast <Type const &> (o));
-        }
+virtual void
+property_post (Type const&);
 
+protected:
+InstanceResourceDeploymentDescription ();
+};
 
-        virtual void
-        execParameter_next (Type const&);
+struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
+InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        execParameter_post (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->execParameter_post (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        execParameter_post (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        deployRequirement_pre (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->deployRequirement_pre (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        deployRequirement_next (Type &o)
-        {
+virtual void
+node (Type &o)
+{
 
-          this->deployRequirement_next (const_cast <Type const &> (o));
-        }
+this->node (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+node (Type const&);
 
-        virtual void 
-        deployRequirement_post (Type &o)
-        {
+virtual void
+source (Type &o)
+{
 
-          this->deployRequirement_post (const_cast <Type const &> (o));
-        }
+this->source (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+source (Type const&);
 
-        virtual void 
-        id (Type &o)
-        {
+virtual void
+implementation (Type &o)
+{
 
-          this->id (const_cast <Type const &> (o));
-        }
+this->implementation (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        id (Type const&);
+virtual void
+implementation (Type const&);
 
-        protected:
-        MonolithicDeploymentDescription ();
-      };
+virtual void
+configProperty_pre (Type &o)
+{
 
-      struct ResourceUsageKind : Traversal::ResourceUsageKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-        virtual void
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
 
-        virtual void
-        traverse (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        protected:
-        ResourceUsageKind ();
-      };
+virtual void
+configProperty_next (Type &o)
+{
 
-      struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
-        InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_next (Type const&);
 
+virtual void
+configProperty_post (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceUsage (Type &o)
-        {
 
-          this->resourceUsage (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_post (Type const&);
 
+virtual void
+deployedResource (Type &o)
+{
 
-        virtual void
-        resourceUsage (Type const&);
+this->deployedResource (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        requirementName (Type &o)
-        {
 
-          this->requirementName (const_cast <Type const &> (o));
-        }
+virtual void
+deployedResource (Type const&);
 
+virtual void
+deployedSharedResource (Type &o)
+{
 
-        virtual void
-        requirementName (Type const&);
+this->deployedSharedResource (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceName (Type &o)
-        {
 
-          this->resourceName (const_cast <Type const &> (o));
-        }
+virtual void
+deployedSharedResource (Type const&);
 
+virtual void
+id (Type &o)
+{
 
-        virtual void
-        resourceName (Type const&);
+this->id (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceValue (Type &o)
-        {
 
-          this->resourceValue (const_cast <Type const &> (o));
-        }
+virtual void
+id (Type const&);
 
+protected:
+InstanceDeploymentDescription ();
+};
 
-        virtual void
-        resourceValue (Type const&);
+struct CCMComponentPortKind : Traversal::CCMComponentPortKind,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        InstanceResourceDeploymentDescription ();
-      };
+virtual void
+traverse (Type &o)
+{
+this->traverse (const_cast <Type const &> (o));
+}
 
-      struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
-        InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+protected:
+CCMComponentPortKind ();
+};
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+struct ComponentPortDescription : Traversal::ComponentPortDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
+ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        node (Type &o)
-        {
 
-          this->node (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+specificType (Type &o)
+{
 
-        virtual void
-        node (Type const&);
+this->specificType (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        source (Type &o)
-        {
 
-          this->source (const_cast <Type const &> (o));
-        }
+virtual void
+specificType (Type const&);
 
+virtual void
+supportedType_pre (Type &o)
+{
 
-        virtual void
-        source (Type const&);
+this->supportedType_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        implementation (Type &o)
-        {
 
-          this->implementation (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_pre (Type const&);
 
+virtual void
+supportedType_next (Type &o)
+{
 
-        virtual void
-        implementation (Type const&);
+this->supportedType_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        configProperty_pre (Type &o)
-        {
 
-          this->configProperty_pre (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_next (Type const&);
 
+virtual void
+supportedType_post (Type &o)
+{
 
-        virtual void
-        configProperty_pre (Type const&);
+this->supportedType_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        configProperty_next (Type &o)
-        {
 
-          this->configProperty_next (const_cast <Type const &> (o));
-        }
+virtual void
+supportedType_post (Type const&);
 
+virtual void
+provider (Type &o)
+{
 
-        virtual void
-        configProperty_next (Type const&);
+this->provider (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        configProperty_post (Type &o)
-        {
 
-          this->configProperty_post (const_cast <Type const &> (o));
-        }
+virtual void
+provider (Type const&);
 
+virtual void
+exclusiveProvider (Type &o)
+{
 
-        virtual void
-        configProperty_post (Type const&);
+this->exclusiveProvider (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployedResource (Type &o)
-        {
 
-          this->deployedResource (const_cast <Type const &> (o));
-        }
+virtual void
+exclusiveProvider (Type const&);
 
+virtual void
+exclusiveUser (Type &o)
+{
 
-        virtual void
-        deployedResource (Type const&);
+this->exclusiveUser (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        deployedSharedResource (Type &o)
-        {
 
-          this->deployedSharedResource (const_cast <Type const &> (o));
-        }
+virtual void
+exclusiveUser (Type const&);
 
+virtual void
+optional (Type &o)
+{
 
-        virtual void
-        deployedSharedResource (Type const&);
+this->optional (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        id (Type &o)
-        {
 
-          this->id (const_cast <Type const &> (o));
-        }
+virtual void
+optional (Type const&);
 
+virtual void
+kind (Type &o)
+{
 
-        virtual void
-        id (Type const&);
+this->kind (const_cast <Type const &> (o));
+}
 
-        protected:
-        InstanceDeploymentDescription ();
-      };
 
-      struct CCMComponentPortKind : Traversal::CCMComponentPortKind, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+kind (Type const&);
 
-        virtual void
-        traverse (Type &o)
-        {
-          this->traverse (const_cast <Type const &> (o));
-        }
+protected:
+ComponentPortDescription ();
+};
 
-        virtual void
-        traverse (Type const&);
+struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
+ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        protected:
-        CCMComponentPortKind ();
-      };
+virtual void
+traverse (Type &o)
+{
 
-      struct ComponentPortDescription : Traversal::ComponentPortDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
-        ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+name (Type const&);
 
+virtual void
+type (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->type (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        specificType (Type &o)
-        {
 
-          this->specificType (const_cast <Type const &> (o));
-        }
+virtual void
+type (Type const&);
 
+protected:
+ComponentPropertyDescription ();
+};
 
-        virtual void
-        specificType (Type const&);
+struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
+ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        supportedType (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->supportedType (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        supportedType (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        provider (Type &o)
-        {
+virtual void
+portName (Type &o)
+{
 
-          this->provider (const_cast <Type const &> (o));
-        }
+this->portName (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        provider (Type const&);
+virtual void
+portName (Type const&);
 
-        virtual void 
-        exclusiveProvider (Type &o)
-        {
+protected:
+ComponentExternalPortEndpoint ();
+};
 
-          this->exclusiveProvider (const_cast <Type const &> (o));
-        }
+struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
+PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        exclusiveProvider (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        exclusiveUser (Type &o)
-        {
 
-          this->exclusiveUser (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+portName (Type &o)
+{
 
-        virtual void
-        exclusiveUser (Type const&);
+this->portName (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        optional (Type &o)
-        {
 
-          this->optional (const_cast <Type const &> (o));
-        }
+virtual void
+portName (Type const&);
 
+virtual void
+provider (Type &o)
+{
 
-        virtual void
-        optional (Type const&);
+this->provider (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        kind (Type &o)
-        {
 
-          this->kind (const_cast <Type const &> (o));
-        }
+virtual void
+provider (Type const&);
 
+virtual void
+kind (Type &o)
+{
 
-        virtual void
-        kind (Type const&);
+this->kind (const_cast <Type const &> (o));
+}
 
-        protected:
-        ComponentPortDescription ();
-      };
 
-      struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
-        ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+kind (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+instance (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->instance (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+instance (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+protected:
+PlanSubcomponentPortEndpoint ();
+};
 
-          this->name (const_cast <Type const &> (o));
-        }
+struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
+ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        type (Type &o)
-        {
 
-          this->type (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+location (Type &o)
+{
 
-        virtual void
-        type (Type const&);
+this->location (const_cast <Type const &> (o));
+}
 
-        protected:
-        ComponentPropertyDescription ();
-      };
 
-      struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
-        ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+location (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+protected:
+ExternalReferenceEndpoint ();
+};
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
+ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        portName (Type &o)
-        {
 
-          this->portName (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+targetName (Type &o)
+{
 
-        virtual void
-        portName (Type const&);
+this->targetName (const_cast <Type const &> (o));
+}
 
-        protected:
-        ComponentExternalPortEndpoint ();
-      };
 
-      struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
-        PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+targetName (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+requirementName (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->requirementName (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+requirementName (Type const&);
 
-        virtual void 
-        portName (Type &o)
-        {
+virtual void
+resourceName (Type &o)
+{
 
-          this->portName (const_cast <Type const &> (o));
-        }
+this->resourceName (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        portName (Type const&);
+virtual void
+resourceName (Type const&);
 
-        virtual void 
-        provider (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->provider (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        provider (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void 
-        kind (Type &o)
-        {
+virtual void
+property_next (Type &o)
+{
 
-          this->kind (const_cast <Type const &> (o));
-        }
+this->property_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        kind (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void 
-        instance (Type &o)
-        {
+virtual void
+property_post (Type &o)
+{
 
-          this->instance (const_cast <Type const &> (o));
-        }
+this->property_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        instance (Type const&);
+virtual void
+property_post (Type const&);
 
-        protected:
-        PlanSubcomponentPortEndpoint ();
-      };
+protected:
+ConnectionResourceDeploymentDescription ();
+};
 
-      struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
-        ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct PlanConnectionDescription : Traversal::PlanConnectionDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
+PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        location (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->location (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        location (Type const&);
+virtual void
+name (Type const&);
 
-        protected:
-        ExternalReferenceEndpoint ();
-      };
+virtual void
+source (Type &o)
+{
 
-      struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
-        ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->source (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+source (Type const&);
 
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        targetName (Type &o)
-        {
 
-          this->targetName (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_pre (Type const&);
 
+virtual void
+deployRequirement_next (Type &o)
+{
 
-        virtual void
-        targetName (Type const&);
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        requirementName (Type &o)
-        {
 
-          this->requirementName (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_next (Type const&);
 
+virtual void
+deployRequirement_post (Type &o)
+{
 
-        virtual void
-        requirementName (Type const&);
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceName (Type &o)
-        {
 
-          this->resourceName (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_post (Type const&);
 
+virtual void
+externalEndpoint_pre (Type &o)
+{
 
-        virtual void
-        resourceName (Type const&);
+this->externalEndpoint_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceValue (Type &o)
-        {
 
-          this->resourceValue (const_cast <Type const &> (o));
-        }
+virtual void
+externalEndpoint_pre (Type const&);
 
+virtual void
+externalEndpoint_next (Type &o)
+{
 
-        virtual void
-        resourceValue (Type const&);
+this->externalEndpoint_next (const_cast <Type const &> (o));
+}
 
-        protected:
-        ConnectionResourceDeploymentDescription ();
-      };
 
-      struct PlanConnectionDescription : Traversal::PlanConnectionDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
-        PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+externalEndpoint_next (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+externalEndpoint_post (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+externalEndpoint_post (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+internalEndpoint_pre (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+internalEndpoint_pre (Type const&);
 
-        virtual void 
-        source (Type &o)
-        {
+virtual void
+internalEndpoint_next (Type &o)
+{
 
-          this->source (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        source (Type const&);
+virtual void
+internalEndpoint_next (Type const&);
 
-        virtual void 
-        deployRequirement_pre (Type &o)
-        {
+virtual void
+internalEndpoint_post (Type &o)
+{
 
-          this->deployRequirement_pre (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement_pre (Type const&);
+virtual void
+internalEndpoint_post (Type const&);
 
-        virtual void 
-        deployRequirement_next (Type &o)
-        {
+virtual void
+externalReference_pre (Type &o)
+{
 
-          this->deployRequirement_next (const_cast <Type const &> (o));
-        }
+this->externalReference_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement_next (Type const&);
+virtual void
+externalReference_pre (Type const&);
 
-        virtual void 
-        deployRequirement_post (Type &o)
-        {
+virtual void
+externalReference_next (Type &o)
+{
 
-          this->deployRequirement_post (const_cast <Type const &> (o));
-        }
+this->externalReference_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement_post (Type const&);
+virtual void
+externalReference_next (Type const&);
 
-        virtual void 
-        externalEndpoint_pre (Type &o)
-        {
+virtual void
+externalReference_post (Type &o)
+{
 
-          this->externalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->externalReference_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+externalReference_post (Type const&);
 
-        virtual void 
-        externalEndpoint_next (Type &o)
-        {
+virtual void
+deployedResource_pre (Type &o)
+{
 
-          this->externalEndpoint_next (const_cast <Type const &> (o));
-        }
+this->deployedResource_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+deployedResource_pre (Type const&);
 
-        virtual void 
-        externalEndpoint_post (Type &o)
-        {
+virtual void
+deployedResource_next (Type &o)
+{
 
-          this->externalEndpoint_post (const_cast <Type const &> (o));
-        }
+this->deployedResource_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+deployedResource_next (Type const&);
 
-        virtual void 
-        internalEndpoint_pre (Type &o)
-        {
+virtual void
+deployedResource_post (Type &o)
+{
 
-          this->internalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->deployedResource_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+deployedResource_post (Type const&);
 
-        virtual void 
-        internalEndpoint_next (Type &o)
-        {
+protected:
+PlanConnectionDescription ();
+};
 
-          this->internalEndpoint_next (const_cast <Type const &> (o));
-        }
+struct ImplementationDependency : Traversal::ImplementationDependency,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
+ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        internalEndpoint_next (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        internalEndpoint_post (Type &o)
-        {
 
-          this->internalEndpoint_post (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+requiredType (Type &o)
+{
 
-        virtual void
-        internalEndpoint_post (Type const&);
+this->requiredType (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        externalReference_pre (Type &o)
-        {
 
-          this->externalReference_pre (const_cast <Type const &> (o));
-        }
+virtual void
+requiredType (Type const&);
 
+protected:
+ImplementationDependency ();
+};
 
-        virtual void
-        externalReference_pre (Type const&);
+struct Capability : Traversal::Capability,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Capability Type;
+Capability (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        externalReference_next (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->externalReference_next (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        externalReference_post (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->externalReference_post (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        deployedResource_pre (Type &o)
-        {
+virtual void
+resourceType_pre (Type &o)
+{
 
-          this->deployedResource_pre (const_cast <Type const &> (o));
-        }
+this->resourceType_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployedResource_pre (Type const&);
+virtual void
+resourceType_pre (Type const&);
 
-        virtual void 
-        deployedResource_next (Type &o)
-        {
+virtual void
+resourceType_next (Type &o)
+{
 
-          this->deployedResource_next (const_cast <Type const &> (o));
-        }
+this->resourceType_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployedResource_next (Type const&);
+virtual void
+resourceType_next (Type const&);
 
-        virtual void 
-        deployedResource_post (Type &o)
-        {
+virtual void
+resourceType_post (Type &o)
+{
 
-          this->deployedResource_post (const_cast <Type const &> (o));
-        }
+this->resourceType_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployedResource_post (Type const&);
+virtual void
+resourceType_post (Type const&);
 
-        protected:
-        PlanConnectionDescription ();
-      };
+virtual void
+property_pre (Type &o)
+{
 
-      struct ImplementationDependency : Traversal::ImplementationDependency, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
-        ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&);
+this->property_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+property_pre (Type const&);
 
+virtual void
+property_next (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->property_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        requiredType (Type &o)
-        {
 
-          this->requiredType (const_cast <Type const &> (o));
-        }
+virtual void
+property_next (Type const&);
 
+virtual void
+property_post (Type &o)
+{
 
-        virtual void
-        requiredType (Type const&);
+this->property_post (const_cast <Type const &> (o));
+}
 
-        protected:
-        ImplementationDependency ();
-      };
 
-      struct Capability : Traversal::Capability, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Capability Type;
-        Capability (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+property_post (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+protected:
+Capability ();
+};
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+struct ImplementationRequirement : Traversal::ImplementationRequirement,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
+ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        traverse (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+resourceUsage (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->resourceUsage (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        resourceType (Type &o)
-        {
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+virtual void
+resourceUsage (Type const&);
 
+virtual void
+resourcePort (Type &o)
+{
 
-        virtual void
-        resourceType (Type const&);
+this->resourcePort (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        property (Type &o)
-        {
 
-          this->property (const_cast <Type const &> (o));
-        }
+virtual void
+resourcePort (Type const&);
 
+virtual void
+componentPort (Type &o)
+{
 
-        virtual void
-        property (Type const&);
+this->componentPort (const_cast <Type const &> (o));
+}
 
-        protected:
-        Capability ();
-      };
 
-      struct ImplementationRequirement : Traversal::ImplementationRequirement, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
-        ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+componentPort (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+resourceType (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->resourceType (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void 
-        resourceUsage (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->resourceUsage (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resourceUsage (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        resourcePort (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->resourcePort (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resourcePort (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void 
-        componentPort (Type &o)
-        {
+virtual void
+property_next (Type &o)
+{
 
-          this->componentPort (const_cast <Type const &> (o));
-        }
+this->property_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        componentPort (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void 
-        resourceType (Type &o)
-        {
+virtual void
+property_post (Type &o)
+{
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+this->property_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+protected:
+ImplementationRequirement ();
+};
 
-          this->name (const_cast <Type const &> (o));
-        }
+struct ComponentPackageReference : Traversal::ComponentPackageReference,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
+ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        property (Type &o)
-        {
 
-          this->property (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+requiredUUID (Type &o)
+{
 
-        virtual void
-        property (Type const&);
+this->requiredUUID (const_cast <Type const &> (o));
+}
 
-        protected:
-        ImplementationRequirement ();
-      };
 
-      struct ComponentPackageReference : Traversal::ComponentPackageReference, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
-        ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+requiredUUID (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+requiredName (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->requiredName (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+requiredName (Type const&);
 
-        virtual void 
-        requiredUUID (Type &o)
-        {
+virtual void
+requiredType (Type &o)
+{
 
-          this->requiredUUID (const_cast <Type const &> (o));
-        }
+this->requiredType (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        requiredUUID (Type const&);
+virtual void
+requiredType (Type const&);
 
-        virtual void 
-        requiredName (Type &o)
-        {
+protected:
+ComponentPackageReference ();
+};
 
-          this->requiredName (const_cast <Type const &> (o));
-        }
+struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type;
+SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        requiredName (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        requiredType (Type &o)
-        {
 
-          this->requiredType (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+portName (Type &o)
+{
 
-        virtual void
-        requiredType (Type const&);
+this->portName (const_cast <Type const &> (o));
+}
 
-        protected:
-        ComponentPackageReference ();
-      };
 
-      struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type;
-        SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+portName (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+instance (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->instance (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+instance (Type const&);
 
-        virtual void 
-        portName (Type &o)
-        {
+protected:
+SubcomponentPortEndpoint ();
+};
 
-          this->portName (const_cast <Type const &> (o));
-        }
+struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
+AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+virtual void
+traverse (Type &o)
+{
 
-        virtual void
-        portName (Type const&);
+this->traverse (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        instance (Type &o)
-        {
 
-          this->instance (const_cast <Type const &> (o));
-        }
+virtual void
+traverse (Type const&);
 
+virtual void
+name (Type &o)
+{
 
-        virtual void
-        instance (Type const&);
+this->name (const_cast <Type const &> (o));
+}
 
-        protected:
-        SubcomponentPortEndpoint ();
-      };
 
-      struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
-        AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+deployRequirement_next (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void 
-        deployRequirement (Type &o)
-        {
+virtual void
+deployRequirement_post (Type &o)
+{
 
-          this->deployRequirement (const_cast <Type const &> (o));
-        }
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void 
-        externalEndpoint_pre (Type &o)
-        {
+virtual void
+internalEndpoint_pre (Type &o)
+{
 
-          this->externalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalEndpoint_pre (Type const&);
+virtual void
+internalEndpoint_pre (Type const&);
 
-        virtual void 
-        externalEndpoint_next (Type &o)
-        {
+virtual void
+internalEndpoint_next (Type &o)
+{
 
-          this->externalEndpoint_next (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalEndpoint_next (Type const&);
+virtual void
+internalEndpoint_next (Type const&);
 
-        virtual void 
-        externalEndpoint_post (Type &o)
-        {
+virtual void
+internalEndpoint_post (Type &o)
+{
 
-          this->externalEndpoint_post (const_cast <Type const &> (o));
-        }
+this->internalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalEndpoint_post (Type const&);
+virtual void
+internalEndpoint_post (Type const&);
 
-        virtual void 
-        internalEndpoint_pre (Type &o)
-        {
+virtual void
+externalEndpoint_pre (Type &o)
+{
 
-          this->internalEndpoint_pre (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        internalEndpoint_pre (Type const&);
+virtual void
+externalEndpoint_pre (Type const&);
 
-        virtual void 
-        internalEndpoint_next (Type &o)
-        {
+virtual void
+externalEndpoint_next (Type &o)
+{
 
-          this->internalEndpoint_next (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        internalEndpoint_next (Type const&);
+virtual void
+externalEndpoint_next (Type const&);
 
-        virtual void 
-        internalEndpoint_post (Type &o)
-        {
+virtual void
+externalEndpoint_post (Type &o)
+{
 
-          this->internalEndpoint_post (const_cast <Type const &> (o));
-        }
+this->externalEndpoint_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        internalEndpoint_post (Type const&);
+virtual void
+externalEndpoint_post (Type const&);
 
-        virtual void 
-        externalReference_pre (Type &o)
-        {
+virtual void
+externalReference_pre (Type &o)
+{
 
-          this->externalReference_pre (const_cast <Type const &> (o));
-        }
+this->externalReference_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalReference_pre (Type const&);
+virtual void
+externalReference_pre (Type const&);
 
-        virtual void 
-        externalReference_next (Type &o)
-        {
+virtual void
+externalReference_next (Type &o)
+{
 
-          this->externalReference_next (const_cast <Type const &> (o));
-        }
+this->externalReference_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalReference_next (Type const&);
+virtual void
+externalReference_next (Type const&);
 
-        virtual void 
-        externalReference_post (Type &o)
-        {
+virtual void
+externalReference_post (Type &o)
+{
 
-          this->externalReference_post (const_cast <Type const &> (o));
-        }
+this->externalReference_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        externalReference_post (Type const&);
+virtual void
+externalReference_post (Type const&);
 
-        protected:
-        AssemblyConnectionDescription ();
-      };
-    }
-  }
+protected:
+AssemblyConnectionDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // BASIC_DEPLOYMENT_DATA_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index 288787f1eda..cda67eb00f3 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ciao/CIAO_common.h"
 #include "CCD_Handler.h"
 #include "ccd.hpp"
 #include "Property_Handler.h"
@@ -13,173 +14,172 @@ namespace CIAO
   {
     void
     CCD_Handler::component_interface_descr (
-        const ComponentInterfaceDescription &desc,
-        Deployment::ComponentInterfaceDescription& toconfig)
+                                            const ComponentInterfaceDescription &desc,
+                                            Deployment::ComponentInterfaceDescription& toconfig)
     {
-	if (desc.UUID_p ())
-	    toconfig.UUID =
-		CORBA::string_dup (desc.UUID ().c_str ());
+      CIAO_TRACE("CCD_Handler::component_interface_descr");
+      if (desc.UUID_p ())
+        toconfig.UUID =
+          CORBA::string_dup (desc.UUID ().c_str ());
 
-	if (desc.label_p ())
+      if (desc.label_p ())
         {
-	    toconfig.label =
-		CORBA::string_dup (desc.label ().c_str ());
+          toconfig.label =
+            CORBA::string_dup (desc.label ().c_str ());
         }
-	
-	if (desc.specificType_p ())
+
+      if (desc.specificType_p ())
         {
-	    toconfig.specificType =
-		CORBA::string_dup (desc.specificType ().c_str ());
+          toconfig.specificType =
+            CORBA::string_dup (desc.specificType ().c_str ());
         }
 
-	ComponentInterfaceDescription::supportedType_const_iterator
-	    end = desc.end_supportedType ();
-	
-        CORBA::ULong pos = 0;
-        toconfig.supportedType.length (desc.count_supportedType ());
-	for (ComponentInterfaceDescription::supportedType_const_iterator s =
-		 desc.begin_supportedType ();
-	     s != end;
-	     ++s)
+      ComponentInterfaceDescription::supportedType_const_iterator
+        end = desc.end_supportedType ();
+
+      CORBA::ULong pos = 0;
+      toconfig.supportedType.length (desc.count_supportedType ());
+      for (ComponentInterfaceDescription::supportedType_const_iterator s =
+             desc.begin_supportedType ();
+           s != end;
+           ++s)
         {
           toconfig.supportedType[pos++] = s->c_str ();
         }
-	
-	ComponentInterfaceDescription::idlFile_const_iterator
-	    eidl = desc.end_idlFile ();
-	pos = 0;
-        toconfig.idlFile.length (desc.count_idlFile ());
-	for (ComponentInterfaceDescription::idlFile_const_iterator sidl=
-		 desc.begin_idlFile ();
-	     sidl != eidl;
-	     ++sidl)
+
+      ComponentInterfaceDescription::idlFile_const_iterator
+        eidl = desc.end_idlFile ();
+      pos = 0;
+      toconfig.idlFile.length (desc.count_idlFile ());
+      for (ComponentInterfaceDescription::idlFile_const_iterator sidl=
+             desc.begin_idlFile ();
+           sidl != eidl;
+           ++sidl)
+        {
+          toconfig.idlFile [pos++] = sidl->c_str ();
+        }
+
+      ComponentInterfaceDescription::configProperty_const_iterator pend =
+        desc.end_configProperty ();
+      pos = 0;
+      toconfig.configProperty.length (desc.count_configProperty ());
+      for (ComponentInterfaceDescription::configProperty_const_iterator pstart =
+             desc.begin_configProperty ();
+           pstart != pend;
+           ++pstart)
+        {
+          Property_Handler::get_property (*pstart,
+                                          toconfig.configProperty [pos++]);
+        }
+
+      pos = 0;
+      toconfig.port.length (desc.count_port ());
+      for (ComponentInterfaceDescription::port_const_iterator
+             port (desc.begin_port ());
+           port != desc.end_port ();
+           ++port)
+        {
+          CPD_Handler::component_port_description (
+                                                   *port,
+                                                   toconfig.port[pos++]);
+        }
+
+      pos = 0;
+      toconfig.property.length ( desc.count_property ());
+      for(ComponentInterfaceDescription::property_const_iterator
+            prop (desc.begin_property());
+          prop != desc.end_property();
+          prop++)
+        {
+          ComponentPropertyDescription_Handler::component_property_description (
+                                                                                *prop,
+                                                                                toconfig.property[pos++]);
+        }
+
+      pos = 0;
+      toconfig.infoProperty.length (desc.count_infoProperty ());
+      for ( ComponentInterfaceDescription::infoProperty_const_iterator
+              infoProp (desc.begin_infoProperty());
+            infoProp != desc.end_infoProperty();
+            infoProp++)
         {
-	    toconfig.idlFile [pos++] = sidl->c_str ();
+          Property_Handler::get_property (
+                                          *infoProp,
+                                          toconfig.infoProperty[pos]);
         }
-	
-	ComponentInterfaceDescription::configProperty_const_iterator pend =
-	    desc.end_configProperty ();
-	pos = 0;
-        toconfig.configProperty.length (desc.count_configProperty ());
-	for (ComponentInterfaceDescription::configProperty_const_iterator pstart =
-		 desc.begin_configProperty ();
-	     pstart != pend;
-	     ++pstart)
-	{
-	    Property_Handler::get_property (*pstart,
-					    toconfig.configProperty [pos++]);
-	}
-	
-        pos = 0;
-        toconfig.port.length (desc.count_port ());
-	for (ComponentInterfaceDescription::port_const_iterator
-		 port (desc.begin_port ());
-	     port != desc.end_port ();
-	     ++port)
-	{
-	    CPD_Handler::component_port_description (
-		*port,
-		toconfig.port[pos++]);
-	}
-	
-        pos = 0;
-        toconfig.property.length ( desc.count_property ());
-	for(ComponentInterfaceDescription::property_const_iterator
-		prop (desc.begin_property());
-	    prop != desc.end_property();
-	    prop++)
-	{
-	    ComponentPropertyDescription_Handler::component_property_description (
-		*prop,
-		toconfig.property[pos++]);
-	}
-	
-        pos = 0;
-        toconfig.infoProperty.length (desc.count_infoProperty ());
-	for ( ComponentInterfaceDescription::infoProperty_const_iterator
-		  infoProp (desc.begin_infoProperty());
-	      infoProp != desc.end_infoProperty();
-	      infoProp++)
-	{
-	    Property_Handler::get_property (
-		*infoProp,
-		toconfig.infoProperty[pos]);
-	}	
     }
 
-      ComponentInterfaceDescription
-      CCD_Handler::component_interface_descr (
-	  const ::Deployment::ComponentInterfaceDescription&  src)
-      {
-	  ComponentInterfaceDescription cid;
-	  
-	  //Load up the basic string members
-	  XMLSchema::string< char > uuid ((src.UUID));
-	  XMLSchema::string< char > label ((src.label));
-	  XMLSchema::string< char > specifict ((src.specificType));
-	  
-	  //Then put them in the CID
-	  cid.UUID (uuid);
-	  cid.label (label);
-	  cid.specificType (specifict);
-	  
-	  //Get the supported type(s) and load them into cid
-	  ::CORBA::ULong total = src.supportedType.length ();
-	  for (size_t i = 0; i < total; ++i)
-	  {
-	      XMLSchema::string< char > curr ((src.supportedType[i]));
-	      cid.add_supportedType (curr);
-	  }
-	  
-	  //Get the idlFile(s) and store them into the cid
-	  total = src.idlFile.length ();
-	  for (size_t j = 0; j < total; ++j)
-	  {
-	      XMLSchema::string< char > curr ((src.idlFile[j]));
-	      cid.add_idlFile (curr);
-	  }
-	  
-	  //Get the configProperty(ies) and store them into the cid 
-	  total = src.configProperty.length ();
-	  for (size_t k = 0; k < total; ++k)
-	  {
-	      cid.add_configProperty (
-		  Property_Handler::get_property (
-		      src.configProperty[k]));
-	  }
-	  
-	  //Same drill for the component port description(s)
-	  total = src.port.length ();
-	  for (size_t l = 0; l < total; ++l)
-	  {
-	      cid.add_port (
-		  CPD_Handler::component_port_description (
-		      src.port[l]));
-	  }
-
-	  //Load up the property field
-	  total = src.property.length();
-	  for(size_t m = 0;
-	      m < total;
-	      m++)
-	  {
-	      cid.add_property(
-		  ComponentPropertyDescription_Handler::component_property_description (
-		      src.property[m]));
-	  }
-
-	  //Load up the infoProperty(s)
-	  total = src.infoProperty.length();
-	  for(size_t n = 0;
-	      n < total;
-	      n++)
-	  {
-	      cid.add_infoProperty(
-		  Property_Handler::get_property (
-		      src.infoProperty[n]));
-	  }
-
-	  return cid;
-      }
+    ComponentInterfaceDescription
+    CCD_Handler::component_interface_descr (
+                                            const ::Deployment::ComponentInterfaceDescription&  src)
+    {
+      CIAO_TRACE("CCD_Handler::component_interface_descr - reverse");
+      ComponentInterfaceDescription cid;
+
+      //Load up the basic string members
+      XMLSchema::string< char > uuid ((src.UUID));
+      XMLSchema::string< char > label ((src.label));
+      XMLSchema::string< char > specifict ((src.specificType));
+
+      //Then put them in the CID
+      cid.UUID (uuid);
+      cid.label (label);
+      cid.specificType (specifict);
+
+      //Get the supported type(s) and load them into cid
+      ::CORBA::ULong total = src.supportedType.length ();
+      for (size_t i = 0; i < total; ++i)
+        {
+          XMLSchema::string< char > curr ((src.supportedType[i]));
+          cid.add_supportedType (curr);
+        }
+
+      //Get the idlFile(s) and store them into the cid
+      total = src.idlFile.length ();
+      for (size_t j = 0; j < total; ++j)
+        {
+          XMLSchema::string< char > curr ((src.idlFile[j]));
+          cid.add_idlFile (curr);
+        }
+
+      //Get the configProperty(ies) and store them into the cid
+      total = src.configProperty.length ();
+      for (size_t k = 0; k < total; ++k)
+        {
+          cid.add_configProperty (
+                                  Property_Handler::get_property (src.configProperty[k]));
+        }
+
+      //Same drill for the component port description(s)
+      total = src.port.length ();
+      for (size_t l = 0; l < total; ++l)
+        {
+          cid.add_port (
+                        CPD_Handler::component_port_description (src.port[l]));
+        }
+
+      //Load up the property field
+      total = src.property.length();
+      for(size_t m = 0;
+          m < total;
+          m++)
+        {
+          cid.add_property(
+                           ComponentPropertyDescription_Handler::component_property_description (
+                                                                                                 src.property[m]));
+        }
+
+      //Load up the infoProperty(s)
+      total = src.infoProperty.length();
+      for(size_t n = 0;
+          n < total;
+          n++)
+        {
+          cid.add_infoProperty(
+                               Property_Handler::get_property (src.infoProperty[n]));
+        }
+
+      return cid;
+    }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h
index 0be3146798c..b3e8292f038 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  CCD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CCD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CCD_HANDLER_H
@@ -20,37 +20,37 @@
 
 namespace Deployment
 {
-  struct ComponentInterfaceDescription;
+struct ComponentInterfaceDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentInterfaceDescription;
-
-   /*
-    * @class CCD_Handler
-    *
-    * @brief Handler class for <ComponentInterfaceDescription> types.
-    *
-    * This class is named CCD_Handler but actually fills
-    * <ComponentInterfaceDescription>. Why is this confusion? We
-    * want to maintain the correlation between the XSD file and the
-    * actual datatype. The file name corresponds to the XSD file but
-    * the data type being filled in is of type
-    * <ComponentInterfaceDescription>
-    */
-    class Config_Handlers_Export CCD_Handler
-    {
-      public:
-       static void component_interface_descr (const ComponentInterfaceDescription &src,
-                                              ::Deployment::ComponentInterfaceDescription& dest);
-       static ComponentInterfaceDescription
-	   component_interface_descr (const ::Deployment::ComponentInterfaceDescription&  src);
-
-    };
-  }
+namespace Config_Handlers
+{
+class ComponentInterfaceDescription;
+
+/*
+* @class CCD_Handler
+*
+* @brief Handler class for <ComponentInterfaceDescription> types.
+*
+* This class is named CCD_Handler but actually fills
+* <ComponentInterfaceDescription>. Why is this confusion? We
+* want to maintain the correlation between the XSD file and the
+* actual datatype. The file name corresponds to the XSD file but
+* the data type being filled in is of type
+* <ComponentInterfaceDescription>
+*/
+class Config_Handlers_Export CCD_Handler
+{
+public:
+static void component_interface_descr (const ComponentInterfaceDescription &src,
+::Deployment::ComponentInterfaceDescription& dest);
+static ComponentInterfaceDescription
+component_interface_descr (const ::Deployment::ComponentInterfaceDescription&  src);
+
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 71d280266bd..8cc056f1b40 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -3,16 +3,17 @@
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     CEPE_Handler::external_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::ComponentExternalPortEndpoints &dest)
+                                           const PlanConnectionDescription &src,
+                                           ::Deployment::ComponentExternalPortEndpoints &dest)
     {
+      CIAO_TRACE("CEOE_Handler::external_port_endpoints");
       PlanConnectionDescription::externalEndpoint_const_iterator eeci_e =
         src.end_externalEndpoint ();
 
@@ -30,20 +31,20 @@ namespace CIAO
 
     void
     CEPE_Handler::external_port_endpoint (
-        const ComponentExternalPortEndpoint &src,
-        ::Deployment::ComponentExternalPortEndpoint &dest)
+                                          const ComponentExternalPortEndpoint &src,
+                                          ::Deployment::ComponentExternalPortEndpoint &dest)
     {
+      CIAO_TRACE("CEPE_Handler::external_port_endpoint");
       dest.portName = src.portName ().c_str ();
     }
-    
+
     ComponentExternalPortEndpoint
     CEPE_Handler::external_port_endpoint (
-      const ::Deployment::ComponentExternalPortEndpoint &src)
+                                          const ::Deployment::ComponentExternalPortEndpoint &src)
     {
-      //MAJO Unfinished
+      CIAO_TRACE("CEPE_Handler::external_port_endpoint - reverse");
       XMLSchema::string< char > portname ((src.portName));
-      ComponentExternalPortEndpoint cepe (portname);
-      return cepe;
+      return ComponentExternalPortEndpoint  (portname);
     }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
index 708e5e35c90..681fcb1ec43 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  CEPE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CEPE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CEPE_HANDLER_H
@@ -13,6 +13,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -20,45 +21,48 @@
 
 namespace Deployment
 {
-  class ComponentExternalPortEndpoints;
-  struct ComponentExternalPortEndpoint;
+class ComponentExternalPortEndpoints;
+struct ComponentExternalPortEndpoint;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class ComponentExternalPortEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ComponentExternalPortEndpoint;
+
+/*
+* @class CEPE_Handler
+*
+* @brief Handler class for <ComponentExternalPortEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC ComponentExternalPortEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export CEPE_Handler
+{
+public:
+static void external_port_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ComponentExternalPortEndpoints &dest);
+
+static ComponentExternalPortEndpoint
+external_port_endpoint (
+const ::Deployment::ComponentExternalPortEndpoint &src);
 
-    /*
-     * @class CEPE_Handler
-     *
-     * @brief Handler class for <ComponentExternalPortEndpoint> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC ComponentExternalPortEndpoint objects, parsed from
-     * the descriptor files, to the corresponding CORBA IDL type.
-     *
-     */
+static void external_port_endpoint (const ComponentExternalPortEndpoint &src,
+::Deployment::ComponentExternalPortEndpoint &dest);
+};
 
-    class Config_Handlers_Export CEPE_Handler
-    {
-    public:
-      static void external_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::ComponentExternalPortEndpoints &dest);
-      
-      static ComponentExternalPortEndpoint
-      external_port_endpoint (
-        const ::Deployment::ComponentExternalPortEndpoint &src);
-        
-    private:
-      static void external_port_endpoint (
-        const ComponentExternalPortEndpoint &src,
-        ::Deployment::ComponentExternalPortEndpoint &dest);
-    };
-  }
+typedef Sequence_Handler < ComponentExternalPortEndpoint,
+::Deployment::ComponentExternalPortEndpoints,
+::Deployment::ComponentExternalPortEndpoint,
+CEPE_Handler::external_port_endpoint > CEPE_Functor;
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index ccf604c5465..25d1af78e9d 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -2,149 +2,148 @@
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     CPD_Handler::component_port_description (
-      const ComponentPortDescription& desc,
-      Deployment::ComponentPortDescription& toconfig)
+                                             const ComponentPortDescription& desc,
+                                             Deployment::ComponentPortDescription& toconfig)
     {
+      CIAO_TRACE("CPD_Handler::component_port_description");
       toconfig.name =
         desc.name ().c_str ();
 
-      toconfig.specificType =
-        desc.specificType ().c_str ();
+      if (desc.specificType_p ())
+        toconfig.specificType =
+          desc.specificType ().c_str ();
+
+      toconfig.supportedType.length (desc.count_supportedType ());
+      std::for_each (desc.begin_supportedType (),
+                     desc.end_supportedType (),
+                     String_Seq_Functor (toconfig.supportedType));
 
-      if (!desc.supportedType ().empty ())
-        {
-          toconfig.supportedType.length (1);
-          toconfig.supportedType[0] =
-            desc.supportedType ().c_str ();
-        }
-      
       switch (desc.kind ().integral ())
         {
         case CCMComponentPortKind::Facet_l:
           toconfig.kind = Deployment::Facet;
           break;
-          
+
         case CCMComponentPortKind::SimplexReceptacle_l:
           toconfig.kind = Deployment::SimplexReceptacle;
           break;
-          
+
         case CCMComponentPortKind::MultiplexReceptacle_l:
           toconfig.kind = Deployment::MultiplexReceptacle;
           break;
-          
+
         case CCMComponentPortKind::EventEmitter_l:
           toconfig.kind = Deployment::EventEmitter;
           break;
-          
+
         case CCMComponentPortKind::EventPublisher_l:
           toconfig.kind = Deployment::EventPublisher;
           break;
-          
+
         case CCMComponentPortKind::EventConsumer_l:
-          toconfig.kind = Deployment::EventConsumer; 
+          toconfig.kind = Deployment::EventConsumer;
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR, "Invalid port type in connection %s\n",
                       desc.name ().c_str ()));
           throw 1;
         }
-      
+
       /* @@BUG: We need to consider how to handle booleans. */
-      toconfig.provider = desc.provider () == "true";
-      toconfig.exclusiveProvider = desc.exclusiveProvider () == "true";
-      toconfig.exclusiveUser = desc.exclusiveUser () == "true";
-      toconfig.optional =  desc.optional () == "true";
+      toconfig.provider = desc.provider ();
+      toconfig.exclusiveProvider = desc.exclusiveProvider ();
+      toconfig.exclusiveUser = desc.exclusiveUser ();
+      toconfig.optional =  desc.optional ();
     }
-    
+
     ComponentPortDescription
     CPD_Handler::component_port_description (
-      const Deployment::ComponentPortDescription& src)
+                                             const Deployment::ComponentPortDescription& src)
     {
+      CIAO_TRACE("CPD_Handler::component_port_description - reverse");
       ::XMLSchema::string< char > name ((src.name));
       ::XMLSchema::string< char > stype ((src.specificType));
-     
-      ::XMLSchema::string< char > tval ("true"); 
-      ::XMLSchema::string< char > fval ("false"); 
-      ::XMLSchema::string< char > provider ("");
-      ::XMLSchema::string< char > exclusiveProvider ("");
-      ::XMLSchema::string< char > exclusiveUser ("");
-      ::XMLSchema::string< char > optional ("");
-      
+
+      ::XMLSchema::string< char > tval ("true");
+      ::XMLSchema::string< char > fval ("false");
+      XMLSchema::boolean provider;
+      XMLSchema::boolean  exclusiveProvider;
+      XMLSchema::boolean exclusiveUser;
+      XMLSchema::boolean optional;
+
       if (src.provider)
-        provider = tval;
+        provider = true;
       else
-        provider = fval;
-      
+        provider = false;
+
       if (src.exclusiveUser)
-        exclusiveUser = tval;
+        exclusiveUser = true;
       else
-        provider = fval;
-      
+        provider = false;
+
       if (src.exclusiveProvider)
-        exclusiveProvider = tval;
+        exclusiveProvider = true;
       else
-        provider = fval;
-      
+        provider = false;
+
       if (src.optional)
-        optional = tval;
+        optional = true;
       else
-        provider = fval;
-      
-      ComponentPortDescription cpd (
-        name,
-        stype,
-        tval,
-        provider,
-        exclusiveProvider,
-        exclusiveUser,
-        optional,
-        CCMComponentPortKind::Facet);
+        provider = false;
+
+      ComponentPortDescription cpd (name,
+                                    provider,
+                                    exclusiveProvider,
+                                    exclusiveUser,
+                                    optional,
+                                    CCMComponentPortKind::Facet);
 
       switch (src.kind)
         {
         case ::Deployment::Facet:
           cpd.kind (CCMComponentPortKind::Facet);
           break;
-          
+
         case ::Deployment::SimplexReceptacle:
           cpd.kind (CCMComponentPortKind::SimplexReceptacle);
           break;
-          
+
         case ::Deployment::MultiplexReceptacle:
           cpd.kind (CCMComponentPortKind::MultiplexReceptacle);
           break;
-          
+
         case ::Deployment::EventEmitter:
           cpd.kind (CCMComponentPortKind::EventEmitter);
           break;
-          
+
         case ::Deployment::EventPublisher:
           cpd.kind (CCMComponentPortKind::EventPublisher);
           break;
-          
+
         case ::Deployment::EventConsumer:
           cpd.kind (CCMComponentPortKind::EventConsumer);
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR, "Invalid port kind in connection %s\n",
                       name.c_str ()));
         }
-      
 
-      if (src.supportedType.length () > 0)
-        cpd.supportedType (
-          XMLSchema::string< char > ((src.supportedType[0])));      
+
+      for (CORBA::ULong i = 0; i < src.supportedType.length (); ++i)
+        cpd.add_supportedType (XMLSchema::string< char > ((src.supportedType[i])));
 
       return cpd;
     }
-  
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
index 3bb017a3429..31737241b51 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  CPD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CPD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CPD_HANDLER_H
@@ -14,6 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,41 +22,48 @@
 
 namespace Deployment
 {
-  struct ComponentPortDescription;
+class ComponentPortDescription;
+class ComponentPortDescriptions;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentPortDescription;
-    /*
-     * @class CPD_Handler
-     *
-     * @brief Handler class for <CCMComponentPortDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-
-    class Config_Handlers_Export CPD_Handler
-    {
-
-    public:
-      /// Maps the values from the XSC object
-      /// <ComponentInterfaceDescription> to the CORBA IDL type
-      /// <Deployment::ComponentInterfaceDescription>.
-     static void component_port_description (
-         const ComponentPortDescription &desc,
-         ::Deployment::ComponentPortDescription &toconfig);
-    
-     static ComponentPortDescription
-     component_port_description (
-         const Deployment::ComponentPortDescription& src);
-  };
- }
+namespace Config_Handlers
+{
+class ComponentPortDescription;
+/*
+* @class CPD_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+
+class Config_Handlers_Export CPD_Handler
+{
+
+public:
+/// Maps the values from the XSC object
+/// <ComponentInterfaceDescription> to the CORBA IDL type
+/// <Deployment::ComponentInterfaceDescription>.
+static void component_port_description (
+const ComponentPortDescription &desc,
+::Deployment::ComponentPortDescription &toconfig);
+
+static ComponentPortDescription
+component_port_description (
+const Deployment::ComponentPortDescription& src);
+};
+
+typedef Sequence_Handler < ComponentPortDescription,
+::Deployment::ComponentPortDescriptions,
+::Deployment::ComponentPortDescription,
+CPD_Handler::component_port_description > CPD_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
index da4f6584eb0..60982da955a 100644
--- a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
@@ -4,7 +4,9 @@
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "Property_Handler.h"
 
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -22,33 +24,40 @@ namespace CIAO
     ///and maps the values from the passed in XSC
     ///ConnectionResourceDeploymentDescription to its members.
     void CRDD_Handler::get_ConnectionResourceDeploymentDescription (
-                Deployment::ConnectionResourceDeploymentDescription& toconfig,
-                ConnectionResourceDeploymentDescription& desc)
+                                                                    Deployment::ConnectionResourceDeploymentDescription& toconfig,
+                                                                    ConnectionResourceDeploymentDescription& desc)
     {
-      toconfig.targetName = CORBA::string_dup (desc.targetName ().c_str ());
-      toconfig.requirementName =
-        CORBA::string_dup (desc.requirementName ().c_str ());
-      toconfig.resourceName =
-        CORBA::string_dup (desc.resourceName ().c_str ());
-
-      Any_Handler::extract_into_any (desc.resourceValue (),
-                                     toconfig.resourceValue);
+      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDD");
+
+      toconfig.targetName = desc.targetName ().c_str ();
+      toconfig.requirementName = desc.requirementName ().c_str ();
+      toconfig.resourceName = desc.resourceName ().c_str ();
+
+      std::for_each (desc.begin_property (),
+                     desc.end_property (),
+                     Property_Functor (toconfig.property));
     }
-    
+
     ConnectionResourceDeploymentDescription
     CRDD_Handler::connection_resource_depl_desc (
-      const ::Deployment::ConnectionResourceDeploymentDescription& src)
+                                                 const ::Deployment::ConnectionResourceDeploymentDescription& src)
     {
-      XMLSchema::string< char > tname ((src.targetName));
-      XMLSchema::string< char > reqname ((src.requirementName));
-      XMLSchema::string< char > resname ((src.resourceName));
-      Any resval (Any_Handler::get_any (src.resourceValue));
-      
-      ConnectionResourceDeploymentDescription crdd (
-                                              tname,
-                                              reqname,
-                                              resname,
-                                              resval);
+      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription- reverse");
+      XMLSchema::string< ACE_TCHAR > tname ((src.targetName));
+      XMLSchema::string< ACE_TCHAR > reqname ((src.requirementName));
+      XMLSchema::string <ACE_TCHAR> resname ((src.resourceName));
+
+      ConnectionResourceDeploymentDescription crdd (tname,
+                                                    reqname,
+                                                    resname);
+
+      for (CORBA::ULong i = 0;
+           i != src.property.length ();
+           ++i)
+        {
+          crdd.add_property (Property_Handler::get_property (src.property[i]));
+        }
+
       return crdd;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h
index 3196b4bb1f4..314a07e1edb 100644
--- a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  CRDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CRDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CRDD_HANDLER_H
@@ -20,48 +20,48 @@
 
 namespace Deployment
 {
-  struct ConnectionResourceDeploymentDescription; 
+struct ConnectionResourceDeploymentDescription;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    
-   class ConnectionResourceDeploymentDescription;
-   
-   /*
-    * @class CRDD_Handler
-    *
-    * @brief Handler class for <ConnectionResourceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC ConnectionResourceDeploymentDescription objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
-    
-    class Config_Handlers_Export CRDD_Handler{
-     
-      public:
-       
-        CRDD_Handler (void);
-        virtual ~CRDD_Handler (void);
-  
-        ///This method takes a <Deployment::ConnectionResourceDeploymentDescription>
-        ///and maps the values from the passed in XSC 
-        ///ConnectionResourceDeploymentDescription to its members.
-        void get_ConnectionResourceDeploymentDescription (
-                    Deployment::ConnectionResourceDeploymentDescription& toconfig,
-                    ConnectionResourceDeploymentDescription& desc);   
-                    
-        static ConnectionResourceDeploymentDescription
-        connection_resource_depl_desc (
-          const ::Deployment::ConnectionResourceDeploymentDescription& src);       
+namespace Config_Handlers
+{
+
+class ConnectionResourceDeploymentDescription;
+
+/*
+* @class CRDD_Handler
+*
+* @brief Handler class for <ConnectionResourceDeploymentDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC ConnectionResourceDeploymentDescription objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export CRDD_Handler{
+
+public:
 
-    };
-  }
+CRDD_Handler (void);
+virtual ~CRDD_Handler (void);
+
+///This method takes a <Deployment::ConnectionResourceDeploymentDescription>
+///and maps the values from the passed in XSC
+///ConnectionResourceDeploymentDescription to its members.
+void get_ConnectionResourceDeploymentDescription (
+Deployment::ConnectionResourceDeploymentDescription& toconfig,
+ConnectionResourceDeploymentDescription& desc);
+
+static ConnectionResourceDeploymentDescription
+connection_resource_depl_desc (
+const ::Deployment::ConnectionResourceDeploymentDescription& src);
+
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Common.h b/TAO/CIAO/tools/Config_Handlers/Common.h
index 8109fa005e0..6057cbb74be 100644
--- a/TAO/CIAO/tools/Config_Handlers/Common.h
+++ b/TAO/CIAO/tools/Config_Handlers/Common.h
@@ -1,41 +1,41 @@
 // $Id$
 /**
- * @file Common.h
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- *
- * Some common definitions for all config_handlers.
- */
+* @file Common.h
+* @author Will Otte <wotte@dre.vanderbilt.edu>
+*
+* Some common definitions for all config_handlers.
+*/
 #ifndef CONFIG_HANDLERS_COMMON_H
 #define CONFIG_HANDLERS_COMMON_H
 #include <string>
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    /**
-     * @class Config_Error
-     * @brief Exception to communicate a config_handlers error
-     */
-    class Config_Error
-    {
-    public:
-      Config_Error (const std::string &name,
-		   const std::string &error) :
-	name_ (name),
-	error_ (error)
-      {};
-      
-      /// Some identifying information about the element that
-      /// caused the error
-      std::string name_;
-      
-      /// A human readable error message
-      std::string error_;
-      
-    };
-  }
+namespace Config_Handlers
+{
+/**
+* @class Config_Error
+* @brief Exception to communicate a config_handlers error
+*/
+class Config_Error
+{
+public:
+Config_Error (const std::string &name,
+const std::string &error) :
+name_ (name),
+error_ (error)
+{};
+
+/// Some identifying information about the element that
+/// caused the error
+std::string name_;
+
+/// A human readable error message
+std::string error_;
+
+};
+}
 }
 #endif /* CONFIG_HANDLERS_COMMON_H */
-      
-      
+
+
diff --git a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 6c56f10a44e..e7f9fa0266d 100644
--- a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -3,32 +3,34 @@
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     ComponentPropertyDescription_Handler::component_property_description (
-        const ComponentPropertyDescription& desc,
-        ::Deployment::ComponentPropertyDescription& toconfig)
+                                                                          const ComponentPropertyDescription& desc,
+                                                                          ::Deployment::ComponentPropertyDescription& toconfig)
     {
+      CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description");
       toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       // Delegate the DataType to the
       // DataType_Handler.
 
       // @@ There is a lurking bug here.
-//#if 0
+      //#if 0
       CORBA::TypeCode_ptr tcptr = toconfig.type.in ();
-      DataType_Handler::data_type (tcptr,desc.type ());
-//#endif /*if 0*/
+      DataType_Handler::data_type (desc.type (), tcptr);
+      //#endif /*if 0*/
     }
 
-    ComponentPropertyDescription 
+    ComponentPropertyDescription
     ComponentPropertyDescription_Handler::component_property_description (
-      const ::Deployment::ComponentPropertyDescription &src)
+                                                                          const ::Deployment::ComponentPropertyDescription &src)
     {
+      CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description - reverse");
       XMLSchema::string< char > name ((src.name));
       DataType dt (DataType_Handler::data_type (src.type));
       ComponentPropertyDescription cpd (name,dt);
diff --git a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h
index dffb9741455..f87edc7fcea 100644
--- a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  ComponentPropertyDescription_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ComponentPropertyDescription_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ComponentPropertyDescription_Handler_H
@@ -21,40 +21,40 @@
 
 namespace Deployment
 {
-  struct ComponentPropertyDescription;
+struct ComponentPropertyDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentPropertyDescription;
-
-    /*
-     * @class ComponentPropertyDescription_Handler
-     *
-     * @brief Handler class for <ComponentPortDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-    class Config_Handlers_Export ComponentPropertyDescription_Handler
-    {
-    public:
-
-      /// This method maps the values from the XSC object
-      /// <ComponentPropertyDescription> to the CORBA IDL type
-      /// <Deployment::ComponentPropertyDescription>.
-     static void   component_property_description (
-         const ComponentPropertyDescription& desc,
-         ::Deployment::ComponentPropertyDescription& toconfig);
-     static ComponentPropertyDescription
-     component_property_description (
-         const ::Deployment::ComponentPropertyDescription &src);
-    };
-  }
+namespace Config_Handlers
+{
+class ComponentPropertyDescription;
+
+/*
+* @class ComponentPropertyDescription_Handler
+*
+* @brief Handler class for <ComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+class Config_Handlers_Export ComponentPropertyDescription_Handler
+{
+public:
+
+/// This method maps the values from the XSC object
+/// <ComponentPropertyDescription> to the CORBA IDL type
+/// <Deployment::ComponentPropertyDescription>.
+static void   component_property_description (
+const ComponentPropertyDescription& desc,
+::Deployment::ComponentPropertyDescription& toconfig);
+static ComponentPropertyDescription
+component_property_description (
+const ::Deployment::ComponentPropertyDescription &src);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index 9c0a1ebd96d..aee09c1e9c9 100644
--- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,94 +1,100 @@
 //$Id$
 
 project (XSC_XML_Handlers) : acelib, xerces {
-  sharedname    += XSC_XML_Handlers
-  dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
-  macros       += XML_USE_PTHREADS
-  requires     += exceptions
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
 
-  Source_Files {
-    ccd.cpp
-    cdd.cpp
-    cdp.cpp
-    cid.cpp
-    cpd.cpp
-    Deployment.cpp
-    iad.cpp
-    pcd.cpp
-    toplevel.cpp
-    Basic_Deployment_Data.cpp
-  }
-  
-  Header_Files {
-    XSC_XML_Handlers_Export.h
-  }
+verbatim(gnuace, macros) {
+override no_hidden_visibility = 1
+}
+
+sharedname    += XSC_XML_Handlers
+dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
+macros       += XML_USE_PTHREADS
+requires     += exceptions
+includes += $(CIAO_ROOT)/tools/Config_Handlers
+
+Source_Files {
+ccd.cpp
+cdd.cpp
+cdp.cpp
+cid.cpp
+cpd.cpp
+Deployment.cpp
+iad.cpp
+pcd.cpp
+toplevel.cpp
+Basic_Deployment_Data.cpp
+}
+
+Header_Files {
+XSC_XML_Handlers_Export.h
+}
 }
 
 project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typecodefactory {
-  after += RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
-  sharedname = XSC_Config_Handlers
-  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
-  macros   += XML_USE_PTHREADS
-  requires += exceptions
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
-  libs += CIAO_XML_Utils RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
 
-  Source_Files {
-    DP_Handler.cpp
-    CCD_Handler.cpp
-    Property_Handler.cpp
-    ComponentPropertyDescription_Handler.cpp
-    DP_PCD_Handler.cpp
-    CPD_Handler.cpp
-    DataType_Handler.cpp
-    MDD_Handler.cpp
-    Req_Handler.cpp
-    CPD_Handler.cpp
-    Any_Handler.cpp
-    ComponentPropertyDescription_Handler.cpp
-    DataType_Handler.cpp
-    MDD_Handler.cpp
-    Req_Handler.cpp
-    CEPE_Handler.cpp
-    PSPE_Handler.cpp
-    ERE_Handler.cpp
-    CRDD_Handler.cpp
-    IDD_Handler.cpp
-    ADD_Handler.cpp
-    ComponentPropertyDescription_Handler.cpp
-    RDD_Handler.cpp
-    ID_Handler.cpp
-    XML_File_Intf.cpp
-    IDREF_Base.cpp
-    DnC_Dump.cpp
-    DnC_Dump_T.cpp
-    Dump_Obj.cpp
-    STD_CID_Handler.cpp
-    STD_CPD_Handler.cpp
-    STD_IAD_Handler.cpp
-    STD_PC_Intf.cpp
-    STD_PCD_Handler.cpp
-    PCD_Handler.cpp
-    IRDD_Handler.cpp
-    DD_Handler.cpp
-  }
+verbatim(gnuace, macros) {
+override no_hidden_visibility = 1
+}
+
+after += RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
+sharedname = XSC_Config_Handlers
+dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
+macros   += XML_USE_PTHREADS
+requires += exceptions
+includes += $(CIAO_ROOT)/tools/Config_Handlers
+libs += CIAO_XML_Utils RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
+
+Source_Files {
+SatisfierProperty_Handler.cpp
+DP_Handler.cpp
+CCD_Handler.cpp
+Property_Handler.cpp
+ComponentPropertyDescription_Handler.cpp
+DP_PCD_Handler.cpp
+CPD_Handler.cpp
+DataType_Handler.cpp
+MDD_Handler.cpp
+Req_Handler.cpp
+CPD_Handler.cpp
+Any_Handler.cpp
+ComponentPropertyDescription_Handler.cpp
+DataType_Handler.cpp
+MDD_Handler.cpp
+Req_Handler.cpp
+CEPE_Handler.cpp
+PSPE_Handler.cpp
+ERE_Handler.cpp
+CRDD_Handler.cpp
+IDD_Handler.cpp
+ADD_Handler.cpp
+ComponentPropertyDescription_Handler.cpp
+RDD_Handler.cpp
+ID_Handler.cpp
+XML_File_Intf.cpp
+IDREF_Base.cpp
+DnC_Dump.cpp
+DnC_Dump_T.cpp
+Dump_Obj.cpp
+PCD_Handler.cpp
+IRDD_Handler.cpp
+DD_Handler.cpp
+}
 
-  Header_Files {
-    Config_Handlers_Export.h
-  }
+Header_Files {
+Config_Handlers_Export.h
+}
 }
 
 project (XSC_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client {
-  requires += dummy_label
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
-  exename = test
-  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
-  macros   += XML_USE_PTHREAD/S
+//  requires += dummy_label
+includes += $(CIAO_ROOT)/tools/Config_Handlers
+exename = test
+dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
+macros   += XML_USE_PTHREAD/S
 
-  Source_Files {
-    test.cpp
-  }
+Source_Files {
+test.cpp
+}
 }
 
 
diff --git a/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
index 939b2437f4c..f9c71d19ac6 100644
--- a/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
@@ -1,5 +1,6 @@
 // $Id$
 #include "Utils/XML_Helper.h"
+#include "SatisfierProperty_Handler.h"
 #include "DD_Handler.h"
 #include "Any_Handler.h"
 #include "Deployment.hpp"
@@ -17,21 +18,22 @@ namespace CIAO
       domain_ (0),
       retval_ (false)
     {
+      CIAO_TRACE("DP_PCD_Handler::constructor");
       XML_Helper helper;
 
       if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "inside DD_Handler"));
-      }
+        {
+          ACE_DEBUG ((LM_DEBUG , "inside DD_Handler"));
+        }
 
 
       XERCES_CPP_NAMESPACE::DOMDocument *dom =
         helper.create_dom (file);
 
       if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "after create dom"));
-      }
+        {
+          ACE_DEBUG ((LM_DEBUG , "after create dom"));
+        }
 
       if (!dom)
         throw DD_Handler::NoDomain ();
@@ -39,20 +41,20 @@ namespace CIAO
       Domain *dm =
         new Domain (domain (dom));
 
-//      Domain d = domain (dom);
+      //      Domain d = domain (dom);
 
       if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "dom"));
-      }
+        {
+          ACE_DEBUG ((LM_DEBUG , "dom"));
+        }
 
 
       this->domain_.reset (dm);
 
       if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "after reset"));
-      }
+        {
+          ACE_DEBUG ((LM_DEBUG , "after reset"));
+        }
 
       if (!this->build_domain ())
         throw NoDomain ();
@@ -63,6 +65,7 @@ namespace CIAO
       domain_(dmn),
       retval_(false)
     {
+      CIAO_TRACE("DP_PCD_Handler::constructor - Domain");
       if(!this->build_domain ())
         throw NoDomain ();
     }
@@ -83,35 +86,41 @@ namespace CIAO
     bool
     DD_Handler::build_domain ()
     {
+      CIAO_TRACE("DP_PCD_Handler::build_domain");
       this->idl_domain_.reset ( new ::Deployment::Domain );
 
       // Read in the name
-      this->idl_domain_->label =
-         CORBA::string_dup (domain_->label ().c_str ());
+      // Check if the label is there or not
+      if (domain_->label_p ())
+        this->idl_domain_->label =
+          CORBA::string_dup (domain_->label ().c_str ());
 
-      this->idl_domain_->UUID =
-         CORBA::string_dup (domain_->UUID ().c_str ());
+      if (domain_->UUID_p ())
+        this->idl_domain_->UUID =
+          CORBA::string_dup (domain_->UUID ().c_str ());
 
       CORBA::ULong len = domain_->count_node ();
       this->idl_domain_->node.length (len);
 
       if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "The node length is [%d]\n",len));
-      }
+        {
+          ACE_DEBUG ((LM_DEBUG , "The node length is [%d]\n",len));
+        }
 
       //Resource _resource;
       int i =0;
       for (Domain::node_const_iterator iter = domain_->begin_node ();
            iter != domain_->end_node ();
            ++iter,++i
-          )
+           )
         {
           // Node* thisNode = (Node*)iter;
           this->idl_domain_->node[i].name =
             CORBA::string_dup (iter->name ().c_str ());
-          this->idl_domain_->node[i].label =
-            CORBA::string_dup (iter->label ().c_str ());
+
+          if (iter->label_p ())
+            this->idl_domain_->node[i].label =
+              CORBA::string_dup (iter->label ().c_str ());
 
           // length is hard-coded for now ...
           // here iterate over the resources ...
@@ -146,27 +155,33 @@ namespace CIAO
               CORBA::ULong property_len = res_iter->count_property ();
               this->idl_domain_->node[i].resource[res_id].property.length (property_len);
 
-              int property_id =0;
+              //              int property_id =0;
 
+              std::for_each (res_iter->begin_property (),
+                             res_iter->end_property (),
+                             SatisfierProperty_Functor (this->idl_domain_->node[i].resource[res_id].property));
+
+              /*
               //FOR EACH PROPERTY
               for (Resource::property_const_iterator property_iter =
-                     res_iter->begin_property ();
-                   property_iter != res_iter->end_property ();
-                   property_iter++, property_id++)
-                {
-                  this->idl_domain_->node[i].resource[res_id].property[property_id ].name =
-                    CORBA::string_dup (property_iter->name ().c_str ());
-
-
-                  this->idl_domain_->node[i].resource[res_id].property[property_id].kind =
-                    ::Deployment::Quantity;
-
-                  Any the_any = property_iter->value ();
-                  CORBA::Any a_corba_any;
-                  Any_Handler::extract_into_any (the_any , a_corba_any);
-                  this->idl_domain_->node[i].resource[res_id].property[property_id].value
-                    = a_corba_any;
-                }
+              res_iter->begin_property ();
+              property_iter != res_iter->end_property ();
+              property_iter++, property_id++)
+              {
+              this->idl_domain_->node[i].resource[res_id].property[property_id ].name =
+              CORBA::string_dup (property_iter->name ().c_str ());
+
+
+              this->idl_domain_->node[i].resource[res_id].property[property_id].kind =
+              ::Deployment::Quantity;
+
+              Any the_any = property_iter->value ();
+              CORBA::Any a_corba_any;
+              Any_Handler::extract_into_any (the_any , a_corba_any);
+              this->idl_domain_->node[i].resource[res_id].property[property_id].value
+              = a_corba_any;
+              }
+              */
             }
         }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/DD_Handler.h b/TAO/CIAO/tools/Config_Handlers/DD_Handler.h
index dcf1e69b073..89aef35182d 100644
--- a/TAO/CIAO/tools/Config_Handlers/DD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DD_Handler.h
@@ -1,14 +1,14 @@
 // $Id$
 //======================================
 /**
- *   @file    DD_Handler.h
- *
- *   @brief Contains the Domain Descriptior
- *   Handler
- *
- *   @author Nilabja Roy <nilabjar@dre.vanderbilt.edu>
- *
- */
+*   @file    DD_Handler.h
+*
+*   @brief Contains the Domain Descriptior
+*   Handler
+*
+*   @author Nilabja Roy <nilabjar@dre.vanderbilt.edu>
+*
+*/
 //======================================
 
 #ifndef CIAO_CONFIG_HANDLERS_DD_HANDLER_H
@@ -25,114 +25,114 @@
 
 namespace Deployment
 {
-  struct Domain;
+struct Domain;
 }
 
 namespace CIAO
 {
-    namespace Config_Handlers
-    {
-      class Domain;
-
-      /*
-       * @class DD_Handler
-       *
-       * @brief Handler class for <Domain>
-       */
-
-      class Config_Handlers_Export DD_Handler
-        {
-        public:
-          class NoDomain {};
-
-          /**
-           * @operation constructor
-           *
-           * @param The file to be read
-           */
-          DD_Handler (const ACE_TCHAR *file);
-
-          /**
-           * @operation constructor
-           *
-           * @param dmn The Domain structure
-           */
-          DD_Handler(Domain *dmn);
-
-          /**
-           * @operation constructor
-           *
-           * @param dmn The Deployment::Domain structure
-           */
-          DD_Handler(::Deployment::Domain *dmn);
-
-          /**
-           * @operation destructor
-           *
-           */
-          ~DD_Handler (void);
-
-          /**
-           * @operation domain_idl
-           *
-           * @brief Returns the const IDL domain
-           * @return Domain* the IDL domain pointer
-           */
-          ::Deployment::Domain const *domain_idl (void) const
-              throw (NoDomain);
-
-          /**
-           * @operation domain_idl
-           *
-           * @brief Returns the IDL domain
-           * @return Domain* the IDL domain pointer
-           */
-          ::Deployment::Domain *domain_idl (void)
-              throw (NoDomain);
-
-          /**
-           * @operation domain_xsc
-           *
-           * @brief Returns the const XSC domain
-           * @return Domain* the XSC domain pointer
-           */
-          Domain const *domain_xsc (void) const
-            throw (NoDomain);
-
-          /**
-           * @operation domain_xsc
-           *
-           * @brief Returns the XSC domain
-           * @return Domain* the XSC domain pointer
-           */
-          Domain *domain_xsc (void)
-            throw (NoDomain);
-
-        private:
-          /**
-           *  @operation build_domain
-           *
-           *  @brief builds the domain structure
-           */
-          bool build_domain ();
-
-          /**
-           *  @operation build_xsc
-           *
-           *  @brief builds the XSC data structure
-           */
-          bool build_xsc ();
-
-          /// The Deployment Domain structure
-          auto_ptr < ::Deployment::Domain > idl_domain_;
-
-          /// The XSC Domain structure
-          auto_ptr <Domain> domain_;
-
-          /// The return value used
-          bool retval_;
-        };
-    }
+namespace Config_Handlers
+{
+class Domain;
+
+/*
+* @class DD_Handler
+*
+* @brief Handler class for <Domain>
+*/
+
+class Config_Handlers_Export DD_Handler
+{
+public:
+class NoDomain {};
+
+/**
+* @operation constructor
+*
+* @param The file to be read
+*/
+DD_Handler (const ACE_TCHAR *file);
+
+/**
+* @operation constructor
+*
+* @param dmn The Domain structure
+*/
+DD_Handler(Domain *dmn);
+
+/**
+* @operation constructor
+*
+* @param dmn The Deployment::Domain structure
+*/
+DD_Handler(::Deployment::Domain *dmn);
+
+/**
+* @operation destructor
+*
+*/
+~DD_Handler (void);
+
+/**
+* @operation domain_idl
+*
+* @brief Returns the const IDL domain
+* @return Domain* the IDL domain pointer
+*/
+::Deployment::Domain const *domain_idl (void) const
+throw (NoDomain);
+
+/**
+* @operation domain_idl
+*
+* @brief Returns the IDL domain
+* @return Domain* the IDL domain pointer
+*/
+::Deployment::Domain *domain_idl (void)
+throw (NoDomain);
+
+/**
+* @operation domain_xsc
+*
+* @brief Returns the const XSC domain
+* @return Domain* the XSC domain pointer
+*/
+Domain const *domain_xsc (void) const
+throw (NoDomain);
+
+/**
+* @operation domain_xsc
+*
+* @brief Returns the XSC domain
+* @return Domain* the XSC domain pointer
+*/
+Domain *domain_xsc (void)
+throw (NoDomain);
+
+private:
+/**
+*  @operation build_domain
+*
+*  @brief builds the domain structure
+*/
+bool build_domain ();
+
+/**
+*  @operation build_xsc
+*
+*  @brief builds the XSC data structure
+*/
+bool build_xsc ();
+
+/// The Deployment Domain structure
+auto_ptr < ::Deployment::Domain > idl_domain_;
+
+/// The XSC Domain structure
+auto_ptr <Domain> domain_;
+
+/// The return value used
+bool retval_;
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 00aacd892c9..f2b4a39b5cb 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -5,6 +5,7 @@
 #endif
 
 #include "DP_Handler.h"
+#include "ace/UUID.h"
 #include "ciao/Deployment_DataC.h"
 
 #include "CCD_Handler.h"
@@ -18,273 +19,284 @@
 #include "RT-CCM/CIAOServerResources.hpp"
 
 #include "DP_PCD_Handler.h"
-  
+
 ACE_RCSID (Config_Handlers,
            DP_Handler,
            "$Id$")
 
-namespace CIAO
-{
-  namespace Config_Handlers
+  namespace CIAO
   {
-    DP_Handler::DP_Handler (DeploymentPlan &dp)
-      :   xsc_dp_ (0)
+    namespace Config_Handlers
+    {
+      DP_Handler::DP_Handler (DeploymentPlan &dp)
+        :   xsc_dp_ (0)
         , idl_dp_ (0)
         , retval_ (true)
-    {
-      if (!this->resolve_plan (dp))
-        throw;
-    }
-    
-    DP_Handler::DP_Handler (const ::Deployment::DeploymentPlan &plan)
-      : xsc_dp_ (new DeploymentPlan),
-        idl_dp_ (0),
-        retval_ (0)
-    {
-      if (!this->build_xsc (plan))
-        throw;
-    }
-    
-    DP_Handler::~DP_Handler (void)
-      throw ()
-    {
-    }
-    
-    DeploymentPlan const *
-    DP_Handler::xsc (void) const
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->xsc_dp_.get () != 0)
-        return this->xsc_dp_.get ();
-
-      throw NoPlan ();
-    }
-    
-    DeploymentPlan *
-    DP_Handler::xsc (void)
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->xsc_dp_.get () != 0)
-        return this->xsc_dp_.release ();
-      
-      throw NoPlan ();
-    }
-    
-    ::Deployment::DeploymentPlan const *
-    DP_Handler::plan (void) const
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->idl_dp_.get () != 0)
-        return this->idl_dp_.get ();
-
-      throw NoPlan ();
-    }
+      {
+        if (!this->resolve_plan (dp))
+          throw;
+      }
 
-    ::Deployment::DeploymentPlan *
-    DP_Handler::plan (void)
-      throw (DP_Handler::NoPlan)
-    {
-      if (this->retval_ && this->idl_dp_.get () != 0)
-        return this->idl_dp_.release ();
+      DP_Handler::DP_Handler (const ::Deployment::DeploymentPlan &plan)
+        : xsc_dp_ (new DeploymentPlan),
+          idl_dp_ (0),
+          retval_ (0)
+      {
+        if (!this->build_xsc (plan))
+          throw;
+      }
 
-      throw NoPlan ();
-    }
+      DP_Handler::~DP_Handler (void)
+        throw ()
+      {
+      }
 
-    bool
-    DP_Handler::resolve_plan (DeploymentPlan &xsc_dp)
-    {
-      ::Deployment::DeploymentPlan *tmp =
-          new Deployment::DeploymentPlan;
-
-      this->idl_dp_.reset (tmp);
-
-      // Read in the label, if present, since minoccurs = 0
-      if (xsc_dp.label_p ())
-	      {
-	        this->idl_dp_->label =
-	          CORBA::string_dup (xsc_dp.label ().c_str ());
-	      }
-
-      // Read in the UUID, if present
-      if (xsc_dp.UUID_p ())
-	      {
-	        this->idl_dp_->UUID =
-	          CORBA::string_dup (xsc_dp.UUID ().c_str ());
-	      }
-
-      // Similar thing for dependsOn
-      for (DeploymentPlan::dependsOn_const_iterator dstart = xsc_dp.begin_dependsOn ();
-	   dstart != xsc_dp.end_dependsOn ();
-	   ++dstart)
+      DeploymentPlan const *
+      DP_Handler::xsc (void) const
+        throw (DP_Handler::NoPlan)
       {
-	CORBA::ULong len = this->idl_dp_->dependsOn.length ();
-	this->idl_dp_->dependsOn.length (len + 1);
-	ID_Handler::get_ImplementationDependency (
-				   this->idl_dp_->dependsOn [len],
-                *dstart);
+        if (this->retval_ && this->xsc_dp_.get () != 0)
+          return this->xsc_dp_.get ();
 
+        throw NoPlan ();
       }
 
-      // ... An the property stuff
-      for (DeploymentPlan::infoProperty_const_iterator pstart = xsc_dp.begin_infoProperty ();
-	   pstart != xsc_dp.end_infoProperty ();
-	   ++pstart)
-	{
-	  CORBA::ULong len =
-	    this->idl_dp_->infoProperty.length ();
-
-	  this->idl_dp_->infoProperty.length (len + 1);
-          
-          if (pstart->name () != "CIAOServerResources")
-            Property_Handler::get_property (*pstart,
-                                            this->idl_dp_->infoProperty [len]);
-          else
-            {
-              /*
-               * Hook for RT-CCM
-               */
-
-
-	      ACE_DEBUG ((LM_DEBUG,
-                          "Importing ServerResources...\n"));
-              
-              // Parse the SR document
-              SRD_Handler srd_handler (pstart->value ().value ().begin_string ()->c_str ());
-
-              // Populate the property
-              this->idl_dp_->infoProperty [len].name = pstart->name ().c_str ();
-              this->idl_dp_->infoProperty [len].value <<= *(srd_handler.srd_idl ());
-            }
-	}
-      // Read in the realizes, if present
-      if (xsc_dp.realizes_p ())
+      DeploymentPlan *
+      DP_Handler::xsc (void)
+        throw (DP_Handler::NoPlan)
       {
-          CCD_Handler::component_interface_descr (
-            xsc_dp.realizes (),
-            this->idl_dp_->realizes);
+        if (this->retval_ && this->xsc_dp_.get () != 0)
+          return this->xsc_dp_.release ();
+
+        throw NoPlan ();
       }
 
-      ADD_Handler::artifact_deployment_descrs (xsc_dp,
-                                               this->idl_dp_->artifact);
-      
-      MDD_Handler::mono_deployment_descriptions (xsc_dp,
-                                                 this->idl_dp_->implementation);
-
-      IDD_Handler::instance_deployment_descrs (xsc_dp,
-                                               this->idl_dp_->instance);
-      
-      DP_PCD_Handler::plan_connection_descrs (xsc_dp, this->idl_dp_->connection);
-      
-      return true;
-    }
-    
-    bool
-    DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan)
-    {
-      size_t len; //Used for checking the length of struct data members
-      
-      // Read in the label, if present, since minoccurs = 0
-      if (plan.label != 0)
+      ::Deployment::DeploymentPlan const *
+      DP_Handler::plan (void) const
+        throw (DP_Handler::NoPlan)
       {
-	  XMLSchema::string< char > i((plan.label));
-	  this->xsc_dp_->label(i);
+        if (this->retval_ && this->idl_dp_.get () != 0)
+          return this->idl_dp_.get ();
+
+        throw NoPlan ();
       }
 
-      // Read in the UUID, if present
-      if (plan.UUID != 0)
+      ::Deployment::DeploymentPlan *
+      DP_Handler::plan (void)
+        throw (DP_Handler::NoPlan)
       {
-	  XMLSchema::string< char > j((plan.UUID));
-	  this->xsc_dp_->UUID(j);
+        if (this->retval_ && this->idl_dp_.get () != 0)
+          return this->idl_dp_.release ();
+
+        throw NoPlan ();
       }
 
-      // Similar thing for dependsOn
-      len = plan.dependsOn.length();
-      for (size_t j = 0;
-	   j < len;
-	   ++j)
+      bool
+      DP_Handler::resolve_plan (DeploymentPlan &xsc_dp)
       {
-	  this->xsc_dp_->add_dependsOn(
-	      ID_Handler::impl_dependency(
-		  plan.dependsOn[j]));	
+        CIAO_TRACE ("DP_Handler::resolve_plan");
+
+        ::Deployment::DeploymentPlan *tmp =
+            new Deployment::DeploymentPlan;
+
+        this->idl_dp_.reset (tmp);
+
+        // Read in the label, if present, since minoccurs = 0
+        if (xsc_dp.label_p ())
+          {
+            this->idl_dp_->label =
+              CORBA::string_dup (xsc_dp.label ().c_str ());
+          }
+
+        // Read in the UUID, if present
+        if (xsc_dp.UUID_p ())
+          {
+            this->idl_dp_->UUID =
+              CORBA::string_dup (xsc_dp.UUID ().c_str ());
+          }
+
+        // Similar thing for dependsOn
+        for (DeploymentPlan::dependsOn_const_iterator dstart = xsc_dp.begin_dependsOn ();
+             dstart != xsc_dp.end_dependsOn ();
+             ++dstart)
+          {
+            CORBA::ULong len = this->idl_dp_->dependsOn.length ();
+            this->idl_dp_->dependsOn.length (len + 1);
+            ID_Handler::get_ImplementationDependency (*dstart,
+                                                      this->idl_dp_->dependsOn [len]);
+
+          }
+
+        // ... An the property stuff
+        for (DeploymentPlan::infoProperty_const_iterator pstart = xsc_dp.begin_infoProperty ();
+             pstart != xsc_dp.end_infoProperty ();
+             ++pstart)
+          {
+            CORBA::ULong len =
+              this->idl_dp_->infoProperty.length ();
+
+            this->idl_dp_->infoProperty.length (len + 1);
+
+            if (pstart->name () != "CIAOServerResources")
+              Property_Handler::get_property (*pstart,
+                                              this->idl_dp_->infoProperty [len]);
+            else
+              {
+                /*
+                 * Hook for RT-CCM
+                 */
+
+
+                ACE_DEBUG ((LM_DEBUG,
+                            "Importing ServerResources...\n"));
+
+                // Parse the SR document
+                SRD_Handler srd_handler (pstart->value ().value ().begin_string ()->c_str ());
+
+                // Populate the property
+                this->idl_dp_->infoProperty [len].name = pstart->name ().c_str ();
+                this->idl_dp_->infoProperty [len].value <<= *(srd_handler.srd_idl ());
+              }
+          }
+        // Read in the realizes, if present
+        if (xsc_dp.realizes_p ())
+          {
+            CCD_Handler::component_interface_descr (
+                                                    xsc_dp.realizes (),
+                                                    this->idl_dp_->realizes);
+          }
+
+        ADD_Handler::artifact_deployment_descrs (xsc_dp,
+                                                 this->idl_dp_->artifact);
+
+        MDD_Handler::mono_deployment_descriptions (xsc_dp,
+                                                   this->idl_dp_->implementation);
+
+        IDD_Handler::instance_deployment_descrs (xsc_dp,
+                                                 this->idl_dp_->instance);
+
+        DP_PCD_Handler::plan_connection_descrs (xsc_dp, this->idl_dp_->connection);
+
+        return true;
       }
 
-      // ... And the property stuff
-      len = plan.infoProperty.length();
-      for (size_t q = 0;
-	   q < len;
-	   q++)
+      bool
+      DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan)
       {
-        if (ACE_OS::strcmp (plan.infoProperty[q].name.in (),
-                            "CIAOServerResources") == 0)
+        CIAO_TRACE ("DP_Handler::build_xsc");
+
+        // Initialize the UUID generator.
+        ACE_Utils::UUID_GENERATOR::instance ()->init ();
+
+        // Clear IDREF tables
+        IDD_Handler::IDREF.unbind_refs ();
+        MDD_Handler::IDREF.unbind_refs ();
+
+
+        size_t len; //Used for checking the length of struct data members
+
+        // Read in the label, if present, since minoccurs = 0
+        if (plan.label != 0)
+          {
+            XMLSchema::string< char > i((plan.label));
+            this->xsc_dp_->label(i);
+          }
+
+        // Read in the UUID, if present
+        if (plan.UUID != 0)
+          {
+            XMLSchema::string< char > j((plan.UUID));
+            this->xsc_dp_->UUID(j);
+          }
+
+        // Similar thing for dependsOn
+        len = plan.dependsOn.length();
+        for (size_t j = 0;
+             j < len;
+             ++j)
+          {
+            this->xsc_dp_->add_dependsOn(
+                                         ID_Handler::impl_dependency(
+                                                                     plan.dependsOn[j]));
+          }
+
+        // ... And the property stuff
+        len = plan.infoProperty.length();
+        for (size_t q = 0;
+             q < len;
+             q++)
+          {
+            if (ACE_OS::strcmp (plan.infoProperty[q].name.in (),
+                                "CIAOServerResources") == 0)
+              {
+                ACE_DEBUG ((LM_ERROR,
+                            "(%P|%t) DP_Handler: Dumping of ServerResources not currently supported."));
+                continue;
+              }
+
+            this->xsc_dp_->add_infoProperty (
+                                             Property_Handler::get_property (
+                                                                             plan.infoProperty[q]));
+          }
+
+
+        // We are assuming there is a realizes for the moment
+        // @@ We may want to change this at a later date by creating a sequence of
+        // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../ciao/Deployment_Data.idl
+        // @@ so we can check for length
+        this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
+        if (!this->xsc_dp_->realizes_p())
           {
             ACE_DEBUG ((LM_ERROR,
-                        "(%P|%t) DP_Handler: Dumping of ServerResources not currently supported."));
-            continue;
+                        "(%P|%t) DP_Handler: "
+                        "Error parsing Component Interface Descriptor."));
+            return false;
           }
-        
-        this->xsc_dp_->add_infoProperty (
-               Property_Handler::get_property (
-                    plan.infoProperty[q]));
-      }
 
+        //Take care of the artifact(s) if they exist
+        len = plan.artifact.length();
+        for(size_t k = 0;
+            k < len;
+            k++)
+          {
+            this->xsc_dp_->add_artifact (
+                                         ADD_Handler::artifact_deployment_descr (
+                                                                                 plan.artifact[k]));
+          }
 
-      // We are assuming there is a realizes for the moment
-      // @@ We may want to change this at a later date by creating a sequence of
-      // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../ciao/Deployment_Data.idl
-      // @@ so we can check for length
-      this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
-      if (!this->xsc_dp_->realizes_p())
-      {
-	  ACE_DEBUG ((LM_ERROR,
-		      "(%P|%t) DP_Handler: "
-		      "Error parsing Component Interface Descriptor."));
-	  return false;
-      }
+        //Take care of the implementation(s) if they exist
+        len = plan.implementation.length();
+        for(size_t l = 0;
+            l < len;
+            l++)
+          {
+            this->xsc_dp_->add_implementation (
+                                               MDD_Handler::mono_deployment_description (
+                                                                                         plan.implementation[l]));
+          }
 
-      //Take care of the artifact(s) if they exist
-      len = plan.artifact.length();
-      for(size_t k = 0;
-	  k < len;
-	  k++)
-      {
-	  this->xsc_dp_->add_artifact (
-	      ADD_Handler::artifact_deployment_descr (
-		  plan.artifact[k]));
-      }
-      
-      //Take care of the implementation(s) if they exist
-      len = plan.implementation.length();
-      for(size_t l = 0;
-	  l < len;
-	  l++)
-      {
-	  this->xsc_dp_->add_implementation (
-	      MDD_Handler::mono_deployment_description (
-		  plan.implementation[l]));
-      }
-    
-      //Ditto for the instance(s)
-      len = plan.instance.length();
-      for(size_t m = 0;
-	  m < len;
-	  m++)
-      {
-	  this->xsc_dp_->add_instance (
-	      IDD_Handler::instance_deployment_descr (
-		  plan.instance[m]));
-      }
+        //Ditto for the instance(s)
+        len = plan.instance.length();
+        for(size_t m = 0;
+            m < len;
+            m++)
+          {
+            this->xsc_dp_->add_instance (
+                                         IDD_Handler::instance_deployment_descr (
+                                                                                 plan.instance[m]));
+          }
 
-      //Finally, take care of the Connection Planning
-      len = plan.connection.length();
-      for(size_t n = 0; n < len; n++)
-      {
-	  this->xsc_dp_->add_connection (
-	      DP_PCD_Handler::plan_connection_descr (
-		  plan.connection[n]));
+        //Finally, take care of the Connection Planning
+        len = plan.connection.length();
+        for(size_t n = 0; n < len; n++)
+          {
+            this->xsc_dp_->add_connection (
+                                           DP_PCD_Handler::plan_connection_descr (
+                                                                                  plan.connection[n]));
+          }
+
+        retval_ = true;
+        return true;
       }
-      
-      retval_ = true;
-      return true;
     }
   }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.h b/TAO/CIAO/tools/Config_Handlers/DP_Handler.h
index b98f697e84b..50620822263 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  DP_Handler.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
+*  @file  DP_Handler.h
+*
+*  $Id$
+*
+*  @author Bala Natarajan <bala@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_DP_HANDLER_H
@@ -13,7 +13,9 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
+using std::auto_ptr;
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,67 +24,67 @@
 
 namespace Deployment
 {
-  struct DeploymentPlan ;
+struct DeploymentPlan ;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-
-   /*
-    * @class DP_Handler
-    *
-    * @brief Handler for Deployment::DeploymentPlan
-    */
-    class Config_Handlers_Export DP_Handler
-    {
-    public:
-      class NoPlan {};
-
-      /// Use this constructor if you want to use
-      /// the XSC->IDL mapping
-      DP_Handler (DeploymentPlan &dp);
-      
-      /// Use this constructor if you want to use
-      /// the IDL->XSC mapping
-      DP_Handler (const ::Deployment::DeploymentPlan &plan);
-      
-      ~DP_Handler (void)
-        throw ();
-      
-      /// Generates the IDL->XSC mapping.  returns
-      /// null if the method fails or if the class was
-      /// constructed with the wrong source.
-      DeploymentPlan const *xsc (void) const
-        throw (NoPlan);
-      
-      DeploymentPlan *xsc (void)
-        throw (NoPlan);
-      
-      /// Generates the XSC->IDL mapping.  returns null
-      /// if the method fails or the class was constructed
-      ::Deployment::DeploymentPlan const *plan (void) const
-        throw (NoPlan);
-
-      ::Deployment::DeploymentPlan *plan (void)
-        throw (NoPlan);
-
-    private:
-
-      bool resolve_plan (DeploymentPlan &dp);
-      
-      bool build_xsc (const ::Deployment::DeploymentPlan &plan);
-      
-    private:
-      auto_ptr< DeploymentPlan > xsc_dp_;
-      
-      auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
-
-      bool retval_;
-    };
-  }
+namespace Config_Handlers
+{
+class DeploymentPlan;
+
+/*
+* @class DP_Handler
+*
+* @brief Handler for Deployment::DeploymentPlan
+*/
+class Config_Handlers_Export DP_Handler
+{
+public:
+class NoPlan {};
+
+/// Use this constructor if you want to use
+/// the XSC->IDL mapping
+DP_Handler (DeploymentPlan &dp);
+
+/// Use this constructor if you want to use
+/// the IDL->XSC mapping
+DP_Handler (const ::Deployment::DeploymentPlan &plan);
+
+~DP_Handler (void)
+throw ();
+
+/// Generates the IDL->XSC mapping.  returns
+/// null if the method fails or if the class was
+/// constructed with the wrong source.
+DeploymentPlan const *xsc (void) const
+throw (NoPlan);
+
+DeploymentPlan *xsc (void)
+throw (NoPlan);
+
+/// Generates the XSC->IDL mapping.  returns null
+/// if the method fails or the class was constructed
+::Deployment::DeploymentPlan const *plan (void) const
+throw (NoPlan);
+
+::Deployment::DeploymentPlan *plan (void)
+throw (NoPlan);
+
+private:
+
+bool resolve_plan (DeploymentPlan &dp);
+
+bool build_xsc (const ::Deployment::DeploymentPlan &plan);
+
+private:
+auto_ptr< DeploymentPlan > xsc_dp_;
+
+auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
+
+bool retval_;
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
index e468ec00357..c42bb8a5e51 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -9,19 +9,20 @@
 #include "Basic_Deployment_Data.hpp"
 #include "cdp.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     DP_PCD_Handler::plan_connection_descrs (
-        const DeploymentPlan &src,
-        Deployment::PlanConnectionDescriptions& dest)
+                                            const DeploymentPlan &src,
+                                            Deployment::PlanConnectionDescriptions& dest)
     {
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descrs");
       DeploymentPlan::connection_const_iterator cci_e =
         src.end_connection ();
-      
+
       CORBA::ULong pos = 0;
       dest.length (src.count_connection ());
       for (DeploymentPlan::connection_const_iterator cci_b =
@@ -33,20 +34,22 @@ namespace CIAO
                                                  dest[pos++]);
         }
     }
-    
+
     PlanConnectionDescription
     DP_PCD_Handler::plan_connection_descr (
-	const Deployment::PlanConnectionDescription &src)
+                                           const Deployment::PlanConnectionDescription &src)
     {
-	PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
-	return pcd;
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descr");
+      PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
+      return pcd;
     }
 
     void
     DP_PCD_Handler::plan_connection_descr (
-        const PlanConnectionDescription &src,
-        Deployment::PlanConnectionDescription &dest)
+                                           const PlanConnectionDescription &src,
+                                           Deployment::PlanConnectionDescription &dest)
     {
+      CIAO_TRACE("DP_PCD_Handler::plan_connection_descr - reverse");
       dest.name =
         src.name ().c_str ();
 
@@ -74,11 +77,11 @@ namespace CIAO
           CRDD_Handler crddhandler;
 
           toconfig.deployedResource.length (
-            toconfig.deployedResource.length () + 1);
+                                            toconfig.deployedResource.length () + 1);
 
           crddhandler.get_ConnectionResourceDeploymentDescription (
-            toconfig.deployedResource[toconfig.deployedResource.length () - 1],
-            desc.deployedResource ());
+                                                                   toconfig.deployedResource[toconfig.deployedResource.length () - 1],
+                                                                   desc.deployedResource ());
         }
 
       if (desc.deployRequirement_p ())
@@ -91,10 +94,10 @@ namespace CIAO
           //Increase the sequence length and delgate
           //the Requirement to the Req_Handler.
           toconfig.deployRequirement.length (
-            toconfig.deployRequirement.length () + 1);
+                                             toconfig.deployRequirement.length () + 1);
           reqhandler.get_Requirement (
-            toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
-            desc.deployRequirement ());
+                                      toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
+                                      desc.deployRequirement ());
 
 
         }
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.h
index cc411c37383..8e04c612bc9 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.h
@@ -1,13 +1,13 @@
 //==============================================================
 /**
- *  @file  DP_PCD_Handler.h
- *
- *  $Id$
- *
- *  Handler for Deployment::PlanConnectionHandler
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  DP_PCD_Handler.h
+*
+*  $Id$
+*
+*  Handler for Deployment::PlanConnectionHandler
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_DP_PCD_HANDLER_H
@@ -22,45 +22,45 @@
 
 namespace Deployment
 {
-  struct PlanConnectionDescription;
-  class PlanConnectionDescriptions;
+struct PlanConnectionDescription;
+class PlanConnectionDescriptions;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-    class PlanConnectionDescription;
+namespace Config_Handlers
+{
+class DeploymentPlan;
+class PlanConnectionDescription;
 
-   /*
-    * @class DP_PCD_Handler
-    *
-    * @brief Handler class for <PlanConnectionDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC PlanConnectionDescription objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
+/*
+* @class DP_PCD_Handler
+*
+* @brief Handler class for <PlanConnectionDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC PlanConnectionDescription objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
 
-    class Config_Handlers_Export DP_PCD_Handler
-    {
-    public:
-      static void plan_connection_descrs (
-          const DeploymentPlan &src,
-          Deployment::PlanConnectionDescriptions& toconfig);
+class Config_Handlers_Export DP_PCD_Handler
+{
+public:
+static void plan_connection_descrs (
+const DeploymentPlan &src,
+Deployment::PlanConnectionDescriptions& toconfig);
 
-      static PlanConnectionDescription plan_connection_descr(
-	  const Deployment::PlanConnectionDescription &src);
+static PlanConnectionDescription plan_connection_descr(
+const Deployment::PlanConnectionDescription &src);
 
-    private:
-      static void plan_connection_descr (
-          const PlanConnectionDescription& desc,
-          Deployment::PlanConnectionDescription& toconfig);
-    };
-  }
+private:
+static void plan_connection_descr (
+const PlanConnectionDescription& desc,
+Deployment::PlanConnectionDescription& toconfig);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
index c71f8701d6f..6ca290dbbe7 100644
--- a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DataType_Handler.h"
 #include "tao/AnyTypeCode/TypeCode.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO{
 
   namespace Config_Handlers{
@@ -17,164 +17,163 @@ namespace CIAO{
     ///This method takes a <CIAO::Config_Handlers::DataType>
     ///and returns the corresponding CORBA::TypeCode.
     void
-    DataType_Handler::data_type (
-                                CORBA::TypeCode_ptr& type,
-                                const DataType& desc)
+    DataType_Handler::data_type (const DataType& desc,
+                                 CORBA::TypeCode_ptr& type)
     {
+      CIAO_TRACE("DataType_Handler::data_type");
+      TCKind kind (desc.kind ());
+
+      switch (kind.integral ())
+        {
+        case  TCKind::tk_null_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
+          break;
+
+        case  TCKind::tk_short_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
+          break;
+
+        case  TCKind::tk_long_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
+          break;
+
+        case  TCKind::tk_ushort_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
+          break;
+
+        case  TCKind::tk_ulong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
+          break;
+
+        case  TCKind::tk_float_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
+          break;
+
+        case  TCKind::tk_double_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
+          break;
+
+        case  TCKind::tk_boolean_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
+          break;
+
+        case  TCKind::tk_char_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
+          break;
+
+        case  TCKind::tk_octet_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
+          break;
 
-        TCKind kind (desc.kind ());
-        
-        switch (kind.integral ())
-          {
-          case  TCKind::tk_null_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-            break;
-
-          case  TCKind::tk_short_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-            break;
-
-          case  TCKind::tk_long_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-            break;
-
-          case  TCKind::tk_ushort_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-            break;
-
-          case  TCKind::tk_ulong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-            break;
-
-          case  TCKind::tk_float_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-            break;
-
-          case  TCKind::tk_double_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-            break;
-
-          case  TCKind::tk_boolean_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-            break;
-
-          case  TCKind::tk_char_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-            break;
-
-          case  TCKind::tk_octet_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-            break;
-
-          case  TCKind::tk_string_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-            break;
-
-          case  TCKind::tk_longlong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-            break;
-
-          case  TCKind::tk_ulonglong_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-            break;
-
-          case  TCKind::tk_longdouble_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-            break;
-
-          case  TCKind::tk_wchar_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-            break;
-
-          case  TCKind::tk_wstring_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-            break;
-
-          case  TCKind::tk_any_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-            break;
-
-          case  TCKind::tk_TypeCode_l:
-            type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-            break;
-
-          default:
-            ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
-            throw 1;
-          }
-        
-        //   This case used to be supported...is it not in the schema?
-    //    case  TCKind::tk_Object)
-    //      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
+        case  TCKind::tk_string_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
+          break;
+
+        case  TCKind::tk_longlong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
+          break;
+
+        case  TCKind::tk_ulonglong_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
+          break;
+
+        case  TCKind::tk_longdouble_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
+          break;
+
+        case  TCKind::tk_wchar_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
+          break;
+
+        case  TCKind::tk_wstring_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
+          break;
+
+        case  TCKind::tk_any_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
+          break;
+
+        case  TCKind::tk_TypeCode_l:
+          type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
+          break;
+
+        default:
+          ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
+          throw 1;
+        }
+
+      //   This case used to be supported...is it not in the schema?
+      //    case  TCKind::tk_Object)
+      //      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
 
     }
 
     DataType
     DataType_Handler::data_type (
-                      const CORBA::TypeCode_ptr&  src)
+                                 const CORBA::TypeCode_ptr&  src)
     {
-              
-        switch (src->kind ())
-          {
-          case ::CORBA::tk_null:
-            return DataType ( (TCKind::tk_null));
-            break;
-          case CORBA::tk_short:
-            return DataType ( (TCKind::tk_short));
-            break;
-          case CORBA::tk_long:
-            return DataType ( (TCKind::tk_long));
-            break;
-          case CORBA::tk_ushort:
-            return DataType ( (TCKind::tk_ushort));
-            break;
-          case CORBA::tk_ulong:
-            return DataType ( (TCKind::tk_ulong));
-            break;
-          case CORBA::tk_float:
-            return DataType ( (TCKind::tk_float));
-            break;
-          case CORBA::tk_double:
-            return DataType ( (TCKind::tk_double));
-            break;
-          case CORBA::tk_boolean:
-            return DataType ( (TCKind::tk_boolean));
-            break;
-          case CORBA::tk_char:
-            return DataType ( (TCKind::tk_char));
-            break;
-          case CORBA::tk_octet:
-            return DataType ( (TCKind::tk_octet));
-            break;
-          case CORBA::tk_string:
-            return DataType ( (TCKind::tk_string));
-            break;
-          case CORBA::tk_longlong:
-            return DataType ( (TCKind::tk_longlong));
-            break;
-          case CORBA::tk_ulonglong:
-            return DataType ( (TCKind::tk_ulonglong));
-            break;
-          case CORBA::tk_longdouble:
-            return DataType ( (TCKind::tk_longdouble));
-            break;
-          case CORBA::tk_wchar:
-            return DataType ( (TCKind::tk_wchar));
-            break;
-          case CORBA::tk_wstring:
-            return DataType ( (TCKind::tk_wstring));
-            break;
-          case CORBA::tk_any:
-            return DataType ( (TCKind::tk_any));
-            break;
-          case CORBA::tk_TypeCode:
-            return DataType ( (TCKind::tk_TypeCode));
-          default:
-            ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
-            throw 1;
-          }
-        
-        
+      CIAO_TRACE("DataType_Handler::data_type - reverse");
+      switch (src->kind ())
+        {
+        case ::CORBA::tk_null:
+          return DataType ( (TCKind::tk_null));
+          break;
+        case CORBA::tk_short:
+          return DataType ( (TCKind::tk_short));
+          break;
+        case CORBA::tk_long:
+          return DataType ( (TCKind::tk_long));
+          break;
+        case CORBA::tk_ushort:
+          return DataType ( (TCKind::tk_ushort));
+          break;
+        case CORBA::tk_ulong:
+          return DataType ( (TCKind::tk_ulong));
+          break;
+        case CORBA::tk_float:
+          return DataType ( (TCKind::tk_float));
+          break;
+        case CORBA::tk_double:
+          return DataType ( (TCKind::tk_double));
+          break;
+        case CORBA::tk_boolean:
+          return DataType ( (TCKind::tk_boolean));
+          break;
+        case CORBA::tk_char:
+          return DataType ( (TCKind::tk_char));
+          break;
+        case CORBA::tk_octet:
+          return DataType ( (TCKind::tk_octet));
+          break;
+        case CORBA::tk_string:
+          return DataType ( (TCKind::tk_string));
+          break;
+        case CORBA::tk_longlong:
+          return DataType ( (TCKind::tk_longlong));
+          break;
+        case CORBA::tk_ulonglong:
+          return DataType ( (TCKind::tk_ulonglong));
+          break;
+        case CORBA::tk_longdouble:
+          return DataType ( (TCKind::tk_longdouble));
+          break;
+        case CORBA::tk_wchar:
+          return DataType ( (TCKind::tk_wchar));
+          break;
+        case CORBA::tk_wstring:
+          return DataType ( (TCKind::tk_wstring));
+          break;
+        case CORBA::tk_any:
+          return DataType ( (TCKind::tk_any));
+          break;
+        case CORBA::tk_TypeCode:
+          return DataType ( (TCKind::tk_TypeCode));
+        default:
+          ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
+          throw 1;
+        }
+
+
     }
 
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h
index eda2375fcee..97d512f2300 100644
--- a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.h
@@ -1,59 +1,61 @@
 //================================================
 /**
- *  @file  DataType_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  DataType_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef DATATYPE_HANDLER_H
 #define DATATYPE_HANDLER_H
 
 #include /**/ "ace/pre.h"
-                                                                                
+
 #include "ciao/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
-             
-                                                                                
+
+#include "Config_Handlers_Export.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
 namespace CIAO{
-    
-  namespace Config_Handlers{
-
-  /*
-   * @class DataType_Handler
-   * 
-   * @brief Handler class for <ComponentPortDescription> types.
-   * 
-   * This class defines handler methods to map values from 
-   * XSC objects, parsed from the descriptor files, to the
-   * corresponding CORBA IDL type for the schema element.
-   * 
-   */
-
-   class DataType_Handler{
- 
-    public:
-       
-      DataType_Handler (void);
-      virtual ~DataType_Handler (void);
-              
-      ////This method takes a <CIAO::Config_Handlers::DataType>
-      ///and returns the corresponding CORBA::TypeCode.
-      static void
-      data_type (CORBA::TypeCode_ptr& type,
-                    const DataType& desc);
-
-      static DataType data_type (const CORBA::TypeCode_ptr& type);
-    };
-
- }
+
+namespace Config_Handlers{
+
+/*
+* @class DataType_Handler
+*
+* @brief Handler class for <ComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+
+class Config_Handlers_Export DataType_Handler {
+
+public:
+
+DataType_Handler (void);
+virtual ~DataType_Handler (void);
+
+////This method takes a <CIAO::Config_Handlers::DataType>
+///and returns the corresponding CORBA::TypeCode.
+static void
+data_type (const DataType& desc,
+CORBA::TypeCode_ptr& type);
+
+
+static DataType data_type (const CORBA::TypeCode_ptr& type);
+};
+
+}
 }
 
 #include /**/ "ace/post.h"
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)
         {
         }
       };
diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
index d58335dfcb6..fd5d3efa2c8 100644
--- a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,9 +27,9 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include <memory>
@@ -44,115 +44,113 @@ namespace CIAO
 
 #include "cdp.hpp"
 
-#include "pcd.hpp"
-
 #include "toplevel.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::Domain
-    domain (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::DeploymentPlan
-    deploymentPlan (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription
-    implementationArtifactDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription
-    componentInterfaceDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentImplementationDescription
-    componentImplementationDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentPackageDescription
-    componentPackageDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::PackageConfiguration
-    packageConfiguration (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::TopLevelPackageDescription
-    topLevelPackageDescription (xercesc::DOMDocument const*);
-  }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::Domain
+domain (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::DeploymentPlan
+deploymentPlan (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ImplementationArtifactDescription
+implementationArtifactDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentInterfaceDescription
+componentInterfaceDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentImplementationDescription
+componentImplementationDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentPackageDescription
+componentPackageDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::PackageConfiguration
+packageConfiguration (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::TopLevelPackageDescription
+topLevelPackageDescription (xercesc::DOMDocument const*);
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-    }
-  }
+namespace Config_Handlers
+{
+namespace Traversal
+{
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-    }
-  }
+namespace Config_Handlers
+{
+namespace Writer
+{
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    XSC_XML_Handlers_Export
-    void
-    domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
-  }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+void
+domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
+}
 }
 
 #endif // DEPLOYMENT_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 67cb9dbde72..cf99fe945bf 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -101,15 +101,15 @@ namespace Deployment
 
 #if (_MSC_VER > 1200)
     dump_ref_seq<Deployment::Domain> (
-      "sharedResourceRef",
-      node.sharedResourceRef, "Domain",
-      &Domain::sharedResource);
+                                      "sharedResourceRef",
+                                      node.sharedResourceRef, "Domain",
+                                      &Domain::sharedResource);
 
     dump_ref_seq<Deployment::Domain> (
-      "connectionRef",
-      node.connectionRef,
-      "Domain",
-      &Domain::interconnect);
+                                      "connectionRef",
+                                      node.connectionRef,
+                                      "Domain",
+                                      &Domain::interconnect);
 #endif /* _MSC_VER */
     dump_sequence ("resource",
                    node.resource);
@@ -125,16 +125,16 @@ namespace Deployment
 
 #if (_MSC_VER > 1200)
     dump_ref_seq<Deployment::Domain> (
-      "connectionRef",
-      conn.connectionRef,
-      "Domain",
-      &Domain::bridge);
+                                      "connectionRef",
+                                      conn.connectionRef,
+                                      "Domain",
+                                      &Domain::bridge);
 
     dump_ref_seq<Deployment::Domain> (
-      "connectRef",
-      conn.connectRef,
-      "Domain",
-      &Domain::node);
+                                      "connectRef",
+                                      conn.connectRef,
+                                      "Domain",
+                                      &Domain::node);
 #endif /*_MSC_VER*/
 
     dump_sequence ("resource",
@@ -151,10 +151,10 @@ namespace Deployment
 #if (_MSC_VER > 1200)
 
     dump_ref_seq<Deployment::Domain> (
-      "connectRef",
-      bridge.connectRef,
-      "Domain",
-      &Domain::interconnect);
+                                      "connectRef",
+                                      bridge.connectRef,
+                                      "Domain",
+                                      &Domain::interconnect);
 #endif /*_MSC_VER*/
 
     dump_sequence ("resource", bridge.resource);
@@ -189,7 +189,7 @@ namespace Deployment
   // ComponentPortDescription
 
   void DnC_Dump::dump (const ::Deployment::ComponentPortDescription
-                         &compportdesc)
+                       &compportdesc)
   {
     Dump_Obj dump_obj("ComponentPortDescription");
 
@@ -334,7 +334,7 @@ namespace Deployment
     dump ("requirementName", irdd.requirementName);
     dump ("resourceName", irdd.resourceName);
     ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (irdd.resourceValue);
+    dump_sequence ("property",  irdd.property);
   }
 
   // InstanceDeploymentDescription
@@ -411,7 +411,7 @@ namespace Deployment
     dump ("requirementName", crdd.requirementName);
     dump ("resourceName", crdd.resourceName);
     ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (crdd.resourceValue);
+    dump_sequence ("properties", crdd.property);
   }
 
   // PlanConnectionDescription
@@ -474,7 +474,7 @@ namespace Deployment
     dump ("requirementName", rdd.requirementName);
     dump ("resourceName", rdd.resourceName);
     ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (rdd.resourceValue);
+    dump_sequence ("properties", rdd.property);
   }
 
   // ArtifactDeploymentDescription
@@ -530,10 +530,10 @@ namespace Deployment
     Dump_Obj dump_obj("SubcomponentInstantiationDescription");
 
     dump ("name", sid.name);
-    dump_sequence ("package", sid.package);
+    //    dump_sequence ("basePackage", sid.package);
     dump_sequence ("configProperty", sid.configProperty);
     dump_sequence ("selectRequirement", sid.selectRequirement);
-    dump_sequence ("reference", sid.reference);
+    //    dump_sequence ("reference", sid.reference);
   }
 
   // SubcomponentPortEndpoint
@@ -654,11 +654,11 @@ namespace Deployment
   // MonolithicImplementationDescription
 
   void DnC_Dump::dump (const ::Deployment::MonolithicImplementationDescription
-                         &mid)
+                       &mid)
   {
     Dump_Obj dump_obj("MonolithicImplementationDescription");
 
-    dump_sequence ("execParameter", mid.execParameter);
+    //    dump_sequence ("execParameter", mid.execParameter);
     dump_sequence ("primaryArtifact", mid.primaryArtifact);
     dump_sequence ("deployRequirement", mid.deployRequirement);
   }
@@ -677,7 +677,7 @@ namespace Deployment
   // ComponentImplementationDescription
 
   void DnC_Dump::dump (
-        const ::Deployment::ComponentImplementationDescription &cid)
+                       const ::Deployment::ComponentImplementationDescription &cid)
   {
     Dump_Obj dump_obj("ComponentImplementationDescription");
 
@@ -708,7 +708,7 @@ namespace Deployment
   // ComponentPackageDescription
 
   void DnC_Dump::dump (const ::Deployment::ComponentPackageDescription
-                         &comppkgdesc)
+                       &comppkgdesc)
   {
     Dump_Obj dump_obj("ComponentPackageDescription");
 
@@ -768,7 +768,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\
-                                  encoded different type"));
+encoded different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -790,7 +790,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -804,7 +804,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\
-                                   encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
@@ -818,7 +818,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
@@ -832,7 +832,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
@@ -845,7 +845,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
@@ -858,7 +858,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_boolean (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
 
@@ -875,7 +875,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_char (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
@@ -889,7 +889,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_octet (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -903,7 +903,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
@@ -916,7 +916,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (),
@@ -930,7 +930,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
@@ -944,7 +944,7 @@ namespace Deployment
           if (! (any >>= CORBA::Any::to_wchar (temp)))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
@@ -958,7 +958,7 @@ namespace Deployment
           if (! (any >>= temp))
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\
-                                    encoded with different type"));
+encoded with different type"));
               ACE_THROW (CORBA::INTERNAL ());
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h
index e4fbf255f21..fbc56b96361 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.h
@@ -1,11 +1,11 @@
 //==================================================================
 /**
- *  @file  DnC_Dump.h
- *
- * $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
+*  @file  DnC_Dump.h
+*
+* $Id$
+*
+*  @author Gan Deng <gan.deng@vanderbilt.edu>
+*/
 //=====================================================================
 
 #ifndef DNC_DUMP_H
@@ -22,130 +22,130 @@
 
 namespace Deployment
 {
-  /**
-   * @class DnC_Dump
-   *
-   * @brief This class defines a set of overloaded "dump" methods to print
-   * the contents of various IDL data types, which passed as input.
-   */
-  class Config_Handlers_Export DnC_Dump
-  {
-  public:
-    /// Dump functions for CORBA sequences
-    static void dump (const char* caption,
-                      const ::CORBA::StringSeq &str_seq);
+/**
+* @class DnC_Dump
+*
+* @brief This class defines a set of overloaded "dump" methods to print
+* the contents of various IDL data types, which passed as input.
+*/
+class Config_Handlers_Export DnC_Dump
+{
+public:
+/// Dump functions for CORBA sequences
+static void dump (const char* caption,
+const ::CORBA::StringSeq &str_seq);
 
-    static void dump (const char* caption, const TAO_String_Manager& str);
+static void dump (const char* caption, const TAO_String_Manager& str);
 
-    static void dump (const char* caption, const CORBA::Boolean& val);
+static void dump (const char* caption, const CORBA::Boolean& val);
 
-    /// A whole slew of overloaded dump routines for different IDL
-    /// data types.
+/// A whole slew of overloaded dump routines for different IDL
+/// data types.
 
-    static void dump(const Deployment::SatisfierProperty &sp);
+static void dump(const Deployment::SatisfierProperty &sp);
 
-    static void dump (const Deployment::SharedResource& sr);
+static void dump (const Deployment::SharedResource& sr);
 
-    static void dump (const Deployment::Node& node);
+static void dump (const Deployment::Node& node);
 
-    static void dump (const Deployment::Resource& resource);
+static void dump (const Deployment::Resource& resource);
 
-    static void dump (const Deployment::Interconnect& conn);
+static void dump (const Deployment::Interconnect& conn);
 
-    static void dump (const Deployment::Bridge& bridge);
+static void dump (const Deployment::Bridge& bridge);
 
-    static void dump (const ::Deployment::Property &property);
+static void dump (const ::Deployment::Property &property);
 
-    static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
+static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
 
-    static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
+static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
 
-    static void dump (const ::Deployment::ComponentPackageDescription
-                      &comppkgdesc);
+static void dump (const ::Deployment::ComponentPackageDescription
+&comppkgdesc);
 
-    static void dump (const ::Deployment::ComponentPortDescription
-                      &compportdesc);
+static void dump (const ::Deployment::ComponentPortDescription
+&compportdesc);
 
-    static void dump (const ::Deployment::ComponentPropertyDescription
-                      &comppropdesc);
+static void dump (const ::Deployment::ComponentPropertyDescription
+&comppropdesc);
 
-    static void dump (const ::Deployment::MonolithicImplementationDescription
-                      &mid);
+static void dump (const ::Deployment::MonolithicImplementationDescription
+&mid);
 
-    static void dump (const ::Deployment::PackageConfiguration &pc);
+static void dump (const ::Deployment::PackageConfiguration &pc);
 
-    static void dump (const ::Deployment::PackagedComponentImplementation
-                      &pci);
+static void dump (const ::Deployment::PackagedComponentImplementation
+&pci);
 
-    static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
+static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
 
-    static void dump (const ::Deployment::Requirement &requirement);
+static void dump (const ::Deployment::Requirement &requirement);
 
-    static void dump (const ::Deployment::ComponentExternalPortEndpoint
-                      &cepe);
+static void dump (const ::Deployment::ComponentExternalPortEndpoint
+&cepe);
 
-    static void dump (const ::Deployment::ComponentPackageReference &cpr);
+static void dump (const ::Deployment::ComponentPackageReference &cpr);
 
-    static void dump (const ::Deployment::ComponentImplementationDescription
-                             &cid);
+static void dump (const ::Deployment::ComponentImplementationDescription
+&cid);
 
-    static void dump (const ::Deployment::SubcomponentInstantiationDescription
-                             &sid);
+static void dump (const ::Deployment::SubcomponentInstantiationDescription
+&sid);
 
-    static void dump (const ::Deployment::NamedImplementationArtifact
-                      &named_implementation);
+static void dump (const ::Deployment::NamedImplementationArtifact
+&named_implementation);
 
-    static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
+static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
 
-    static void dump (const ::Deployment::SubcomponentPropertyReference
-                      &scpr);
+static void dump (const ::Deployment::SubcomponentPropertyReference
+&scpr);
 
-    static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
+static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
 
-    static void dump (const ::Deployment::Domain &domain);
+static void dump (const ::Deployment::Domain &domain);
 
-    static void dump (const ::Deployment::Capability &capability);
+static void dump (const ::Deployment::Capability &capability);
 
-    static void dump (const ::Deployment::ImplementationArtifactDescription
-                             &iad);
+static void dump (const ::Deployment::ImplementationArtifactDescription
+&iad);
 
-    static void dump (const ::Deployment::ImplementationRequirement &ir);
+static void dump (const ::Deployment::ImplementationRequirement &ir);
 
-    static void dump(const Deployment::ResourceUsageKind &ruk);
+static void dump(const Deployment::ResourceUsageKind &ruk);
 
-    static void dump(const Deployment::DeploymentPlan &plan);
+static void dump(const Deployment::DeploymentPlan &plan);
 
-    static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
+static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
 
-    static void dump(const Deployment::InstanceDeploymentDescription &idd);
+static void dump(const Deployment::InstanceDeploymentDescription &idd);
 
-    static void dump(const Deployment::PlanConnectionDescription &pcd);
+static void dump(const Deployment::PlanConnectionDescription &pcd);
 
-    static void dump(const Deployment::PlanPropertyMapping &ppm);
+static void dump(const Deployment::PlanPropertyMapping &ppm);
 
-    static void dump(const Deployment::ImplementationDependency &id);
+static void dump(const Deployment::ImplementationDependency &id);
 
-    static void dump(const Deployment::ArtifactDeploymentDescription &add);
+static void dump(const Deployment::ArtifactDeploymentDescription &add);
 
-    static void dump(const Deployment::InstanceResourceDeploymentDescription
-                     &irdd);
+static void dump(const Deployment::InstanceResourceDeploymentDescription
+&irdd);
 
-    static void dump(const PlanSubcomponentPortEndpoint &pspe);
+static void dump(const PlanSubcomponentPortEndpoint &pspe);
 
-    static void dump(const ConnectionResourceDeploymentDescription &crdd);
+static void dump(const ConnectionResourceDeploymentDescription &crdd);
 
-    static void dump(const PlanSubcomponentPropertyReference &pspr);
+static void dump(const PlanSubcomponentPropertyReference &pspr);
 
-    static void dump(const ResourceDeploymentDescription &rdd);
+static void dump(const ResourceDeploymentDescription &rdd);
 
-    static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
+static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
 
-    static void dump (const Deployment::RequirementSatisfier& rs);
+static void dump (const Deployment::RequirementSatisfier& rs);
 
-  private:
-    static void dump (const ::CORBA::Any &any);
-    // Helper function to print an Any
-  };
+private:
+static void dump (const ::CORBA::Any &any);
+// Helper function to print an Any
+};
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
index dff9365ceb7..6dd83b18989 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
@@ -8,83 +8,83 @@
 ACE_RCSID (Config_Handlers,
            DnC_Dump_T,
            "$Id$")
-namespace Deployment
-{
-  namespace DnC_Dump_T
+  namespace Deployment
   {
-    // Dumps a reference
-    template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-              typename CLASS>
-    void
-    dump_ref (const char* caption, REFERENCE& ref,
-              const char* root, DATA_TYPE CLASS::*data)
+    namespace DnC_Dump_T
     {
-      ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
-                  Dump_Obj::indent(), caption));
+      // Dumps a reference
+      template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
+                typename CLASS>
+      void
+      dump_ref (const char* caption, REFERENCE& ref,
+                const char* root, DATA_TYPE CLASS::*data)
+      {
+        ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
+                    Dump_Obj::indent(), caption));
 
-      const CORBA::Any &val = Dump_Obj::desc (root);
+        const CORBA::Any &val = Dump_Obj::desc (root);
 
-      ROOT *t = 0;
+        ROOT *t = 0;
 
-      val >>= t;
+        val >>= t;
 
-      const ROOT &root_obj = *t;
+        const ROOT &root_obj = *t;
 
-      int value = ref;
-      ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n",
-                  Dump_Obj::indent(), caption,
-                  (root_obj.*data)[value].name.in()));
-    }
+        int value = ref;
+        ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n",
+                    Dump_Obj::indent(), caption,
+                    (root_obj.*data)[value].name.in()));
+      }
 
-    // Dumps a reference sequence
-    template <typename ROOT, typename SEQUENCE, typename DATA_TYPE,
-              typename CLASS>
-    void
-    dump_ref_seq (const char* caption, SEQUENCE& seq, 
-                  const char* root, DATA_TYPE CLASS::*data)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s%s:\n",
-                  Dump_Obj::indent(), caption));
+      // Dumps a reference sequence
+      template <typename ROOT, typename SEQUENCE, typename DATA_TYPE,
+                typename CLASS>
+      void
+      dump_ref_seq (const char* caption, SEQUENCE& seq,
+                    const char* root, DATA_TYPE CLASS::*data)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    "%s%s:\n",
+                    Dump_Obj::indent(), caption));
 
-      CORBA::Any val;
-      val <<= root;
+        CORBA::Any val;
+        val <<= root;
 
-      for (size_t i = 0; i < seq.length(); ++i)
-        {
-          const CORBA::Any &val = Dump_Obj::desc (root);
+        for (size_t i = 0; i < seq.length(); ++i)
+          {
+            const CORBA::Any &val = Dump_Obj::desc (root);
 
-          ROOT *t = 0;
+            ROOT *t = 0;
 
-          val >>= t;
+            val >>= t;
 
-          const ROOT &root_obj = *t;
-          int value = seq[i];
-          ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n",
-                      Dump_Obj::indent(), caption, i,
-                      (root_obj.*data)[value].name.in()));
-        }
-    }
+            const ROOT &root_obj = *t;
+            int value = seq[i];
+            ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n",
+                        Dump_Obj::indent(), caption, i,
+                        (root_obj.*data)[value].name.in()));
+          }
+      }
 
-    // Dumps a sequence
-    template <typename SEQUENCE>
-    void
-    dump_sequence (const char* caption, const SEQUENCE &seq)
-    {
-      CORBA::ULong size = seq.length ();
+      // Dumps a sequence
+      template <typename SEQUENCE>
+      void
+      dump_sequence (const char* caption, const SEQUENCE &seq)
+      {
+        CORBA::ULong size = seq.length ();
 
-      if (size != 0)
-        {
-          Dump_Obj dump_obj(caption);
+        if (size != 0)
+          {
+            Dump_Obj dump_obj(caption);
 
-          for (CORBA::ULong i = 0; i < size; ++i)
-            {
-              ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(),
-                          caption, i));
-              DnC_Dump::dump (seq[i]);
-            }
-        }
+            for (CORBA::ULong i = 0; i < size; ++i)
+              {
+                ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(),
+                            caption, i));
+                DnC_Dump::dump (seq[i]);
+              }
+          }
+      }
     }
   }
-}
 #endif /* DNC_DUMP_C */
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
index 4d4c7427797..88a5c55f3cd 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
@@ -1,11 +1,11 @@
 //==================================================================
 /**
- *  @file  DnC_Dump_T.h
- *
- * $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
+*  @file  DnC_Dump_T.h
+*
+* $Id$
+*
+*  @author Gan Deng <gan.deng@vanderbilt.edu>
+*/
 //=====================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_DNC_DUMP_T_H
@@ -20,21 +20,21 @@
 
 namespace Deployment
 {
-  namespace DnC_Dump_T
-  {
-    template <typename SEQUENCE>
-    void dump_sequence (const char* caption, const SEQUENCE &seq);
-
-    template <typename ROOT, typename SEQUENCE,
-              typename DATA_TYPE, typename CLASS>
-    void dump_ref_seq (const char* caption, SEQUENCE& seq,
-                              const char* root, DATA_TYPE CLASS::*data);
-
-    template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-              typename CLASS>
-    void dump_ref (const char* caption, REFERENCE& ref,
-                          const char* root, DATA_TYPE CLASS::*data);
-  }
+namespace DnC_Dump_T
+{
+template <typename SEQUENCE>
+void dump_sequence (const char* caption, const SEQUENCE &seq);
+
+template <typename ROOT, typename SEQUENCE,
+typename DATA_TYPE, typename CLASS>
+void dump_ref_seq (const char* caption, SEQUENCE& seq,
+const char* root, DATA_TYPE CLASS::*data);
+
+template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
+typename CLASS>
+void dump_ref (const char* caption, REFERENCE& ref,
+const char* root, DATA_TYPE CLASS::*data);
+}
 }
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp
index 18dde6aa39f..3caf5440e9b 100644
--- a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.cpp
@@ -5,60 +5,60 @@ ACE_RCSID (Config_Handlers,
            Dump_Obj,
            "$Id$")
 
-namespace Deployment
-{
-  // static member initialization
-  std::string Dump_Obj::indent_ = "-";
-  std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
-
-  Dump_Obj::Dump_Obj(const char* caption)
-    : desc_()
+  namespace Deployment
   {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
-    indent_.append("  ");
-  }
+    // static member initialization
+    std::string Dump_Obj::indent_ = "-";
+    std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
 
+    Dump_Obj::Dump_Obj(const char* caption)
+      : desc_()
+    {
+      ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
+      indent_.append("  ");
+    }
 
-  Dump_Obj::Dump_Obj(const char* caption,
-                     CORBA::Any &val)
-    : desc_(caption)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
-                indent_.c_str(),
-                caption));
 
-    indent_.append("   ");
+    Dump_Obj::Dump_Obj(const char* caption,
+                       CORBA::Any &val)
+      : desc_(caption)
+    {
+      ACE_DEBUG ((LM_DEBUG, "%s%s:\n",
+                  indent_.c_str(),
+                  caption));
 
-    if (desc_map_.find (std::string (caption)) != desc_map_.end())
-      {
-        ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                      The item with name %s is already in \
-                      the node map.\n", caption));
-        throw Node_Exist();
-      }
-    else
-      {
-        desc_map_[std::string(caption)] = val;
-      }
-  }
+      indent_.append("   ");
 
-  Dump_Obj::~Dump_Obj()
-  {
-    indent_.erase(indent_.size() - 2, 2);
-    if (desc_.size() != 0)
-      {
-        if (desc_map_.find(desc_) != desc_map_.end())
-          {
-            desc_map_.erase(desc_map_.find(desc_));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                          The item with name %s is not in the node map.\n",
-                        desc_.c_str()));
-            throw Node_Not_Exist();
-          }
-      }
-  }
+      if (desc_map_.find (std::string (caption)) != desc_map_.end())
+        {
+          ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
+The item with name %s is already in \
+the node map.\n", caption));
+          throw Node_Exist();
+        }
+      else
+        {
+          desc_map_[std::string(caption)] = val;
+        }
+    }
 
-}
+    Dump_Obj::~Dump_Obj()
+    {
+      indent_.erase(indent_.size() - 2, 2);
+      if (desc_.size() != 0)
+        {
+          if (desc_map_.find(desc_) != desc_map_.end())
+            {
+              desc_map_.erase(desc_map_.find(desc_));
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
+The item with name %s is not in the node map.\n",
+                          desc_.c_str()));
+              throw Node_Not_Exist();
+            }
+        }
+    }
+
+  }
diff --git a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h
index 954fea46aa7..d8e90351ad1 100644
--- a/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h
+++ b/TAO/CIAO/tools/Config_Handlers/Dump_Obj.h
@@ -1,11 +1,11 @@
 //==================================================================
 /**
- *  @file  Dump_Obj.h
- *
- * $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
+*  @file  Dump_Obj.h
+*
+* $Id$
+*
+*  @author Gan Deng <gan.deng@vanderbilt.edu>
+*/
 //=====================================================================
 
 #ifndef CIAO_DUMP_OBJ_H
@@ -24,52 +24,52 @@
 
 namespace Deployment
 {
-  /*
-   *  @brief class Dump_Obj handles the indentation and keeps a map of
-   * structures for reference look-up.
-   */
-  class Config_Handlers_Export Dump_Obj
-  {
-  public:
-    /// Exception thrown when there is a node with the same name in the
-    /// map
-    class Node_Exist { };
+/*
+*  @brief class Dump_Obj handles the indentation and keeps a map of
+* structures for reference look-up.
+*/
+class Config_Handlers_Export Dump_Obj
+{
+public:
+/// Exception thrown when there is a node with the same name in the
+/// map
+class Node_Exist { };
 
-    /// Exception thrown when there is no node with the name given in
-    /// the map
-    class Node_Not_Exist { };
+/// Exception thrown when there is no node with the name given in
+/// the map
+class Node_Not_Exist { };
 
-    /// Constructors prints out the caption and increases indent
-    Dump_Obj (const char *caption);
+/// Constructors prints out the caption and increases indent
+Dump_Obj (const char *caption);
 
-    /// Additionally insets <val> into the map
-    Dump_Obj (const char* caption,
-              CORBA::Any &val);
+/// Additionally insets <val> into the map
+Dump_Obj (const char* caption,
+CORBA::Any &val);
 
-    // Destructor
-    ~Dump_Obj (void);
-    // return the indent string
-    static const char* indent()
-    {
-      return indent_.c_str();
-    }
+// Destructor
+~Dump_Obj (void);
+// return the indent string
+static const char* indent()
+{
+return indent_.c_str();
+}
 
-    static CORBA::Any& desc(const char* caption)
-    {
-      return desc_map_[caption];
-    }
+static CORBA::Any& desc(const char* caption)
+{
+return desc_map_[caption];
+}
 
-  private:
-    // indent string
-    static std::string indent_;
+private:
+// indent string
+static std::string indent_;
 
-    // map for reference lookup
-    static std::map<std::string, CORBA::Any> desc_map_;
+// map for reference lookup
+static std::map<std::string, CORBA::Any> desc_map_;
 
-    // descriptor - used by destructor for deleting the
-    // correct descriptor from the map
-    std::string desc_;
-  };
+// descriptor - used by destructor for deleting the
+// correct descriptor from the map
+std::string desc_;
+};
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
index 51daccc97dc..60095581130 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
@@ -1,19 +1,19 @@
 // $Id$
 
 project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory, ciao_client_dnc {
-  after += XSC_XML_Handlers
-  libs += XSC_XML_Handlers
-  dynamicflags += DYNANY_HANDLER_BUILD_DLL
-  macros += XML_USE_PTHREADS
-  requires += exceptions
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
+after += XSC_XML_Handlers
+libs += XSC_XML_Handlers
+dynamicflags += DYNANY_HANDLER_BUILD_DLL
+macros += XML_USE_PTHREADS
+requires += exceptions
+includes += $(CIAO_ROOT)/tools/Config_Handlers
 
-  Source_Files {
-    DynAny_Handler/DynAny_Handler.cpp
-    DynAny_Handler/DynEnum_Handler.cpp
-  }
-  
-  Header_Files {
-    DynAny_Handler_Export.h
-  }
-}
\ No newline at end of file
+Source_Files {
+DynAny_Handler/DynAny_Handler.cpp
+DynAny_Handler/DynEnum_Handler.cpp
+}
+
+Header_Files {
+DynAny_Handler_Export.h
+}
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
index cfc8d657fca..77567e3739c 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
@@ -21,86 +21,86 @@ namespace CIAO{
     {
 
         TCKind kind (desc.kind ());
-        
+
         switch (kind.integral ())
           {
           case  TCKind::tk_null_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-            
+
 
           case  TCKind::tk_short_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-            
+
 
           case  TCKind::tk_long_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-            
+
 
           case  TCKind::tk_ushort_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-            
+
 
           case  TCKind::tk_ulong_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-            
+
 
           case  TCKind::tk_float_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-            
+
 
           case  TCKind::tk_double_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-            
+
 
           case  TCKind::tk_boolean_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-            
+
 
           case  TCKind::tk_char_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-            
+
 
           case  TCKind::tk_octet_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-            
+
 
           case  TCKind::tk_string_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-            
+
 
           case  TCKind::tk_longlong_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-            
+
 
           case  TCKind::tk_ulonglong_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-            
+
 
           case  TCKind::tk_longdouble_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-            
+
 
           case  TCKind::tk_wchar_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-            
+
 
           case  TCKind::tk_wstring_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-            
+
 
           case  TCKind::tk_any_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-            
+
 
           case  TCKind::tk_TypeCode_l:
             return CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-            
+
 
           default:
             ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
             throw 1;
           }
-        
+
         //   This case used to be supported...is it not in the schema?
     //    case  TCKind::tk_Object)
     //      return CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/
@@ -112,7 +112,7 @@ namespace CIAO{
                       const CORBA::TypeCode_ptr&  src)
     {
         DataType type;
-        
+
         switch (src->kind ())
           {
           case ::CORBA::tk_null:
@@ -172,7 +172,7 @@ namespace CIAO{
             ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
             throw 1;
           }
-        
+
         return type;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
index eda2375fcee..c16b4b21fe3 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
@@ -12,38 +12,38 @@
 #define DATATYPE_HANDLER_H
 
 #include /**/ "ace/pre.h"
-                                                                                
+
 #include "ciao/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
-             
-                                                                                
+
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
 namespace CIAO{
-    
+
   namespace Config_Handlers{
 
   /*
    * @class DataType_Handler
-   * 
+   *
    * @brief Handler class for <ComponentPortDescription> types.
-   * 
-   * This class defines handler methods to map values from 
+   *
+   * This class defines handler methods to map values from
    * XSC objects, parsed from the descriptor files, to the
    * corresponding CORBA IDL type for the schema element.
-   * 
+   *
    */
 
    class DataType_Handler{
- 
+
     public:
-       
+
       DataType_Handler (void);
       virtual ~DataType_Handler (void);
-              
+
       ////This method takes a <CIAO::Config_Handlers::DataType>
       ///and returns the corresponding CORBA::TypeCode.
       static void
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index 74d702e1bd9..64690ad61c1 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
@@ -10,8 +10,6 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    //    DynAny_Handler * DynAny_Handler::instance_ = 0;
-
     DynAny_Handler::DynAny_Handler (void) :
       orb_ (0),
       daf_ (0)
@@ -35,17 +33,6 @@ namespace CIAO
     {
     }
 
-    /*
-    DynAny_Handler *
-    DynAny_Handler::instance (void)
-    {
-      if (instance_ == 0)
-        instance_ = new DynAny_Handler (0, 0);
-
-      return instance_;
-    }
-    */
-
     CORBA::ORB_ptr
     DynAny_Handler::orb ()
     {
@@ -94,25 +81,11 @@ namespace CIAO
         case TCKind::tk_float_l:
           retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_float);
           retval->insert_float (CORBA::Float (*value.begin_float ()));
-          /*
-#ifdef __BORLANDC__
-          CORBA::Float (static_cast < float & > (*value.begin_float_ ())));
-#else
-          CORBA::Float (static_cast < ::XMLSchema::float_ const& > (*value.begin_float_ ())));
-#endif
-          */
           break;
 
         case TCKind::tk_double_l:
           retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_double);
           retval->insert_double (CORBA::Double (*value.begin_double ()));
-          /*
-#ifdef __BORLANDC__
-            CORBA::Double (static_cast < double &> (*value.begin_double_ ())));
-#else
-          CORBA::Double (static_cast < ::XMLSchema::double_ const& > (*value.begin_double_ ())));
-#endif
-          */
           break;
 
         case TCKind::tk_boolean_l:
@@ -146,8 +119,6 @@ namespace CIAO
           break;
 
          case TCKind::tk_longdouble_l:
-//           retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_longdouble);
-//           retval->insert_longdouble (CORBA::LongDouble (*value.begin_longdouble ()));
            break;
 
         case TCKind::tk_wchar_l:
@@ -156,8 +127,6 @@ namespace CIAO
           break;
 
         case TCKind::tk_wstring_l:
-          //          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_wstring);
-          //retval->insert_wstring (CORBA::WString (*value.begin_string ().c_str ()));
           break;
 
         case TCKind::tk_enum_l:
@@ -190,10 +159,83 @@ namespace CIAO
       return retval._retn ();
     }
 
-          //    Any Any_Handler::get_any (const ::CORBA::Any& src)
-          //   {
-          //ACE_ERROR ((LM_ERROR, "Output of Anys not yet supported."));
-          // }
+    Any
+    DynAny_Handler::extract_from_dynany (const CORBA::Any &any)
+    {
+      DynamicAny::DynAny_var dyn = this->daf_->create_dyn_any (any);
+
+      DataValue val;
+
+      switch (dyn->type ()->kind ())
+        {
+        case CORBA::tk_short:
+          val.add_short (dyn->get_short ());
+          return Any (TCKind::tk_short, val);
+
+        case CORBA::tk_long:
+          val.add_long (dyn->get_long ());
+          return Any (TCKind::tk_long, val);
+
+        case CORBA::tk_ushort:
+          val.add_ushort (dyn->get_ushort ());
+          return Any (TCKind::tk_ushort, val);
+
+        case CORBA::tk_ulong:
+          val.add_ulong (dyn->get_ulong ());
+          return Any (TCKind::tk_ulong, val);
+
+        case CORBA::tk_float:
+          val.add_float (dyn->get_float ());
+          return Any (TCKind::tk_float, val);
+
+        case CORBA::tk_double:
+          val.add_double (dyn->get_double ());
+          return Any (TCKind::tk_double, val);
+
+        case CORBA::tk_boolean:
+          val.add_boolean (dyn->get_boolean ());
+          return Any (TCKind::tk_boolean, val);
+
+        case CORBA::tk_octet:
+          val.add_octet (dyn->get_octet ());
+          return Any (TCKind::tk_octet, val);
+
+        case CORBA::tk_string:
+          val.add_string (dyn->get_string ());
+          return Any (TCKind::tk_string, val);
+
+        case CORBA::tk_longlong:
+          val.add_longlong (dyn->get_longlong ());
+          return Any (TCKind::tk_longlong, val);
+
+        case CORBA::tk_ulonglong:
+          val.add_ulonglong (dyn->get_ulonglong ());
+          return Any (TCKind::tk_ulonglong, val);
+
+        case CORBA::tk_longdouble:
+          //          return Any (TCKind::tk_longdouble);
+          // @@MAJO: Need to add longdouble to schema.
+          //val.add_longdouble (dyn->get_longdouble ());
+
+        case CORBA::tk_wchar:
+          //          return Any (TCKind::tk_wchar);
+          // @@MAJO: Need to add wchar to schema
+          //          val.add_wchar (dyn->get_wchar ());
+        case CORBA::tk_char:
+          // return Any (TCKind::tk_char);
+          // @@MAJO: Need to add char into the schema.
+          //          val.add_char (dyn->get_char ());
+
+        case CORBA::tk_wstring:
+        case CORBA::tk_any:
+        case CORBA::tk_TypeCode:
+        case ::CORBA::tk_null:
+        default:
+          ACE_ERROR ((LM_ERROR, "DynAny_Handler: I have no idea how to perform a referse mapping.\n"));
+          throw 1;
+        }
+
+    }
   }
 }
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
index af81ace52ff..a209b3eae2c 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
@@ -29,7 +29,7 @@ namespace CIAO
     class Any;
     class DataType;
     class DataValue;
-    
+
     /**
     * @class Any_Handler
     *
@@ -46,26 +46,23 @@ namespace CIAO
       DynAny_Handler ();
 
       ~DynAny_Handler (void);
-      
-      //      static DynAny_Handler *instance ();
-      
+
       DynamicAny::DynAny_ptr  extract_into_dynany (const DataType& type,
                                                    const DataValue& value);
-      
-      //      Any get_any (const CORBA::Any &src);
-      
+
+      Any extract_from_dynany (const CORBA::Any &any);
+
       CORBA::ORB_ptr orb ();
-            
+
       DynamicAny::DynAnyFactory_ptr daf ();
-            
+
     private:
-      //      static DynAny_Handler *instance_;
-      
+
       CORBA::ORB_var orb_;
-      
+
       DynamicAny::DynAnyFactory_var daf_;
     };
-    
+
     typedef ACE_Singleton<DynAny_Handler, ACE_Null_Mutex> DynAny_Singleton;
     #define DYNANY_HANDLER DynAny_Singleton::instance()
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
index 736a866cdc0..8773f7b9014 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
@@ -23,43 +23,43 @@ namespace CIAO
           ACE_ERROR ((LM_ERROR, "ERROR: Enum type descriptioin required"));
           throw 1;
         }
-      
+
       // Construct TypeCode for the enum
       CORBA::EnumMemberSeq members;
       members.length (type.enum_ ().count_member ());
       CORBA::ULong index (0);
-      
+
       for (EnumType::member_const_iterator i = type.enum_ ().begin_member ();
            i != type.enum_ ().end_member ();
            ++i)
         {
           members[index++] = i->c_str ();
         }
-      
+
       // Grab pointer to the DynAny_Handler to use the orb and any factory.
       //      DynAny_Handler *dah = DynAny_Handler::instance ();
-      
-      // @@ Leak this guy onto the heap to avoid a compile problem. 
-      CORBA::TypeCode_ptr tc = 
+
+      // @@ Leak this guy onto the heap to avoid a compile problem.
+      CORBA::TypeCode_ptr tc =
         DYNANY_HANDLER->orb ()->create_enum_tc (type.enum_ ().typeId ().c_str (),
                                      type.enum_ ().name ().c_str (),
                                      members);
-      
+
       ACE_ERROR ((LM_ERROR, "Type: %s \nName: %s\nvalue: %s\n",
                   type.enum_ ().typeId ().c_str (),
                   type.enum_ ().name ().c_str (),
                   value.begin_enum ()->c_str ()));
-      
+
       // Make the actual DynEnum
-      DynamicAny::DynAny_var temp =  
+      DynamicAny::DynAny_var temp =
         DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
       DynamicAny::DynEnum_var retval = DynamicAny::DynEnum::_narrow (temp.in ());
-      
+
       retval->set_as_string (value.begin_enum ()->c_str ());
 
       return retval._retn ();
     }
-    
+
     void
     DynEnum_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn)
     {
@@ -69,4 +69,4 @@ namespace CIAO
   }
 }
 
-    
+
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
index 9203b32ba58..009b8b37659 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
@@ -1,6 +1,6 @@
 /**
  * $Id$
- * 
+ *
  * @file DynEnum_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
  */
@@ -25,7 +25,7 @@ namespace CIAO
     class Any;
     class DataType;
     class DataValue;
-    
+
     /**
      * @class DynEnum_Handler
      * @brief Translates enums specified in deployment plans into Dynamic Anys
@@ -36,10 +36,10 @@ namespace CIAO
     public:
       static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
                                                       const DataValue &value);
-      
+
       static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn);
     };
-    
+
   }
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index 2f6de450d8c..200282aa792 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -3,16 +3,17 @@
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
   {
     void
     ERE_Handler::external_ref_endpoints (
-        const PlanConnectionDescription &src,
-        Deployment::ExternalReferenceEndpoints &dest)
+                                         const PlanConnectionDescription &src,
+                                         Deployment::ExternalReferenceEndpoints &dest)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoints");
       PlanConnectionDescription::externalReference_const_iterator erep_e =
         src.end_externalReference ();
 
@@ -30,17 +31,19 @@ namespace CIAO
 
     void
     ERE_Handler::external_ref_endpoint (
-        const ExternalReferenceEndpoint &src,
-        Deployment::ExternalReferenceEndpoint &dest)
+                                        const ExternalReferenceEndpoint &src,
+                                        Deployment::ExternalReferenceEndpoint &dest)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoint");
       dest.location =
         src.location ().c_str ();
     }
-   
-    ExternalReferenceEndpoint 
+
+    ExternalReferenceEndpoint
     ERE_Handler::external_ref_endpoint (
-        const Deployment::ExternalReferenceEndpoint& src)
+                                        const Deployment::ExternalReferenceEndpoint& src)
     {
+      CIAO_TRACE("ERE_Handler::external_ref_endpoint - reverse");
       XMLSchema::string< char > loc ((src.location));
       ExternalReferenceEndpoint erp (loc);
       return erp;
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
index 93671582bae..934e2273bf5 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  ERE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ERE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ERE_HANDLER_H
@@ -18,46 +18,53 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "Utils/Functors.h"
+
 namespace Deployment
 {
-  class ExternalReferenceEndpoints;
-  struct ExternalReferenceEndpoint;
+class ExternalReferenceEndpoints;
+struct ExternalReferenceEndpoint;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class ExternalReferenceEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ExternalReferenceEndpoint;
+
+/*
+* @class ERE_Handler
+*
+* @brief Handler class for <ExternalReferenceEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC ExternalReferenceEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export ERE_Handler
+{
+public:
+static void external_ref_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ExternalReferenceEndpoints &dest);
+
+static ExternalReferenceEndpoint external_ref_endpoint (
+const Deployment::ExternalReferenceEndpoint& src);
 
-   /*
-    * @class ERE_Handler
-    *
-    * @brief Handler class for <ExternalReferenceEndpoint> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC ExternalReferenceEndpoint objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
+static void external_ref_endpoint (const ExternalReferenceEndpoint &src,
+Deployment::ExternalReferenceEndpoint &dest);
+};
 
-    class Config_Handlers_Export ERE_Handler
-    {
-    public:
-      static void external_ref_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::ExternalReferenceEndpoints &dest);
-      
-      static ExternalReferenceEndpoint external_ref_endpoint (
-        const Deployment::ExternalReferenceEndpoint& src);
-    private:
-      static void external_ref_endpoint (
-        const ExternalReferenceEndpoint &src,
-        Deployment::ExternalReferenceEndpoint &dest);
-    };
-  }
+typedef Sequence_Handler < ExternalReferenceEndpoint,
+::Deployment::ExternalReferenceEndpoints,
+::Deployment::ExternalReferenceEndpoint,
+ERE_Handler::external_ref_endpoint > ERE_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 5f1978d41b9..3a1995ceed8 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/UUID.h"
 #include "IDD_Handler.h"
 #include "IRDD_Handler.h"
 #include "MDD_Handler.h"
@@ -17,13 +18,14 @@ namespace CIAO
 
     void
     IDD_Handler::instance_deployment_descrs (
-        const DeploymentPlan &src,
-        Deployment::InstanceDeploymentDescriptions& dest)
+                                             const DeploymentPlan &src,
+                                             Deployment::InstanceDeploymentDescriptions& dest)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDD_Handler::instance_deployment_descrs");
       DeploymentPlan::instance_const_iterator idd_e =
         src.end_instance ();
-      
+
       CORBA::ULong pos = 0;
       dest.length (src.count_instance ());
       for (DeploymentPlan::instance_const_iterator idd_b =
@@ -31,124 +33,129 @@ namespace CIAO
            idd_b != idd_e;
            ++idd_b)
         {
-	  IDD_Handler::instance_deployment_descr ((*idd_b),
-						  dest[pos], pos);
-	  pos++;
+          IDD_Handler::instance_deployment_descr ((*idd_b),
+                                                  dest[pos], pos);
+          pos++;
         }
     }
 
     void
     IDD_Handler::instance_deployment_descr (
-        const InstanceDeploymentDescription& src,
-        Deployment::InstanceDeploymentDescription& dest,
-        CORBA::ULong pos)
+                                            const InstanceDeploymentDescription& src,
+                                            Deployment::InstanceDeploymentDescription& dest,
+                                            CORBA::ULong pos)
       throw (Config_Error)
     {
+      CIAO_TRACE("IDD_Handler::instance_deployment_descr");
       try
-	{
-	  dest.name = src.name ().c_str ();
-	  dest.node = src.node ().c_str ();
-
-	  if (src.id_p ())
-	    {
-	      ACE_CString cstr (src.id ().c_str ());
-	      IDD_Handler::IDREF.bind_ref (cstr, pos);
-	    }
-	  else
-	    {
-	      ACE_DEBUG((LM_ERROR,
-			 "(%P|%t) Warning:  IDD %s has no idref \n",
-			 src.name ().c_str ()));
-	    }
-
-	  // We know there should be only one element
+        {
+          dest.name = src.name ().c_str ();
+          dest.node = src.node ().c_str ();
+
+          if (src.id_p ())
+            {
+              ACE_CString cstr (src.id ().c_str ());
+              IDD_Handler::IDREF.bind_ref (cstr, pos);
+            }
+          else
+            {
+              ACE_DEBUG((LM_ERROR,
+                         "(%P|%t) Warning:  IDD %s has no idref \n",
+                         src.name ().c_str ()));
+            }
+
+          // We know there should be only one element
           dest.source.length (1);
-	  dest.source [0] =
-	    src.source ().c_str ();
-
-	  CORBA::ULong tmp = 0;
-	  MDD_Handler::IDREF.find_ref 
-	    (ACE_CString (src.implementation ().id ().c_str ()), tmp);
-      
-	  dest.implementationRef = tmp;
-
-	  InstanceDeploymentDescription::configProperty_const_iterator pend =
-	    src.end_configProperty ();
-          
-          CORBA::ULong pos = 0;
+          dest.source [0] =
+            src.source ().c_str ();
+
+          CORBA::ULong tmp = 0;
+          MDD_Handler::IDREF.find_ref
+            (ACE_CString (src.implementation ().id ().c_str ()), tmp);
+
+          dest.implementationRef = tmp;
+
           dest.configProperty.length (src.count_configProperty ());
-	  for (InstanceDeploymentDescription::configProperty_const_iterator pstart =
-		 src.begin_configProperty ();
-	       pstart != pend;
-	       ++pstart)
-	    {
-	      Property_Handler::get_property (*pstart,
-					      dest.configProperty[pos++]);
-	    }
-
-	  if (src.deployedResource_p ())
-	    {
-	      dest.deployedResource.length (1);
-	      IRDD_Handler::instance_resource_deployment_descr (src.deployedResource (),
-							  dest.deployedResource[0]);
-	    }
-
-	  if (src.deployedSharedResource_p ())
-	    {
-	      dest.deployedSharedResource.length (1);
-	      IRDD_Handler::instance_resource_deployment_descr (src.deployedSharedResource (),
-								dest.deployedSharedResource[0]);
-	    }
-
-	}
+          std::for_each (src.begin_configProperty (),
+                         src.end_configProperty (),
+                         Property_Functor (dest.configProperty));
+
+          if (src.deployedResource_p ())
+            {
+              dest.deployedResource.length (1);
+              IRDD_Handler::instance_resource_deployment_descr (src.deployedResource (),
+                                                                dest.deployedResource[0]);
+            }
+
+          if (src.deployedSharedResource_p ())
+            {
+              dest.deployedSharedResource.length (1);
+              IRDD_Handler::instance_resource_deployment_descr (src.deployedSharedResource (),
+                                                                dest.deployedSharedResource[0]);
+            }
+
+        }
       catch (Config_Error &ex)
-	{
-	  ex.name_ = src.name ()  + ":" + ex.name_;
-	  throw ex;
-	}
+        {
+          ex.name_ = src.name ()  + ":" + ex.name_;
+          throw ex;
+        }
       // Done!
     }
- 
+
     InstanceDeploymentDescription
     IDD_Handler::instance_deployment_descr (
-	const Deployment::InstanceDeploymentDescription& src)
+                                            const Deployment::InstanceDeploymentDescription& src)
       throw (Config_Error)
     {
-	
-	//Get all the string/IDREFs
-	XMLSchema::string < ACE_TCHAR > name ((src.name));
-	XMLSchema::string < ACE_TCHAR > node ((src.node));
-	XMLSchema::string < ACE_TCHAR > source ((src.source[0]));
-	ACE_CString temp;
-	MDD_Handler::IDREF.find_ref(src.implementationRef, temp);
-	XMLSchema::IDREF< ACE_TCHAR > implementation ((temp.c_str()));
-
-	// Instantiate the IDD
-	InstanceDeploymentDescription idd (name, node, source, implementation);
-
-	//Get and store the configProperty(s)
-	size_t total = src.configProperty.length();
-	for(size_t j = 0; j < total; j++)
-	{
-	    idd.add_configProperty(
-		Property_Handler::get_property (
-		    src.configProperty[j]));
-	}
-
-	//Check if there is a deployedResource, if so store
-	if(src.deployedResource.length() != 0)
-	    idd.deployedResource(
-		IRDD_Handler::instance_resource_deployment_descr(
-		    src.deployedResource[0]));
-
-	//Check if there is a deployedSharedResource, if so store it
-	if(src.deployedSharedResource.length() != 0)
-	    idd. deployedSharedResource(
-		IRDD_Handler::instance_resource_deployment_descr(
-		    src.deployedSharedResource[0]));
-
-	return idd;
-    }	
+      CIAO_TRACE("IDD_Handler::instance_deployment_descr - reverse");
+      //Get all the string/IDREFs
+      XMLSchema::string < ACE_TCHAR > name ((src.name));
+      XMLSchema::string < ACE_TCHAR > node ((src.node));
+      XMLSchema::string < ACE_TCHAR > source ((src.source[0]));
+      ACE_CString temp;
+      MDD_Handler::IDREF.find_ref(src.implementationRef, temp);
+      XMLSchema::IDREF< ACE_TCHAR > implementation ((temp.c_str()));
+
+      // Instantiate the IDD
+      InstanceDeploymentDescription idd (name, node, source, implementation);
+
+      //Get and store the configProperty(s)
+      size_t total = src.configProperty.length();
+      for(size_t j = 0; j < total; j++)
+        {
+          idd.add_configProperty(
+                                 Property_Handler::get_property (
+                                                                 src.configProperty[j]));
+        }
+
+      //Check if there is a deployedResource, if so store
+      if(src.deployedResource.length() != 0)
+        idd.deployedResource(
+                             IRDD_Handler::instance_resource_deployment_descr(
+                                                                              src.deployedResource[0]));
+
+      //Check if there is a deployedSharedResource, if so store it
+      if(src.deployedSharedResource.length() != 0)
+        idd. deployedSharedResource(
+                                    IRDD_Handler::instance_resource_deployment_descr(
+                                                                                     src.deployedSharedResource[0]));
+
+      // Generate a UUID to use for the IDREF.
+      ACE_Utils::UUID uuid;
+      ACE_Utils::UUID_GENERATOR::instance ()->generateUUID (uuid);
+      ACE_CString idd_id ("_");
+      idd_id += *uuid.to_string ();
+
+      XMLSchema::ID< ACE_TCHAR > xml_id (idd_id.c_str ());
+
+      // Bind the ref and set it in the IDD
+      IDD_Handler::IDREF.bind_next_available (idd_id);
+
+      idd.id (xml_id);
+
+      return idd;
+    }
 
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h
index f21ea114f49..735038e2468 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  IDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  IDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_IDD_HANDLER_H
@@ -23,53 +23,53 @@
 
 namespace Deployment
 {
-  struct InstanceDeploymentDescription;
-  class InstanceDeploymentDescriptions;
-  struct InstanceResourceDeploymentDescription;
+struct InstanceDeploymentDescription;
+class InstanceDeploymentDescriptions;
+struct InstanceResourceDeploymentDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-    class InstanceDeploymentDescription;
-    class InstanceResourceDeploymentDescription;
+namespace Config_Handlers
+{
+class DeploymentPlan;
+class InstanceDeploymentDescription;
+class InstanceResourceDeploymentDescription;
+
+/*
+* @class IDD_Handler
+*
+* @brief Handler class for <InstanceDeploymentDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC InstanceDeploymentDescriptionn objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
 
-   /*
-    * @class IDD_Handler
-    *
-    * @brief Handler class for <InstanceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC InstanceDeploymentDescriptionn objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
+class Config_Handlers_Export IDD_Handler
+{
+public:
+static void instance_deployment_descrs (
+const DeploymentPlan &src,
+::Deployment::InstanceDeploymentDescriptions& dest)
+throw (Config_Error);
 
-    class Config_Handlers_Export IDD_Handler
-    {
-    public:
-      static void instance_deployment_descrs (
-          const DeploymentPlan &src,
-          ::Deployment::InstanceDeploymentDescriptions& dest)
-	throw (Config_Error);
+static InstanceDeploymentDescription instance_deployment_descr (
+const Deployment::InstanceDeploymentDescription &src)
+throw (Config_Error);
 
-      static InstanceDeploymentDescription instance_deployment_descr (
-	  const Deployment::InstanceDeploymentDescription &src)
-	throw (Config_Error);
-      
-      static IDREF_Base<CORBA::ULong> IDREF;
+static IDREF_Base<CORBA::ULong> IDREF;
 
-    private:
-      static void instance_deployment_descr (
-          const InstanceDeploymentDescription &src,
-          ::Deployment::InstanceDeploymentDescription &dest,
-          CORBA::ULong pos)
-	throw (Config_Error);
+private:
+static void instance_deployment_descr (
+const InstanceDeploymentDescription &src,
+::Deployment::InstanceDeploymentDescription &dest,
+CORBA::ULong pos)
+throw (Config_Error);
 
-    };
-  }
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
index 88808bb4a6f..7a6201c2906 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
@@ -2,6 +2,7 @@
 #ifndef IDREF_BASE_CPP
 #define IDREF_BASE_CPP
 
+#include "ciao/CIAO_common.h"
 #include "IDREF_Base.h"
 #include <iostream>
 
@@ -10,68 +11,104 @@ ACE_RCSID (DAnCE,
            IDREF_Base,
            "$Id$")
 
- 
-namespace CIAO
-{
-  namespace Config_Handlers
+
+  namespace CIAO
   {
-    template <typename T>
-    void
-    IDREF_Base<T>::bind_ref (ACE_CString& id, T value)
-      throw (Config_Error)
+    namespace Config_Handlers
     {
-      int retval =
-        idref_map_.bind (id, value);
+      template <typename T>
+      void
+      IDREF_Base<T>::bind_ref (ACE_CString& id, T value)
+        throw (Config_Error)
+      {
+        CIAO_TRACE("IDREF_Base<T>::bind_ref");
 
-      pos_map_.bind (value,id);
+        int retval =
+          idref_map_.bind (id, value);
 
-      if (retval < 0)
-        throw Config_Error (id.c_str (),
-			    "Failed to bind an IDRef.  This likely indicates a name clash.");
-    }
+        pos_map_.bind (value,id);
 
-    template <typename T>
-    void
-    IDREF_Base<T>::find_ref (const ACE_CString& id, T& val)
-      throw (Config_Error)
-    {
-      int retval =
-        idref_map_.find (id, val);
+        if (retval < 0)
+          throw Config_Error (id.c_str (),
+                              "Failed to bind an IDRef.  This likely indicates a name clash.");
+      }
 
-      if (retval < 0)
-        throw Config_Error (id.c_str (),
-			    "Unable to look up an IDRef.");
-    }
+      template <typename T>
+      void
+      IDREF_Base<T>::bind_next_available (ACE_CString &id)
+      {
+        // Note:  For this function to compile and work properly,
+        // T must have the postincrement operator defined.
+        CIAO_TRACE ("IDREF_Base<T>::bind_next_available");
+        //      ACE_DEBUG ((LM_DEBUG, "**** Binding %s to %i\n",
+        //            id.c_str (),
+        //            this->next_));
 
-    template <typename T>
-    void
-    IDREF_Base<T>::find_ref (const T& value, ACE_CString& id)
-      throw (Config_Error)
-    {
-      int retval =
-        pos_map_.find (value, id);
+        int retval = idref_map_.bind (id, this->next_);
 
-      if (retval < 0)
-        throw Config_Error ("No location information",
-			    "Failed a reverse IDRef lookup.");
-    }
+        int pos_retval = pos_map_.bind (this->next_, id);
 
-    template <typename T>
-    bool
-    IDREF_Base<T>::unbind_refs (void)
-    {
-      int retval =
-        idref_map_.unbind_all ();
- 
-      pos_map_.unbind_all ();
-   
-      if (retval < 0)
-        return false;
-
-      return true;
+        ++this->next_;
+
+        if (retval < 0 || pos_retval < 0)
+          throw Config_Error (id.c_str (),
+                              "Failed to bind an IDRef.  This likely indicates a name clash");
+
+      }
+
+      template <typename T>
+      void
+      IDREF_Base<T>::find_ref (const ACE_CString& id, T& val)
+        throw (Config_Error)
+      {
+        CIAO_TRACE("IDREF_Base<T>::find_ref(C_String, T)");
+
+        int retval =
+          idref_map_.find (id, val);
+
+        if (retval < 0)
+          throw Config_Error (id.c_str (),
+                              "Unable to look up an IDRef.");
+      }
+
+      template <typename T>
+      void
+      IDREF_Base<T>::find_ref (const T& value, ACE_CString& id)
+        throw (Config_Error)
+      {
+        CIAO_TRACE("IDREF_Base<T>::find_ref (T, CString)");
+
+        int retval =
+          pos_map_.find (value, id);
+
+        //      ACE_DEBUG ((LM_ERROR, "**** Looking up value %i\n",
+        //            value));
+
+        if (retval < 0)
+          throw Config_Error ("No location information for reverse IDREF lookup",
+                              id.c_str ());
+      }
+
+      template <typename T>
+      bool
+      IDREF_Base<T>::unbind_refs (void)
+      {
+        CIAO_TRACE("IDREF_Base<T>::unbind_refs");
+
+        int retval =
+          idref_map_.unbind_all ();
+
+        pos_map_.unbind_all ();
+
+        this->next_ = 0;
+
+        if (retval < 0)
+          return false;
+
+        return true;
+      }
     }
-}
 
-}
+  }
 
 #endif /* IDREF_BASE_CPP */
diff --git a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
index 6f29866c9ac..85f0d3a4f22 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
+++ b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.h
@@ -1,11 +1,11 @@
-/** 
- * $Id$
- * @file IDREF_Base.h
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- *
- * Defines the IDREF_Base class, which is an abstract class that serves
- * as a base for any config handler that must map IDREFS.  
- */
+/**
+* $Id$
+* @file IDREF_Base.h
+* @author Will Otte <wotte@dre.vanderbilt.edu>
+*
+* Defines the IDREF_Base class, which is an abstract class that serves
+* as a base for any config handler that must map IDREFS.
+*/
 
 #ifndef CIAO_CONFIG_HANDLERS_IDREF_BASE_H
 #define CIAO_CONFIG_HANDLERS_IDREF_BASE_H
@@ -24,53 +24,66 @@
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    
-    /**
-     * @class IDREF_Handler
-     * @brief Base class for any handler that must process idrefs.
-     *
-     */
-    template <typename T>
-    class IDREF_Base
-    {
-    public:
-      /// Bind an IDREF to an index
-      void bind_ref (ACE_CString& id, T value)
-	throw (Config_Error);
-  
-      /// Get the index associated with an IDREF
-      void find_ref (const ACE_CString& id, T& value)
-	throw (Config_Error);
-      
-      /// get the IDREF associated with an index
-      void find_ref (const T &value, ACE_CString& id)
-	throw (Config_Error);
-  
-      /// Unbind all IDREFS
-      bool
-      unbind_refs (void);
-
-      typedef ACE_Hash_Map_Manager<ACE_CString,
-                                   T,
-                                   ACE_Null_Mutex> IDREF_MAP;
-
-          
-      typedef ACE_Hash_Map_Manager<T,
-                                   ACE_CString,
-                                   ACE_Null_Mutex> POS_MAP;
-    protected:
-      /// The map used to store and look up the indexes of elements
-      /// referenced by their IDREF.
-      IDREF_MAP idref_map_;
-      /// The map used to store and look up the IDREFS of elements
-      /// referenced by their index.
-      POS_MAP pos_map_;
-    };
-    
-  }
-  
+namespace Config_Handlers
+{
+
+/**
+* @class IDREF_Handler
+* @brief Base class for any handler that must process idrefs.
+*
+*/
+template <typename T>
+class IDREF_Base
+{
+public:
+IDREF_Base ()
+{
+}
+
+IDREF_Base (T start_point)
+: next_ (start_point)
+{
+}
+
+/// Bind an IDREF to an index
+void bind_ref (ACE_CString& id, T value)
+throw (Config_Error);
+
+void bind_next_available (ACE_CString &id);
+
+/// Get the index associated with an IDREF
+void find_ref (const ACE_CString& id, T& value)
+throw (Config_Error);
+
+/// get the IDREF associated with an index
+void find_ref (const T &value, ACE_CString& id)
+throw (Config_Error);
+
+/// Unbind all IDREFS
+bool
+unbind_refs (void);
+
+typedef ACE_Hash_Map_Manager<ACE_CString,
+T,
+ACE_Null_Mutex> IDREF_MAP;
+
+
+typedef ACE_Hash_Map_Manager<T,
+ACE_CString,
+ACE_Null_Mutex> POS_MAP;
+protected:
+/// The map used to store and look up the indexes of elements
+/// referenced by their IDREF.
+IDREF_MAP idref_map_;
+/// The map used to store and look up the IDREFS of elements
+/// referenced by their index.
+POS_MAP pos_map_;
+
+T next_;
+};
+
+}
+
 }
 
 #include "IDREF_Base.cpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
index 664e4f46b3d..8bd3172bf18 100644
--- a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
@@ -4,7 +4,7 @@
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -19,18 +19,20 @@ namespace CIAO
 
 
     void
-    ID_Handler::get_ImplementationDependency (
-                    Deployment::ImplementationDependency& toconfig,
-                    const ImplementationDependency& desc)
+    ID_Handler::get_ImplementationDependency (const ImplementationDependency& desc,
+                                              Deployment::ImplementationDependency& toconfig)
     {
+      CIAO_TRACE("ID_Handler::get_ImplementationDependency");
+
       toconfig.requiredType=
-           CORBA::string_dup (desc.requiredType ().c_str ());
+        CORBA::string_dup (desc.requiredType ().c_str ());
     }
 
     ImplementationDependency
     ID_Handler::impl_dependency (
-        const ::Deployment::ImplementationDependency& src)
+                                 const ::Deployment::ImplementationDependency& src)
     {
+      CIAO_TRACE("ID_Handler::get_ImplementationDependency - reverse");
       XMLSchema::string< char > reqtype ((src.requiredType));
 
       ImplementationDependency id (reqtype);
diff --git a/TAO/CIAO/tools/Config_Handlers/ID_Handler.h b/TAO/CIAO/tools/Config_Handlers/ID_Handler.h
index c800b31e0b3..60fed331647 100644
--- a/TAO/CIAO/tools/Config_Handlers/ID_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ID_Handler.h
@@ -1,12 +1,12 @@
 
 //==============================================================
 /**
- *  @file  ID_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ID_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ID_Handler_H
@@ -16,6 +16,8 @@
 #include "Config_Handlers_Export.h"
 #include "ace/config-lite.h"
 
+#include "Utils/Functors.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -24,44 +26,52 @@
 
 namespace Deployment
 {
-  struct ImplementationDependency;
+struct ImplementationDependency;
+class ImplementationDependencies;;
+
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-
-   class ImplementationDependency;
-
-
-   /*
-    * @class ID_Handler
-    *
-    * @brief Handler class for <ImplementationDependency> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC ImplementationDependency objects, parsed from the descriptor files, to the
-    * corresponding CORBA IDL Any type.
-    *
-    */
-    class Config_Handlers_Export ID_Handler
-    {
-    public:
-
-      ID_Handler (void);
-      virtual ~ID_Handler (void);
-
-      static void get_ImplementationDependency (
-          Deployment::ImplementationDependency& toconfig,
-          const ImplementationDependency& desc);
-
-      static ImplementationDependency impl_dependency (
-          const ::Deployment::ImplementationDependency& src);
-    };
-  }
+namespace Config_Handlers
+{
+
+class ImplementationDependency;
+
+
+/*
+* @class ID_Handler
+*
+* @brief Handler class for <ImplementationDependency> types.
+*
+* This class defines handler methods to map values from
+* XSC ImplementationDependency objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL Any type.
+*
+*/
+class Config_Handlers_Export ID_Handler
+{
+public:
+
+ID_Handler (void);
+virtual ~ID_Handler (void);
+
+static void get_ImplementationDependency (
+const ImplementationDependency& desc,
+Deployment::ImplementationDependency& toconfig);
+
+static ImplementationDependency impl_dependency (
+const ::Deployment::ImplementationDependency& src);
+};
+
+typedef Sequence_Handler < ImplementationDependency,
+::Deployment::ImplementationDependencies,
+::Deployment::ImplementationDependency,
+ID_Handler::get_ImplementationDependency > ID_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
index 36ab6231001..110297ce783 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
@@ -5,8 +5,8 @@
 #include "IRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-#include "Any_Handler.h"
-
+#include "Property_Handler.h"
+#include "ciao/CIAO_common.h"
 
 
 namespace CIAO
@@ -25,90 +25,98 @@ namespace CIAO
 
     void
     IRDD_Handler::instance_resource_deployment_descr (
-                    const InstanceResourceDeploymentDescription& desc,
-                    Deployment::InstanceResourceDeploymentDescription& toconfig)
+                                                      const InstanceResourceDeploymentDescription& desc,
+                                                      Deployment::InstanceResourceDeploymentDescription& toconfig)
       throw (Config_Error)
     {
-      
+      CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr");
+
       switch (desc.resourceUsage ().integral ())
-	{
-	case ResourceUsageKind::None_l:
-	  toconfig.resourceUsage = Deployment::None;
-	  break;
-	  
-	case ResourceUsageKind::InstanceUsesResource_l:
-	  toconfig.resourceUsage = Deployment::InstanceUsesResource;
-	  break;
-	  
-	case ResourceUsageKind::ResourceUsesInstance_l:
-	  toconfig.resourceUsage = Deployment::ResourceUsesInstance;
-	  break;
-	  
-	case ResourceUsageKind::PortUsesResource_l:
-	  toconfig.resourceUsage = Deployment::PortUsesResource;
-	  break;
-	  
-	case ResourceUsageKind::ResourceUsesPort_l:
-	  toconfig.resourceUsage = Deployment::ResourceUsesPort;
-	  break;
-	  
-	default:
-	  throw Config_Error (desc.requirementName (),
-			      "Unknown ResourceUsageKind.");
-	  break;
-	}
-      
+        {
+        case ResourceUsageKind::None_l:
+          toconfig.resourceUsage = Deployment::None;
+          break;
+
+        case ResourceUsageKind::InstanceUsesResource_l:
+          toconfig.resourceUsage = Deployment::InstanceUsesResource;
+          break;
+
+        case ResourceUsageKind::ResourceUsesInstance_l:
+          toconfig.resourceUsage = Deployment::ResourceUsesInstance;
+          break;
+
+        case ResourceUsageKind::PortUsesResource_l:
+          toconfig.resourceUsage = Deployment::PortUsesResource;
+          break;
+
+        case ResourceUsageKind::ResourceUsesPort_l:
+          toconfig.resourceUsage = Deployment::ResourceUsesPort;
+          break;
+
+        default:
+          throw Config_Error (desc.requirementName (),
+                              "Unknown ResourceUsageKind.");
+          break;
+        }
+
       toconfig.requirementName = desc.requirementName ().c_str ();
-      
+
       toconfig.resourceName= desc.resourceName ().c_str ();
-      
-      Any_Handler::extract_into_any (desc.resourceValue (),
-				     toconfig.resourceValue);
-      
+
+      toconfig.property.length (desc.count_property ());
+      std::for_each (desc.begin_property (),
+                     desc.end_property (),
+                     Property_Functor (toconfig.property));
     }
 
     InstanceResourceDeploymentDescription
     IRDD_Handler::instance_resource_deployment_descr (
-      const Deployment::InstanceResourceDeploymentDescription& src)
+                                                      const Deployment::InstanceResourceDeploymentDescription& src)
       throw (Config_Error)
     {
+      CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr - reverse");
+
       XMLSchema::string< char > reqname ((src.requirementName));
       XMLSchema::string< char > resname ((src.resourceName));
-      Any resval (Any_Handler::get_any (src.resourceValue));
-      
+
       InstanceResourceDeploymentDescription irdd (ResourceUsageKind::None,
-						  reqname,
-						  resname,
-						  resval);
-      
+                                                  reqname,
+                                                  resname);
+
       switch (src.resourceUsage)
-	{
-	case Deployment::None:
-	  irdd.resourceUsage (ResourceUsageKind::None);
-	  break;
-	  
-	case Deployment::InstanceUsesResource:
-	  irdd.resourceUsage (ResourceUsageKind::InstanceUsesResource);
-	  break;
-	  
-	case Deployment::ResourceUsesInstance:
-	  irdd.resourceUsage (ResourceUsageKind::ResourceUsesInstance);
-	  break;
-	  
-	case Deployment::PortUsesResource:
-	  irdd.resourceUsage (ResourceUsageKind::PortUsesResource);
-	  break;
-
-	case Deployment::ResourceUsesPort:
-         irdd.resourceUsage (ResourceUsageKind::ResourceUsesPort);
-	 break;
-	 
-	default:
-	  throw Config_Error (src.resourceName.in (),
-			      "Unknown ResourceUsageKind.");
-	  break;
-	}
-      
+        {
+        case Deployment::None:
+          irdd.resourceUsage (ResourceUsageKind::None);
+          break;
+
+        case Deployment::InstanceUsesResource:
+          irdd.resourceUsage (ResourceUsageKind::InstanceUsesResource);
+          break;
+
+        case Deployment::ResourceUsesInstance:
+          irdd.resourceUsage (ResourceUsageKind::ResourceUsesInstance);
+          break;
+
+        case Deployment::PortUsesResource:
+          irdd.resourceUsage (ResourceUsageKind::PortUsesResource);
+          break;
+
+        case Deployment::ResourceUsesPort:
+          irdd.resourceUsage (ResourceUsageKind::ResourceUsesPort);
+          break;
+
+        default:
+          throw Config_Error (src.resourceName.in (),
+                              "Unknown ResourceUsageKind.");
+          break;
+        }
+
+      for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+        {
+          irdd.add_property (Property_Handler::get_property (src.property[i]));
+        }
+
+
       return irdd;
     }
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
index aba36bc9e87..df30ed2e87f 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
@@ -1,12 +1,11 @@
-
-      //==============================================================
+//==============================================================
 /**
- *  @file  IRDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  IRDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_IRDD_Handler_H
@@ -25,48 +24,48 @@
 
 namespace Deployment
 {
-  struct InstanceResourceDeploymentDescription;
+struct InstanceResourceDeploymentDescription;
 }
 
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-
-   class InstanceResourceDeploymentDescription;
-
-
-   /*
-    * @class IRDD_Handler
-    *
-    * @brief Handler class for <InstanceResourceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC InstanceResourceDeploymentDescription objects, parsed from the descriptor files, to the
-    * corresponding CORBA IDL Any type.
-    *
-    */
-    class Config_Handlers_Export IRDD_Handler {    
-      public:
-        IRDD_Handler (void);
-        virtual ~IRDD_Handler (void);
-
-        static void instance_resource_deployment_descr (
-             const InstanceResourceDeploymentDescription& desc,
-             Deployment::InstanceResourceDeploymentDescription& toconfig)
-	  throw (Config_Error);
-        
-        static InstanceResourceDeploymentDescription
-        instance_resource_deployment_descr (
-          const Deployment::InstanceResourceDeploymentDescription& src)
-	  throw (Config_Error);
-      
-
-    };
-  }
+namespace Config_Handlers
+{
+
+class InstanceResourceDeploymentDescription;
+
+
+/*
+* @class IRDD_Handler
+*
+* @brief Handler class for <InstanceResourceDeploymentDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC InstanceResourceDeploymentDescription objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL Any type.
+*
+*/
+class Config_Handlers_Export IRDD_Handler {
+public:
+IRDD_Handler (void);
+virtual ~IRDD_Handler (void);
+
+static void instance_resource_deployment_descr (
+const InstanceResourceDeploymentDescription& desc,
+Deployment::InstanceResourceDeploymentDescription& toconfig)
+throw (Config_Error);
+
+static InstanceResourceDeploymentDescription
+instance_resource_deployment_descr (
+const Deployment::InstanceResourceDeploymentDescription& src)
+throw (Config_Error);
+
+
+};
+}
 }
 
-#include /**/ "ace/post.h" 
+#include /**/ "ace/post.h"
 #endif /* CIAO_CONFIG_HANDLERS_IRDD_Handler_H */
 
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index e9200cb0a49..dcea23fc96c 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -12,12 +12,14 @@ namespace CIAO
   namespace Config_Handlers
   {
     IDREF_Base<CORBA::ULong> MDD_Handler::IDREF;
-    
+
     void
     MDD_Handler::mono_deployment_descriptions (
-        const DeploymentPlan& src,
-        Deployment::MonolithicDeploymentDescriptions& dest)
+                                               const DeploymentPlan& src,
+                                               Deployment::MonolithicDeploymentDescriptions& dest)
     {
+      CIAO_TRACE("MDD_Handler::mono_deployment_descriptions");
+
       DeploymentPlan::implementation_const_iterator imp_e =
         src.end_implementation ();
       CORBA::ULong pos = 0;
@@ -30,22 +32,22 @@ namespace CIAO
           MDD_Handler::mono_deployment_description (*imp_b,
                                                     dest[pos],
                                                     pos);
-	  pos++;
+          pos++;
         }
-    }  
-    
+    }
+
     void
     MDD_Handler::mono_deployment_description (
-        const MonolithicDeploymentDescription& desc,
-        Deployment::MonolithicDeploymentDescription& toconfig,
-        CORBA::ULong pos)
+                                              const MonolithicDeploymentDescription& desc,
+                                              Deployment::MonolithicDeploymentDescription& toconfig,
+                                              CORBA::ULong pos)
     {
       toconfig.name =
         CORBA::string_dup (desc.name ().c_str ());
 
       MonolithicDeploymentDescription::source_const_iterator me =
         desc.end_source ();
-      
+
       CORBA::ULong len = 0;
       toconfig.source.length (desc.count_source ());
       for (MonolithicDeploymentDescription::source_const_iterator se =
@@ -68,8 +70,8 @@ namespace CIAO
         {
           CORBA::ULong tmp = 0;
 
-	  ADD_Handler::IDREF.find_ref (ACE_CString (ab->id ().c_str ()),
-						   tmp);
+          ADD_Handler::IDREF.find_ref (ACE_CString (ab->id ().c_str ()),
+                                       tmp);
 
           toconfig.artifactRef[len++] = tmp;
         }
@@ -87,24 +89,16 @@ namespace CIAO
                                           toconfig.execParameter[len++]);
         }
 
-#if 0
-      // @@ MAJO: Don't know how to handle this
-      if (desc.deployRequirement_p ())
-        {
-                                  Req_Handler handler;
-          toconfig.deployRequirement.length (
-            toconfig.deployRequirement.length () + 1);
-          handler.get_Requirement (
-            toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
-            desc.deployRequirement ());
-        }
-#endif /*if 0*/
+      toconfig.deployRequirement.length (desc.count_deployRequirement ());
+      std::for_each (desc.begin_deployRequirement (),
+                     desc.end_deployRequirement (),
+                     Requirement_Functor (toconfig.deployRequirement));
 
       // Handle the idref
       if (desc.id_p ())
         {
           ACE_CString cstr (desc.id ().c_str ());
-          
+
           MDD_Handler::IDREF.bind_ref (cstr, pos);
         }
       else
@@ -113,57 +107,70 @@ namespace CIAO
                      "(%P|%t) Warning:  MDD %s has no idref \n",
                      desc.name ().c_str ()));
         }
-    }  
-
-
-      MonolithicDeploymentDescription
-      MDD_Handler::mono_deployment_description(
-	  const Deployment::MonolithicDeploymentDescription &src)
-      {
-	  //Get the name and instantiate the mdd
-	  XMLSchema::string < char > name ((src.name));
-	  MonolithicDeploymentDescription mdd (name);
-
-	  //Get the source(s) from the IDL and store them
-	  size_t total = src.source.length();
-	  for(size_t i = 0; i < total; i++)
-	  {
-	      XMLSchema::string< char > curr ((src.source[i]));
-	      mdd.add_source(curr);
-	  }
-
-	  //Get the artifactRef(s) from the IDL and store them
-	  total = src.artifactRef.length();
-	  for(size_t j = 0; j < total; j++)
-	  {
-	      ACE_CString tmp;
-	      ADD_Handler::IDREF.find_ref(src.artifactRef[j], tmp);
-	      XMLSchema::IDREF< ACE_TCHAR > curr(tmp.c_str());
-	      mdd.add_artifact (curr);
-	  }
-
-	  //Get the execParameter(s) from the IDL and store them
-	  total = src.execParameter.length();
-	  for(size_t k = 0; k < total; k++)
-	  {
-	      mdd.add_execParameter (
-		  Property_Handler::get_property (
-		      src.execParameter[k]));
-	  }
-
-	  //Get the deployRequirement(s) from the IDL and store them
-	  total = src.deployRequirement.length();
-	  for(size_t l = 0; l < total; l++)
-	  {
-	      mdd.add_deployRequirement(
-		  Req_Handler::get_requirement (
-		      src.deployRequirement[l]));
-	  }
-
-	  return mdd;
-      }
+    }
+
+
+    MonolithicDeploymentDescription
+    MDD_Handler::mono_deployment_description(
+                                             const Deployment::MonolithicDeploymentDescription &src)
+    {
+      CIAO_TRACE("mono_deployment_description - reverse");
+
+      //Get the name and instantiate the mdd
+      XMLSchema::string < char > name ((src.name));
+      MonolithicDeploymentDescription mdd (name);
+
+      //Get the source(s) from the IDL and store them
+      size_t total = src.source.length();
+      for(size_t i = 0; i < total; i++)
+        {
+          XMLSchema::string< char > curr ((src.source[i]));
+          mdd.add_source(curr);
+        }
+
+      //Get the artifactRef(s) from the IDL and store them
+      total = src.artifactRef.length();
+      for(size_t j = 0; j < total; j++)
+        {
+          ACE_CString tmp;
+          ADD_Handler::IDREF.find_ref(src.artifactRef[j], tmp);
+          XMLSchema::IDREF< ACE_TCHAR > curr(tmp.c_str());
+          mdd.add_artifact (curr);
+        }
+
+      //Get the execParameter(s) from the IDL and store them
+      total = src.execParameter.length();
+      for(size_t k = 0; k < total; k++)
+        {
+          mdd.add_execParameter (
+                                 Property_Handler::get_property (src.execParameter[k]));
+        }
+
+      //Get the deployRequirement(s) from the IDL and store them
+      total = src.deployRequirement.length();
+      for(size_t l = 0; l < total; l++)
+        {
+          mdd.add_deployRequirement(
+                                    Req_Handler::get_requirement (src.deployRequirement[l]));
+        }
+
+      // Generate a UUID to use for the IDREF.
+      ACE_Utils::UUID uuid;
+      ACE_Utils::UUID_GENERATOR::instance ()->generateUUID (uuid);
+      ACE_CString mdd_id ("_");
+      mdd_id += *uuid.to_string ();
+
+      XMLSchema::ID< ACE_TCHAR > xml_id (mdd_id.c_str ());
+
+      // Bind the ref and set it in the IDD
+      MDD_Handler::IDREF.bind_next_available (mdd_id);
+
+      mdd.id (xml_id);
+
+      return mdd;
+    }
 
   }
 
 }
-      
+
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h
index 343e737beb2..2d95ff71e2d 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  MDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  MDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_MDD_Handler_H
@@ -22,49 +22,49 @@
 
 namespace Deployment
 {
-  struct MonolithicDeploymentDescription;
-  class MonolithicDeploymentDescriptions;
+struct MonolithicDeploymentDescription;
+class MonolithicDeploymentDescriptions;
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class MonolithicDeploymentDescription;
-    class DeploymentPlan;
-    
-    /*
-     * @class MDD_Handler
-     *
-     * @brief Handler class for <MonolithicDeploymentDescription> types.
-     *
-     * This class defines handler methods to map values from XSC
-     * MonolithicDeploymentDescription objects, parsed from the
-     * descriptor files, to the corresponding CORBA IDL types.
-     *
-     */
+namespace Config_Handlers
+{
+class MonolithicDeploymentDescription;
+class DeploymentPlan;
+
+/*
+* @class MDD_Handler
+*
+* @brief Handler class for <MonolithicDeploymentDescription> types.
+*
+* This class defines handler methods to map values from XSC
+* MonolithicDeploymentDescription objects, parsed from the
+* descriptor files, to the corresponding CORBA IDL types.
+*
+*/
+
+class Config_Handlers_Export MDD_Handler
+{
+public:
+static void mono_deployment_descriptions (
+const DeploymentPlan &src,
+Deployment::MonolithicDeploymentDescriptions &dest);
+
+static MonolithicDeploymentDescription mono_deployment_description(
+const Deployment::MonolithicDeploymentDescription &src);
 
-    class Config_Handlers_Export MDD_Handler
-    {
-    public:
-      static void mono_deployment_descriptions (
-          const DeploymentPlan &src,
-          Deployment::MonolithicDeploymentDescriptions &dest);
-      
-      static MonolithicDeploymentDescription mono_deployment_description(
-	  const Deployment::MonolithicDeploymentDescription &src);
+static IDREF_Base<CORBA::ULong> IDREF;
 
-      static IDREF_Base<CORBA::ULong> IDREF;
-      
-    private:
-      static void mono_deployment_description (
-          const MonolithicDeploymentDescription& desc,
-          Deployment::MonolithicDeploymentDescription& toconfig,
-          CORBA::ULong pos);
-    };
-  }
+private:
+static void mono_deployment_description (
+const MonolithicDeploymentDescription& desc,
+Deployment::MonolithicDeploymentDescription& toconfig,
+CORBA::ULong pos);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 917c056a6cb..007355c0139 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -8,6 +8,7 @@
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
+#include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
@@ -26,9 +27,11 @@ namespace CIAO
     ///and maps the values from the passed in XSC
     ///PlanConnectionDescription to its members.
     void PCD_Handler::get_PlanConnectionDescription (
-                Deployment::PlanConnectionDescription& toconfig,
-                PlanConnectionDescription& desc)
+                                                     Deployment::PlanConnectionDescription& toconfig,
+                                                     PlanConnectionDescription& desc)
     {
+      CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
+
       toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       //Source is mapped to a string in the schema and a sequence
@@ -43,118 +46,98 @@ namespace CIAO
           toconfig.source[0] = desc.source ().c_str ();
         }
 
-      for(PlanConnectionDescription::deployRequirement_iterator 
-	      req (desc.begin_deployRequirement());
-	  req != desc.end_deployRequirement();
-	  req++)
-        {
-#if 0
-          // @@ MAJO:
-          //Create the handler for the requirements.
-          Requirement_Handler reqhandler;
-
-          //Increase the sequence length and delgate
-          //the Requirement to the Req_Handler.
-          toconfig.deployRequirement.length (
-            toconfig.deployRequirement.length () + 1);
-          reqhandler.get_Requirement (
-            toconfig.deployRequirement[toconfig.deployRequirement.length () - 1],
-            desc.deployRequirement ());
-#endif /*if 0*/
-        }
+      toconfig.deployRequirement.length (desc.count_deployRequirement ());
+      std::for_each (desc.begin_deployRequirement (),
+                     desc.end_deployRequirement (),
+                     Requirement_Functor (toconfig.deployRequirement));
+
 
       //Create the ComponentExternalPortEndpoint handler.
-      CEPE_Handler::external_port_endpoints (
-	  desc,
-	  toconfig.externalEndpoint);
-      
+      CEPE_Handler::external_port_endpoints (desc,
+                                             toconfig.externalEndpoint);
+
       //Configure the PlanSubcomponentPortEndpoint's.
 
-      PSPE_Handler::sub_component_port_endpoints (
-	  desc,
-	  toconfig.internalEndpoint);
+      PSPE_Handler::sub_component_port_endpoints (desc,
+                                                  toconfig.internalEndpoint);
 
       //Configure the ExternalReferenceEndpoint's.
-      ERE_Handler::external_ref_endpoints (
-	  desc,
-	  toconfig.externalReference);
-      
+      ERE_Handler::external_ref_endpoints (desc,
+                                           toconfig.externalReference);
+
       //Configure the resource value.
       CRDD_Handler crddhandler;
       CORBA::ULong pos = 0;
       toconfig.deployedResource.length (desc.count_deployedResource ());
       for(PlanConnectionDescription::deployedResource_iterator res =
-	      desc.begin_deployedResource();
-	  res != desc.end_deployedResource();
-	  res++)
-      {
+            desc.begin_deployedResource();
+          res != desc.end_deployedResource();
+          res++)
+        {
           crddhandler.get_ConnectionResourceDeploymentDescription (
-            toconfig.deployedResource[pos++],
-            *res);
-      }
+                                                                   toconfig.deployedResource[pos++],
+                                                                   *res);
+        }
+
+    }
+
+    PlanConnectionDescription PCD_Handler::get_PlanConnectionDescription (
+                                                                          const Deployment::PlanConnectionDescription &src)
+    {
+      CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
+
+      XMLSchema::string< char > name ((src.name));
+
+      PlanConnectionDescription pcd(name);
+
+      //Get the source if it exists
+      if(src.source.length() != 0)
+        {
+          XMLSchema::string< char > source((src.source[0]));
+          pcd.source(source);
+        }
+
+      //Get any externalEndpoint(s) and store them
+      size_t total = src.externalEndpoint.length();
+      for(size_t i = 0; i < total; i++)
+        {
+          pcd.add_externalEndpoint(
+                                   CEPE_Handler::external_port_endpoint(src.externalEndpoint[i]));
+        }
+
+      //Get any externalReference(s) and store them
+      total = src.externalReference.length();
+      for(size_t j = 0; j < total; j++)
+        {
+          pcd.add_externalReference(
+                                    ERE_Handler::external_ref_endpoint(src.externalReference[j]));
+        }
+
+      //Get any internalEndpoint(s) and store them
+      total = src.internalEndpoint.length();
+      for(size_t k = 0; k < total; k++)
+        {
+          pcd.add_internalEndpoint(
+                                   PSPE_Handler::sub_component_port_endpoint(src.internalEndpoint[k]));
+        }
+
+      //Get any deployedResource(s) and store them
+      total = src.deployedResource.length();
+      for(size_t l = 0; l < total; l++)
+        {
+          pcd.add_deployedResource(
+                                   CRDD_Handler::connection_resource_depl_desc(src.deployedResource[l]));
+        }
+
+      //Get any deployRequirement(s) and store them
+      total = src.deployRequirement.length();
+      for(size_t m = 0; m < total; m++)
+        {
+          pcd.add_deployRequirement(
+                                    Req_Handler::get_requirement(src.deployRequirement[m]));
+        }
 
+      return pcd;
     }
-      
-      PlanConnectionDescription PCD_Handler::get_PlanConnectionDescription (
-	  const Deployment::PlanConnectionDescription &src)
-      {
-	  XMLSchema::string< char > name ((src.name));
-
-	  PlanConnectionDescription pcd(name);
-
-	  //Get the source if it exists
-	  if(src.source.length() != 0)
-	  {
-	      XMLSchema::string< char > source((src.source[0]));
-	      pcd.source(source);
-	  }
-
-	  //Get any externalEndpoint(s) and store them
-	  size_t total = src.externalEndpoint.length();
-	  for(size_t i = 0; i < total; i++)
-	  {
-	      pcd.add_externalEndpoint(
-		  CEPE_Handler::external_port_endpoint(
-		      src.externalEndpoint[i]));
-	  }
-
-	  //Get any externalReference(s) and store them
-	  total = src.externalReference.length();
-	  for(size_t j = 0; j < total; j++)
-	  {
-	      pcd.add_externalReference(
-		  ERE_Handler::external_ref_endpoint(
-		      src.externalReference[j]));
-	  }
-
-	  //Get any internalEndpoint(s) and store them
-	  total = src.internalEndpoint.length();
-	  for(size_t k = 0; k < total; k++)
-	  {
-	      pcd.add_internalEndpoint(
-		  PSPE_Handler::sub_component_port_endpoint(
-		      src.internalEndpoint[k]));
-	  }
-	  
-	  //Get any deployedResource(s) and store them
-	  total = src.deployedResource.length();
-	  for(size_t l = 0; l < total; l++)
-	  {
-	      pcd.add_deployedResource(
-		  CRDD_Handler::connection_resource_depl_desc(
-		      src.deployedResource[l]));
-	  }
-
-	  //Get any deployRequirement(s) and store them
-	  total = src.deployRequirement.length();
-	  for(size_t m = 0; m < total; m++)
-	  {
-	      pcd.add_deployRequirement(
-		  Req_Handler::get_requirement(
-		      src.deployRequirement[m]));
-	  }
-
-	  return pcd;
-      }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
index f5ad6eee6e8..0df811b601c 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  PCD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  PCD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_PCD_HANDLER_H
@@ -20,49 +20,49 @@
 
 namespace Deployment
 {
-  struct PlanConnectionDescription; 
+struct PlanConnectionDescription;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    
-   class PlanConnectionDescription;
-   
-   /*
-    * @class PCD_Handler
-    *
-    * @brief Handler class for <PlanConnectionDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC PlanConnectionDescription objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
-    
-    class Config_Handlers_Export PCD_Handler{
-     
-      public:
-       
-        PCD_Handler (void);
-        virtual ~PCD_Handler (void);
-  
-        ///This method takes a <Deployment::PlanConnectionDescription>
-        ///and maps the values from the passed in XSC 
-        ///PlanConnectionDescription to its members.
-        void get_PlanConnectionDescription (
-                    Deployment::PlanConnectionDescription& toconfig,
-                    PlanConnectionDescription& desc);          
+namespace Config_Handlers
+{
+
+class PlanConnectionDescription;
+
+/*
+* @class PCD_Handler
+*
+* @brief Handler class for <PlanConnectionDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC PlanConnectionDescription objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export PCD_Handler{
 
-	//This method takes a <Deployment::PlanConnectionDescription>
-	//converts it into a <Config_Handler::PlanConnectionDescription>
-	//and returns the value
-	static PlanConnectionDescription get_PlanConnectionDescription (
-	    const Deployment::PlanConnectionDescription &src);
-    };
-  }
+public:
+
+PCD_Handler (void);
+virtual ~PCD_Handler (void);
+
+///This method takes a <Deployment::PlanConnectionDescription>
+///and maps the values from the passed in XSC
+///PlanConnectionDescription to its members.
+void get_PlanConnectionDescription (
+Deployment::PlanConnectionDescription& toconfig,
+PlanConnectionDescription& desc);
+
+//This method takes a <Deployment::PlanConnectionDescription>
+//converts it into a <Config_Handler::PlanConnectionDescription>
+//and returns the value
+static PlanConnectionDescription get_PlanConnectionDescription (
+const Deployment::PlanConnectionDescription &src);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 9dcf33fc81e..21b85125a85 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -11,14 +11,16 @@ namespace CIAO
   {
     void
     PSPE_Handler::sub_component_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::PlanSubcomponentPortEndpoints &dest)
+                                                const PlanConnectionDescription &src,
+                                                ::Deployment::PlanSubcomponentPortEndpoints &dest)
     {
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoints");
+
       PlanConnectionDescription::internalEndpoint_const_iterator iei_e =
         src.end_internalEndpoint ();
       CORBA::ULong pos = 0;
       dest.length (src.count_internalEndpoint ());
-      
+
       for (PlanConnectionDescription::internalEndpoint_const_iterator iei_b =
              src.begin_internalEndpoint ();
            iei_b != iei_e;
@@ -31,9 +33,10 @@ namespace CIAO
 
     void
     PSPE_Handler::sub_component_port_endpoint (
-        const PlanSubcomponentPortEndpoint &src,
-        ::Deployment::PlanSubcomponentPortEndpoint &dest)
+                                               const PlanSubcomponentPortEndpoint &src,
+                                               ::Deployment::PlanSubcomponentPortEndpoint &dest)
     {
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint");
       dest.portName =
         src.portName ().c_str ();
 
@@ -47,84 +50,85 @@ namespace CIAO
         }
 
       CORBA::ULong tmp = 0;
-      IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()), 
-					    tmp);
-            
+      IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().id ().c_str ()),
+                                   tmp);
+
       dest.instanceRef = tmp;
 
       switch (src.kind ().integral ())
         {
-          case CCMComponentPortKind::Facet_l:
-            dest.kind = Deployment::Facet;
-            break;
-            
-          case CCMComponentPortKind::SimplexReceptacle_l:
-            dest.kind = Deployment::SimplexReceptacle;
-            break;
-            
-          case CCMComponentPortKind::MultiplexReceptacle_l:
-            dest.kind = Deployment::MultiplexReceptacle;
-            break;
-            
-          case CCMComponentPortKind::EventEmitter_l:
-            dest.kind = Deployment::EventEmitter;
-            break;
-            
-          case CCMComponentPortKind::EventPublisher_l:
-            dest.kind = Deployment::EventPublisher;
-            break;
-            
-          case CCMComponentPortKind::EventConsumer_l:
-            dest.kind = Deployment::EventConsumer;
-            break;
-          
-          default:
-            ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n"));
-            
-         }
+        case CCMComponentPortKind::Facet_l:
+          dest.kind = Deployment::Facet;
+          break;
+
+        case CCMComponentPortKind::SimplexReceptacle_l:
+          dest.kind = Deployment::SimplexReceptacle;
+          break;
+
+        case CCMComponentPortKind::MultiplexReceptacle_l:
+          dest.kind = Deployment::MultiplexReceptacle;
+          break;
+
+        case CCMComponentPortKind::EventEmitter_l:
+          dest.kind = Deployment::EventEmitter;
+          break;
+
+        case CCMComponentPortKind::EventPublisher_l:
+          dest.kind = Deployment::EventPublisher;
+          break;
+
+        case CCMComponentPortKind::EventConsumer_l:
+          dest.kind = Deployment::EventConsumer;
+          break;
+
+        default:
+          ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n"));
+
+        }
     }
 
     PlanSubcomponentPortEndpoint
     PSPE_Handler::sub_component_port_endpoint (
-      const Deployment::PlanSubcomponentPortEndpoint &src)
+                                               const Deployment::PlanSubcomponentPortEndpoint &src)
     { // @@MAJO
+      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint - reverse");
       XMLSchema::string< char > pname ((src.portName));
       XMLSchema::string< char > tval  ("true");
       XMLSchema::string< char > prov  ("");
       ACE_CString id;
       IDD_Handler::IDREF.find_ref(src.instanceRef, id);
-      XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str()); 
-      
+      XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str());
+
       if (src.provider)
         prov = tval;
 
       PlanSubcomponentPortEndpoint pspe (pname,
-					 CCMComponentPortKind::Facet,
-					 idref);
+                                         CCMComponentPortKind::Facet,
+                                         idref);
       pspe.provider (prov);
-      
+
       switch (src.kind)
-        {    
+        {
         case ::Deployment::Facet:
           pspe.kind (CCMComponentPortKind::Facet);
           break;
-          
+
         case ::Deployment::SimplexReceptacle:
           pspe.kind (CCMComponentPortKind::SimplexReceptacle);
           break;
-          
+
         case ::Deployment::MultiplexReceptacle:
           pspe.kind (CCMComponentPortKind::MultiplexReceptacle);
           break;
-          
+
         case ::Deployment::EventEmitter:
           pspe.kind (CCMComponentPortKind::EventEmitter);
           break;
-          
+
         case ::Deployment::EventPublisher:
           pspe.kind (CCMComponentPortKind::EventPublisher);
           break;
-        
+
         case ::Deployment::EventConsumer:
           pspe.kind (CCMComponentPortKind::EventConsumer);
           break;
@@ -142,7 +146,7 @@ namespace CIAO
           break;
 
         }
-      
+
 
       return pspe;
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h
index ec27a6e4dcb..aeb92da9eb0 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  PSPE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  PSPE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_PSPE_HANDLER_H
@@ -20,45 +20,45 @@
 
 namespace Deployment
 {
-  class PlanSubcomponentPortEndpoints;
-  struct PlanSubcomponentPortEndpoint;
+class PlanSubcomponentPortEndpoints;
+struct PlanSubcomponentPortEndpoint;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class PlanSubcomponentPortEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class PlanSubcomponentPortEndpoint;
 
-    /*
-     * @class PSPE_Handler
-     *
-     * @brief Handler class for <PlanSubcomponentPortEndpoint> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC PlanSubcomponentPortEndpoint objects, parsed from
-     * the descriptor files, to the corresponding CORBA IDL type.
-     *
-     */
-    class Config_Handlers_Export PSPE_Handler
-    {
-    public:
-      static void sub_component_port_endpoints (
-        const PlanConnectionDescription &src,
-        ::Deployment::PlanSubcomponentPortEndpoints &dest);
+/*
+* @class PSPE_Handler
+*
+* @brief Handler class for <PlanSubcomponentPortEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC PlanSubcomponentPortEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+class Config_Handlers_Export PSPE_Handler
+{
+public:
+static void sub_component_port_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::PlanSubcomponentPortEndpoints &dest);
 
-      static PlanSubcomponentPortEndpoint
-      sub_component_port_endpoint (
-        const Deployment::PlanSubcomponentPortEndpoint &src);
+static PlanSubcomponentPortEndpoint
+sub_component_port_endpoint (
+const Deployment::PlanSubcomponentPortEndpoint &src);
 
-    private:
-      static void sub_component_port_endpoint (
-        const PlanSubcomponentPortEndpoint &src,
-        ::Deployment::PlanSubcomponentPortEndpoint &dest);
-    };
-  }
+private:
+static void sub_component_port_endpoint (
+const PlanSubcomponentPortEndpoint &src,
+::Deployment::PlanSubcomponentPortEndpoint &dest);
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
new file mode 100644
index 00000000000..d9756f3c07f
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -0,0 +1,259 @@
+// $Id$
+
+#include "Package_Handlers/CAD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "cid.hpp"
+#include "ciao/DeploymentC.h"
+#include "Req_Handler.h"
+#include "CEPE_Handler.h"
+#include "ERE_Handler.h"
+#include "Utils/Exceptions.h"
+
+#include "Package_Handlers/SID_Handler.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Packaging
+    {
+      namespace
+      {
+        struct SPE_Handler
+        {
+          static void get_spe (const SubcomponentPortEndpoint &desc,
+                               ::Deployment::SubcomponentPortEndpoint &toconfig)
+          {
+            CIAO_TRACE("SPE_Handler::get_spe");
+
+            toconfig.portName = desc.portName ().c_str ();
+
+            ACE_CString str (desc.instance ().id ().c_str ());
+            CORBA::ULong pos (0);
+
+            SID_Handler::IDREF.find_ref (str, pos);
+            toconfig.instanceRef = pos;
+          }
+
+          static SubcomponentPortEndpoint
+          get_spe (const ::Deployment::SubcomponentPortEndpoint &src)
+          {
+            CIAO_TRACE("SPE_Handler::get_spe - reverse");
+            ACE_CString str;
+            SID_Handler::IDREF.find_ref (src.instanceRef, str);
+
+            return SubcomponentPortEndpoint (src.portName.in (),
+                                             str.c_str ());
+          }
+        };
+
+        typedef Sequence_Handler < SubcomponentPortEndpoint,
+                                   ::Deployment::SubcomponentPortEndpoints,
+                                   ::Deployment::SubcomponentPortEndpoint,
+                                   SPE_Handler::get_spe > SPE_Functor;
+
+        struct ACD_Handler
+        {
+          static void get_acd (const AssemblyConnectionDescription &desc,
+                               ::Deployment::AssemblyConnectionDescription &toconfig)
+          {
+            CIAO_TRACE("ACD_Handler::get_acd");
+
+            toconfig.name = desc.name ().c_str ();
+
+            toconfig.deployRequirement.length (desc.count_deployRequirement ());
+            std::for_each (desc.begin_deployRequirement (),
+                           desc.end_deployRequirement (),
+                           Requirement_Functor (toconfig.deployRequirement));
+
+            toconfig.internalEndpoint.length (desc.count_internalEndpoint ());
+            std::for_each (desc.begin_internalEndpoint (),
+                           desc.end_internalEndpoint (),
+                           SPE_Functor (toconfig.internalEndpoint));
+
+            toconfig.externalEndpoint.length (desc.count_externalEndpoint ());
+            std::for_each (desc.begin_externalEndpoint (),
+                           desc.end_externalEndpoint (),
+                           CEPE_Functor (toconfig.externalEndpoint));
+
+            toconfig.externalReference.length (desc.count_externalReference ());
+            std::for_each (desc.begin_externalReference (),
+                           desc.end_externalReference (),
+                           ERE_Functor (toconfig.externalReference));
+
+          }
+
+          static AssemblyConnectionDescription
+          get_acd (const ::Deployment::AssemblyConnectionDescription &src)
+          {
+            CIAO_TRACE("ACD_Handler::get_acd - reverse");
+
+            AssemblyConnectionDescription retval (src.name.in ());
+
+            for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
+              retval.add_deployRequirement
+                (Req_Handler::get_requirement (src.deployRequirement[i]));
+
+            for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i)
+              retval.add_internalEndpoint
+                (SPE_Handler::get_spe (src.internalEndpoint[i]));
+
+            for (CORBA::ULong i = 0; i < src.externalEndpoint.length (); ++i)
+              retval.add_externalEndpoint
+                (CEPE_Handler::external_port_endpoint (src.externalEndpoint[i]));
+
+            for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i)
+              retval.add_externalReference
+                (ERE_Handler::external_ref_endpoint (src.externalReference[i]));
+
+            return retval;
+          }
+        };
+
+        typedef Sequence_Handler < AssemblyConnectionDescription,
+                                   ::Deployment::AssemblyConnectionDescriptions,
+                                   ::Deployment::AssemblyConnectionDescription,
+                                   ACD_Handler::get_acd > ACD_Functor;
+
+
+        struct SPR_Handler
+        {
+          static void get_spr (const SubcomponentPropertyReference &desc,
+                               ::Deployment::SubcomponentPropertyReference &toconfig)
+          {
+            CIAO_TRACE("SPR_Handler::get_spr");
+
+            toconfig.propertyName = desc.propertyName ().c_str ();
+
+            ACE_CString str (desc.instance ().id ().c_str ());
+            CORBA::ULong pos (0);
+
+            SID_Handler::IDREF.find_ref (str, pos);
+            toconfig.instanceRef = pos;
+
+          }
+
+          static SubcomponentPropertyReference
+          get_spr (const ::Deployment::SubcomponentPropertyReference &src)
+          {
+            CIAO_TRACE("SPR_HAndler::get_spr - reverse");
+            ACE_CString str;
+            SID_Handler::IDREF.find_ref (src.instanceRef, str);
+
+            return SubcomponentPropertyReference (src.propertyName.in (),
+                                                  str.c_str ());
+          }
+
+        };
+
+        typedef Sequence_Handler < SubcomponentPropertyReference,
+                                   ::Deployment::SubcomponentPropertyReferences,
+                                   ::Deployment::SubcomponentPropertyReference,
+                                   SPR_Handler::get_spr > SPR_Functor;
+
+        struct APM_Handler
+        {
+          static void get_apm (const AssemblyPropertyMapping &desc,
+                               ::Deployment::AssemblyPropertyMapping &toconfig)
+          {
+            CIAO_TRACE("APM_Handler::get_apm");
+
+            toconfig.name = desc.name ().c_str ();
+            toconfig.externalName = desc.externalName ().c_str ();
+
+            toconfig.delegatesTo.length (desc.count_delegatesTo ());
+            std::for_each (desc.begin_delegatesTo (),
+                           desc.end_delegatesTo (),
+                           SPR_Functor (toconfig.delegatesTo));
+          }
+
+          static AssemblyPropertyMapping
+          get_apm (const ::Deployment::AssemblyPropertyMapping &src)
+          {
+            CIAO_TRACE("APM_Handler::get_apm - reverse");
+
+            AssemblyPropertyMapping retval (src.name.in (),
+                                            src.externalName.in ());
+
+            for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i)
+              retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i]));
+
+            return retval;
+          }
+        };
+
+        typedef Sequence_Handler < AssemblyPropertyMapping,
+                                   ::Deployment::AssemblyPropertyMappings,
+                                   ::Deployment::AssemblyPropertyMapping,
+                                   APM_Handler::get_apm > APM_Functor;
+      }
+
+
+
+      void
+      CAD_Handler::component_assem_descr (const ComponentAssemblyDescription &desc,
+                                          ::Deployment::ComponentAssemblyDescription &toconfig)
+      {
+        CIAO_TRACE("CAD_Handler::component_assem_descr");
+
+        toconfig.instance.length (desc.count_instance ());
+        std::for_each (desc.begin_instance (),
+                       desc.end_instance (),
+                       SID_Functor (toconfig.instance));
+
+        /* @@ MAJO: Implement Locality */
+
+        toconfig.connection.length (desc.count_connection ());
+        std::for_each (desc.begin_connection (),
+                       desc.end_connection (),
+                       ACD_Functor (toconfig.connection));
+
+        toconfig.externalProperty.length (desc.count_externalProperty ());
+        std::for_each (desc.begin_externalProperty (),
+                       desc.end_externalProperty (),
+                       APM_Functor (toconfig.externalProperty));
+      }
+
+      ComponentAssemblyDescription
+      CAD_Handler::component_assem_descr (const ::Deployment::ComponentAssemblyDescription &src)
+      {
+        CIAO_TRACE("CAD_Handler::component_assem_descr - reverse");
+
+        ComponentAssemblyDescription retval;
+
+        for (CORBA::ULong i = 0; i < src.instance.length (); ++i)
+          retval.add_instance
+            (SID_Handler::sub_comp_inst_descr (src.instance[i]));
+
+        for (CORBA::ULong i = 0; i < src.connection.length (); ++i)
+          retval.add_connection (ACD_Handler::get_acd (src.connection[i]));
+
+        for (CORBA::ULong i = 0; i < src.externalProperty.length (); ++i)
+          retval.add_externalProperty (APM_Handler::get_apm (src.externalProperty[i]));
+
+        return retval;
+
+      }
+
+      ComponentAssemblyDescription *
+      CAD_Handler::resolve_cad (const char *)
+      {
+        /*      xercesc::DOMDocument *dom =
+                this->xml_helper_->create_dom (uri);
+
+                if (!dom)
+                throw Parse_Error ("Unable to create DOM for CAD");
+
+                try {
+                return new ComponentAssemblyDescription
+                (componentAssemblyDescription (dom));
+                }
+                catch (...) {
+                throw Parse_Error ("Unable to create XSC structure for CAD");
+        */
+        return 0;
+      }
+    }
+  }
+}
+
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
new file mode 100644
index 00000000000..b4c0b790fc0
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
@@ -0,0 +1,59 @@
+/**
+ * @file CAD_Handler.h
+ * @author William Otte <wotte@dre.vanderbilt.edu>
+ *
+ * $Id$
+ */
+
+#ifndef CIAO_PACKAGING_CAD_HANDLER_H
+#define CIAO_PACKAGING_CAD_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "Utils/XML_Helper.h"
+#include "ciao/DeploymentC.h"
+#include "Package_Handlers/Packaging_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+  struct ComponentAssemblyDescription;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ComponentAssemblyDescription;
+
+    namespace Packaging
+    {
+
+      /**
+       * @class CAD_Handler
+       *
+       * @brief Handler class for ComponentAssemblyDescription.
+       */
+      class Packaging_Handlers_Export CAD_Handler
+      {
+      public:
+        static void component_assem_descr (const ComponentAssemblyDescription &desc,
+                                           ::Deployment::ComponentAssemblyDescription &toconfig);
+
+        static ComponentAssemblyDescription
+        component_assem_descr (const ::Deployment::ComponentAssemblyDescription &src);
+
+      private:
+        static ComponentAssemblyDescription * resolve_cad (const char *uri);
+      };
+
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_PACKAGING_CAD_HANDLER_H */
+
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
new file mode 100644
index 00000000000..3df24e01cb0
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -0,0 +1,382 @@
+// $Id$
+#include "Package_Handlers/CID_Handler.h"
+#include "Package_Handlers/CPD_Handler.h"
+#include "Package_Handlers/IAD_Handler.h"
+#include "Package_Handlers/CAD_Handler.h"
+#include "Package_Handlers/Comp_Intf_Descr_Handler.h"
+#include "Package_Handlers/NIA_Handler.h"
+#include "SatisfierProperty_Handler.h"
+#include "Req_Handler.h"
+
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+#include "Utils/XML_Helper.h"
+#include "Utils/Exceptions.h"
+
+#include "Deployment.hpp"
+#include "Property_Handler.h"
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Packaging
+    {
+
+      IDREF_Base<CORBA::ULong> CID_Handler::IDREF;
+
+      namespace
+      {
+        struct Capability_Handler
+        {
+          static void get_capability (const Capability &desc,
+                                      ::Deployment::Capability &toconfig)
+          {
+            CIAO_TRACE ("Capability_Handler::get_capability");
+
+            toconfig.name = desc.name ().c_str ();
+
+            toconfig.resourceType.length (desc.count_resourceType ());
+            std::for_each (desc.begin_resourceType (),
+                           desc.end_resourceType (),
+                           String_Seq_Functor (toconfig.resourceType));
+
+            toconfig.property.length (desc.count_property ());
+            std::for_each (desc.begin_property (),
+                           desc.end_property (),
+                           SatisfierProperty_Functor (toconfig.property));
+          }
+
+          static Capability get_capability (const ::Deployment::Capability &src)
+          {
+            CIAO_TRACE ("Capability_Handler::get_capability - reverse");
+
+            Capability retval (src.name.in ());
+
+            for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i)
+              retval.add_resourceType (src.resourceType[i].in ());
+
+            for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+              retval.add_property (SatisfierProperty_Handler::get_sat_property (src.property[i]));
+
+            return retval;
+          }
+        };
+
+        typedef Sequence_Handler < Capability,
+                                   ::Deployment::Capabilities,
+                                   ::Deployment::Capability,
+                                   Capability_Handler::get_capability > Capability_Functor;
+
+        struct IR_Handler
+        {
+          static void get_ir (const ImplementationRequirement &desc,
+                              ::Deployment::ImplementationRequirement &toconfig)
+          {
+            CIAO_TRACE ("IR_Handler::get_ir");
+
+            if (desc.resourceUsage_p ())
+              {
+                switch (desc.resourceUsage ().integral ())
+                  {
+                  case ResourceUsageKind::None_l:
+                    toconfig.resourceUsage = Deployment::None;
+                    break;
+
+                  case ResourceUsageKind::InstanceUsesResource_l:
+                    toconfig.resourceUsage = Deployment::InstanceUsesResource;
+                    break;
+
+                  case ResourceUsageKind::ResourceUsesInstance_l:
+                    toconfig.resourceUsage = Deployment::ResourceUsesInstance;
+                    break;
+
+                  case ResourceUsageKind::PortUsesResource_l:
+                    toconfig.resourceUsage = Deployment::PortUsesResource;
+                    break;
+
+                  case ResourceUsageKind::ResourceUsesPort_l:
+                    toconfig.resourceUsage = Deployment::ResourceUsesPort;
+                    break;
+
+                  default:
+                    throw Config_Error (desc.name (),
+                                        "Unknown ResourceUsageKind.");
+                    break;
+                  }
+              }
+
+            if (desc.resourcePort_p ())
+              toconfig.resourcePort = desc.resourcePort ().c_str ();
+
+            if (desc.componentPort_p  ())
+              toconfig.componentPort = desc.componentPort ().c_str ();
+
+            toconfig.resourceType = desc.resourceType ().c_str ();
+            toconfig.name = desc.name ().c_str ();
+
+            std::for_each (desc.begin_property (),
+                           desc.end_property (),
+                           Property_Functor (toconfig.property ));
+          }
+
+          static ImplementationRequirement
+          get_ir (const ::Deployment::ImplementationRequirement &src)
+          {
+            CIAO_TRACE ("IR_Handler::get_ir - reverse");
+
+            ImplementationRequirement retval (src.resourceType.in (),
+                                              src.name.in ());
+
+            if (src.resourceUsage.length () == 1)
+              switch (src.resourceUsage[0])
+                {
+                case Deployment::None:
+                  retval.resourceUsage (ResourceUsageKind::None);
+                  break;
+
+                case Deployment::InstanceUsesResource:
+                  retval.resourceUsage (ResourceUsageKind::InstanceUsesResource);
+                  break;
+
+                case Deployment::ResourceUsesInstance:
+                  retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance);
+                  break;
+
+                case Deployment::PortUsesResource:
+                  retval.resourceUsage (ResourceUsageKind::PortUsesResource);
+                  break;
+
+                case Deployment::ResourceUsesPort:
+                  retval.resourceUsage (ResourceUsageKind::ResourceUsesPort);
+                  break;
+
+                default:
+                  throw Config_Error (src.name.in (),
+                                      "Unknown ResourceUsageKind.");
+                  break;
+                }
+
+            retval.resourcePort (src.resourcePort.in ());
+
+            retval.componentPort (src.componentPort.in ());
+
+            for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+              retval.add_property (Property_Handler::get_property (src.property[i]));
+
+            return retval;
+          }
+        };
+
+        typedef Sequence_Handler < ImplementationRequirement,
+                                   ::Deployment::ImplementationRequirements,
+                                   ::Deployment::ImplementationRequirement,
+                                   IR_Handler::get_ir > IR_Functor;
+
+
+
+        struct MID_Handler
+        {
+          static void get_mid (const MonolithicImplementationDescription &desc,
+                               ::Deployment::MonolithicImplementationDescription &toconfig)
+          {
+            CIAO_TRACE ("MID_Handler::get_mid");
+
+            toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ());
+            std::for_each (desc.begin_nodeExecParameter (),
+                           desc.end_nodeExecParameter (),
+                           Property_Functor (toconfig.nodeExecParameter));
+
+            toconfig.componentExecParameter.length (desc.count_componentExecParameter ());
+            std::for_each (desc.begin_componentExecParameter (),
+                           desc.end_componentExecParameter (),
+                           Property_Functor (toconfig.componentExecParameter));
+
+            toconfig.deployRequirement.length (desc.count_deployRequirement ());
+            std::for_each (desc.begin_deployRequirement (),
+                           desc.end_deployRequirement (),
+                           IR_Functor (toconfig.deployRequirement));
+
+            toconfig.primaryArtifact.length (desc.count_primaryArtifact ());
+            std::for_each (desc.begin_primaryArtifact (),
+                           desc.end_primaryArtifact (),
+                           NIA_Functor (toconfig.primaryArtifact));
+          }
+
+          static MonolithicImplementationDescription
+          get_mid (const ::Deployment::MonolithicImplementationDescription &src)
+          {
+            CIAO_TRACE ("MID_Handler::get_mid - reverse");
+
+            MonolithicImplementationDescription retval;
+
+            for (CORBA::ULong i = 0; i < src.nodeExecParameter.length (); ++i)
+              retval.add_nodeExecParameter
+                (Property_Handler::get_property (src.nodeExecParameter[i]));
+
+            for (CORBA::ULong i = 0; i < src.componentExecParameter.length (); ++i)
+              retval.add_componentExecParameter
+                (Property_Handler::get_property (src.componentExecParameter[i]));
+
+            for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
+              retval.add_deployRequirement
+                (IR_Handler::get_ir (src.deployRequirement[i]));
+
+            for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i)
+              retval.add_primaryArtifact
+                (NIA_Handler::get_nia (src.primaryArtifact[i]));
+
+            return retval;
+          }
+
+        };
+
+        typedef Sequence_Handler < MonolithicImplementationDescription,
+                                   ::Deployment::MonolithicImplementationDescriptions,
+                                   ::Deployment::MonolithicImplementationDescription,
+                                   MID_Handler::get_mid > MID_Functor;
+
+      }
+
+      void
+      CID_Handler::component_impl_descr (
+                                         const ComponentImplementationDescription &desc,
+                                         ::Deployment::ComponentImplementationDescription &toconfig)
+      {
+        CIAO_TRACE ("CID_Handler::component_impl_descr");
+
+        const ComponentImplementationDescription *cid = 0;
+        std::auto_ptr <ComponentImplementationDescription> xsc_cid;
+
+        if (desc.href_p ())
+          {
+            xsc_cid.reset (CID_Handler::resolve_cid (desc.href ().c_str ()));
+            cid = xsc_cid.get ();
+          }
+        else
+          cid = &desc;
+
+        if (cid->label_p ())
+          toconfig.label = cid->label ().c_str ();
+
+        if (cid->UUID_p ())
+          toconfig.UUID = cid->UUID ().c_str ();
+
+        if (cid->implements_p ())
+          { // MAJO: We should be able to assume this exists, fix broken interpeters..
+            Comp_Intf_Descr_Handler::comp_intf_descr (cid->implements (),
+                                                      toconfig.implements);
+          }
+
+        if (cid->assemblyImpl_p ())
+          {
+            toconfig.assemblyImpl.length (1);
+            CAD_Handler::component_assem_descr (cid->assemblyImpl (),
+                                                toconfig.assemblyImpl[0]);
+          }
+        else if (cid->monolithicImpl_p ())
+          {
+            toconfig.monolithicImpl.length (1);
+            MID_Handler::get_mid (cid->monolithicImpl (),
+                                  toconfig.monolithicImpl[0]);
+          }
+        else
+          throw Plan_Error ("ComponentImplementationDescription must have either assemblyImpl or monolithicImpl");
+
+        // configProperty
+        toconfig.configProperty.length (cid->count_configProperty ());
+        std::for_each (cid->begin_configProperty (),
+                       cid->end_configProperty (),
+                       Property_Functor (toconfig.configProperty));
+
+        // capability
+        toconfig.capability.length (cid->count_capability ());
+        std::for_each (cid->begin_capability (),
+                       cid->end_capability (),
+                       Capability_Functor (toconfig.capability));
+
+        // dependsOn
+        toconfig.dependsOn.length (cid->count_dependsOn ());
+        CORBA::ULong pos = 0;
+        for (ComponentImplementationDescription::dependsOn_const_iterator i = cid->begin_dependsOn ();
+             i != cid->end_dependsOn ();
+             ++i)
+          toconfig.dependsOn[pos++].requiredType = i->requiredType ().c_str ();
+
+        // infoProperty
+        toconfig.infoProperty.length (cid->count_infoProperty ());
+        std::for_each (cid->begin_infoProperty (),
+                       cid->end_infoProperty (),
+                       Property_Functor (toconfig.infoProperty));
+
+      }
+
+      ComponentImplementationDescription
+      CID_Handler::component_impl_descr (const Deployment::ComponentImplementationDescription& src)
+      {
+        CIAO_TRACE ("CID_Handler::component_impl_descr - reverse");
+
+        ComponentImplementationDescription retval;
+
+        retval.label (src.label.in ());
+        retval.UUID (src.UUID.in ());
+
+        {
+          retval.implements (Comp_Intf_Descr_Handler::comp_intf_descr (src.implements));
+        }
+
+        if (src.assemblyImpl.length () == 1)
+          {
+            retval.assemblyImpl (CAD_Handler::component_assem_descr (src.assemblyImpl[0]));
+          }
+        else if (src.monolithicImpl.length () == 1)
+          {
+            retval.monolithicImpl (MID_Handler::get_mid (src.monolithicImpl[0]));
+          }
+        else
+          ACE_DEBUG ((LM_WARNING, "Warning: ComponentImplementationDescription lacks "
+                      "either a required assemblyImpl or monolithicImpl, or has too many"));
+
+        for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i)
+          {
+            retval.add_configProperty (
+                                       Property_Handler::get_property (src.configProperty[i]));
+          }
+
+        for (CORBA::ULong i = 0; i < src.dependsOn.length (); ++i)
+          {
+            retval.add_dependsOn (ImplementationDependency (src.dependsOn[i].requiredType.in ()));
+          }
+
+        for (CORBA::ULong i = 0; i < src.infoProperty.length (); ++i)
+          {
+            retval.add_infoProperty (
+                                     Property_Handler::get_property (src.infoProperty[i]));
+          }
+
+        return retval;
+      }
+
+      ComponentImplementationDescription *
+      CID_Handler::resolve_cid (const char *uri)
+      {
+        CIAO_TRACE ("CID_Handler::resolve_cid");
+
+        xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
+
+        if (!dom)
+          throw Parse_Error ("Unable to create DOM for CID");
+
+        try {
+          return new ComponentImplementationDescription
+            (componentImplementationDescription (dom));
+        }
+        catch (...) {
+          throw Parse_Error ("Unable to create XSC structure for CID");
+        }
+      }
+    }
+
+  }
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.h
new file mode 100644
index 00000000000..ef1263ad139
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.h
@@ -0,0 +1,67 @@
+/**
+ *  @file  CID_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author William Otte <wotte@dre.vanderbilt.edu
+ */
+
+#ifndef CIAO_PACKAGING_CID_HANDLER_H
+#define CIAO_PACKAGING_CID_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "IDREF_Base.h"
+#include "Package_Handlers/Packaging_Handlers_Export.h"
+#include "tao/Basic_Types.h"
+
+namespace Deployment
+{
+  struct ComponentImplementationDescription;
+}
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ComponentImplementationDescription;
+
+    namespace Packaging
+    {
+
+      /**
+       * @class CID_Handler
+       *
+       * @brief Handler class for <CCMComponentImplementationDescription> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC objects, parsed from the descriptor files, to the
+       * corresponding CORBA IDL type for the schema element.
+       *
+       */
+      class Packaging_Handlers_Export CID_Handler
+      {
+
+      public:
+        /// Maps the values from the XSC object
+        /// <ComponentImplementationDescription> to the CORBA IDL type
+        /// <Deployment::ComponentImplementationDescription>.
+        static void component_impl_descr (const ComponentImplementationDescription &desc,
+                                          ::Deployment::ComponentImplementationDescription &toconfig);
+
+        static IDREF_Base<CORBA::ULong> IDREF;
+
+        static ComponentImplementationDescription
+        component_impl_descr (const Deployment::ComponentImplementationDescription& src);
+
+      private:
+
+        static ComponentImplementationDescription * resolve_cid (const char *uri);
+      };
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_PACKAGING_CID_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
new file mode 100644
index 00000000000..2cfaae6f2a0
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -0,0 +1,158 @@
+// $Id$
+#include "Package_Handlers/CPD_Handler.h"
+#include "Package_Handlers/CID_Handler.h"
+#include "Package_Handlers/Comp_Intf_Descr_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Packaging_DataC.h"
+#include "Deployment.hpp"
+#include "Utils/Exceptions.h"
+#include "Property_Handler.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Packaging
+    {
+      namespace
+      {
+        struct PCI_Handler
+        {
+          static void get_pci (const PackagedComponentImplementation &desc,
+                               ::Deployment::PackagedComponentImplementation &toconfig)
+          {
+            CIAO_TRACE ("PCI_Handler::get_pci");
+            toconfig.name = desc.name ().c_str ();
+
+            CID_Handler::component_impl_descr (desc.referencedImplementation (),
+                                               toconfig.referencedImplementation);
+          }
+
+          static PackagedComponentImplementation
+          get_pci (const ::Deployment::PackagedComponentImplementation &src)
+          {
+            CIAO_TRACE ("PCI_Handler::get_pci - reverse");
+            return PackagedComponentImplementation (src.name.in (),
+               CID_Handler::component_impl_descr (src.referencedImplementation));
+          }
+        };
+
+        typedef Sequence_Handler < PackagedComponentImplementation,
+                                   ::Deployment::PackagedComponentImplementations,
+                                   ::Deployment::PackagedComponentImplementation,
+                                   PCI_Handler::get_pci > PCI_Functor;
+      }
+
+      void
+      CPD_Handler::component_package_descr (const ComponentPackageDescription &desc,
+                                            ::Deployment::ComponentPackageDescription &toconfig)
+      {
+        CIAO_TRACE ("CPD_Handler::component_package_descr");
+
+        auto_ptr < ComponentPackageDescription > xsc_cpd;
+        const ComponentPackageDescription *cpd = 0;
+
+        if (desc.href_p ())
+          {
+            xsc_cpd.reset (CPD_Handler::resolve_cpd (desc.href ().c_str ()));
+            cpd = xsc_cpd.get ();
+          }
+        else
+          cpd = &desc;
+
+        if (cpd->label_p ())
+          toconfig.label = cpd->label ().c_str ();
+
+        if (cpd->UUID_p ())
+          toconfig.UUID = cpd->UUID ().c_str ();
+
+        // CID
+        if (cpd->realizes_p ())
+          Comp_Intf_Descr_Handler::comp_intf_descr (cpd->realizes (),
+                                                    toconfig.realizes);
+
+        // Config Properties
+        toconfig.configProperty.length (desc.count_configProperty ());
+        std::for_each (cpd->begin_infoProperty (),
+                       cpd->end_infoProperty (),
+                       Property_Functor (toconfig.configProperty));
+
+        //        ACE_DEBUG ((LM_ERROR, "***** Count of PCIs is %i\n",
+        //           cpd->count_implementation ()));
+
+        // Packaged Component Implementations
+        toconfig.implementation.length ( cpd->count_implementation ());
+        std::for_each (cpd->begin_implementation (),
+                       cpd->end_implementation (),
+                       PCI_Functor (toconfig.implementation));
+
+        // Info Properties
+        toconfig.infoProperty.length (cpd->count_infoProperty ());
+        std::for_each (cpd->begin_infoProperty (),
+                       cpd->end_infoProperty (),
+                       Property_Functor (toconfig.infoProperty));
+      }
+
+      ComponentPackageDescription
+      CPD_Handler::component_package_descr (const Deployment::ComponentPackageDescription& src)
+      {
+        CIAO_TRACE ("CPD_Handler::component_package_descr - reverse");
+        ComponentPackageDescription toconfig;
+
+        if (src.label.in () != 0)
+          toconfig.label (src.label.in ());
+
+        if (src.UUID.in () != 0)
+          toconfig.UUID (src.UUID.in ());
+
+        {
+          toconfig.realizes
+            (Comp_Intf_Descr_Handler::comp_intf_descr (src.realizes));
+        }
+
+        for (size_t i = 0; i < src.configProperty.length (); ++i)
+          {
+            toconfig.add_configProperty (
+              Property_Handler::get_property (src.configProperty[i]));
+          }
+
+        { // Packaged Component Implementations
+          for (size_t i = 0; i < src.implementation.length (); ++i)
+            toconfig.add_implementation (
+              PCI_Handler::get_pci (src.implementation[i]));
+        }
+
+        for (size_t i = 0; i < src.infoProperty.length (); ++i)
+          {
+            toconfig.add_infoProperty (
+              Property_Handler::get_property (src.infoProperty[i]));
+          }
+
+        return toconfig;
+      }
+
+      ComponentPackageDescription * CPD_Handler::resolve_cpd (const char *uri)
+      {
+        CIAO_TRACE ("CPD_Handler::resolve_cpd");
+        if (!XML_HELPER->is_initialized ())
+          return false;
+
+        xercesc::DOMDocument* dom =
+          XML_HELPER->create_dom (uri);
+
+        if (!dom)
+          throw Parse_Error ("Unable to create DOM for component package description");
+
+        try {
+          //ACE_ERROR ((LM_ERROR, "Creating new CPD XSC Object\n"));
+          return new ComponentPackageDescription (componentPackageDescription (dom));
+        }
+        catch (...) {
+          throw Parse_Error ("Unable to create XSC structure for CID");
+        }
+      }
+    }
+
+
+  }
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
new file mode 100644
index 00000000000..92b05187fa8
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
@@ -0,0 +1,74 @@
+//================================================
+/**
+ *  @file  STD_CPD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_STD_CPD_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_STD_CPD_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include <memory>
+#include "Utils/XML_Helper.h"
+#include "Utils/Functors.h"
+#include "Package_Handlers/Packaging_Handlers_Export.h"
+
+namespace Deployment
+{
+  struct ComponentPackageDescription;
+  class ComponentPackageDescriptions;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ComponentPackageDescription;
+
+    namespace Packaging
+    {
+
+      /*
+       * @class CPD_Handler
+       *
+       * @brief Handler class for <CCMComponentPackageDescription> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC objects, parsed from the descriptor files, to the
+       * corresponding CORBA IDL type for the schema element.
+       *
+       */
+      class Packaging_Handlers_Export CPD_Handler
+      {
+
+      public:
+        /// Maps the values from the XSC object
+        /// <ComponentPackageDescription> to the CORBA IDL type
+        /// <Deployment::ComponentPackageDescription>.
+        static void component_package_descr (const ComponentPackageDescription &desc,
+                                             ::Deployment::ComponentPackageDescription &toconfig);
+
+        static ComponentPackageDescription
+        component_package_descr (const Deployment::ComponentPackageDescription& src);
+      private:
+        static ComponentPackageDescription * resolve_cpd (const char *uri);
+
+      };
+
+      typedef Sequence_Handler < ComponentPackageDescription,
+                                 ::Deployment::ComponentPackageDescriptions,
+                                 ::Deployment::ComponentPackageDescription,
+                                 CPD_Handler::component_package_descr > CPD_Functor;
+
+    }
+
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_CPD_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
new file mode 100644
index 00000000000..f1d87923493
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -0,0 +1,164 @@
+// $Id$
+#include "Comp_Intf_Descr_Handler.h"
+
+#include "Utils/XML_Helper.h"
+#include "Utils/Exceptions.h"
+#include "Utils/Functors.h"
+#include "DataType_Handler.h"
+#include "Property_Handler.h"
+#include "Deployment.hpp"
+#include "Package_Handlers/CPD_Handler.h"
+#include "tools/Config_Handlers/CPD_Handler.h"
+#include "ciao/CIAO_common.h"
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Packaging
+    {
+      namespace
+      {
+        struct Comp_Prop_Handler
+        {
+          static void get_cpd (const ComponentPropertyDescription &desc,
+                               ::Deployment::ComponentPropertyDescription &toconfig)
+          {
+            CIAO_TRACE ("Comp_Prop_Handler::get_cpd");
+
+            toconfig.name = desc.name ().c_str ();
+            DataType_Handler::data_type (desc.type (),
+                                         toconfig.type);
+          }
+
+          static ComponentPropertyDescription
+          get_cpd (const ::Deployment::ComponentPropertyDescription &src)
+          {
+            CIAO_TRACE ("Comp_Prop_Handler::get_cpd - reverse");
+
+            return ComponentPropertyDescription (src.name.in (),
+                                                 DataType_Handler::data_type (src.type));
+          }
+
+        };
+
+        typedef Sequence_Handler < ComponentPropertyDescription,
+                                   ::Deployment::ComponentPropertyDescriptions,
+                                   ::Deployment::ComponentPropertyDescription,
+                                   Comp_Prop_Handler::get_cpd > Comp_Prop_Functor;
+      }
+
+      void
+      Comp_Intf_Descr_Handler::comp_intf_descr (
+                                                const ComponentInterfaceDescription &desc,
+                                                ::Deployment::ComponentInterfaceDescription &toconfig)
+      {
+        CIAO_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr");
+
+        const ComponentInterfaceDescription *cid = 0;
+        std::auto_ptr <ComponentInterfaceDescription> safe_cid;
+
+        if (desc.href_p ())
+          {
+            safe_cid.reset (Comp_Intf_Descr_Handler::resolve_cid (desc.href ().c_str ()));
+            cid = safe_cid.get ();
+          }
+        else
+          cid = &desc;
+
+        if (cid->label_p ())
+          toconfig.label = cid->label ().c_str ();
+
+        if (cid->UUID_p ())
+          toconfig.UUID = cid->UUID ().c_str ();
+
+        // MAJO: SpecificType should be required.
+        if (cid->specificType_p ())
+          toconfig.specificType = cid->specificType ().c_str ();
+
+        toconfig.supportedType.length (cid->count_supportedType ());
+        std::for_each (cid->begin_supportedType (),
+                       cid->end_supportedType (),
+                       String_Seq_Functor (toconfig.supportedType));
+
+        toconfig.idlFile.length (cid->count_idlFile ());
+        std::for_each (cid->begin_idlFile (),
+                       cid->end_idlFile (),
+                       String_Seq_Functor (toconfig.idlFile));
+
+        toconfig.configProperty.length (cid->count_configProperty ());
+        std::for_each (cid->begin_configProperty (),
+                       cid->end_configProperty (),
+                       Property_Functor (toconfig.configProperty));
+
+        toconfig.port.length (cid->count_port ());
+        std::for_each (cid->begin_port (),
+                       cid->end_port (),
+                       CIAO::Config_Handlers::CPD_Functor (toconfig.port));
+
+        toconfig.property.length (cid->count_property ());
+        std::for_each (cid->begin_property (),
+                       cid->end_property (),
+                       Comp_Prop_Functor (toconfig.property));
+
+        toconfig.infoProperty.length (cid->count_infoProperty ());
+        std::for_each (cid->begin_infoProperty (),
+                       cid->end_infoProperty (),
+                       Property_Functor (toconfig.infoProperty));
+      }
+
+
+      ComponentInterfaceDescription
+      Comp_Intf_Descr_Handler::comp_intf_descr (
+                                                const ::Deployment::ComponentInterfaceDescription &src)
+      {
+        CIAO_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr - reverse");
+        ComponentInterfaceDescription retval;
+
+        retval.label (src.label.in ());
+        retval.UUID (src.UUID.in ());
+        retval.specificType (src.specificType.in ());
+
+        for (CORBA::ULong i = 0; i < src.supportedType.length (); ++i)
+          retval.add_supportedType (src.supportedType[i].in ());
+
+        for (CORBA::ULong i = 0; i < src.idlFile.length (); ++i)
+          retval.add_idlFile (src.idlFile[i].in ());
+
+        for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i)
+          retval.add_configProperty (
+                                     Property_Handler::get_property (src.configProperty[i]));
+
+        for (CORBA::ULong i = 0; i < src.port.length (); ++i)
+          retval.add_port
+            (CIAO::Config_Handlers::CPD_Handler::component_port_description (src.port[i]));
+
+        for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+          retval.add_property (Comp_Prop_Handler::get_cpd (src.property[i]));
+
+        for (CORBA::ULong i = 0; i < src.infoProperty.length (); ++i)
+          retval.add_infoProperty (
+                                   Property_Handler::get_property (src.infoProperty[i]));
+
+        return retval;
+      }
+
+      ComponentInterfaceDescription *
+      Comp_Intf_Descr_Handler::resolve_cid (const char *uri)
+      {
+        CIAO_TRACE ("Comp_Intf_Descr_Handler::resolve_cid");
+
+        xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
+
+        if (!dom)
+          throw Parse_Error ("Unable to create DOM for Component Interface Description.");
+
+        try {
+          return new ComponentInterfaceDescription
+            (componentInterfaceDescription (dom));
+        }
+        catch (...) {
+          throw Parse_Error ("Unable to create XSC structure for Component Interface Description");
+        }
+      }
+    }
+  }}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
new file mode 100644
index 00000000000..e4eb2b0af58
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
@@ -0,0 +1,54 @@
+/**
+ * @file Comp_Intf_Descr_Handler.h
+ * @author William Otte <wotte@dre.vanderbilt.edu>
+ *
+ * $Id$
+ */
+
+#ifndef CIAO_PACKAGING_COMP_INTF_DESCR_HANDLER_H
+#define CIAO_PACKAGING_COMP_INTF_DESCR_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "Utils/XML_Helper.h"
+#include "ciao/DeploymentC.h"
+#include "Package_Handlers/Packaging_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ComponentInterfaceDescription;
+
+    namespace Packaging
+    {
+
+      /**
+       * @class Comp_Intf_Descr_Handler
+       *
+       * @brief Handler class for ComponentInterfaceDescription.
+       */
+      class Packaging_Handlers_Export Comp_Intf_Descr_Handler
+      {
+      public:
+        static void comp_intf_descr (const ComponentInterfaceDescription &descr,
+                                     ::Deployment::ComponentInterfaceDescription &toconfig);
+
+        static ComponentInterfaceDescription
+        comp_intf_descr (const ::Deployment::ComponentInterfaceDescription &src);
+
+      private:
+        static ComponentInterfaceDescription *resolve_cid (const char *uri);
+      };
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_PACKAGING_COMP_INTF_DESCR_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
new file mode 100644
index 00000000000..deb4c5d09d9
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
@@ -0,0 +1,122 @@
+// $Id$
+#include "Package_Handlers/IAD_Handler.h"
+#include "Package_Handlers/NIA_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Packaging_DataC.h"
+#include "Property_Handler.h"
+#include "Req_Handler.h"
+#include "Utils/Functors.h"
+#include "Utils/Exceptions.h"
+#include "Utils/XML_Helper.h"
+
+#include "Deployment.hpp"
+#include "ciao/CIAO_common.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Packaging
+    {
+
+      void
+      IAD_Handler::impl_artifact_descr (const ImplementationArtifactDescription &desc,
+                                        ::Deployment::ImplementationArtifactDescription &toconfig)
+      {
+        CIAO_TRACE ("IAD_Handler::impl_artifact_descr");
+
+        const ImplementationArtifactDescription *iad = 0;
+        std::auto_ptr <ImplementationArtifactDescription> safe_iad;
+
+        if (desc.href_p ())
+          {
+            safe_iad.reset (IAD_Handler::resolve_iad (desc.href ().c_str ()));
+            iad = safe_iad.get ();
+          }
+        else
+          iad = &desc;
+
+
+        if (iad->label_p ())
+          toconfig.label = iad->label ().c_str ();
+
+        if (iad->UUID_p ())
+          toconfig.UUID = iad->UUID ().c_str ();
+
+        toconfig.location.length (iad->count_location ());
+        std::for_each (iad->begin_location (),
+                       iad->end_location (),
+                       String_Seq_Functor (toconfig.location));
+
+        toconfig.dependsOn.length (iad->count_dependsOn ());
+        std::for_each (iad->begin_dependsOn (),
+                       iad->end_dependsOn (),
+                       NIA_Functor (toconfig.dependsOn));
+
+        toconfig.execParameter.length (iad->count_execParameter ());
+        std::for_each (iad->begin_execParameter (),
+                       iad->end_execParameter (),
+                       Property_Functor (toconfig.execParameter));
+
+        toconfig.infoProperty.length (iad->count_infoProperty ());
+        std::for_each (iad->begin_infoProperty (),
+                       iad->end_infoProperty (),
+                       Property_Functor (toconfig.infoProperty));
+
+        toconfig.deployRequirement.length (iad->count_deployRequirement ());
+        std::for_each (iad->begin_deployRequirement (),
+                       iad->end_deployRequirement (),
+                       Requirement_Functor (toconfig.deployRequirement ));
+      }
+
+      ImplementationArtifactDescription
+      IAD_Handler::impl_artifact_descr (const ::Deployment::ImplementationArtifactDescription &src)
+      {
+        CIAO_TRACE ("IAD_Handler::impl_artifact_descr - reverse");
+        ImplementationArtifactDescription retval;
+
+        retval.label (src.label.in ());
+        retval.UUID (src.UUID.in ());
+
+        for (CORBA::ULong i = 0; i < src.location.length (); ++i)
+          retval.add_location (src.location[i].in ());
+
+        for (CORBA::ULong i = 0; i < src.dependsOn.length (); ++i)
+          retval.add_dependsOn (NIA_Handler::get_nia (src.dependsOn[i]));
+
+        for (CORBA::ULong i = 0; i < src.execParameter.length (); ++i)
+          retval.add_execParameter
+            (Property_Handler::get_property (src.execParameter[i]));
+
+        for (CORBA::ULong i = 0; i < src.infoProperty.length (); ++i)
+          retval.add_infoProperty
+            (Property_Handler::get_property ( src.infoProperty[i]));
+
+        for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
+          retval.add_deployRequirement
+            (Req_Handler::get_requirement (src.deployRequirement[i]));
+
+        return retval;
+      }
+
+      ImplementationArtifactDescription *  IAD_Handler::resolve_iad (const char *uri)
+      {
+        CIAO_TRACE ("IAD_Handler::resolve_iad");
+
+        xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
+
+        if (!dom)
+          throw Parse_Error ("Unable to create DOM for IAD");
+
+        try {
+          return new ImplementationArtifactDescription
+            (implementationArtifactDescription (dom));
+        }
+        catch (...) {
+          throw Parse_Error ("Unable to create XSC structure for IAD");
+        }
+      }
+
+    }
+  }
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.h
new file mode 100644
index 00000000000..869dbe25a8a
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.h
@@ -0,0 +1,66 @@
+//================================================
+/**
+ *  @file  IAD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author William Otte  <wotte@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "Package_Handlers/Packaging_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+  struct ImplementationArtifactDescription;
+  struct ImplementationArtifactDescriptions;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ImplementationArtifactDescription;
+    namespace Packaging
+    {
+      /*
+       * @class IAD_Handler
+       *
+       * @brief Handler class for <CCMImplementationArtifactDescription> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC objects, parsed from the descriptor files, to the
+       * corresponding CORBA IDL type for the schema element.
+       *
+       */
+      class Packaging_Handlers_Export IAD_Handler
+      {
+      public:
+        /// Maps the values from the XSC object
+        /// <ImplementationArtifactDescription> to the CORBA IDL type
+        /// <Deployment::ImplementationArtifactDescription>.
+        static void
+        impl_artifact_descr (const ImplementationArtifactDescription &desc,
+                             ::Deployment::ImplementationArtifactDescription &toconfig);
+
+
+        static ImplementationArtifactDescription
+        impl_artifact_descr (const Deployment::ImplementationArtifactDescription& src);
+
+        static ImplementationArtifactDescription * resolve_iad (const char *uri);
+      };
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
new file mode 100644
index 00000000000..6ad2767104b
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -0,0 +1,64 @@
+/**
+ * @file NIA_Handler.h
+ * @author William Otte <wotte@dre.vanderbilt.edu>
+ * $Id$
+ */
+
+#ifndef CIAO_PACKAGING_NIA_HANDLER_H
+#define CIAO_PACKAGING_NIA_HANDLER_H
+
+#include /**/ "ace/pre.h"
+#include "Package_Handlers/Packaging_Handlers_Export.h"
+#include "Utils/Functors.h"
+#include "ciao/Packaging_DataC.h"
+#include "iad.hpp"
+
+namespace Deployment
+{
+  struct NamedImplementationArtifact;
+  class NamedImplementationArtifacts;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class NamedImplementationArtifact;
+
+    namespace Packaging
+    {
+      /**
+       * @class NIA_Handler
+       * @brief Handler class for NamedImplementationArtifact types.
+       */
+      class Packaging_Handlers_Export NIA_Handler
+      {
+      public:
+        static void get_nia (const NamedImplementationArtifact &desc,
+                             ::Deployment::NamedImplementationArtifact &toconfig)
+        {
+          toconfig.name = desc.name ().c_str ();
+          IAD_Handler::impl_artifact_descr (desc.referencedArtifact (),
+                                            toconfig.referencedArtifact);
+        }
+
+
+        static NamedImplementationArtifact
+        get_nia (const ::Deployment::NamedImplementationArtifact &src)
+        {
+          return NamedImplementationArtifact (src.name.in (),
+                                              IAD_Handler::impl_artifact_descr (src.referencedArtifact));
+        }
+
+      };
+
+      typedef Sequence_Handler < NamedImplementationArtifact,
+                                 ::Deployment::NamedImplementationArtifacts,
+                                 ::Deployment::NamedImplementationArtifact,
+        NIA_Handler::get_nia > NIA_Functor;
+    }
+  }
+}
+
+
+#endif /* CIAO_PACKAGING_NIA_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
new file mode 100644
index 00000000000..9c55e47fe85
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -0,0 +1,152 @@
+// $Id$
+#include "Package_Handlers/PCD_Handler.h"
+#include "Package_Handlers/CPD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Packaging_DataC.h"
+#include "Deployment.hpp"
+#include "Property_Handler.h"
+#include "Req_Handler.h"
+#include "Utils/XercesString.h"
+#include "Utils/Exceptions.h"
+
+#include <memory>
+#include "ciao/CIAO_common.h"
+
+#include <xercesc/util/XMLString.hpp>
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Packaging
+    {
+      void
+      PCD_Handler::package_config (const ACE_TCHAR *uri,
+                                   ::Deployment::PackageConfiguration &toconfig)
+      {
+        xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
+
+        XStr root = dom->getDocumentElement ()->getTagName ();
+
+        if (root == XStr ("Deployment:topLevelPackageDescription"))
+          {
+            TopLevelPackageDescription tpd (topLevelPackageDescription (dom));
+            PCD_Handler::package_config (tpd.package (),
+                                         toconfig);
+          }
+        else if (root == XStr ("Deployment:packageConfiguration"))
+          {
+            PackageConfiguration pcd (packageConfiguration (dom));
+            PCD_Handler::package_config (pcd, toconfig);
+          }
+        else
+          {
+            std::string error ("Invliad file passed to package_config, has base ");
+
+            char *croot = xercesc::XMLString::transcode (root);
+
+            error += croot;
+
+            delete [] croot;
+
+            throw Plan_Error ("Invalid file passed to package_config, had base");
+          }
+      }
+
+      void
+      PCD_Handler::package_config (const PackageConfiguration &desc,
+                                   ::Deployment::PackageConfiguration &toconfig)
+      {
+        CIAO_TRACE ("PCD_Handler::package_config");
+        std::auto_ptr < PackageConfiguration > xsc_pcd;
+
+        const PackageConfiguration *pcd;
+
+        if (desc.href_p ())
+          {
+            // Take ownership of the resolved pcd
+            xsc_pcd.reset (PCD_Handler:: resolve_package_config (desc.href ().c_str ()));
+            pcd = xsc_pcd.get ();
+          }
+        else
+          pcd = &desc;
+
+        if (pcd->label_p ())
+          toconfig.label =
+            pcd->label ().c_str ();
+
+        if (pcd->UUID_p ())
+          toconfig.UUID =
+            pcd->UUID ().c_str ();
+
+        if (pcd->basePackage_p ())
+          {
+            toconfig.basePackage.length (1);
+            CPD_Handler::component_package_descr (pcd->basePackage (),
+                                                  toconfig.basePackage [0]);
+          }
+
+        // @@ MAJO: Support other elements present here.
+
+        toconfig.configProperty.length (desc.count_configProperty ());
+        std::for_each (desc.begin_configProperty (),
+                       desc.end_configProperty (),
+                       Property_Functor (toconfig.configProperty));
+
+        toconfig.selectRequirement.length (desc.count_selectRequirement ());
+        std::for_each (desc.begin_selectRequirement (),
+                       desc.end_selectRequirement (),
+                       Requirement_Functor (toconfig.selectRequirement));
+
+      }
+
+      PackageConfiguration
+      PCD_Handler::package_config (const Deployment::PackageConfiguration& src)
+      {
+        CIAO_TRACE ("PCD_Handler::package_config - reverse");
+        PackageConfiguration pcd = PackageConfiguration ();
+
+        if (src.label.in () != 0)
+          pcd.label (src.label.in ());
+
+        if (src.UUID.in () != 0)
+          pcd.UUID (src.UUID.in ());
+
+        if (src.basePackage.length () > 0)
+          {
+            ACE_DEBUG ((LM_DEBUG, "5\n"));
+            pcd.basePackage (CPD_Handler::component_package_descr (src.basePackage[0]));
+          }
+
+        // @@ MAJO: Support other elements present here.
+        for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i)
+          pcd.add_configProperty (Property_Handler::get_property (src.configProperty[i]));
+
+        for (CORBA::ULong i = 0; i < src.selectRequirement.length (); ++i)
+          pcd.add_selectRequirement (Req_Handler::get_requirement (src.selectRequirement[i]));
+
+        return pcd;
+
+      }
+
+      PackageConfiguration * PCD_Handler::resolve_package_config (const char *uri)
+      {
+        xercesc::DOMDocument* dom =
+          XML_HELPER->create_dom (uri);
+
+        if (!dom)
+          throw Parse_Error ("Unable to create DOM for PackageConfiguration");
+
+        try {
+          return new PackageConfiguration (packageConfiguration (dom));
+        }
+        catch (...) {
+          throw Parse_Error ("Unable to create XSC structure for PackageConfiguration");
+        }
+
+      }
+
+
+    }
+  }
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.h
new file mode 100644
index 00000000000..be92a6871c0
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.h
@@ -0,0 +1,69 @@
+//================================================
+/**
+ *  @file  PCD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author William Otte <wotte@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_PCD_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_PCD_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "Packaging_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+  struct PackageConfiguration;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class PackageConfiguration;
+
+    namespace Packaging
+    {
+      /*
+       * @class PCD_Handler
+       *
+       * @brief Handler class for <CCMPackageConfiguration> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC objects, parsed from the descriptor files, to the
+       * corresponding CORBA IDL type for the schema element.
+       *
+       */
+      class Packaging_Handlers_Export PCD_Handler
+      {
+
+      public:
+        static void package_config (const ACE_TCHAR *uri,
+                                    ::Deployment::PackageConfiguration &toconfig);
+
+        /// Maps the values from the XSC object
+        /// <PackageConfiguration> to the CORBA IDL type
+        /// <Deployment::PackageConfiguration>.
+        static void package_config (const PackageConfiguration &desc,
+                                    ::Deployment::PackageConfiguration &toconfig);
+
+        static PackageConfiguration package_config (const Deployment::PackageConfiguration& src);
+
+      private:
+         static PackageConfiguration *resolve_package_config (const char *uri);
+      };
+    }
+
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
new file mode 100644
index 00000000000..334245559fa
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -0,0 +1,81 @@
+// $Id$
+
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
+
+#include "STD_PC_Intf.h"
+#include "Utils/XML_Helper.h"
+#include "Deployment.hpp"
+#include "STD_PCD_Handler.h"
+#include "ciao/Packaging_DataC.h"
+#include "ciao/CIAO_common.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    STD_PC_Intf::STD_PC_Intf (const char *file)
+    {
+      if (!this->prepare_PC (file))
+        throw;
+    }
+
+    bool
+    STD_PC_Intf::prepare_PC (const char *file)
+    {
+      CIAO_TRACE("STD_PC_Intf::prepare_PC");
+
+      ACE_Auto_Ptr<XML_Helper> helper (new XML_Helper);
+
+      if (!helper->is_initialized ())
+        return false;
+
+      // parse the .pcd (PackageConfigurationDescription) file
+      xercesc::DOMDocument *dom =
+        helper->create_dom (file);
+
+      if (!dom)
+        return false;
+
+
+      PackageConfiguration pc =
+        packageConfiguration (dom);
+
+
+      Deployment::PackageConfiguration idl_pc;
+
+
+      STD_PCD_Handler pcd_handler (helper.get ());
+
+      pcd_handler.package_config (pc,
+                                  idl_pc);
+
+
+      Deployment::PackageConfiguration *p_idl_pc =
+        new Deployment::PackageConfiguration (idl_pc);
+
+      // let ACE_Auto_Ptr take over
+      this->idl_pc_.reset (p_idl_pc);
+
+      if (this->idl_pc_.get ())
+        return true;
+
+      return false;
+    }
+
+    ::Deployment::PackageConfiguration const *
+    STD_PC_Intf::get_PC (void) const
+    {
+      return this->idl_pc_.get ();
+    }
+
+    ::Deployment::PackageConfiguration *
+    STD_PC_Intf::get_PC (void)
+    {
+      return this->idl_pc_.release ();
+    }
+  }
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
new file mode 100644
index 00000000000..d280fb5c655
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
@@ -0,0 +1,58 @@
+//==============================================================
+/**
+ *  @file  STD_PC_Intf.h
+ *
+ *  $Id$
+ *
+ *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+ */
+//================================================================
+
+#ifndef CIAO_CONFIG_STD_PC_INTF_H
+#define CIAO_CONFIG_STD_PC_INTF_H
+#include /**/ "ace/pre.h"
+
+#include "Config_Handlers_Export.h"
+
+#include "ace/Auto_Ptr.h"
+
+
+namespace Deployment
+{
+  struct PackageConfiguration ;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+   /*
+    * @class PC_Intf
+    *
+    * @brief Wrapper class for PackageConfiguration extraction
+    *
+    * This class defines wrapper functions for extracting
+    * PackageConfiguration IDL structures from XSC structures.
+    * It serves as the public interface used by application
+    * developers.
+    *
+    */
+    class Config_Handlers_Export STD_PC_Intf
+    {
+    public:
+      STD_PC_Intf (const char *file);
+
+      ::Deployment::PackageConfiguration const *get_PC (void) const;
+      ::Deployment::PackageConfiguration *get_PC (void);
+
+    protected:
+      bool prepare_PC (const char *file);
+
+    private:
+      ACE_Auto_Ptr< ::Deployment::PackageConfiguration> idl_pc_;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /*CIAO_CONFIG_STD_PC_INTF_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
new file mode 100644
index 00000000000..fce4f459738
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -0,0 +1,45 @@
+// $Id$
+
+project (Package_Config_Handlers) : acelib, ciao_deployment_stub, xerces {
+  sharedname = Package_Config_Handlers
+  dynamicflags = PACKAGING_HANDLERS_BUILD_DLL
+  macros += XML_USE_PTHREADS
+  requires += exceptions
+  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  after    += CIAO_XML_Utils XSC_XML_Handlers XSC_Config_Handlers
+  libs     += CIAO_XML_Utils XSC_XML_Handlers XSC_Config_Handlers
+  includes += $(CIAO_ROOT)/ciao
+
+  Source_files {
+    CAD_Handler.cpp
+    CID_Handler.cpp
+    Comp_Intf_Descr_Handler.cpp
+    CPD_Handler.cpp
+    IAD_Handler.cpp
+    PCD_Handler.cpp
+    SID_Handler.cpp
+  }
+
+  Header_Files {
+    CAD_Handler.h
+    CID_Handler.h
+    Comp_Intf_Descr_Handler.h
+    CPD_Handler.h
+    IAD_Handler.h
+    PCD_Handler.h
+    SID_Handler.h
+  }
+}
+
+project (Package_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client {
+//  requires += dummy_label
+  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  exename = test
+  macros   += XML_USE_PTHREADS
+  libs += Package_Config_Handlers XSC_Config_Handlers
+  Source_Files {
+    test.cpp
+  }
+}
+
+
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
new file mode 100644
index 00000000000..86193a1a664
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl Packaging_Handlers
+// ------------------------------
+#ifndef PACKAGING_HANDLERS_EXPORT_H
+#define PACKAGING_HANDLERS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (PACKAGING_HANDLERS_HAS_DLL)
+#  define PACKAGING_HANDLERS_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && PACKAGING_HANDLERS_HAS_DLL */
+
+#if !defined (PACKAGING_HANDLERS_HAS_DLL)
+#  define PACKAGING_HANDLERS_HAS_DLL 1
+#endif /* ! PACKAGING_HANDLERS_HAS_DLL */
+
+#if defined (PACKAGING_HANDLERS_HAS_DLL) && (PACKAGING_HANDLERS_HAS_DLL == 1)
+#  if defined (PACKAGING_HANDLERS_BUILD_DLL)
+#    define Packaging_Handlers_Export ACE_Proper_Export_Flag
+#    define PACKAGING_HANDLERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PACKAGING_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PACKAGING_HANDLERS_BUILD_DLL */
+#    define Packaging_Handlers_Export ACE_Proper_Import_Flag
+#    define PACKAGING_HANDLERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PACKAGING_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PACKAGING_HANDLERS_BUILD_DLL */
+#else /* PACKAGING_HANDLERS_HAS_DLL == 1 */
+#  define Packaging_Handlers_Export
+#  define PACKAGING_HANDLERS_SINGLETON_DECLARATION(T)
+#  define PACKAGING_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PACKAGING_HANDLERS_HAS_DLL == 1 */
+
+// Set PACKAGING_HANDLERS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PACKAGING_HANDLERS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PACKAGING_HANDLERS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PACKAGING_HANDLERS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PACKAGING_HANDLERS_NTRACE */
+
+#if (PACKAGING_HANDLERS_NTRACE == 1)
+#  define PACKAGING_HANDLERS_TRACE(X)
+#else /* (PACKAGING_HANDLERS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PACKAGING_HANDLERS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PACKAGING_HANDLERS_NTRACE == 1) */
+
+#endif /* PACKAGING_HANDLERS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
new file mode 100644
index 00000000000..8631582a10b
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -0,0 +1,140 @@
+// $Id$
+
+#include "Package_Handlers/SID_Handler.h"
+#include "cid.hpp"
+#include "ciao/DeploymentC.h"
+#include "Package_Handlers/CPD_Handler.h"
+#include "Package_Handlers/PCD_Handler.h"
+#include "Req_Handler.h"
+#include "Property_Handler.h"
+
+#include "ace/UUID.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    namespace Packaging
+    {
+      IDREF_Base<CORBA::ULong> SID_Handler::IDREF;
+
+      void
+      SID_Handler::sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+                                         ::Deployment::SubcomponentInstantiationDescription &toconfig)
+      {
+        CIAO_TRACE ("SID_Handler::sub_comp_inst_descr");
+        toconfig.name = desc.name ().c_str ();
+
+        if (desc.basePackage_p ())
+          {
+            toconfig.basePackage.length (1);
+            CPD_Handler::component_package_descr (desc.basePackage (),
+                                                  toconfig.basePackage[0]);
+          }
+        else if (desc.specializedConfig_p ())
+          {
+            toconfig.specializedConfig.length (1);
+            PCD_Handler::package_config (desc.specializedConfig (),
+                                         toconfig.specializedConfig[0]);
+          }
+        else if (desc.importedPackage_p ())
+          {
+            toconfig.importedPackage.length (1);
+            toconfig.importedPackage[0].location.length (desc.importedPackage ().count_location ());
+
+            std::for_each (desc.importedPackage ().begin_location (),
+                           desc.importedPackage ().end_location (),
+                           String_Seq_Functor (toconfig.importedPackage[0].location));
+          }
+        else if (desc.referencedPackage_p ())
+          {
+            toconfig.referencedPackage.length (1);
+
+            if (desc.referencedPackage ().requiredUUID_p ())
+              toconfig.referencedPackage[0].requiredUUID =
+                desc.referencedPackage ().requiredUUID ().c_str ();
+
+            if (desc.referencedPackage ().requiredName_p ())
+              toconfig.referencedPackage[0].requiredName =
+                desc.referencedPackage ().requiredName ().c_str ();
+
+            toconfig.referencedPackage[0].requiredType =
+              desc.referencedPackage ().requiredType ().c_str ();
+          }
+
+        toconfig.selectRequirement.length (desc.count_selectRequirement ());
+        std::for_each (desc.begin_selectRequirement (),
+                       desc.end_selectRequirement (),
+                       Requirement_Functor (toconfig.selectRequirement));
+
+        toconfig.configProperty.length (desc.count_configProperty ());
+        std::for_each (desc.begin_configProperty (),
+                       desc.end_configProperty (),
+                       Property_Functor (toconfig.configProperty));
+
+        if (desc.id_p ())
+          {
+            ACE_CString str (desc.id ().c_str ());
+            SID_Handler::IDREF.bind_next_available (str);
+          }
+        else
+          ACE_ERROR ((LM_ERROR, "Warning: SID With Name %s has no ID\n",
+                      desc.name ().c_str ()));
+
+      }
+
+      SubcomponentInstantiationDescription
+      SID_Handler::sub_comp_inst_descr (const Deployment::SubcomponentInstantiationDescription &src)
+      {
+        CIAO_TRACE ("SID_Handler::sub_comp_inst_descr - reverse");
+        SubcomponentInstantiationDescription retval (src.name.in ());
+
+        if (src.basePackage.length () == 1)
+          retval.basePackage
+            (CPD_Handler::component_package_descr (src.basePackage[0]));
+        else if (src.specializedConfig.length () == 1)
+          retval.specializedConfig
+            (PCD_Handler::package_config (src.specializedConfig[0]));
+        else if (src.importedPackage.length () == 1)
+          {
+            ComponentPackageImport ci;
+
+            for (CORBA::ULong i = 0; i < src.importedPackage[0].location.length (); ++i)
+              ci.add_location (src.importedPackage[0].location[i].in ());
+
+            retval.importedPackage (ci);
+          }
+        else if (src.referencedPackage.length () == 1)
+          {
+            ComponentPackageReference cpr (src.referencedPackage[0].requiredType.in ());
+            cpr.requiredUUID (src.referencedPackage[0].requiredUUID.in ());
+            cpr.requiredName (src.referencedPackage[0].requiredName.in ());
+
+            retval.referencedPackage (cpr);
+          }
+
+        for (CORBA::ULong i = 0; i < src.selectRequirement.length (); ++i)
+          retval.add_selectRequirement
+            (Req_Handler::get_requirement (src.selectRequirement[i]));
+
+        for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i)
+          retval.add_configProperty
+            (Property_Handler::get_property (src.configProperty[i]));
+
+        // @@MAJO This is not a good way of binding reverse IDREFS.
+        std::auto_ptr <ACE_Utils::UUID> safe_uuid (
+          ACE_Utils::UUID_GENERATOR::instance ()->generateUUID ());
+        ACE_CString uuid ( safe_uuid->to_string ()->c_str ());
+
+        //        ACE_ERROR ((LM_ERROR, "*** Binding to %s\n",
+        //           uuid.c_str ()));
+
+        SID_Handler::IDREF.bind_next_available (uuid);
+
+        return retval;
+      }
+
+    }
+  }
+}
+
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
new file mode 100644
index 00000000000..c166fcd6294
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
@@ -0,0 +1,71 @@
+/**
+ * @file SID_Handler.h
+ * @author William Otte <wotte@dre.vanderbilt.edu>
+ *
+ * $Id$
+ */
+
+
+#ifndef CIAO_PACKAGING_SID_HANDLER_H
+#define CIAO_PACKAGING_SID_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "Utils/XML_Helper.h"
+#include "Utils/Functors.h"
+#include "IDREF_Base.h"
+#include "Package_Handlers/Packaging_Handlers_Export.h"
+
+namespace Deployment
+{
+  struct SubcomponentInstantiationDescription;
+  class SubcomponentInstantiationDescriptions;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class SubcomponentInstantiationDescription;
+
+    namespace Packaging
+    {
+      /**
+       * @class SID_Handler
+       * @brief Handler class for SubcomponentInstantiationDescription
+       */
+      class Packaging_Handlers_Export SID_Handler
+      {
+        SID_Handler (XML_Helper *xml_helper)
+          : xml_helper_ (xml_helper)
+        {
+
+        }
+
+      public:
+        static void sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+                                         ::Deployment::SubcomponentInstantiationDescription &toconfig);
+
+        static SubcomponentInstantiationDescription
+        sub_comp_inst_descr (const ::Deployment::SubcomponentInstantiationDescription &src);
+
+        static IDREF_Base< CORBA::ULong > IDREF;
+
+      private:
+        static SubcomponentInstantiationDescription *resolve_sid (const char *uri);
+
+        XML_Helper *xml_helper_;
+
+      };
+
+      typedef Sequence_Handler < SubcomponentInstantiationDescription,
+                                 ::Deployment::SubcomponentInstantiationDescriptions,
+                                 ::Deployment::SubcomponentInstantiationDescription,
+                                 SID_Handler::sub_comp_inst_descr > SID_Functor;
+
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_PACKAGING_SID_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
new file mode 100644
index 00000000000..485b96ec830
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
@@ -0,0 +1,111 @@
+// $Id$
+
+#include <iostream>
+
+#include "Deployment.hpp"
+#include "PCD_Handler.h"
+#include "ciao/Packaging_DataC.h"
+#include "SID_Handler.h"
+#include "ace/Get_Opt.h"
+#include "Utils/XML_Helper.h"
+#include "tao/ORB.h"
+#include "Utils/Exceptions.h"
+
+static const char *input_file = "BasicSP.cdp";
+
+
+static int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "i:");
+
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'i':
+        input_file = get_opts.opt_arg ();
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-i <input file> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command-line
+  return 0;
+}
+
+// Check to see if SRD was imported.
+void check_srd (const Deployment::DeploymentPlan &);
+
+using namespace CIAO::Config_Handlers;
+
+
+int main (int argc, char *argv[])
+{
+  try
+    {
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      // Initialize an ORB so Any will work
+      CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
+
+      if (xercesc::DOMDocument *doc = XML_HELPER->create_dom (input_file))
+        {
+
+          ::Deployment::PackageConfiguration idl_pc;
+          {
+            //            //Read in the XSC type structure from the DOMDocument
+            //PackageConfiguration pc = packageConfiguration (doc);
+            //std::cerr << "XML to XSC conversion succeeded. Converting to IDL...\n";
+
+            //Convert the XSC to an IDL datatype
+            Packaging::PCD_Handler::package_config (input_file, idl_pc);
+            std::cout << "Instance document import succeeded.  Dumping contents to file\n";
+          }
+
+          // Clear SID_Handler's IDREF Table
+          Packaging::SID_Handler::IDREF.unbind_refs ();
+
+          std::cerr << "Performing IDL->XSC transformation...\n";
+
+          PackageConfiguration out_pc (Packaging::PCD_Handler::package_config (idl_pc));
+
+          //Create a new DOMDocument for writing the XSC into XML
+          xercesc::DOMDocument* the_xsc (XML_HELPER->create_dom("Deployment:packageConfiguration",
+                                                                "http://www.omg.org/Deployment"));
+
+          //Serialize the XSC into a DOMDocument
+          packageConfiguration(out_pc, the_xsc);
+
+
+          //Write it to test.xml
+          XML_HELPER->write_DOM(the_xsc, "test.xml");
+
+          //Cleanliness is next to Godliness
+          delete doc;
+        }
+
+      std::cout << "Test completed!\n";
+    }
+  catch (CIAO::Config_Handlers::Plan_Error &excep)
+    {
+      std::cerr << "Plan Error exception caught: " << excep.reason_ << std::endl;
+    }
+  catch (CIAO::Config_Handlers::Config_Error &excep)
+    {
+      std::cerr << "Config Error " << excep.name_ << ": " << excep.error_ << std::endl;
+    }
+
+
+  return 0;
+}
+
+
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
index c2525f5ceeb..273fe8c8e69 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -20,9 +20,11 @@ namespace CIAO
 
     void
     Property_Handler::get_property (
-      const Property& desc,
-      Deployment::Property& toconfig)
+                                    const Property& desc,
+                                    Deployment::Property& toconfig)
     {
+      CIAO_TRACE("Property_Handler::get_property");
+
       toconfig.name =
         CORBA::string_dup (desc.name ().c_str ());
 
@@ -33,8 +35,10 @@ namespace CIAO
 
     Property
     Property_Handler::get_property (
-      const Deployment::Property& src)
+                                    const Deployment::Property& src)
     {
+      CIAO_TRACE("Property_Handler::get_property - reverse");
+
       ::XMLSchema::string< char > name ((src.name));
       Any value (Any_Handler::get_any (src.value));
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
index ae6dee192da..07044faed8e 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  Property_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Property_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H
@@ -14,6 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,42 +22,50 @@
 
 namespace Deployment
 {
-  struct Property;
+struct Property;
+class Properties;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class Property;
-
-    /*
-     * @class Property_Handler
-     *
-     * @brief Handler class for <CCMComponentPortDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-
-   class Config_Handlers_Export Property_Handler
-   {
-   public:
-     Property_Handler (void);
-     virtual ~Property_Handler (void);
-
-     /// This method maps the values from the XSC object
-     /// <CIAO::Config_Handlers::Property> to the CORBA IDL type
-     /// <Deployment::Property>.
-     static void get_property (const Property& desc,
-       ::Deployment::Property& toconfig);
-     static Property get_property (
-       const ::Deployment::Property& src);
-   };
-
- }
+namespace Config_Handlers
+{
+class Property;
+
+/*
+* @class Property_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+
+class Config_Handlers_Export Property_Handler
+{
+public:
+Property_Handler (void);
+virtual ~Property_Handler (void);
+
+typedef Sequence_Iterator< const ::Deployment::Properties, const ::Deployment::Property > prop_iter;
+
+/// This method maps the values from the XSC object
+/// <CIAO::Config_Handlers::Property> to the CORBA IDL type
+/// <Deployment::Property>.
+static void get_property (const Property& desc,
+::Deployment::Property& toconfig);
+static Property get_property (
+const ::Deployment::Property& src);
+};
+
+typedef Sequence_Handler < Property,
+::Deployment::Properties,
+::Deployment::Property,
+Property_Handler::get_property> Property_Functor;
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
index 7a9fe8bca08..6d3518b6ac3 100644
--- a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
@@ -3,6 +3,8 @@
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
 #include "Any_Handler.h"
+#include "ciao/CIAO_common.h"
+#include "Property_Handler.h"
 
 namespace CIAO
 {
@@ -10,29 +12,41 @@ namespace CIAO
   {
     void
     RDD_Handler::resource_deployment_descr (
-        const ResourceDeploymentDescription &src,
-        ::Deployment::ResourceDeploymentDescription &dest)
+                                            const ResourceDeploymentDescription &src,
+                                            ::Deployment::ResourceDeploymentDescription &dest)
     {
+      CIAO_TRACE("RDD_Handler::resource_deployment_descr");
+
       dest.requirementName =
         src.requirementName ().c_str ();
 
       dest.resourceName=
         src.resourceName ().c_str ();
 
-      Any_Handler::extract_into_any (src.resourceValue (),
-                                     dest.resourceValue);
+      std::for_each (src.begin_property (),
+                     src.end_property (),
+                     Property_Functor (dest.property));
 
     }
 
     ResourceDeploymentDescription
     RDD_Handler::resource_deployment_descr (
-      const ::Deployment::ResourceDeploymentDescription &src)
+                                            const ::Deployment::ResourceDeploymentDescription &src)
     {
+      CIAO_TRACE("RDD_Handler::resource_deployment_descr - reverse");
+
       XMLSchema::string< char > reqname ((src.requirementName));
-      XMLSchema::string< char > resname ((src.resourceName));
-      Any resval (Any_Handler::get_any (src.resourceValue));
+      XMLSchema::string< char > resname ((src.resourceName.in ()));
+
+      ResourceDeploymentDescription rdd (reqname,resname);
+
+      for (CORBA::ULong i = 0;
+           i != src.property.length ();
+           ++i)
+        {
+          rdd.add_property (Property_Handler::get_property (src.property[i]));
+        }
 
-      ResourceDeploymentDescription rdd (reqname,resname,resval);
       return rdd;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h
index 001a57e0da7..e0d19c58ee2 100644
--- a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.h
@@ -1,12 +1,12 @@
 
-      //==============================================================
+//==============================================================
 /**
- *  @file  RDD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  RDD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_RDD_Handler_H
@@ -23,40 +23,40 @@
 
 namespace Deployment
 {
-  struct ResourceDeploymentDescription;
+struct ResourceDeploymentDescription;
 }
 
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-    class ResourceDeploymentDescription;
-
-    /*
-    * @class RDD_Handler
-    *
-    * @brief Handler class for <ResourceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from XSC
-    * ResourceDeploymentDescription objects, parsed from the
-    * descriptor files, to the  corresponding CORBA IDL Any type.
-    *
-    */
-
-    class Config_Handlers_Export RDD_Handler
-    {
-      public:
-      static void resource_deployment_descr (
-          const ResourceDeploymentDescription& desc,
-          ::Deployment::ResourceDeploymentDescription& toconfig);
-      static ResourceDeploymentDescription
-      resource_deployment_descr (
-          const ::Deployment::ResourceDeploymentDescription &src);
-
-    };
-  }
+namespace Config_Handlers
+{
+class ResourceDeploymentDescription;
+
+/*
+* @class RDD_Handler
+*
+* @brief Handler class for <ResourceDeploymentDescription> types.
+*
+* This class defines handler methods to map values from XSC
+* ResourceDeploymentDescription objects, parsed from the
+* descriptor files, to the  corresponding CORBA IDL Any type.
+*
+*/
+
+class Config_Handlers_Export RDD_Handler
+{
+public:
+static void resource_deployment_descr (
+const ResourceDeploymentDescription& desc,
+::Deployment::ResourceDeploymentDescription& toconfig);
+static ResourceDeploymentDescription
+resource_deployment_descr (
+const ::Deployment::ResourceDeploymentDescription &src);
+
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
index 61f6e58352a..16d6697c509 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
@@ -10,15 +10,15 @@ namespace CIAO
   namespace Config_Handlers
   {
     //    IDREF_Base CB_Handler::IDREF;
-    
-    bool 
+
+    bool
     CB_Handler::connection_band (const ConnectionBandsDef &src,
                                  ::CIAO::DAnCE::ORS_ConnectionBands &dest)
     {
       // Set the number of bands
       CORBA::ULong num (dest.bands.length ());
       dest.bands.length (num + src.count_band ());
-      
+
       for (ConnectionBandsDef::band_const_iterator i = src.begin_band ();
            i != src.end_band ();
            ++i)
@@ -27,7 +27,7 @@ namespace CIAO
           dest.bands[num].high = static_cast < ACE_INT32 > (i->high ());
           num++;
         }
-      
+
       if (src.id_p ())
         {
           /*
@@ -37,16 +37,16 @@ namespace CIAO
           */
           dest.Id = CORBA::string_dup (src.id ().c_str ());
         }
-      
+
       return true;
     }
-    
 
-    ConnectionBandsDef 
+
+    ConnectionBandsDef
     CB_Handler::connection_band (const ::CIAO::DAnCE::ORS_ConnectionBands &src)
     {
       ConnectionBandsDef cb;
-      
+
       for (CORBA::ULong i = 0;
            i < src.bands.length ();
            ++i)
@@ -54,18 +54,18 @@ namespace CIAO
           cb.add_band (PriorityBandDef (src.bands[i].low,
                                         src.bands[i].high));
         }
-      
+
       /*
       ACE_CString cstr;
       if (CB_Handler::IDREF.find_ref (src, cstr))
         cb->id (cstr.c_str ());
       */
-      
+
       if (src.Id.in () != 0)
         cb.id (src.Id.in ());
-      
+
       return cb;
     }
-    
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
index 338a21e134c..e72bbe18ee8 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
@@ -1,7 +1,7 @@
 /**
  * @file CB_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * $Id$
  */
 
@@ -22,26 +22,26 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ConnectionBandsDef;
+
+    /*
+     * @class CB_Handler
+     * A brief Handler class for <ConnectionBands>
+     */
+
+    class RT_CCM_Handlers_Export CB_Handler
     {
-	class ConnectionBandsDef;
-
-	/*
-	 * @class CB_Handler
-	 * A brief Handler class for <ConnectionBands>
-	 */
-
-	class RT_CCM_Handlers_Export CB_Handler
-	{
-        public:
-          static bool connection_band (const ConnectionBandsDef &src,
-                                       ::CIAO::DAnCE::ORS_ConnectionBands &dest);
-          
-          static ConnectionBandsDef connection_band (const ::CIAO::DAnCE::ORS_ConnectionBands &src);
-          
-          //          static IDREF_Base<::CIAO::DAnCE::ORS_ConnectionBands> IDREF;
-	};
-    }
+    public:
+      static bool connection_band (const ConnectionBandsDef &src,
+                                   ::CIAO::DAnCE::ORS_ConnectionBands &dest);
+
+      static ConnectionBandsDef connection_band (const ::CIAO::DAnCE::ORS_ConnectionBands &src);
+
+      //          static IDREF_Base<::CIAO::DAnCE::ORS_ConnectionBands> IDREF;
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index 67f26438d49..af9d71cfbee 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.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 "CIAOServerResources.hpp"
 
 namespace CIAO
@@ -16,12 +16,12 @@ namespace CIAO
   namespace Config_Handlers
   {
     // ServerResourcesDef
-    // 
+    //
 
     ServerResourcesDef::
     ServerResourcesDef (::CIAO::Config_Handlers::ORBConfigs const& orbConfigs__)
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     orbConfigs_ (new ::CIAO::Config_Handlers::ORBConfigs (orbConfigs__)),
     regulator__ ()
     {
@@ -63,7 +63,7 @@ namespace CIAO
 
 
     // ServerResourcesDef
-    // 
+    //
     bool ServerResourcesDef::
     cmdline_p () const
     {
@@ -92,7 +92,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    // 
+    //
     bool ServerResourcesDef::
     svcconf_p () const
     {
@@ -121,7 +121,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    // 
+    //
     ::CIAO::Config_Handlers::ORBConfigs const& ServerResourcesDef::
     orbConfigs () const
     {
@@ -135,7 +135,7 @@ namespace CIAO
     }
 
     // ServerResourcesDef
-    // 
+    //
     bool ServerResourcesDef::
     id_p () const
     {
@@ -171,12 +171,12 @@ namespace CIAO
 
 
     // ServerCmdlineOptions
-    // 
+    //
 
     ServerCmdlineOptions::
     ServerCmdlineOptions ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -205,7 +205,7 @@ namespace CIAO
 
 
     // ServerCmdlineOptions
-    // 
+    //
     ServerCmdlineOptions::arg_iterator ServerCmdlineOptions::
     begin_arg ()
     {
@@ -244,12 +244,12 @@ namespace CIAO
 
 
     // ACESvcConf
-    // 
+    //
 
     ACESvcConf::
     ACESvcConf ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -275,7 +275,7 @@ namespace CIAO
 
 
     // ACESvcConf
-    // 
+    //
     bool ACESvcConf::
     uri_p () const
     {
@@ -305,12 +305,12 @@ namespace CIAO
 
 
     // ORBConfigs
-    // 
+    //
 
     ORBConfigs::
     ORBConfigs ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -344,7 +344,7 @@ namespace CIAO
 
 
     // ORBConfigs
-    // 
+    //
     bool ORBConfigs::
     resources_p () const
     {
@@ -373,7 +373,7 @@ namespace CIAO
     }
 
     // ORBConfigs
-    // 
+    //
     ORBConfigs::policySet_iterator ORBConfigs::
     begin_policySet ()
     {
@@ -412,12 +412,12 @@ namespace CIAO
 
 
     // ORBResources
-    // 
+    //
 
     ORBResources::
     ORBResources ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -464,7 +464,7 @@ namespace CIAO
 
 
     // ORBResources
-    // 
+    //
     ORBResources::threadpool_iterator ORBResources::
     begin_threadpool ()
     {
@@ -502,7 +502,7 @@ namespace CIAO
     }
 
     // ORBResources
-    // 
+    //
     ORBResources::threadpoolWithLanes_iterator ORBResources::
     begin_threadpoolWithLanes ()
     {
@@ -540,7 +540,7 @@ namespace CIAO
     }
 
     // ORBResources
-    // 
+    //
     ORBResources::connectionBands_iterator ORBResources::
     begin_connectionBands ()
     {
@@ -579,11 +579,11 @@ namespace CIAO
 
 
     // Priority
-    // 
+    //
 
     Priority::
     Priority (::XMLSchema::int_ const& b__)
-    : 
+    :
     Base__ (b__),
     regulator__ ()
     {
@@ -608,7 +608,7 @@ namespace CIAO
 
 
     // ThreadpoolDef
-    // 
+    //
 
     ThreadpoolDef::
     ThreadpoolDef (::XMLSchema::unsignedLong const& stacksize__,
@@ -618,8 +618,8 @@ namespace CIAO
                    ::XMLSchema::boolean const& allow_request_buffering__,
                    ::XMLSchema::unsignedLong const& max_buffered_requests__,
                    ::XMLSchema::unsignedLong const& max_request_buffered_size__)
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     stacksize_ (new ::XMLSchema::unsignedLong (stacksize__)),
     static_threads_ (new ::XMLSchema::unsignedLong (static_threads__)),
     dynamic_threads_ (new ::XMLSchema::unsignedLong (dynamic_threads__)),
@@ -687,7 +687,7 @@ namespace CIAO
 
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     stacksize () const
     {
@@ -701,7 +701,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     static_threads () const
     {
@@ -715,7 +715,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     dynamic_threads () const
     {
@@ -729,7 +729,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::CIAO::Config_Handlers::Priority const& ThreadpoolDef::
     default_priority () const
     {
@@ -743,7 +743,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::boolean const& ThreadpoolDef::
     allow_request_buffering () const
     {
@@ -757,7 +757,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     max_buffered_requests () const
     {
@@ -771,7 +771,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolDef::
     max_request_buffered_size () const
     {
@@ -785,7 +785,7 @@ namespace CIAO
     }
 
     // ThreadpoolDef
-    // 
+    //
     bool ThreadpoolDef::
     id_p () const
     {
@@ -821,7 +821,7 @@ namespace CIAO
 
 
     // ThreadpoolWithLanesDef
-    // 
+    //
 
     ThreadpoolWithLanesDef::
     ThreadpoolWithLanesDef (::XMLSchema::unsignedLong const& stacksize__,
@@ -829,8 +829,8 @@ namespace CIAO
                             ::XMLSchema::boolean const& allow_request_buffering__,
                             ::XMLSchema::unsignedLong const& max_buffered_requests__,
                             ::XMLSchema::unsignedLong const& max_request_buffered_size__)
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     stacksize_ (new ::XMLSchema::unsignedLong (stacksize__)),
     allow_borrowing_ (new ::XMLSchema::boolean (allow_borrowing__)),
     allow_request_buffering_ (new ::XMLSchema::boolean (allow_request_buffering__)),
@@ -895,7 +895,7 @@ namespace CIAO
 
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ThreadpoolWithLanesDef::threadpoolLane_iterator ThreadpoolWithLanesDef::
     begin_threadpoolLane ()
     {
@@ -933,7 +933,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     stacksize () const
     {
@@ -947,7 +947,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::boolean const& ThreadpoolWithLanesDef::
     allow_borrowing () const
     {
@@ -961,7 +961,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::boolean const& ThreadpoolWithLanesDef::
     allow_request_buffering () const
     {
@@ -975,7 +975,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     max_buffered_requests () const
     {
@@ -989,7 +989,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolWithLanesDef::
     max_request_buffered_size () const
     {
@@ -1003,7 +1003,7 @@ namespace CIAO
     }
 
     // ThreadpoolWithLanesDef
-    // 
+    //
     bool ThreadpoolWithLanesDef::
     id_p () const
     {
@@ -1039,14 +1039,14 @@ namespace CIAO
 
 
     // ThreadpoolLaneDef
-    // 
+    //
 
     ThreadpoolLaneDef::
     ThreadpoolLaneDef (::XMLSchema::unsignedLong const& static_threads__,
                        ::XMLSchema::unsignedLong const& dynamic_threads__,
                        ::CIAO::Config_Handlers::Priority const& priority__)
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     static_threads_ (new ::XMLSchema::unsignedLong (static_threads__)),
     dynamic_threads_ (new ::XMLSchema::unsignedLong (dynamic_threads__)),
     priority_ (new ::CIAO::Config_Handlers::Priority (priority__)),
@@ -1085,7 +1085,7 @@ namespace CIAO
 
 
     // ThreadpoolLaneDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolLaneDef::
     static_threads () const
     {
@@ -1099,7 +1099,7 @@ namespace CIAO
     }
 
     // ThreadpoolLaneDef
-    // 
+    //
     ::XMLSchema::unsignedLong const& ThreadpoolLaneDef::
     dynamic_threads () const
     {
@@ -1113,7 +1113,7 @@ namespace CIAO
     }
 
     // ThreadpoolLaneDef
-    // 
+    //
     ::CIAO::Config_Handlers::Priority const& ThreadpoolLaneDef::
     priority () const
     {
@@ -1128,12 +1128,12 @@ namespace CIAO
 
 
     // ConnectionBandsDef
-    // 
+    //
 
     ConnectionBandsDef::
     ConnectionBandsDef ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -1168,7 +1168,7 @@ namespace CIAO
 
 
     // ConnectionBandsDef
-    // 
+    //
     ConnectionBandsDef::band_iterator ConnectionBandsDef::
     begin_band ()
     {
@@ -1206,7 +1206,7 @@ namespace CIAO
     }
 
     // ConnectionBandsDef
-    // 
+    //
     bool ConnectionBandsDef::
     id_p () const
     {
@@ -1242,13 +1242,13 @@ namespace CIAO
 
 
     // PriorityBandDef
-    // 
+    //
 
     PriorityBandDef::
     PriorityBandDef (::XMLSchema::int_ const& low__,
                      ::XMLSchema::int_ const& high__)
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     low_ (new ::XMLSchema::int_ (low__)),
     high_ (new ::XMLSchema::int_ (high__)),
     regulator__ ()
@@ -1281,7 +1281,7 @@ namespace CIAO
 
 
     // PriorityBandDef
-    // 
+    //
     ::XMLSchema::int_ const& PriorityBandDef::
     low () const
     {
@@ -1295,7 +1295,7 @@ namespace CIAO
     }
 
     // PriorityBandDef
-    // 
+    //
     ::XMLSchema::int_ const& PriorityBandDef::
     high () const
     {
@@ -1310,12 +1310,12 @@ namespace CIAO
 
 
     // PolicySet
-    // 
+    //
 
     PolicySet::
     PolicySet ()
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     regulator__ ()
     {
     }
@@ -1368,7 +1368,7 @@ namespace CIAO
 
 
     // PolicySet
-    // 
+    //
     PolicySet::priorityModel_iterator PolicySet::
     begin_priorityModel ()
     {
@@ -1406,7 +1406,7 @@ namespace CIAO
     }
 
     // PolicySet
-    // 
+    //
     PolicySet::threadpool_iterator PolicySet::
     begin_threadpool ()
     {
@@ -1444,7 +1444,7 @@ namespace CIAO
     }
 
     // PolicySet
-    // 
+    //
     PolicySet::priorityBandedConnection_iterator PolicySet::
     begin_priorityBandedConnection ()
     {
@@ -1482,7 +1482,7 @@ namespace CIAO
     }
 
     // PolicySet
-    // 
+    //
     bool PolicySet::
     id_p () const
     {
@@ -1518,7 +1518,7 @@ namespace CIAO
 
 
     // PriorityModel
-    // 
+    //
 
     PriorityModel::Value PriorityModel::
     integral () const
@@ -1545,12 +1545,12 @@ namespace CIAO
     }
 
     // PriorityModelPolicyDef
-    // 
+    //
 
     PriorityModelPolicyDef::
     PriorityModelPolicyDef (::CIAO::Config_Handlers::PriorityModel const& priority_model__)
-    : 
-    ::XSCRT::Type (), 
+    :
+    ::XSCRT::Type (),
     priority_model_ (new ::CIAO::Config_Handlers::PriorityModel (priority_model__)),
     regulator__ ()
     {
@@ -1582,7 +1582,7 @@ namespace CIAO
 
 
     // PriorityModelPolicyDef
-    // 
+    //
     ::CIAO::Config_Handlers::PriorityModel const& PriorityModelPolicyDef::
     priority_model () const
     {
@@ -1596,7 +1596,7 @@ namespace CIAO
     }
 
     // PriorityModelPolicyDef
-    // 
+    //
     bool PriorityModelPolicyDef::
     server_priority_p () const
     {
@@ -1669,7 +1669,7 @@ namespace CIAO
           orbConfigs_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1684,7 +1684,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1711,7 +1711,7 @@ namespace CIAO
           add_arg (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1738,7 +1738,7 @@ namespace CIAO
           uri (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1771,7 +1771,7 @@ namespace CIAO
           add_policySet (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1810,7 +1810,7 @@ namespace CIAO
           add_connectionBands (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1890,7 +1890,7 @@ namespace CIAO
           max_request_buffered_size_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1905,7 +1905,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1962,7 +1962,7 @@ namespace CIAO
           max_request_buffered_size_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -1977,7 +1977,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2016,7 +2016,7 @@ namespace CIAO
           priority_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2043,7 +2043,7 @@ namespace CIAO
           add_band (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2058,7 +2058,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2091,7 +2091,7 @@ namespace CIAO
           high_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2130,7 +2130,7 @@ namespace CIAO
           add_priorityBandedConnection (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2145,7 +2145,7 @@ namespace CIAO
           id (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2162,7 +2162,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
       else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
-      else 
+      else
       {
       }
     }
@@ -2175,7 +2175,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
       else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
-      else 
+      else
       {
       }
     }
@@ -2204,7 +2204,7 @@ namespace CIAO
           priority_model_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -2219,7 +2219,7 @@ namespace CIAO
           server_priority (t);
         }
 
-        else 
+        else
         {
         }
       }
@@ -4983,7 +4983,7 @@ namespace CIAO
 
         if (o == ::CIAO::Config_Handlers::PriorityModel::SERVER_DECLARED) s = "SERVER_DECLARED";
         else if (o == ::CIAO::Config_Handlers::PriorityModel::CLIENT_PROPAGATED) s = "CLIENT_PROPAGATED";
-        else 
+        else
         {
         }
 
@@ -5071,7 +5071,7 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::PolicySet,
       virtual ::CIAO::Config_Handlers::Writer::PriorityModelPolicyDef,
       virtual ::CIAO::Config_Handlers::Writer::PriorityModel,
-      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
+      virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index cceaf787891..c649330c480 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -3,7 +3,7 @@
  *
  * 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>
@@ -12,7 +12,7 @@
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -60,7 +60,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // cmdline
-      // 
+      //
       public:
       bool cmdline_p () const;
       ::CIAO::Config_Handlers::ServerCmdlineOptions const& cmdline () const;
@@ -70,7 +70,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ServerCmdlineOptions > cmdline_;
 
       // svcconf
-      // 
+      //
       public:
       bool svcconf_p () const;
       ::CIAO::Config_Handlers::ACESvcConf const& svcconf () const;
@@ -80,7 +80,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ACESvcConf > svcconf_;
 
       // orbConfigs
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ORBConfigs const& orbConfigs () const;
       void orbConfigs (::CIAO::Config_Handlers::ORBConfigs const& );
@@ -89,7 +89,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ORBConfigs > orbConfigs_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -119,7 +119,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // arg
-      // 
+      //
       public:
       typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator arg_iterator;
       typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator arg_const_iterator;
@@ -153,7 +153,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // uri
-      // 
+      //
       public:
       bool uri_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& uri () const;
@@ -182,7 +182,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resources
-      // 
+      //
       public:
       bool resources_p () const;
       ::CIAO::Config_Handlers::ORBResources const& resources () const;
@@ -192,7 +192,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ORBResources > resources_;
 
       // policySet
-      // 
+      //
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::iterator policySet_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::const_iterator policySet_const_iterator;
@@ -226,7 +226,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // threadpool
-      // 
+      //
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::iterator threadpool_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::const_iterator threadpool_const_iterator;
@@ -241,7 +241,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef > threadpool_;
 
       // threadpoolWithLanes
-      // 
+      //
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::iterator threadpoolWithLanes_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::const_iterator threadpoolWithLanes_const_iterator;
@@ -256,7 +256,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef > threadpoolWithLanes_;
 
       // connectionBands
-      // 
+      //
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::iterator connectionBands_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::const_iterator connectionBands_const_iterator;
@@ -309,7 +309,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // stacksize
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& stacksize () const;
       void stacksize (::XMLSchema::unsignedLong const& );
@@ -318,7 +318,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > stacksize_;
 
       // static_threads
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& static_threads () const;
       void static_threads (::XMLSchema::unsignedLong const& );
@@ -327,7 +327,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > static_threads_;
 
       // dynamic_threads
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& dynamic_threads () const;
       void dynamic_threads (::XMLSchema::unsignedLong const& );
@@ -336,7 +336,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > dynamic_threads_;
 
       // default_priority
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Priority const& default_priority () const;
       void default_priority (::CIAO::Config_Handlers::Priority const& );
@@ -345,7 +345,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Priority > default_priority_;
 
       // allow_request_buffering
-      // 
+      //
       public:
       ::XMLSchema::boolean const& allow_request_buffering () const;
       void allow_request_buffering (::XMLSchema::boolean const& );
@@ -354,7 +354,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > allow_request_buffering_;
 
       // max_buffered_requests
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& max_buffered_requests () const;
       void max_buffered_requests (::XMLSchema::unsignedLong const& );
@@ -363,7 +363,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_buffered_requests_;
 
       // max_request_buffered_size
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& max_request_buffered_size () const;
       void max_request_buffered_size (::XMLSchema::unsignedLong const& );
@@ -372,7 +372,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_request_buffered_size_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -408,7 +408,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // threadpoolLane
-      // 
+      //
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::iterator threadpoolLane_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::const_iterator threadpoolLane_const_iterator;
@@ -423,7 +423,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef > threadpoolLane_;
 
       // stacksize
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& stacksize () const;
       void stacksize (::XMLSchema::unsignedLong const& );
@@ -432,7 +432,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > stacksize_;
 
       // allow_borrowing
-      // 
+      //
       public:
       ::XMLSchema::boolean const& allow_borrowing () const;
       void allow_borrowing (::XMLSchema::boolean const& );
@@ -441,7 +441,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > allow_borrowing_;
 
       // allow_request_buffering
-      // 
+      //
       public:
       ::XMLSchema::boolean const& allow_request_buffering () const;
       void allow_request_buffering (::XMLSchema::boolean const& );
@@ -450,7 +450,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > allow_request_buffering_;
 
       // max_buffered_requests
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& max_buffered_requests () const;
       void max_buffered_requests (::XMLSchema::unsignedLong const& );
@@ -459,7 +459,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_buffered_requests_;
 
       // max_request_buffered_size
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& max_request_buffered_size () const;
       void max_request_buffered_size (::XMLSchema::unsignedLong const& );
@@ -468,7 +468,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > max_request_buffered_size_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -502,7 +502,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // static_threads
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& static_threads () const;
       void static_threads (::XMLSchema::unsignedLong const& );
@@ -511,7 +511,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > static_threads_;
 
       // dynamic_threads
-      // 
+      //
       public:
       ::XMLSchema::unsignedLong const& dynamic_threads () const;
       void dynamic_threads (::XMLSchema::unsignedLong const& );
@@ -520,7 +520,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > dynamic_threads_;
 
       // priority
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Priority const& priority () const;
       void priority (::CIAO::Config_Handlers::Priority const& );
@@ -550,7 +550,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // band
-      // 
+      //
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::iterator band_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::const_iterator band_const_iterator;
@@ -565,7 +565,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::PriorityBandDef > band_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -595,7 +595,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // low
-      // 
+      //
       public:
       ::XMLSchema::int_ const& low () const;
       void low (::XMLSchema::int_ const& );
@@ -604,7 +604,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::int_ > low_;
 
       // high
-      // 
+      //
       public:
       ::XMLSchema::int_ const& high () const;
       void high (::XMLSchema::int_ const& );
@@ -633,7 +633,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // priorityModel
-      // 
+      //
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::iterator priorityModel_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::const_iterator priorityModel_const_iterator;
@@ -648,7 +648,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef > priorityModel_;
 
       // threadpool
-      // 
+      //
       public:
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator threadpool_iterator;
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator threadpool_const_iterator;
@@ -663,7 +663,7 @@ namespace CIAO
       ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > threadpool_;
 
       // priorityBandedConnection
-      // 
+      //
       public:
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator priorityBandedConnection_iterator;
       typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator priorityBandedConnection_const_iterator;
@@ -678,7 +678,7 @@ namespace CIAO
       ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > priorityBandedConnection_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -720,10 +720,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool RT_CCM_Handlers_Export 
+      friend bool RT_CCM_Handlers_Export
       operator== (PriorityModel const& a, PriorityModel const& b);
 
-      friend bool RT_CCM_Handlers_Export 
+      friend bool RT_CCM_Handlers_Export
       operator!= (PriorityModel const& a, PriorityModel const& b);
 
       private:
@@ -743,7 +743,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // priority_model
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::PriorityModel const& priority_model () const;
       void priority_model (::CIAO::Config_Handlers::PriorityModel const& );
@@ -752,7 +752,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::PriorityModel > priority_model_;
 
       // server_priority
-      // 
+      //
       public:
       bool server_priority_p () const;
       ::CIAO::Config_Handlers::Priority const& server_priority () const;
@@ -1593,13 +1593,13 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct ServerResourcesDef : Traversal::ServerResourcesDef, 
+      struct ServerResourcesDef : Traversal::ServerResourcesDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ServerResourcesDef Type;
         ServerResourcesDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1610,7 +1610,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         cmdline (Type &o)
         {
 
@@ -1621,7 +1621,7 @@ namespace CIAO
         virtual void
         cmdline (Type const&);
 
-        virtual void 
+        virtual void
         svcconf (Type &o)
         {
 
@@ -1632,7 +1632,7 @@ namespace CIAO
         virtual void
         svcconf (Type const&);
 
-        virtual void 
+        virtual void
         orbConfigs (Type &o)
         {
 
@@ -1643,7 +1643,7 @@ namespace CIAO
         virtual void
         orbConfigs (Type const&);
 
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -1658,13 +1658,13 @@ namespace CIAO
         ServerResourcesDef ();
       };
 
-      struct ServerCmdlineOptions : Traversal::ServerCmdlineOptions, 
+      struct ServerCmdlineOptions : Traversal::ServerCmdlineOptions,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ServerCmdlineOptions Type;
         ServerCmdlineOptions (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1675,7 +1675,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         arg_pre (Type &o)
         {
 
@@ -1686,7 +1686,7 @@ namespace CIAO
         virtual void
         arg_pre (Type const&);
 
-        virtual void 
+        virtual void
         arg_next (Type &o)
         {
 
@@ -1697,7 +1697,7 @@ namespace CIAO
         virtual void
         arg_next (Type const&);
 
-        virtual void 
+        virtual void
         arg_post (Type &o)
         {
 
@@ -1712,13 +1712,13 @@ namespace CIAO
         ServerCmdlineOptions ();
       };
 
-      struct ACESvcConf : Traversal::ACESvcConf, 
+      struct ACESvcConf : Traversal::ACESvcConf,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ACESvcConf Type;
         ACESvcConf (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1729,7 +1729,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         uri (Type &o)
         {
 
@@ -1744,13 +1744,13 @@ namespace CIAO
         ACESvcConf ();
       };
 
-      struct ORBConfigs : Traversal::ORBConfigs, 
+      struct ORBConfigs : Traversal::ORBConfigs,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ORBConfigs Type;
         ORBConfigs (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1761,7 +1761,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         resources (Type &o)
         {
 
@@ -1772,7 +1772,7 @@ namespace CIAO
         virtual void
         resources (Type const&);
 
-        virtual void 
+        virtual void
         policySet_pre (Type &o)
         {
 
@@ -1783,7 +1783,7 @@ namespace CIAO
         virtual void
         policySet_pre (Type const&);
 
-        virtual void 
+        virtual void
         policySet_next (Type &o)
         {
 
@@ -1794,7 +1794,7 @@ namespace CIAO
         virtual void
         policySet_next (Type const&);
 
-        virtual void 
+        virtual void
         policySet_post (Type &o)
         {
 
@@ -1809,13 +1809,13 @@ namespace CIAO
         ORBConfigs ();
       };
 
-      struct ORBResources : Traversal::ORBResources, 
+      struct ORBResources : Traversal::ORBResources,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ORBResources Type;
         ORBResources (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1826,7 +1826,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         threadpool_pre (Type &o)
         {
 
@@ -1837,7 +1837,7 @@ namespace CIAO
         virtual void
         threadpool_pre (Type const&);
 
-        virtual void 
+        virtual void
         threadpool_next (Type &o)
         {
 
@@ -1848,7 +1848,7 @@ namespace CIAO
         virtual void
         threadpool_next (Type const&);
 
-        virtual void 
+        virtual void
         threadpool_post (Type &o)
         {
 
@@ -1859,7 +1859,7 @@ namespace CIAO
         virtual void
         threadpool_post (Type const&);
 
-        virtual void 
+        virtual void
         threadpoolWithLanes_pre (Type &o)
         {
 
@@ -1870,7 +1870,7 @@ namespace CIAO
         virtual void
         threadpoolWithLanes_pre (Type const&);
 
-        virtual void 
+        virtual void
         threadpoolWithLanes_next (Type &o)
         {
 
@@ -1881,7 +1881,7 @@ namespace CIAO
         virtual void
         threadpoolWithLanes_next (Type const&);
 
-        virtual void 
+        virtual void
         threadpoolWithLanes_post (Type &o)
         {
 
@@ -1892,7 +1892,7 @@ namespace CIAO
         virtual void
         threadpoolWithLanes_post (Type const&);
 
-        virtual void 
+        virtual void
         connectionBands_pre (Type &o)
         {
 
@@ -1903,7 +1903,7 @@ namespace CIAO
         virtual void
         connectionBands_pre (Type const&);
 
-        virtual void 
+        virtual void
         connectionBands_next (Type &o)
         {
 
@@ -1914,7 +1914,7 @@ namespace CIAO
         virtual void
         connectionBands_next (Type const&);
 
-        virtual void 
+        virtual void
         connectionBands_post (Type &o)
         {
 
@@ -1929,13 +1929,13 @@ namespace CIAO
         ORBResources ();
       };
 
-      struct Priority : Traversal::Priority, 
+      struct Priority : Traversal::Priority,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Priority Type;
         Priority (::XSCRT::XML::Element< ACE_TCHAR >&);
-	
-        virtual void 
+
+        virtual void
         traverse (Type &o)
         {
 
@@ -1950,13 +1950,13 @@ namespace CIAO
         Priority ();
       };
 
-      struct ThreadpoolDef : Traversal::ThreadpoolDef, 
+      struct ThreadpoolDef : Traversal::ThreadpoolDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ThreadpoolDef Type;
         ThreadpoolDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -1967,7 +1967,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         stacksize (Type &o)
         {
 
@@ -1978,7 +1978,7 @@ namespace CIAO
         virtual void
         stacksize (Type const&);
 
-        virtual void 
+        virtual void
         static_threads (Type &o)
         {
 
@@ -1989,7 +1989,7 @@ namespace CIAO
         virtual void
         static_threads (Type const&);
 
-        virtual void 
+        virtual void
         dynamic_threads (Type &o)
         {
 
@@ -2000,7 +2000,7 @@ namespace CIAO
         virtual void
         dynamic_threads (Type const&);
 
-        virtual void 
+        virtual void
         default_priority (Type &o)
         {
 
@@ -2011,7 +2011,7 @@ namespace CIAO
         virtual void
         default_priority (Type const&);
 
-        virtual void 
+        virtual void
         allow_request_buffering (Type &o)
         {
 
@@ -2022,7 +2022,7 @@ namespace CIAO
         virtual void
         allow_request_buffering (Type const&);
 
-        virtual void 
+        virtual void
         max_buffered_requests (Type &o)
         {
 
@@ -2033,7 +2033,7 @@ namespace CIAO
         virtual void
         max_buffered_requests (Type const&);
 
-        virtual void 
+        virtual void
         max_request_buffered_size (Type &o)
         {
 
@@ -2044,7 +2044,7 @@ namespace CIAO
         virtual void
         max_request_buffered_size (Type const&);
 
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2059,13 +2059,13 @@ namespace CIAO
         ThreadpoolDef ();
       };
 
-      struct ThreadpoolWithLanesDef : Traversal::ThreadpoolWithLanesDef, 
+      struct ThreadpoolWithLanesDef : Traversal::ThreadpoolWithLanesDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ThreadpoolWithLanesDef Type;
         ThreadpoolWithLanesDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2076,7 +2076,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         threadpoolLane_pre (Type &o)
         {
 
@@ -2087,7 +2087,7 @@ namespace CIAO
         virtual void
         threadpoolLane_pre (Type const&);
 
-        virtual void 
+        virtual void
         threadpoolLane_next (Type &o)
         {
 
@@ -2098,7 +2098,7 @@ namespace CIAO
         virtual void
         threadpoolLane_next (Type const&);
 
-        virtual void 
+        virtual void
         threadpoolLane_post (Type &o)
         {
 
@@ -2109,7 +2109,7 @@ namespace CIAO
         virtual void
         threadpoolLane_post (Type const&);
 
-        virtual void 
+        virtual void
         stacksize (Type &o)
         {
 
@@ -2120,7 +2120,7 @@ namespace CIAO
         virtual void
         stacksize (Type const&);
 
-        virtual void 
+        virtual void
         allow_borrowing (Type &o)
         {
 
@@ -2131,7 +2131,7 @@ namespace CIAO
         virtual void
         allow_borrowing (Type const&);
 
-        virtual void 
+        virtual void
         allow_request_buffering (Type &o)
         {
 
@@ -2142,7 +2142,7 @@ namespace CIAO
         virtual void
         allow_request_buffering (Type const&);
 
-        virtual void 
+        virtual void
         max_buffered_requests (Type &o)
         {
 
@@ -2153,7 +2153,7 @@ namespace CIAO
         virtual void
         max_buffered_requests (Type const&);
 
-        virtual void 
+        virtual void
         max_request_buffered_size (Type &o)
         {
 
@@ -2164,7 +2164,7 @@ namespace CIAO
         virtual void
         max_request_buffered_size (Type const&);
 
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2179,13 +2179,13 @@ namespace CIAO
         ThreadpoolWithLanesDef ();
       };
 
-      struct ThreadpoolLaneDef : Traversal::ThreadpoolLaneDef, 
+      struct ThreadpoolLaneDef : Traversal::ThreadpoolLaneDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ThreadpoolLaneDef Type;
         ThreadpoolLaneDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2196,7 +2196,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         static_threads (Type &o)
         {
 
@@ -2207,7 +2207,7 @@ namespace CIAO
         virtual void
         static_threads (Type const&);
 
-        virtual void 
+        virtual void
         dynamic_threads (Type &o)
         {
 
@@ -2218,7 +2218,7 @@ namespace CIAO
         virtual void
         dynamic_threads (Type const&);
 
-        virtual void 
+        virtual void
         priority (Type &o)
         {
 
@@ -2233,13 +2233,13 @@ namespace CIAO
         ThreadpoolLaneDef ();
       };
 
-      struct ConnectionBandsDef : Traversal::ConnectionBandsDef, 
+      struct ConnectionBandsDef : Traversal::ConnectionBandsDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::ConnectionBandsDef Type;
         ConnectionBandsDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2250,7 +2250,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         band_pre (Type &o)
         {
 
@@ -2261,7 +2261,7 @@ namespace CIAO
         virtual void
         band_pre (Type const&);
 
-        virtual void 
+        virtual void
         band_next (Type &o)
         {
 
@@ -2272,7 +2272,7 @@ namespace CIAO
         virtual void
         band_next (Type const&);
 
-        virtual void 
+        virtual void
         band_post (Type &o)
         {
 
@@ -2283,7 +2283,7 @@ namespace CIAO
         virtual void
         band_post (Type const&);
 
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2298,13 +2298,13 @@ namespace CIAO
         ConnectionBandsDef ();
       };
 
-      struct PriorityBandDef : Traversal::PriorityBandDef, 
+      struct PriorityBandDef : Traversal::PriorityBandDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PriorityBandDef Type;
         PriorityBandDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2315,7 +2315,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         low (Type &o)
         {
 
@@ -2326,7 +2326,7 @@ namespace CIAO
         virtual void
         low (Type const&);
 
-        virtual void 
+        virtual void
         high (Type &o)
         {
 
@@ -2341,13 +2341,13 @@ namespace CIAO
         PriorityBandDef ();
       };
 
-      struct PolicySet : Traversal::PolicySet, 
+      struct PolicySet : Traversal::PolicySet,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PolicySet Type;
         PolicySet (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2358,7 +2358,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         priorityModel_pre (Type &o)
         {
 
@@ -2369,7 +2369,7 @@ namespace CIAO
         virtual void
         priorityModel_pre (Type const&);
 
-        virtual void 
+        virtual void
         priorityModel_next (Type &o)
         {
 
@@ -2380,7 +2380,7 @@ namespace CIAO
         virtual void
         priorityModel_next (Type const&);
 
-        virtual void 
+        virtual void
         priorityModel_post (Type &o)
         {
 
@@ -2391,7 +2391,7 @@ namespace CIAO
         virtual void
         priorityModel_post (Type const&);
 
-        virtual void 
+        virtual void
         threadpool_pre (Type &o)
         {
 
@@ -2402,7 +2402,7 @@ namespace CIAO
         virtual void
         threadpool_pre (Type const&);
 
-        virtual void 
+        virtual void
         threadpool_next (Type &o)
         {
 
@@ -2413,7 +2413,7 @@ namespace CIAO
         virtual void
         threadpool_next (Type const&);
 
-        virtual void 
+        virtual void
         threadpool_post (Type &o)
         {
 
@@ -2424,7 +2424,7 @@ namespace CIAO
         virtual void
         threadpool_post (Type const&);
 
-        virtual void 
+        virtual void
         priorityBandedConnection_pre (Type &o)
         {
 
@@ -2435,7 +2435,7 @@ namespace CIAO
         virtual void
         priorityBandedConnection_pre (Type const&);
 
-        virtual void 
+        virtual void
         priorityBandedConnection_next (Type &o)
         {
 
@@ -2446,7 +2446,7 @@ namespace CIAO
         virtual void
         priorityBandedConnection_next (Type const&);
 
-        virtual void 
+        virtual void
         priorityBandedConnection_post (Type &o)
         {
 
@@ -2457,7 +2457,7 @@ namespace CIAO
         virtual void
         priorityBandedConnection_post (Type const&);
 
-        virtual void 
+        virtual void
         id (Type &o)
         {
 
@@ -2472,7 +2472,7 @@ namespace CIAO
         PolicySet ();
       };
 
-      struct PriorityModel : Traversal::PriorityModel, 
+      struct PriorityModel : Traversal::PriorityModel,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         PriorityModel (::XSCRT::XML::Element< ACE_TCHAR >&);
@@ -2490,13 +2490,13 @@ namespace CIAO
         PriorityModel ();
       };
 
-      struct PriorityModelPolicyDef : Traversal::PriorityModelPolicyDef, 
+      struct PriorityModelPolicyDef : Traversal::PriorityModelPolicyDef,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::PriorityModelPolicyDef Type;
         PriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        virtual void
         traverse (Type &o)
         {
 
@@ -2507,7 +2507,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void 
+        virtual void
         priority_model (Type &o)
         {
 
@@ -2518,7 +2518,7 @@ namespace CIAO
         virtual void
         priority_model (Type const&);
 
-        virtual void 
+        virtual void
         server_priority (Type &o)
         {
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
index c810c4e44ea..188289de3f9 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
@@ -6,40 +6,40 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    bool CLA_Handler::commandline_arguments (const ServerResourcesDef &src,
+                                             ::CIAO::DAnCE::CommandlineArgs &dest)
     {
-	bool CLA_Handler::commandline_arguments (const ServerResourcesDef &src,
-                                                 ::CIAO::DAnCE::CommandlineArgs &dest)
-	{
-	    ServerCmdlineOptions sco = src.cmdline();
-	   
-	    for(ServerCmdlineOptions::arg_iterator loc = sco.begin_arg();
-		loc != sco.end_arg();
-		loc++)
-	    {
-		CORBA::ULong len = dest.length();
-
-		dest.length(len+1);
-                
-                dest[len] = CORBA::string_dup (loc->c_str ());
-	    }
-
-	    return true;	
-	}
-
-        ServerCmdlineOptions
-	CLA_Handler::commandline_argument (const CIAO::DAnCE::CommandlineArgs &src)
-	{
-          ServerCmdlineOptions co;
-          
-          for  (CORBA::ULong i = 0;
-                i < src.length ();
-                ++i)
-            {
-              co.add_arg (src[i].in ());
-            }
-          
-          return co;
+      ServerCmdlineOptions sco = src.cmdline();
+
+      for(ServerCmdlineOptions::arg_iterator loc = sco.begin_arg();
+          loc != sco.end_arg();
+          loc++)
+        {
+          CORBA::ULong len = dest.length();
+
+          dest.length(len+1);
+
+          dest[len] = CORBA::string_dup (loc->c_str ());
+        }
+
+      return true;
+    }
+
+    ServerCmdlineOptions
+    CLA_Handler::commandline_argument (const CIAO::DAnCE::CommandlineArgs &src)
+    {
+      ServerCmdlineOptions co;
+
+      for  (CORBA::ULong i = 0;
+            i < src.length ();
+            ++i)
+        {
+          co.add_arg (src[i].in ());
         }
+
+      return co;
     }
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
index 13d115a5b2d..ae917f885e5 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
@@ -21,31 +21,31 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 namespace CIAO
-{   
-    namespace Config_Handlers
+{
+  namespace Config_Handlers
+  {
+
+    class ServerResourcesDef;
+    class ServerCmdlineOptions;
+
+    /*
+     * class CLA_Handler
+     * This is a brief Handler class for <CommandlineArg>
+     */
+
+    class RT_CCM_Handlers_Export CLA_Handler
     {
-	
-	class ServerResourcesDef;
-	class ServerCmdlineOptions;
-
-	/*
-	 * class CLA_Handler
-	 * This is a brief Handler class for <CommandlineArg>
-	 */
-	
-	class RT_CCM_Handlers_Export CLA_Handler
-	{
-	public:
-	    static bool
-		commandline_arguments (
-		    const ServerResourcesDef &src,
-		    ::CIAO::DAnCE::CommandlineArgs &dest);
-	    
-	    static ServerCmdlineOptions
-            commandline_argument (const ::CIAO::DAnCE::CommandlineArgs &src);
-
-	};
-    }
+    public:
+      static bool
+      commandline_arguments (
+                             const ServerResourcesDef &src,
+                             ::CIAO::DAnCE::CommandlineArgs &dest);
+
+      static ServerCmdlineOptions
+      commandline_argument (const ::CIAO::DAnCE::CommandlineArgs &src);
+
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
index 1adf552c09e..5a8fc9114f2 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.cpp
@@ -8,45 +8,45 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+
+    bool OC_Handler::orb_config (
+                                 const ORBConfigs &src,
+                                 ::CIAO::DAnCE::ORBConfigs &dest)
     {
+      if (src.resources_p ())
+        OR_Handler::orb_resources (src.resources (), dest.orb_resources);
+
+      CORBA::ULong pos (dest.policy_set.length ());
+
+      dest.policy_set.length (pos + src.count_policySet ());
+
+      for (ORBConfigs::policySet_const_iterator i = src.begin_policySet ();
+           i != src.end_policySet ();
+           ++i)
+        {
+          PS_Handler::policy_set (*i, dest.policy_set[pos++]);
+        }
+
+      return true;
+    }
+
+
+    ORBConfigs OC_Handler::orb_config (
+                                       const ::CIAO::DAnCE::ORBConfigs &src)
+    {
+      ORBConfigs oc;
+
+      oc.resources(OR_Handler::orb_resources (src.orb_resources));
+
+      size_t len = src.policy_set.length();
+      for(size_t i = 0; i < len; i++)
+        {
+          oc.add_policySet (PS_Handler::policy_set (src.policy_set [i]));
+        }
 
-	bool OC_Handler::orb_config (
-	    const ORBConfigs &src,
-	    ::CIAO::DAnCE::ORBConfigs &dest)
-	{
-          if (src.resources_p ())
-            OR_Handler::orb_resources (src.resources (), dest.orb_resources);
-          
-          CORBA::ULong pos (dest.policy_set.length ());
-          
-          dest.policy_set.length (pos + src.count_policySet ());
-          
-          for (ORBConfigs::policySet_const_iterator i = src.begin_policySet ();
-               i != src.end_policySet ();
-               ++i)
-            {
-              PS_Handler::policy_set (*i, dest.policy_set[pos++]);
-            }
-          
-          return true;
-	}
-
-
-	ORBConfigs OC_Handler::orb_config (
-	    const ::CIAO::DAnCE::ORBConfigs &src)
-	{
-          ORBConfigs oc;
-          
-          oc.resources(OR_Handler::orb_resources (src.orb_resources));
-          
-          size_t len = src.policy_set.length();
-          for(size_t i = 0; i < len; i++)
-	    {
-              oc.add_policySet (PS_Handler::policy_set (src.policy_set [i]));
-	    }
-          
-          return oc;
-	}
+      return oc;
     }
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
index ab702e321f9..8360825226e 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
@@ -23,28 +23,28 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ORBConfigs;
+
+    /*
+     * @class OC_Handler
+     *
+     * @brief Handler class for <ORBConfigs>
+     */
+
+    class RT_CCM_Handlers_Export OC_Handler
     {
-	class ORBConfigs;
-
-	/*
-	 * @class OC_Handler
-	 *
-	 * @brief Handler class for <ORBConfigs>
-	 */
-
-	class RT_CCM_Handlers_Export OC_Handler
-	{
-	public:
-          static bool orb_config (const ORBConfigs &src,
-                                  ::CIAO::DAnCE::ORBConfigs &dest);
-          
-	  static ORBConfigs orb_config (const ::CIAO::DAnCE::ORBConfigs &src);
-
-	};
-    }
+    public:
+      static bool orb_config (const ORBConfigs &src,
+                              ::CIAO::DAnCE::ORBConfigs &dest);
+
+      static ORBConfigs orb_config (const ::CIAO::DAnCE::ORBConfigs &src);
+
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
 #endif /* OC_HANDLER_H */
-		
+
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
index d7c750d07cd..5fd8a1b32ff 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp
@@ -9,84 +9,84 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    bool OR_Handler::orb_resources (const ORBResources &src,
+                                    ::CIAO::DAnCE::ORBResources &dest)
     {
-	bool OR_Handler::orb_resources (const ORBResources &src,
-	    ::CIAO::DAnCE::ORBResources &dest)
-	{
-          // We know that there should be only one.
-          dest.length (1);
-          
-          // Set the length of the threadpools
-          CORBA::ULong pos (dest[0].threadpool_list.length ());
-          dest[0].threadpool_list.length (pos + src.count_threadpool ());
-          
-          for (ORBResources::threadpool_const_iterator i = src.begin_threadpool ();
-               i != src.end_threadpool ();
-               ++i)
-            {
-              TP_Handler::thread_pool (*i,
-                                       dest[0].threadpool_list[pos++]);
-	    }
-          
-          pos = dest[0].threadpool_with_lanes_list.length ();
-          dest[0].threadpool_with_lanes_list.length (pos + src.count_threadpoolWithLanes ());
+      // We know that there should be only one.
+      dest.length (1);
 
-          for (ORBResources::threadpoolWithLanes_const_iterator j = src.begin_threadpoolWithLanes();
-		 j != src.end_threadpoolWithLanes();
-		 j++)
-	    {
-		TPL_Handler::threadpool_with_lanes (*j,
-                                                    dest[0].threadpool_with_lanes_list [pos++]);
-	    }
+      // Set the length of the threadpools
+      CORBA::ULong pos (dest[0].threadpool_list.length ());
+      dest[0].threadpool_list.length (pos + src.count_threadpool ());
 
-          pos = dest[0].connection_bands_list.length ();
-          dest[0].connection_bands_list.length (pos + src.count_connectionBands ());
+      for (ORBResources::threadpool_const_iterator i = src.begin_threadpool ();
+           i != src.end_threadpool ();
+           ++i)
+        {
+          TP_Handler::thread_pool (*i,
+                                   dest[0].threadpool_list[pos++]);
+        }
 
-          for (ORBResources::connectionBands_const_iterator k = src.begin_connectionBands();
-               k != src.end_connectionBands();
-               k++)
-	    {
-		CB_Handler::connection_band (*k,
-                                             dest[0].connection_bands_list[pos++]);
-            }
-          return true;
-	}
+      pos = dest[0].threadpool_with_lanes_list.length ();
+      dest[0].threadpool_with_lanes_list.length (pos + src.count_threadpoolWithLanes ());
 
-	ORBResources OR_Handler::orb_resources (const ::CIAO::DAnCE::ORBResources &src)
-          throw (OR_Handler::No_Resource)
-	{
-          if (src.length () == 0 ||
-              src[0].threadpool_list.length () == 0 ||
-              src[0].threadpool_with_lanes_list.length () == 0 ||
-              src[0].connection_bands_list.length () == 0)
-            {
-              throw No_Resource ();
-            }
-          
-          size_t len; //For checking the length of sequences
-          
-          ORBResources ores;
-          
-          len = src[0].threadpool_list.length();
-          for(size_t i = 0; i < len; ++i)
-	    {
-              ores.add_threadpool (TP_Handler::thread_pool (src[0].threadpool_list[i]));
-	    }
-          
-          len = src[0].threadpool_with_lanes_list.length();
-          for(size_t j = 0; j < len; ++j)
-	    {
-              ores.add_threadpoolWithLanes(TPL_Handler::threadpool_with_lanes (src[0].threadpool_with_lanes_list[j]));
-	    }
-          
-          len = src[0].connection_bands_list.length();
-          for(size_t k = 0; k < len; k++)
-	    {
-              ores.add_connectionBands (CB_Handler::connection_band (src[0].connection_bands_list[k]));
-	    }
-          
-          return ores;
-	}
+      for (ORBResources::threadpoolWithLanes_const_iterator j = src.begin_threadpoolWithLanes();
+           j != src.end_threadpoolWithLanes();
+           j++)
+        {
+          TPL_Handler::threadpool_with_lanes (*j,
+                                              dest[0].threadpool_with_lanes_list [pos++]);
+        }
+
+      pos = dest[0].connection_bands_list.length ();
+      dest[0].connection_bands_list.length (pos + src.count_connectionBands ());
+
+      for (ORBResources::connectionBands_const_iterator k = src.begin_connectionBands();
+           k != src.end_connectionBands();
+           k++)
+        {
+          CB_Handler::connection_band (*k,
+                                       dest[0].connection_bands_list[pos++]);
+        }
+      return true;
+    }
+
+    ORBResources OR_Handler::orb_resources (const ::CIAO::DAnCE::ORBResources &src)
+      throw (OR_Handler::No_Resource)
+    {
+      if (src.length () == 0 ||
+          src[0].threadpool_list.length () == 0 ||
+          src[0].threadpool_with_lanes_list.length () == 0 ||
+          src[0].connection_bands_list.length () == 0)
+        {
+          throw No_Resource ();
+        }
+
+      size_t len; //For checking the length of sequences
+
+      ORBResources ores;
+
+      len = src[0].threadpool_list.length();
+      for(size_t i = 0; i < len; ++i)
+        {
+          ores.add_threadpool (TP_Handler::thread_pool (src[0].threadpool_list[i]));
+        }
+
+      len = src[0].threadpool_with_lanes_list.length();
+      for(size_t j = 0; j < len; ++j)
+        {
+          ores.add_threadpoolWithLanes(TPL_Handler::threadpool_with_lanes (src[0].threadpool_with_lanes_list[j]));
+        }
+
+      len = src[0].connection_bands_list.length();
+      for(size_t k = 0; k < len; k++)
+        {
+          ores.add_connectionBands (CB_Handler::connection_band (src[0].connection_bands_list[k]));
+        }
+
+      return ores;
     }
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
index 928ed1bb286..707547adf61 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
@@ -23,30 +23,30 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ORBResources;
+
+    /* Class description
+     * @class OR_Handler
+     * @function A brief Handler class for the <ORBResource> member
+     */
+
+    class RT_CCM_Handlers_Export OR_Handler
     {
-	class ORBResources;
-
-	/* Class description
-	 * @class OR_Handler
-	 * @function A brief Handler class for the <ORBResource> member
-	 */
-
-	class RT_CCM_Handlers_Export OR_Handler
-	{
-	public:
-          
-          static bool orb_resources (const ORBResources &src,
-                                     ::CIAO::DAnCE::ORBResources &dest);
-          
-          class No_Resource {};
-          
-          static ORBResources orb_resources (const ::CIAO::DAnCE::ORBResources &src)
-            throw (No_Resource);
-          
-          
-	};
-    }
+    public:
+
+      static bool orb_resources (const ORBResources &src,
+                                 ::CIAO::DAnCE::ORBResources &dest);
+
+      class No_Resource {};
+
+      static ORBResources orb_resources (const ::CIAO::DAnCE::ORBResources &src)
+        throw (No_Resource);
+
+
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp
index cf53e198499..088a426505c 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.cpp
@@ -8,7 +8,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    
+
     bool
     PM_Handler::priority_model_pd (const PriorityModelPolicyDef &src,
                                    ::CIAO::DAnCE::PriorityModelPolicyDef &dest)
@@ -18,56 +18,56 @@ namespace CIAO
         case PriorityModel::SERVER_DECLARED_l:
           dest.priority_model = ::CIAO::DAnCE::SERVER_DECLARED;
           break;
-          
+
         case PriorityModel::CLIENT_PROPAGATED_l:
           dest.priority_model = ::CIAO::DAnCE::CLIENT_PROPAGATED;
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR,
                       "Unknown priority model passed to priority_model_pd\n"));
           return false;
         }
-      
+
       if (src.server_priority_p ())
         dest.server_priority = static_cast < ACE_INT32 > (src.server_priority ());
       else
         dest.server_priority = 0;
-      
+
       return true;
     }
-    
-      
-    PriorityModelPolicyDef 
+
+
+    PriorityModelPolicyDef
     PM_Handler::priority_model_pd (const ::CIAO::DAnCE::PriorityModelPolicyDef &src)
     {
       auto_ptr <PriorityModelPolicyDef> pmd;
-      
+
       switch (src.priority_model)
         {
         case ::CIAO::DAnCE::CLIENT_PROPAGATED:
           pmd.reset (new PriorityModelPolicyDef (PriorityModel::CLIENT_PROPAGATED));
           break;
-          
+
         case ::CIAO::DAnCE::SERVER_DECLARED:
           pmd.reset (new PriorityModelPolicyDef (PriorityModel::SERVER_DECLARED));
           break;
-          
+
         default:
           ACE_ERROR ((LM_ERROR,
                       "Invalid priority model given to priority_model_pd\n"));
           throw 1;
         }
-      
+
       pmd->server_priority (XMLSchema::int_ (src.server_priority));
-      
+
       return *pmd;
     }
-    
-    
+
+
   }
-  
-  
-  
+
+
+
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
index 2ebe0fb0c0e..aa0705fcac2 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file PM_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
  *
@@ -23,22 +23,22 @@ namespace CIAO
     namespace Config_Handlers
     {
       class PriorityModelPolicyDef;
-      
+
       /**
        * @class PS_Handler
        * @brief Handler class for PriorityModelPolicyDefs
        */
-      
+
       class RT_CCM_Handlers_Export PM_Handler
       {
       public:
         static bool priority_model_pd (const PriorityModelPolicyDef &src,
                                        ::CIAO::DAnCE::PriorityModelPolicyDef &dest);
-        
+
         static PriorityModelPolicyDef priority_model_pd (const ::CIAO::DAnCE::PriorityModelPolicyDef &src);
       };
     }
-  
+
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
index bbe8f7a28db..a2fa834233e 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
@@ -14,14 +14,14 @@ namespace CIAO
     {
       if (src.id_p ())
         dest.Id = CORBA::string_dup (src.id ().c_str ());
-      
+
       // Make room for all of the policies
       CORBA::ULong len (dest.policies.length ());
-      dest.policies.length (len + 
+      dest.policies.length (len +
                             src.count_priorityModel () +
                             src.count_threadpool () +
                             src.count_priorityBandedConnection ());
-      
+
       for (PolicySet::priorityModel_const_iterator i = src.begin_priorityModel ();
            i != src.end_priorityModel ();
            ++i)
@@ -32,44 +32,44 @@ namespace CIAO
 
           dest.policies[len++].PriorityModelDef (pmd);
         }
-      
+
       for (PolicySet::threadpool_const_iterator i = src.begin_threadpool ();
            i != src.end_threadpool ();
            ++i)
         {
           ::CIAO::DAnCE::ThreadpoolPolicyDef tpd;
-          
+
           tpd.Id = CORBA::string_dup (i->id ().c_str ());
-          
+
           dest.policies[len++].ThreadpoolDef (tpd);
         }
-      
-      
+
+
       for (PolicySet::priorityBandedConnection_const_iterator i = src.begin_priorityBandedConnection ();
            i != src.end_priorityBandedConnection ();
            ++i)
         {
           ::CIAO::DAnCE::PriorityBandedConnectionPolicyDef pbc;
-          
+
           pbc.Id = CORBA::string_dup (i->id ().c_str ());
-          
+
           dest.policies[len++].PriorityBandedConnectionDef (pbc);
         }
-      
-          
-          
+
+
+
       return true;
     }
 
 
-    PolicySet 
+    PolicySet
     PS_Handler::policy_set (const ::CIAO::DAnCE::PolicySet &src)
     {
       PolicySet ps;
-      
+
       if (src.Id.in ())
         ps.id (src.Id.in ());
-      
+
       for (CORBA::ULong i = 0;
            i < src.policies.length ();
            ++i)
@@ -77,38 +77,38 @@ namespace CIAO
           ACE_DEBUG ((LM_ERROR,
                       "Attempting switch for i = %d\n",
                       i));
-          
+
           switch (src.policies[i]._d ())
             {
             case ::CIAO::DAnCE::PRIORITY_MODEL_POLICY_TYPE:
               ps.add_priorityModel (
                 PM_Handler::priority_model_pd (src.policies[i].PriorityModelDef ()));
               break;
-              
+
             case ::CIAO::DAnCE::THREADPOOL_POLICY_TYPE:
               ps.add_threadpool  (src.policies[i].ThreadpoolDef ().Id.in ());
               break;
-              
+
             case ::CIAO::DAnCE::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
               ps.add_priorityBandedConnection (src.policies[i].PriorityBandedConnectionDef ().Id.in ());
               break;
-              
+
             case 0:
               ACE_ERROR ((LM_ERROR,
                           "Skipping invalid policy.\n"));
               break;
-              
+
             default:
               ACE_ERROR ((LM_ERROR,
                           "Bad policy stored in policy_set: %i\n",
                           src.policies[i]._d ()));
               throw 1;
             }
-        } 
-      
+        }
+
       return ps;
     }
-    
+
   }
-  
+
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
index 5d924587fa9..5f8673d94ef 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
@@ -1,7 +1,7 @@
-/** 
+/**
  * @file PS_Handler.h
  * @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  *  $Id$
  */
 
@@ -23,21 +23,21 @@ namespace CIAO
     namespace Config_Handlers
     {
       class PolicySet;
-      
+
       /**
        * @class PS_Handler
        * @brief Handler class for PolicySets
        */
-      
+
       class RT_CCM_Handlers_Export PS_Handler
       {
       public:
         static bool policy_set (const PolicySet &src,
                                 ::CIAO::DAnCE::PolicySet &dest);
-        
+
         static PolicySet policy_set (const ::CIAO::DAnCE::PolicySet &src);
       };
-      
+
     }
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
index 5b4500becf9..fc7e4b88a56 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
@@ -16,20 +16,20 @@ namespace CIAO
       retval_ (false)
     {
       XML_Helper helper;
-      
-      XERCES_CPP_NAMESPACE::DOMDocument *dom = 
-	helper.create_dom (file);
-      
+
+      XERCES_CPP_NAMESPACE::DOMDocument *dom =
+        helper.create_dom (file);
+
       if (!dom)
-	throw SRD_Handler::NoSRD ();
-      
-      this->srd_.reset (new ServerResourcesDef 
-	(ServerResources (dom)));
-      
+        throw SRD_Handler::NoSRD ();
+
+      this->srd_.reset (new ServerResourcesDef
+                        (ServerResources (dom)));
+
       if (!this->build_srd ())
-	throw NoSRD ();
+        throw NoSRD ();
     }
-    
+
     SRD_Handler::SRD_Handler (ServerResourcesDef *srd):
       idl_srd_(0),
       srd_(srd),
@@ -47,16 +47,16 @@ namespace CIAO
       if(!this->build_xsc())
         throw NoSRD ();
     }
-    
+
     SRD_Handler::~SRD_Handler (void)
     {
     }
-    
+
     bool
     SRD_Handler::build_srd ()
     {
       this->idl_srd_.reset ( new ::CIAO::DAnCE::ServerResource );
-          
+
       if(this->srd_->cmdline_p())
         {
           this->retval_ = CLA_Handler::commandline_arguments(*this->srd_,
@@ -70,12 +70,12 @@ namespace CIAO
 
       this->retval_ = OC_Handler::orb_config (this->srd_->orbConfigs (),
                                               this->idl_srd_->orb_config);
-      
+
       if (this->srd_->id_p ())
         {
           this->idl_srd_->Id = srd_->id ().c_str ();
         }
-      
+
       return this->retval_;
     }
 
@@ -83,11 +83,11 @@ namespace CIAO
     SRD_Handler::build_xsc ()
     {
       size_t len; //For checking the length of src data members
-	    
+
       // Load the ORBConfigs and create the XSC structure for SRD
       this->srd_.reset (new ServerResourcesDef (OC_Handler::orb_config (this->idl_srd_->orb_config)));
-      
-      
+
+
       //Note: Why did we make the CmdlineOptions a separate class instead of a
       //      vector of strings???
 
@@ -107,10 +107,10 @@ namespace CIAO
       ACESvcConf asc;
       asc.uri(curr);
       this->srd_->svcconf (asc);
-      
+
       XMLSchema::string < ACE_TCHAR > id (this->idl_srd_->Id.in ());
       this->srd_->id  (id);
-      
+
       return true;
     }
 
@@ -160,4 +160,4 @@ namespace CIAO
   }
 }
 
-    
+
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
index cfa7871b705..c97d951ec90 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
@@ -4,7 +4,7 @@
  *
  *   @author Lucas Seibert <lseibert@dre.vanderbilt.edu>
  *   @author Will Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * $Id$
  */
 //======================================
@@ -24,54 +24,54 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ServerResourcesDef;
+
+    /*
+     * @class SRD_Handler
+     *
+     * @brief Handler class for <ServerResourcesDef
+     */
+
+    class RT_CCM_Handlers_Export SRD_Handler
     {
-      class ServerResourcesDef;
-      
-	/*
-	 * @class SRD_Handler
-	 *
-	 * @brief Handler class for <ServerResourcesDef
-	 */
-
-	class RT_CCM_Handlers_Export SRD_Handler
-	{
-	public:
-          class NoSRD {};
-	    
-          SRD_Handler (const ACE_TCHAR *file);
-          
-          SRD_Handler(ServerResourcesDef *srd);
-          
-          SRD_Handler(::CIAO::DAnCE::ServerResource *srd);
-          
-          ~SRD_Handler (void);
-          
-          ::CIAO::DAnCE::ServerResource const *srd_idl (void) const
-            throw (NoSRD);
-          
-          ::CIAO::DAnCE::ServerResource *srd_idl (void)
-            throw (NoSRD);
-          
-          ServerResourcesDef const *srd_xsc (void) const
-            throw (NoSRD);
-          
-          ServerResourcesDef *srd_xsc (void)
-            throw (NoSRD);
-
-	private:
-          bool build_srd ();
-          
-
-          bool build_xsc ();
-          	    
-          auto_ptr < ::CIAO::DAnCE::ServerResource > idl_srd_;
-          
-          auto_ptr <ServerResourcesDef> srd_;
-          
-          bool retval_;
-	};
-    }
+    public:
+      class NoSRD {};
+
+      SRD_Handler (const ACE_TCHAR *file);
+
+      SRD_Handler(ServerResourcesDef *srd);
+
+      SRD_Handler(::CIAO::DAnCE::ServerResource *srd);
+
+      ~SRD_Handler (void);
+
+      ::CIAO::DAnCE::ServerResource const *srd_idl (void) const
+        throw (NoSRD);
+
+      ::CIAO::DAnCE::ServerResource *srd_idl (void)
+        throw (NoSRD);
+
+      ServerResourcesDef const *srd_xsc (void) const
+        throw (NoSRD);
+
+      ServerResourcesDef *srd_xsc (void)
+        throw (NoSRD);
+
+    private:
+      bool build_srd ();
+
+
+      bool build_xsc ();
+
+      auto_ptr < ::CIAO::DAnCE::ServerResource > idl_srd_;
+
+      auto_ptr <ServerResourcesDef> srd_;
+
+      bool retval_;
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
index 5232b48a757..4d65478d19c 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
@@ -7,7 +7,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    bool 
+    bool
     TPL_Handler::threadpool_with_lanes (
            const ThreadpoolWithLanesDef &src,
            ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &dest)
@@ -25,7 +25,7 @@ namespace CIAO
           size_t len = dest.threadpool_lanes.length ();
 
           dest.threadpool_lanes.length (len + 1);
-                      
+
           dest.threadpool_lanes[len].lane_priority =
             static_cast <ACE_INT16> (loc->priority ());
 
@@ -47,7 +47,7 @@ namespace CIAO
 
       dest.max_request_buffer_size =
         static_cast <ACE_UINT32> (src.max_request_buffered_size ());
-        
+
       return true;
     }
 
@@ -60,10 +60,10 @@ namespace CIAO
                                   XMLSchema::unsignedLong ((src.max_buffered_requests)),
                                   XMLSchema::unsignedLong ((src.max_request_buffer_size))
                                   );
-        
+
       //XMLSchema::ID <ACE_TCHAR> id = ((src.Id));
       tpl.id (src.Id.in ());
-        
+
       size_t len = src.threadpool_lanes.length ();
       for (size_t i = 0; i < len; i++)
         {
@@ -71,10 +71,10 @@ namespace CIAO
                XMLSchema::unsignedLong (src.threadpool_lanes[i].static_threads),
                XMLSchema::unsignedLong (src.threadpool_lanes[i].dynamic_threads),
                XMLSchema::int_ (src.threadpool_lanes[i].lane_priority));
-                          
+
           tpl.add_threadpoolLane (new_tplane);
-        } 
-              
+        }
+
       return tpl;
     }
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
index ec28027cb5c..7a9bc607b32 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
@@ -7,58 +7,58 @@
 namespace CIAO
 {
   namespace Config_Handlers
-  {	
-	  bool TP_Handler::thread_pool (
-	      const ThreadpoolDef &src,
-	      ::CIAO::DAnCE::ORS_Threadpool &dest
-	    )
-	  {
+  {
+    bool TP_Handler::thread_pool (
+                                  const ThreadpoolDef &src,
+                                  ::CIAO::DAnCE::ORS_Threadpool &dest
+                                  )
+    {
       dest.Id = CORBA::String_var (src.id ().c_str ());
-  
+
       dest.stacksize =
         static_cast <ACE_UINT32> (src.stacksize ());
-  
+
       dest.static_threads =
         static_cast <ACE_UINT32> (src.static_threads( ));
-  
+
       dest.dynamic_threads =
         static_cast <ACE_UINT32> (src.dynamic_threads());
-      
+
       dest.default_priority =
         static_cast <ACE_INT16> (src.default_priority ());
-                  
+
       dest.allow_request_buffering = src.allow_request_buffering ();
-  
+
       dest.max_buffered_requests =
         static_cast <ACE_UINT32> (src.max_buffered_requests ());
-  
+
       dest.max_request_buffer_size =
         static_cast <ACE_UINT32> (src.max_request_buffered_size ());
-      
+
       return true;
-	  }
+    }
 
-	  ThreadpoolDef 
-        TP_Handler::thread_pool (
-	      const ::CIAO::DAnCE::ORS_Threadpool &src
-	    )
-	  {
+    ThreadpoolDef
+    TP_Handler::thread_pool (
+                             const ::CIAO::DAnCE::ORS_Threadpool &src
+                             )
+    {
       ThreadpoolDef tp (
-          XMLSchema::unsignedLong (src.stacksize),
-          XMLSchema::unsignedLong (src.static_threads),
-          XMLSchema::unsignedLong (src.dynamic_threads),
-          Priority (src.default_priority),
-          XMLSchema::boolean (src.allow_request_buffering),
-          XMLSchema::unsignedLong (src.max_buffered_requests),
-          XMLSchema::unsignedLong (src.max_request_buffer_size)
-        );
-      
+                        XMLSchema::unsignedLong (src.stacksize),
+                        XMLSchema::unsignedLong (src.static_threads),
+                        XMLSchema::unsignedLong (src.dynamic_threads),
+                        Priority (src.default_priority),
+                        XMLSchema::boolean (src.allow_request_buffering),
+                        XMLSchema::unsignedLong (src.max_buffered_requests),
+                        XMLSchema::unsignedLong (src.max_request_buffer_size)
+                        );
+
       if (src.Id.in () == 0)
         {
           tp.id (src.Id.in ());
-        }       
+        }
 
       return tp;
-	  }
+    }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
index 638ab07f675..b0403ab0342 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
@@ -22,24 +22,24 @@
 
 namespace CIAO
 {
-    namespace Config_Handlers
+  namespace Config_Handlers
+  {
+    class ThreadpoolDef;
+
+    /*
+     * @class TP_Handler
+     * A brief Handler class for <ThreadpoolDef>
+     */
+
+    class RT_CCM_Handlers_Export TP_Handler
     {
-	class ThreadpoolDef;
-
-	/*
-	 * @class TP_Handler
-	 * A brief Handler class for <ThreadpoolDef>
-	 */
-
-	class RT_CCM_Handlers_Export TP_Handler
-	{
-        public:
-          static bool thread_pool (const ThreadpoolDef &src,
-                                   ::CIAO::DAnCE::ORS_Threadpool &dest);
-          
-          static ThreadpoolDef thread_pool (const ::CIAO::DAnCE::ORS_Threadpool &src);
-	};
-    }
+    public:
+      static bool thread_pool (const ThreadpoolDef &src,
+                               ::CIAO::DAnCE::ORS_Threadpool &dest);
+
+      static ThreadpoolDef thread_pool (const ::CIAO::DAnCE::ORS_Threadpool &src);
+    };
+  }
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr b/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
index e8a05932f4b..3a44faf9754 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/input.csr
@@ -4,17 +4,17 @@
  xmlns:xmi="http://www.omg.org/XMI"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd">
-  
+
   <cmdline>
     <arg> -ORBDebugLevel 10 -ORBEndpoint corbaloc://foo/bar</arg>
   </cmdline>
-  
+
   <svcconf>
     <uri>
       svcconf.uri
     </uri>
   </svcconf>
-  
+
   <orbConfigs>
     <resources>
       <threadpool id="threadpool-1">
@@ -26,7 +26,7 @@
         <max_buffered_requests>10</max_buffered_requests>
         <max_request_buffered_size>20</max_request_buffered_size>
       </threadpool>
-      
+
       <threadpoolWithLanes id="threadpool-2">
         <threadpoolLane>
           <static_threads>50</static_threads>
@@ -39,7 +39,7 @@
         <max_buffered_requests>10</max_buffered_requests>
         <max_request_buffered_size>20</max_request_buffered_size>
       </threadpoolWithLanes>
-      
+
       <connectionBands id="cb-1">
         <band>
           <low>0</low>
@@ -51,7 +51,7 @@
         </band>
       </connectionBands>
     </resources>
-    
+
     <policySet>
       <priorityModel server_priority="10">
         <priority_model>SERVER_DECLARED</priority_model>
@@ -59,12 +59,12 @@
       <priorityModel>
         <priority_model>CLIENT_PROPAGATED</priority_model>
       </priorityModel>
-      
+
       <threadpool>threadpool-1</threadpool>
       <threadpool>threadpool-2</threadpool>
-      
+
       <priorityBandedConnection>cb-1</priorityBandedConnection>
-      
+
     </policySet>
   </orbConfigs>
 </CIAO:ServerResources>
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index e177820261a..15fabe1f34a 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -33,17 +33,17 @@ parse_args (int argc, char *argv[])
                            "-i <input file> "
                            "\n",
                            argv [0]),
-                          -1); 
+                          -1);
       }
   // Indicates sucessful parsing of the command-line
-  return 0;  
+  return 0;
 }
 
 using namespace CIAO::Config_Handlers;
 
 int main (int argc, char *argv[])
 {
-    
+
   if (parse_args (argc, argv) != 0)
     return 1;
 
@@ -52,38 +52,38 @@ int main (int argc, char *argv[])
 
   //Create an XML_Helper for all the file work
   XML_Helper the_helper;
-  
+
   if (xercesc::DOMDocument *doc = the_helper.create_dom (input_file))
   {
     //Read in the XSC type structure from the DOMDocument
     ServerResourcesDef srd = ServerResources (doc);
-    
+
     // Convert XSC to idl datatype
     SRD_Handler srd_handler (&srd);
-    
+
     std::cout << "Instance document import succeeded.  Dumping contents to file\n";
-    
+
     CIAO::DAnCE::ServerResource *sr (srd_handler.srd_idl ());
-    
+
     SRD_Handler reverse_handler (sr);
-    
+
     xercesc::DOMDocument *the_xsc (the_helper.create_dom ("CIAO:ServerResources",
                                                           "http://www.dre.vanderbilt.edu/ServerResources"));
-    
-    std::cout << "NS:" 
+
+    std::cout << "NS:"
               << std::string (xercesc::XMLString::transcode (the_xsc->getDocumentElement ()->getNamespaceURI ())) << std::endl
               << std::string (xercesc::XMLString::transcode (the_xsc->getDocumentElement ()->getPrefix ())) << std::endl
               << std::string (xercesc::XMLString::transcode (the_xsc->getDocumentElement ()->getLocalName ())) << std::endl
               << std::endl;
-    
+
     ServerResources (*reverse_handler.srd_xsc (), the_xsc);
-    
+
     // write out the result
     the_helper.write_DOM (the_xsc, "output.srd");
   }
-  
+
   std::cout << "Test completed!";
-  
+
   return 0;
-  
+
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
index 4a52efb9967..37fd441ac92 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Req_Handler.h"
 #include "Property_Handler.h"
 #include "ciao/DeploymentC.h"
-
+#include "ciao/CIAO_common.h"
 namespace CIAO
 {
   namespace Config_Handlers
@@ -18,43 +18,40 @@ namespace CIAO
     }
 
     void
-    Req_Handler::get_Requirement (
-                         Deployment::Requirement& toconfig,
-                         Requirement& desc)
+    Req_Handler::get_requirement (const Requirement& desc,
+                                  Deployment::Requirement& toconfig)
     {
+      CIAO_TRACE("Req_Handler::get_Requirement");
+
       //Map the basic string types to their Deployment::Req
       //counterparts.
-      toconfig.name = CORBA::string_dup (desc.name ().c_str ());
-      toconfig.resourceType =
-        CORBA::string_dup (desc.resourceType ().c_str ());
-
-      //Map the XSC Req's property into the next
-      //position in the IDL Req's sequence.
-      /// @@ MAJO:
-      Property_Handler prophandler;
-      toconfig.property.length (toconfig.property.length () + 1);
-      Property_Handler::get_property (
-        desc.property (),
-        toconfig.property[toconfig.property.length () - 1]);
+      toconfig.name = desc.name ().c_str ();
+      toconfig.resourceType = desc.resourceType ().c_str ();
+
+      toconfig.property.length (desc.count_property ());
+      std::for_each (desc.begin_property (),
+                     desc.end_property (),
+                     Property_Functor (toconfig.property));
+    }
+
+    Requirement
+    Req_Handler::get_requirement (const Deployment::Requirement& src)
+    {
+      CIAO_TRACE("Req_Handler::get_requirement - reverse");
+
+      //Get the values for name and res
+      XMLSchema::string< char > name ((src.name));
+      XMLSchema::string< char > res ((src.resourceType));
+
+      //Instantiate the Requirement
+      Requirement req (name,res);
+
+      for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+        {
+          req.add_property (Property_Handler::get_property (src.property[i]));
+        }
+
+      return req;
     }
-    
-      Requirement
-      Req_Handler::get_requirement (
-	  const Deployment::Requirement& src)
-      {
-	  //Get the values for name and res
-	  XMLSchema::string< char > name ((src.name));
-	  XMLSchema::string< char > res ((src.resourceType));
-
-	  //Get the Property
-	  Property prop (
-	      Property_Handler::get_property (
-		  src.property[0]));
-
-	  //Instantiate the Requirement
-	  Requirement req (name,res,prop);
-	  
-	  return req;
-      }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
index 6f58f8677e4..315eee76579 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  Req_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Req_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_REQ_HANDLER_H
@@ -14,6 +14,7 @@
 
 #include "Basic_Deployment_Data.hpp"
 #include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,42 +22,49 @@
 
 namespace Deployment
 {
-  struct Requirement; 
+struct Requirement;
+class Requirements;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-  {
-   /*
-    * @class REQ_Handler
-    *
-    * @brief Handler class for <Requirement> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC Requirement objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
-    
-    class Config_Handlers_Export Req_Handler{
-     
-      public:
-       
-        Req_Handler (void);
-        virtual ~Req_Handler (void);
-  
-        ///This method takes a <Deployment::Requirement>
-        ///and maps the values from the passed in XSC 
-        ///Requirement to its members.
-        static void get_Requirement (
-                    Deployment::Requirement& toconfig,
-                    Requirement& desc);          
-        static Requirement
-          get_requirement (const Deployment::Requirement& src);
-    };
-  }
+namespace Config_Handlers
+{
+/*
+* @class REQ_Handler
+*
+* @brief Handler class for <Requirement> types.
+*
+* This class defines handler methods to map values from
+* XSC Requirement objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
+
+class Config_Handlers_Export Req_Handler
+{
+public:
+
+Req_Handler (void);
+virtual ~Req_Handler (void);
+
+///This method takes a <Deployment::Requirement>
+///and maps the values from the passed in XSC
+///Requirement to its members.
+static void get_requirement (const Requirement& desc,
+Deployment::Requirement& toconfig);
+static Requirement
+get_requirement (const Deployment::Requirement& src);
+};
+
+typedef Sequence_Handler < Requirement,
+::Deployment::Requirements,
+::Deployment::Requirement,
+Req_Handler::get_requirement > Requirement_Functor;
+
+
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
index 4eeb7377b29..dee1dbda326 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
@@ -16,8 +16,8 @@ namespace CIAO
 
     bool
     STD_CID_Handler::component_impl_descr (
-      const ComponentImplementationDescription &desc,
-      ::Deployment::ComponentImplementationDescription &toconfig)
+                                           const ComponentImplementationDescription &desc,
+                                           ::Deployment::ComponentImplementationDescription &toconfig)
     {
       toconfig.label =
         desc.label ().c_str ();
@@ -27,145 +27,145 @@ namespace CIAO
 
 
       if (desc.assemblyImpl_p ())
-      {
-        Deployment::ComponentAssemblyDescription idl_cad;
-        ComponentAssemblyDescription cad =
-          desc.assemblyImpl ();
-
-        // @@: handle <assemblyImpl>
-        for (ComponentAssemblyDescription::instance_const_iterator iter =
-               cad.begin_instance ();
-             iter != cad.end_instance ();
-             iter++)
         {
-          CORBA::ULong len =
-            idl_cad.instance.length ();
-          idl_cad.instance.length (len + 1);
-          idl_cad.instance [len].name =
-            (*iter).name ().c_str ();
-
-          // Bind the instance id with the index
-          if ((*iter).id_p ())
-          {
-            ACE_CString cstr ((*iter).id ().c_str ());
-            
-	    STD_CID_Handler::IDREF.bind_ref (cstr,len);
-	  }
-
-          if (!this->xml_helper_->is_initialized ())
-            return false;
-
-          // parse the .cpd (ComponentPackageDescription) file
-          // that <package> links to
-          xercesc::DOMDocument* dom =
-            this->xml_helper_->create_dom (((*iter).package ()).href ().c_str ());
-
-          if (!dom)
-            return false;
-
-          ComponentPackageDescription cpd =
-            componentPackageDescription (dom);
-
-          Deployment::ComponentPackageDescription idl_cpd;
-
-          STD_CPD_Handler cpd_handler (this->xml_helper_);
-
-          cpd_handler.component_package_descr (cpd,
-                                               idl_cpd);
-
-          idl_cad.instance [len].package.length (1);
-          idl_cad.instance [len].package [0] = idl_cpd;
-        }
-
-        // @@: handle <connection>
-        for (ComponentAssemblyDescription::connection_const_iterator conn_iter =
-               cad.begin_connection ();
-             conn_iter != cad.end_connection ();
-             conn_iter++)
-        {
-          CORBA::ULong conn_len =
-            idl_cad.connection.length ();
-
-          idl_cad.connection.length (conn_len + 1);
-          idl_cad.connection [conn_len].name =
-            (*conn_iter).name ().c_str ();
-
-
-          for (AssemblyConnectionDescription::internalEndpoint_const_iterator ep_iter =
-                 (*conn_iter).begin_internalEndpoint ();
-               ep_iter != (*conn_iter).end_internalEndpoint ();
-               ep_iter++)
-          {
-            CORBA::ULong endp_len =
-              idl_cad.connection [conn_len].internalEndpoint.length ();
-            idl_cad.connection [conn_len].internalEndpoint.length (endp_len + 1);
-            idl_cad.connection [conn_len].internalEndpoint [endp_len].portName =
-              (*ep_iter).portName ().c_str ();
-
-            CORBA::ULong tmp = 0;
-	    STD_CID_Handler::IDREF.find_ref (ACE_CString ((((*ep_iter).instance ()).id ()).c_str ()),
-					     tmp);
-            CORBA::ULong ref = tmp;
-            idl_cad.connection[conn_len].internalEndpoint [endp_len].instanceRef = ref;
-          }
+          Deployment::ComponentAssemblyDescription idl_cad;
+          ComponentAssemblyDescription cad =
+            desc.assemblyImpl ();
+
+          // @@: handle <assemblyImpl>
+          for (ComponentAssemblyDescription::instance_const_iterator iter =
+                 cad.begin_instance ();
+               iter != cad.end_instance ();
+               iter++)
+            {
+              CORBA::ULong len =
+                idl_cad.instance.length ();
+              idl_cad.instance.length (len + 1);
+              idl_cad.instance [len].name =
+                (*iter).name ().c_str ();
+
+              // Bind the instance id with the index
+              if ((*iter).id_p ())
+                {
+                  ACE_CString cstr ((*iter).id ().c_str ());
+
+                  STD_CID_Handler::IDREF.bind_ref (cstr,len);
+                }
+
+              if (!this->xml_helper_->is_initialized ())
+                return false;
+
+              // parse the .cpd (ComponentPackageDescription) file
+              // that <package> links to
+              xercesc::DOMDocument* dom =
+                this->xml_helper_->create_dom (((*iter).package ()).href ().c_str ());
+
+              if (!dom)
+                return false;
+
+              ComponentPackageDescription cpd =
+                componentPackageDescription (dom);
+
+              Deployment::ComponentPackageDescription idl_cpd;
+
+              STD_CPD_Handler cpd_handler (this->xml_helper_);
+
+              cpd_handler.component_package_descr (cpd,
+                                                   idl_cpd);
+
+              idl_cad.instance [len].package.length (1);
+              idl_cad.instance [len].package [0] = idl_cpd;
+            }
+
+          // @@: handle <connection>
+          for (ComponentAssemblyDescription::connection_const_iterator conn_iter =
+                 cad.begin_connection ();
+               conn_iter != cad.end_connection ();
+               conn_iter++)
+            {
+              CORBA::ULong conn_len =
+                idl_cad.connection.length ();
+
+              idl_cad.connection.length (conn_len + 1);
+              idl_cad.connection [conn_len].name =
+                (*conn_iter).name ().c_str ();
+
+
+              for (AssemblyConnectionDescription::internalEndpoint_const_iterator ep_iter =
+                     (*conn_iter).begin_internalEndpoint ();
+                   ep_iter != (*conn_iter).end_internalEndpoint ();
+                   ep_iter++)
+                {
+                  CORBA::ULong endp_len =
+                    idl_cad.connection [conn_len].internalEndpoint.length ();
+                  idl_cad.connection [conn_len].internalEndpoint.length (endp_len + 1);
+                  idl_cad.connection [conn_len].internalEndpoint [endp_len].portName =
+                    (*ep_iter).portName ().c_str ();
+
+                  CORBA::ULong tmp = 0;
+                  STD_CID_Handler::IDREF.find_ref (ACE_CString ((((*ep_iter).instance ()).id ()).c_str ()),
+                                                   tmp);
+                  CORBA::ULong ref = tmp;
+                  idl_cad.connection[conn_len].internalEndpoint [endp_len].instanceRef = ref;
+                }
+            }
+
+          toconfig.assemblyImpl.length (1);
+          toconfig.assemblyImpl [0] = idl_cad;
         }
 
-        toconfig.assemblyImpl.length (1);
-        toconfig.assemblyImpl [0] = idl_cad;
-      }
-
       // handle <monolithicImpl>
       if (desc.monolithicImpl_p ())
-      {
-        Deployment::MonolithicImplementationDescription idl_mid;
-        MonolithicImplementationDescription mid =
-          desc.monolithicImpl ();
-
-        for (MonolithicImplementationDescription::primaryArtifact_const_iterator iter =
-               mid.begin_primaryArtifact ();
-             iter != mid.end_primaryArtifact ();
-             iter++)
         {
-          CORBA::ULong len =
-            idl_mid.primaryArtifact.length ();
-          idl_mid.primaryArtifact.length (len + 1);
-          idl_mid.primaryArtifact [len].name = (*iter).name ().c_str ();
+          Deployment::MonolithicImplementationDescription idl_mid;
+          MonolithicImplementationDescription mid =
+            desc.monolithicImpl ();
+
+          for (MonolithicImplementationDescription::primaryArtifact_const_iterator iter =
+                 mid.begin_primaryArtifact ();
+               iter != mid.end_primaryArtifact ();
+               iter++)
+            {
+              CORBA::ULong len =
+                idl_mid.primaryArtifact.length ();
+              idl_mid.primaryArtifact.length (len + 1);
+              idl_mid.primaryArtifact [len].name = (*iter).name ().c_str ();
 
-          if (!this->xml_helper_->is_initialized ())
-            return false;
+              if (!this->xml_helper_->is_initialized ())
+                return false;
 
-          // parse the .iad (ImplementationArtifactDescription) file
-          // that the <referencedArtifact> links to
-          xercesc::DOMDocument* dom =
-            this->xml_helper_->create_dom (((*iter).referencedArtifact ()).href ().c_str ()); // here location indicates .iad file
+              // parse the .iad (ImplementationArtifactDescription) file
+              // that the <referencedArtifact> links to
+              xercesc::DOMDocument* dom =
+                this->xml_helper_->create_dom (((*iter).referencedArtifact ()).href ().c_str ()); // here location indicates .iad file
 
-          if (!dom)
-            return false;
+              if (!dom)
+                return false;
 
-          ImplementationArtifactDescription iad =
-            implementationArtifactDescription (dom);
+              ImplementationArtifactDescription iad =
+                implementationArtifactDescription (dom);
 
-          Deployment::ImplementationArtifactDescription idl_iad;
+              Deployment::ImplementationArtifactDescription idl_iad;
 
-          STD_IAD_Handler::impl_artifact_descr (iad,
-                                                idl_iad);
+              STD_IAD_Handler::impl_artifact_descr (iad,
+                                                    idl_iad);
 
-          idl_mid.primaryArtifact [len].referencedArtifact = idl_iad;
+              idl_mid.primaryArtifact [len].referencedArtifact = idl_iad;
 
+            }
+          toconfig.monolithicImpl.length (1);
+          toconfig.monolithicImpl [0] = idl_mid;
         }
-        toconfig.monolithicImpl.length (1);
-        toconfig.monolithicImpl [0] = idl_mid;
-      }
 
       // handle <configProperty>
       if (desc.configProperty_p ())
-      {
-        Property p = desc.configProperty ();
-        Deployment::Property idl_p;
-        Property_Handler::get_property (p, idl_p);
-        toconfig.configProperty.length (1);
-        toconfig.configProperty [0] = idl_p;
-      }
+        {
+          Property p = desc.configProperty ();
+          Deployment::Property idl_p;
+          Property_Handler::get_property (p, idl_p);
+          toconfig.configProperty.length (1);
+          toconfig.configProperty [0] = idl_p;
+        }
 
       return true;
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h
index c8fb2954a6f..ff812efc949 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  STD_CID_Handler.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
+*  @file  STD_CID_Handler.h
+*
+*  $Id$
+*
+*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_STD_CID_HANDLER_H
@@ -25,54 +25,54 @@
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentImplementationDescription;
+namespace Config_Handlers
+{
+class ComponentImplementationDescription;
 
-    /*
-     * @class STD_CID_Handler
-     *
-     * @brief Handler class for <CCMComponentImplementationDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-    class Config_Handlers_Export STD_CID_Handler
-    {
+/*
+* @class STD_CID_Handler
+*
+* @brief Handler class for <CCMComponentImplementationDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+class Config_Handlers_Export STD_CID_Handler
+{
 
-    public:
+public:
 
-      STD_CID_Handler (XML_Helper *xml_helper)
-        :xml_helper_ (xml_helper)
-      {
-      }
+STD_CID_Handler (XML_Helper *xml_helper)
+:xml_helper_ (xml_helper)
+{
+}
 
-      /// Maps the values from the XSC object
-      /// <ComponentImplementationDescription> to the CORBA IDL type
-      /// <Deployment::ComponentImplementationDescription>.
-      bool component_impl_descr (
-            const ComponentImplementationDescription &desc,
-            ::Deployment::ComponentImplementationDescription &toconfig);
+/// Maps the values from the XSC object
+/// <ComponentImplementationDescription> to the CORBA IDL type
+/// <Deployment::ComponentImplementationDescription>.
+bool component_impl_descr (
+const ComponentImplementationDescription &desc,
+::Deployment::ComponentImplementationDescription &toconfig);
 
-      static IDREF_Base<CORBA::ULong> IDREF;
+static IDREF_Base<CORBA::ULong> IDREF;
 
 //@@Note: This part has yet to be added in the future
 //    ComponentImplementationDescription
 //    component_port_description (
 //      const Deployment::ComponentImplementationDescription& src);
 
-    private:
-      // disable the default constructor
-      STD_CID_Handler ()
-        :xml_helper_ (0)
-      {
-      }
+private:
+// disable the default constructor
+STD_CID_Handler ()
+:xml_helper_ (0)
+{
+}
 
-      XML_Helper *xml_helper_;
-    };
-  }
+XML_Helper *xml_helper_;
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
index d79a4ea5d39..e5d097750f1 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
@@ -11,8 +11,8 @@ namespace CIAO
   {
     bool
     STD_CPD_Handler::component_package_descr (
-      const ComponentPackageDescription &desc,
-      ::Deployment::ComponentPackageDescription &toconfig)
+                                              const ComponentPackageDescription &desc,
+                                              ::Deployment::ComponentPackageDescription &toconfig)
     {
       toconfig.label =
         desc.label ().c_str ();
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
index 654fb0155ca..785847a7bcd 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  STD_CPD_Handler.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
+*  @file  STD_CPD_Handler.h
+*
+*  $Id$
+*
+*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_STD_CPD_HANDLER_H
@@ -22,56 +22,56 @@
 
 namespace Deployment
 {
-  struct ComponentPackageDescription;
+struct ComponentPackageDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentPackageDescription;
+namespace Config_Handlers
+{
+class ComponentPackageDescription;
+
+/*
+* @class STD_CPD_Handler
+*
+* @brief Handler class for <CCMComponentPackageDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+class Config_Handlers_Export STD_CPD_Handler
+{
 
-    /*
-     * @class STD_CPD_Handler
-     *
-     * @brief Handler class for <CCMComponentPackageDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-    class Config_Handlers_Export STD_CPD_Handler
-    {
+public:
 
-    public:
+STD_CPD_Handler (XML_Helper *xml_helper)
+:xml_helper_ (xml_helper)
+{
+}
 
-      STD_CPD_Handler (XML_Helper *xml_helper)
-        :xml_helper_ (xml_helper)
-      {
-      }
+/// Maps the values from the XSC object
+/// <ComponentPackageDescription> to the CORBA IDL type
+/// <Deployment::ComponentPackageDescription>.
+bool component_package_descr(
+const ComponentPackageDescription &desc,
+::Deployment::ComponentPackageDescription &toconfig);
 
-      /// Maps the values from the XSC object
-      /// <ComponentPackageDescription> to the CORBA IDL type
-      /// <Deployment::ComponentPackageDescription>.
-     bool component_package_descr(
-            const ComponentPackageDescription &desc,
-            ::Deployment::ComponentPackageDescription &toconfig);
+//@@Note: This part has yet to be added in the future
+//     ComponentPortDescription
+//     component_package_descr (
+//         const Deployment::ComponentPortDescription& src);
+private:
+// disable the default constructor
+STD_CPD_Handler ()
+:xml_helper_ (0)
+{
+}
 
-      //@@Note: This part has yet to be added in the future
-      //     ComponentPortDescription
-      //     component_package_descr (
-      //         const Deployment::ComponentPortDescription& src);
-    private:
-      // disable the default constructor
-      STD_CPD_Handler ()
-        :xml_helper_ (0)
-      {
-      }
-      
-      XML_Helper *xml_helper_;
-    };
-  }
+XML_Helper *xml_helper_;
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp
index 020396582d3..48f95b99dbe 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp
@@ -12,8 +12,8 @@ namespace CIAO
   {
     bool
     STD_IAD_Handler::impl_artifact_descr (
-      const ImplementationArtifactDescription &desc,
-      ::Deployment::ImplementationArtifactDescription &toconfig)
+                                          const ImplementationArtifactDescription &desc,
+                                          ::Deployment::ImplementationArtifactDescription &toconfig)
     {
       toconfig.label =
         desc.label ().c_str ();
@@ -25,22 +25,22 @@ namespace CIAO
              desc.begin_location ();
            iter != desc.end_location ();
            iter++)
-      {
-        CORBA::ULong len =
-          toconfig.location.length ();
-        toconfig.location.length (len + 1);
-        toconfig.location [len] = (*iter).c_str ();
-      }
+        {
+          CORBA::ULong len =
+            toconfig.location.length ();
+          toconfig.location.length (len + 1);
+          toconfig.location [len] = (*iter).c_str ();
+        }
 
       if (desc.execParameter_p ())
-      {
-        Property p = desc.execParameter ();
-        Deployment::Property idl_p;
-        Property_Handler::get_property (p, idl_p);
-        toconfig.execParameter.length (1);
-        toconfig.execParameter [0] = idl_p;
-      }
-     return true;
+        {
+          Property p = desc.execParameter ();
+          Deployment::Property idl_p;
+          Property_Handler::get_property (p, idl_p);
+          toconfig.execParameter.length (1);
+          toconfig.execParameter [0] = idl_p;
+        }
+      return true;
     }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.h
index 3523526f5be..872afe5693b 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  STD_IAD_Handler.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
+*  @file  STD_IAD_Handler.h
+*
+*  $Id$
+*
+*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H
@@ -21,43 +21,43 @@
 
 namespace Deployment
 {
-  struct ImplementationArtifactDescription;
+struct ImplementationArtifactDescription;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ImplementationArtifactDescription;
+namespace Config_Handlers
+{
+class ImplementationArtifactDescription;
 
-    /*
-     * @class STD_IAD_Handler
-     *
-     * @brief Handler class for <CCMImplementationArtifactDescription> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-    class Config_Handlers_Export STD_IAD_Handler
-    {
+/*
+* @class STD_IAD_Handler
+*
+* @brief Handler class for <CCMImplementationArtifactDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+class Config_Handlers_Export STD_IAD_Handler
+{
 
-    public:
-      /// Maps the values from the XSC object
-      /// <ImplementationArtifactDescription> to the CORBA IDL type
-      /// <Deployment::ImplementationArtifactDescription>.
-     static bool
-     impl_artifact_descr (
-       const ImplementationArtifactDescription &desc,
-       ::Deployment::ImplementationArtifactDescription &toconfig);
+public:
+/// Maps the values from the XSC object
+/// <ImplementationArtifactDescription> to the CORBA IDL type
+/// <Deployment::ImplementationArtifactDescription>.
+static bool
+impl_artifact_descr (
+const ImplementationArtifactDescription &desc,
+::Deployment::ImplementationArtifactDescription &toconfig);
 
 //@@Note: The reverse part has yet to be handed in the future
 //     ImplementationArtifactDescription
 //     impl_artifact_descr (
 //         const Deployment::ComponentPortDescription& src);
-    };
- }
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
index 6bef6636238..e37b0059181 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
@@ -13,8 +13,8 @@ namespace CIAO
 
     bool
     STD_PCD_Handler::package_config (
-      const PackageConfiguration &desc,
-      ::Deployment::PackageConfiguration &toconfig)
+                                     const PackageConfiguration &desc,
+                                     ::Deployment::PackageConfiguration &toconfig)
     {
       toconfig.label =
         desc.label ().c_str ();
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
index ba53f6736da..c4082d9a5eb 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  STD_PCD_Handler.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
+*  @file  STD_PCD_Handler.h
+*
+*  $Id$
+*
+*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H
@@ -22,56 +22,56 @@
 
 namespace Deployment
 {
-  struct PackageConfiguration;
+struct PackageConfiguration;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class PackageConfiguration;
+namespace Config_Handlers
+{
+class PackageConfiguration;
 
-    /*
-     * @class STD_PCD_Handler
-     *
-     * @brief Handler class for <CCMPackageConfiguration> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC objects, parsed from the descriptor files, to the
-     * corresponding CORBA IDL type for the schema element.
-     *
-     */
-    class Config_Handlers_Export STD_PCD_Handler
-    {
+/*
+* @class STD_PCD_Handler
+*
+* @brief Handler class for <CCMPackageConfiguration> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+class Config_Handlers_Export STD_PCD_Handler
+{
 
-    public:
-      STD_PCD_Handler (XML_Helper *xml_helper)
-        :xml_helper_ (xml_helper)
-      {
-      }
+public:
+STD_PCD_Handler (XML_Helper *xml_helper)
+:xml_helper_ (xml_helper)
+{
+}
 
-      /// Maps the values from the XSC object
-      /// <PackageConfiguration> to the CORBA IDL type
-      /// <Deployment::PackageConfiguration>.
-      bool package_config (
-            const PackageConfiguration &desc,
-            ::Deployment::PackageConfiguration &toconfig);
+/// Maps the values from the XSC object
+/// <PackageConfiguration> to the CORBA IDL type
+/// <Deployment::PackageConfiguration>.
+bool package_config (
+const PackageConfiguration &desc,
+::Deployment::PackageConfiguration &toconfig);
 
 //@@Note: This part has yet to be added in the future
 //     PackageConfiguration
 //     package_config (
 //       const Deployment::ComponentPortDescription& src);
 
-    private:
-      // Disable the default constructor
-      STD_PCD_Handler ()
-        :xml_helper_ (0)
-      {
-      }
+private:
+// Disable the default constructor
+STD_PCD_Handler ()
+:xml_helper_ (0)
+{
+}
 
-      XML_Helper *xml_helper_;
-    };
- }
+XML_Helper *xml_helper_;
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.h
index 2e07e1922eb..303224a387b 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.h
+++ b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  STD_PC_Intf.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
+*  @file  STD_PC_Intf.h
+*
+*  $Id$
+*
+*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_STD_PC_INTF_H
@@ -23,39 +23,39 @@
 
 namespace Deployment
 {
-  struct PackageConfiguration ;
+struct PackageConfiguration ;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-   /*
-    * @class STD_PC_Intf
-    *
-    * @brief Wrapper class for PackageConfiguration extraction
-    *
-    * This class defines wrapper functions for extracting
-    * PackageConfiguration IDL structures from XSC structures.
-    * It serves as the public interface used by application
-    * developers.
-    *
-    */
-    class Config_Handlers_Export STD_PC_Intf
-    {
-    public:
-      STD_PC_Intf (const char *file);
-
-      ::Deployment::PackageConfiguration const *get_PC (void) const;
-      ::Deployment::PackageConfiguration *get_PC (void);
-
-    protected:
-      bool prepare_PC (const char *file);
-
-    private:
-      ACE_Auto_Ptr< ::Deployment::PackageConfiguration> idl_pc_;
-    };
-  }
+namespace Config_Handlers
+{
+/*
+* @class STD_PC_Intf
+*
+* @brief Wrapper class for PackageConfiguration extraction
+*
+* This class defines wrapper functions for extracting
+* PackageConfiguration IDL structures from XSC structures.
+* It serves as the public interface used by application
+* developers.
+*
+*/
+class Config_Handlers_Export STD_PC_Intf
+{
+public:
+STD_PC_Intf (const char *file);
+
+::Deployment::PackageConfiguration const *get_PC (void) const;
+::Deployment::PackageConfiguration *get_PC (void);
+
+protected:
+bool prepare_PC (const char *file);
+
+private:
+ACE_Auto_Ptr< ::Deployment::PackageConfiguration> idl_pc_;
+};
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
new file mode 100644
index 00000000000..ef29bc86272
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -0,0 +1,113 @@
+//$Id$
+
+#include "SatisfierProperty_Handler.h"
+#include "Any_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+#include "ciao/CIAO_common.h"
+#include "Utils/Exceptions.h"
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+
+    SatisfierProperty_Handler::SatisfierProperty_Handler (void)
+    {
+    }
+
+    SatisfierProperty_Handler::~SatisfierProperty_Handler (void)
+    {
+    }
+
+    void
+    SatisfierProperty_Handler::get_sat_property (
+                                                 const SatisfierProperty& desc,
+                                                 Deployment::SatisfierProperty& toconfig)
+    {
+      CIAO_TRACE("SatisfierProperty_Handler::get_sat_property");
+
+      toconfig.name = desc.name ().c_str ();
+
+      switch (desc.kind ().integral ())
+        {
+        case SatisfierPropertyKind::Quantity_l:
+          toconfig.kind = Deployment::Quantity;
+          break;
+
+        case SatisfierPropertyKind::Capacity_l:
+          toconfig.kind = Deployment::Capacity;
+          break;
+
+        case SatisfierPropertyKind::Minimum_l:
+          toconfig.kind = Deployment::Minimum;
+          break;
+
+        case SatisfierPropertyKind::Maximum_l:
+          toconfig.kind = Deployment::Maximum;
+          break;
+
+          //        case SatisfierPropertyKind::Attribute_l:
+          //toconfig.kind = Deployment::_Attribute;
+          //break;
+
+        case SatisfierPropertyKind::Selection_l:
+          toconfig.kind = Deployment::Selection;
+          break;
+        }
+
+      toconfig.dynamic = desc.dynamic ();
+
+      Any_Handler::extract_into_any (desc.value (),
+                                     toconfig.value);
+    }
+
+    SatisfierProperty
+    SatisfierProperty_Handler::get_sat_property (
+                                                 const Deployment::SatisfierProperty& src)
+    {
+      CIAO_TRACE("SatisfierProperty_Handler::get_sat_property - reverse");
+
+      ::XMLSchema::string< ACE_TCHAR > name ((src.name));
+      SatisfierPropertyKind::Value kind;
+
+      const SatisfierPropertyKind *spk;
+
+      switch (src.kind)
+        {
+        case Deployment::Quantity:
+          spk = &SatisfierPropertyKind::Quantity;
+          break;
+
+        case Deployment::Capacity:
+          spk = &SatisfierPropertyKind::Capacity;
+          break;
+
+        case Deployment::Minimum:
+          spk = &SatisfierPropertyKind::Minimum;
+          break;
+
+        case Deployment::Maximum:
+          spk = &SatisfierPropertyKind::Maximum;
+          break;
+
+          //        case Deployment::_Attribute:
+          //kind = SatisfierPropertyKind::Attribute_l;
+          //break;
+
+        case Deployment::Selection:
+          kind = SatisfierPropertyKind::Selection_l;
+          break;
+
+        default:
+          throw Plan_Error ("Invalid SatisfierPropertyKind");
+        }
+
+      bool dynamic = src.dynamic;
+
+      Any value (Any_Handler::get_any (src.value));
+
+      return SatisfierProperty (name, *spk, dynamic, value);
+    }
+
+  }
+}
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
new file mode 100644
index 00000000000..2c2f671cb02
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
@@ -0,0 +1,71 @@
+//================================================
+/**
+*  @file  SatisfierProperty_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_SATIS_PROPERTY_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_SATIS_PROPERTY_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "Config_Handlers_Export.h"
+#include "Utils/Functors.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+struct SatisfierProperty;
+class SatisfierProperties;
+}
+
+namespace CIAO
+{
+namespace Config_Handlers
+{
+class SatisfierProperty;
+
+/*
+* @class SatisfierProperty_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
+
+class Config_Handlers_Export SatisfierProperty_Handler
+{
+public:
+SatisfierProperty_Handler (void);
+virtual ~SatisfierProperty_Handler (void);
+
+typedef Sequence_Iterator< const ::Deployment::SatisfierProperties, const ::Deployment::SatisfierProperty > sat_prop_iter;
+
+/// This method maps the values from the XSC object
+/// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type
+/// <Deployment::SatisfierProperty>.
+static void get_sat_property (const SatisfierProperty& desc,
+::Deployment::SatisfierProperty& toconfig);
+static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src);
+};
+
+typedef Sequence_Handler < SatisfierProperty,
+::Deployment::SatisfierProperties,
+::Deployment::SatisfierProperty,
+SatisfierProperty_Handler::get_sat_property> SatisfierProperty_Functor;
+
+}
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_SATIS_PROPERTY_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Exceptions.h b/TAO/CIAO/tools/Config_Handlers/Utils/Exceptions.h
new file mode 100644
index 00000000000..dadb7ed615d
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/Exceptions.h
@@ -0,0 +1,39 @@
+// $Id$
+/**
+ * @file Exceptions.h
+ * @author William Otte <wotte@dre.vanderbilt.edu>
+ *
+ * Defines exceptions that may be thrown during the XSC<=>IDL translation process.
+ */
+#include <string>
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    struct Parse_Error
+    {
+      Parse_Error (const std::string &reason)
+        : reason_ (reason)
+      {
+      }
+
+      std::string reason_;
+    };
+
+    struct Plan_Error
+    {
+      Plan_Error (const std::string &reason)
+        : reason_ (reason)
+      {
+      }
+
+      std::string reason_;
+    };
+
+  }
+}
+
+
+
+
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Functors.h b/TAO/CIAO/tools/Config_Handlers/Utils/Functors.h
new file mode 100644
index 00000000000..34702cd60d0
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/Functors.h
@@ -0,0 +1,137 @@
+#ifndef CONFIG_HANDLERS_FUNCTORS_H
+#define CONFIG_HANDLERS_FUNCTORS_H
+
+/**
+ * @file Functors.h
+ * @author William Otte <wotte@dre.vanderbilt.edu>
+ * $Id$
+ * Functors useful in the config handlers
+ */
+#include <iterator>
+
+#include "tao/Basic_Types.h" // For CORBA::ULong
+#include "tao/StringSeqC.h"
+
+#include "XMLSchema/Types.hpp"
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    template <typename Seq_Type, typename T>
+    class Sequence_Iterator :
+      public std::iterator <std::forward_iterator_tag, //iterator type
+                            T, // Type pointed to by the iterator
+                            CORBA::ULong> // Distance type
+    {
+    public:
+      Sequence_Iterator (void)
+        : pos_ (0),
+          seq_ (0)
+      {
+      }
+
+      Sequence_Iterator (const Seq_Type &seq, CORBA::ULong pos = 0)
+        : pos_ (pos),
+          seq_ (&seq)
+      {
+      }
+
+      Sequence_Iterator (const Sequence_Iterator &s)
+      {
+        *this = s;
+      }
+
+      Sequence_Iterator& operator= (const Sequence_Iterator &s)
+      {
+        this->seq_ = s.seq_;
+        this->pos_ = s.pos_;
+        return *this;
+      }
+
+      bool operator== (Sequence_Iterator &s)
+      {
+        return (this->seq_ == s.seq_) && (this->pos_ == s.pos_);
+      }
+
+      bool operator!= (Sequence_Iterator &s)
+      {
+        return !(*this == s);
+      }
+
+      T& operator* (void)
+      {
+        return (*seq_)[pos_];
+      }
+
+      T& operator-> (void)
+      {
+        return *(*this);
+      }
+
+      //  Prefix operator
+      Sequence_Iterator& operator++ ()
+      {
+        ++pos_;
+        return *this;
+      }
+
+      Sequence_Iterator& operator++ (int)
+      {
+        Sequence_Iterator ans (*this);
+        ++(*this);
+        return ans;
+      }
+
+    private:
+      CORBA::ULong pos_;
+      Seq_Type *seq_;
+    };
+
+    template <typename Source,
+              typename Dest,
+              typename Dest_Type,
+              void (*Func)(const Source &, Dest_Type &)>
+    struct Sequence_Handler
+    {
+      Sequence_Handler (Dest &dest, CORBA::ULong pos = 0)
+         : dest_ (dest),
+          pos_ (pos)
+      {
+      }
+
+      void operator() (const Source &src)
+      {
+        Func (src, dest_[pos_++]);
+      }
+
+    private:
+      Dest &dest_;
+      CORBA::ULong pos_;
+    };
+
+    template <typename Dest, typename Dest_Type>
+    struct String_Seq_Handler
+    {
+      String_Seq_Handler (Dest &dest, CORBA::ULong pos = 0)
+         : dest_ (dest),
+          pos_ (pos)
+      {
+      }
+
+      void operator() (const ::XMLSchema::string<ACE_TCHAR>  &src)
+      {
+        dest_[pos_++] = src.c_str ();
+      }
+
+    private:
+      Dest &dest_;
+      CORBA::ULong pos_;
+    };
+
+    typedef String_Seq_Handler < ::CORBA::StringSeq,
+                                 ::CORBA::String_var > String_Seq_Functor;
+
+  }
+}
+
+#endif /* CONFIG_HANDLERS_FUNCTORS_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
index 359af0af27a..bef9d906d1b 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
@@ -6,7 +6,7 @@ project (CIAO_XML_Utils) : acelib, xerces {
   dynamicflags  = CIAO_XML_UTILS_BUILD_DLL
   macros       += XML_USE_PTHREADS
   requires     += exceptions
-  
+
   Source_Files {
     XML_Schema_Resolver.cpp
     XML_Error_Handler.cpp
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
index d87e75dfb93..beae7bce56c 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
@@ -42,12 +42,18 @@ namespace CIAO
 
       ACE_Auto_Basic_Array_Ptr<char> cleanup_msg (msg);
 
+      char *file =
+        XMLString::transcode (domError.getLocation ()->getURI ());
+
+      ACE_Auto_Basic_Array_Ptr<char> cleanup_file (file);
+
       ACE_DEBUG ((LM_DEBUG,
-                  "%s at line %d and column %d\n", 
+                  "%s at line %d and column %d in file %s\n",
                   msg,
                   domError.getLocation ()->getLineNumber (),
-                  domError.getLocation ()->getColumnNumber ()));
-      
+                  domError.getLocation ()->getColumnNumber (),
+                  file));
+
       return true;
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
index de7c85bd979..c711b54a250 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
@@ -72,25 +72,25 @@ namespace CIAO
 
       // Instantiate the DOM parser.
       static const XMLCh gLS[] = { xercesc::chLatin_L,
-				   xercesc::chLatin_S,
-				   xercesc::chNull };
-      
+                                   xercesc::chLatin_S,
+                                   xercesc::chNull };
+
       // Get an implementation of the Load-Store (LS) interface
       // and cache it for later use
       impl_ =
-	  DOMImplementationRegistry::getDOMImplementation(gLS);
-      
+        DOMImplementationRegistry::getDOMImplementation(gLS);
+
       this->initialized_ = true;
       return;
     }
-    
+
     XERCES_CPP_NAMESPACE::DOMDocument *
     XML_Helper::create_dom (const ACE_TCHAR *root,
                             const ACE_TCHAR *ns)
     {
       if (root == 0 || ns == 0)
         return 0;
-      
+
       return this->impl_->createDocument (XStr (ns),
                                           XStr (root),
                                           0);
@@ -101,10 +101,10 @@ namespace CIAO
     {
 
       if (url == 0)
-	  return impl_->createDocument(
-	      XStr ("http://www.omg.org/DeploymentPlan"),
-	      XStr ("deploymentPlan"),
-	      0);
+        return impl_->createDocument(
+                                     XStr ("http://www.omg.org/DeploymentPlan"),
+                                     XStr ("deploymentPlan"),
+                                     0);
 
       try
         {
@@ -112,7 +112,7 @@ namespace CIAO
           // Create a DOMBuilder
           DOMBuilder* parser =
             impl_->createDOMBuilder (DOMImplementationLS::MODE_SYNCHRONOUS,
-                                    0);
+                                     0);
 
           // Discard comment nodes in the document
           parser->setFeature (XMLUni::fgDOMComments, false);
@@ -151,15 +151,15 @@ namespace CIAO
           XML_Error_Handler handler;
 
           parser->setErrorHandler (&handler);
-          
+
           CIAO_Schema_Resolver resolver;
-          
+
           parser->setEntityResolver (&resolver);
-          
+
           DOMDocument* doc = parser->parseURI (url);
 
           if (handler.getErrors ())
-            throw;
+            throw 0;
 
           return doc;
         }
@@ -183,13 +183,13 @@ namespace CIAO
         {
           char* message = XMLString::transcode (e.getMessage());
           ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          throw;
+          throw 0;
         }
       catch (...)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Caught an unknown exception \n"));
-          throw;
+          throw 0;
         }
 
       return 0;
@@ -214,22 +214,22 @@ namespace CIAO
       return;
     }
 
-      bool XML_Helper::write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
-				 ACE_TCHAR *file)
-      {
-	  bool retn;
-	  XERCES_CPP_NAMESPACE::DOMWriter *writer = impl_->createDOMWriter();
-          
-          if (writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint,
-                                      true))
-            writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true);
-          
-	  xercesc::XMLFormatTarget* ft (new xercesc::LocalFileFormatTarget(file));
-	  retn = writer->writeNode(ft, *doc);
-	  delete writer;
-	  delete ft;
-	  return retn;
-      }
-	  
+    bool XML_Helper::write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
+                                const ACE_TCHAR *file)
+    {
+      bool retn;
+      XERCES_CPP_NAMESPACE::DOMWriter *writer = impl_->createDOMWriter();
+
+      if (writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint,
+                                 true))
+        writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true);
+
+      xercesc::XMLFormatTarget* ft (new xercesc::LocalFileFormatTarget(file));
+      retn = writer->writeNode(ft, *doc);
+      delete writer;
+      delete ft;
+      return retn;
+    }
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
index 50c05f3472d..40b16e6bafa 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
@@ -17,6 +17,8 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/Singleton.h"
+#include "ace/Null_Mutex.h"
 
 #include "xercesc/util/XercesDefs.hpp"
 
@@ -47,15 +49,15 @@ namespace CIAO
       /// Create a DOM tree
       XERCES_CPP_NAMESPACE::DOMDocument *
       create_dom (const ACE_TCHAR *uri);
-      
+
       XERCES_CPP_NAMESPACE::DOMDocument *
       create_dom (const ACE_TCHAR *root,
                   const ACE_TCHAR *ns);
-      
+
       //Writes out a DOMDocument to an XML file
       bool write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
-		      ACE_TCHAR *file);
-      
+                      const ACE_TCHAR *file);
+
       bool is_initialized (void) const;
 
     protected:
@@ -69,8 +71,16 @@ namespace CIAO
       bool initialized_;
       XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
     };
+
+    CIAO_XML_UTILS_SINGLETON_DECLARE (ACE_Singleton,
+                                      XML_Helper,
+                                      ACE_Null_Mutex);
+
+    typedef ACE_Singleton < XML_Helper, ACE_Null_Mutex > XML_Helper_Singleton;
+#define XML_HELPER XML_Helper_Singleton::instance ()
   }
 }
 
+
 #include /**/ "ace/post.h"
 #endif/*CIAO_CONFIG_HANDLERS_XML_HELPER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
index 8901675a8b1..db3e704caa5 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
@@ -111,7 +111,7 @@ namespace Config_Handlers
   {
     return _wstr[i];
   }
-  
+
   XMLCh XStr::operator [] (const int i) const
   {
     return _wstr[i];
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
index 4df0f009984..a6f1dabe1db 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
@@ -17,13 +17,13 @@
 
 // Utility class that provides a std::string like facade to XMLString.
 // Doesn't implement all of the methods of std::string.
-
+#include "CIAO_XML_Utils_Export.h"
 namespace CIAO
 {
 namespace Config_Handlers
 {
 
-  class XStr
+  class CIAO_XML_Utils_Export XStr
   {
   public:
     XStr() : _wstr(0L) { };
@@ -62,12 +62,12 @@ namespace Config_Handlers
 
   };
 
-  bool operator== (const XStr& lhs, const XStr& rhs);
-  bool operator!= (const XStr& lhs, const XStr& rhs);
+  CIAO_XML_Utils_Export bool operator== (const XStr& lhs, const XStr& rhs);
+  CIAO_XML_Utils_Export bool operator!= (const XStr& lhs, const XStr& rhs);
 
-  std::ostream&
+  CIAO_XML_Utils_Export std::ostream&
   operator<< (std::ostream& o, XStr const& str);
-  
+
 }
 }
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp
index 436787813dd..a5c614182a3 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp
@@ -5,6 +5,6 @@
 namespace XMLSchema
 {
   namespace Traversal
-  { 
-  }  
+  {
+  }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp
index 67d4c4ad21a..d79c13630fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp
@@ -6,6 +6,6 @@ namespace XMLSchema
 {
   namespace Traversal
   {
-    
+
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp
index 947e37d2ae3..5b9422f38c8 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp
@@ -3,5 +3,5 @@
 // cvs-id    : $Id$
 
 namespace XMLSchema
-{ 
+{
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
index 0ef2db213f3..93c2a003606 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
@@ -421,7 +421,7 @@ namespace XMLSchema
         //std::wcerr << "registering " << container ()
         //           << " as '" << *this
         //           << "' on " << container () << std::endl;
-        NCName<C>::container ()->register_id (id_provider_, 
+        NCName<C>::container ()->register_id (id_provider_,
                                               NCName<C>::container ());
       }
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp
index 410eeda8167..6b749260f55 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp
@@ -4,5 +4,5 @@
 
 namespace XMLSchema
 {
-  
+
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp
index edd10f817f0..4a8bddcf597 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp
@@ -4,6 +4,6 @@
 
 namespace XMLSchema
 {
-  
+
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
index 04532665d51..d647b630a33 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
@@ -12,6 +12,8 @@
 #include <XMLSchema/Types.hpp>
 #include <XMLSchema/Traversal.hpp>
 
+#include <iostream>
+
 namespace XMLSchema
 {
   namespace Writer
@@ -26,8 +28,8 @@ namespace XMLSchema
       }
 
       using XSCRT::Writer<C>::top_;
-      using XSCRT::Writer<C>::attr_;      
-      
+      using XSCRT::Writer<C>::attr_;
+
       virtual void
       traverse (T const& o)
       {
@@ -59,6 +61,57 @@ namespace XMLSchema
       }
     };
 
+    template<typename C>
+    struct FundamentalType <XSCRT::FundamentalType<bool>, C> :
+      Traversal::Traverser<XSCRT::FundamentalType<bool> >,
+      virtual XSCRT::Writer<C>
+    {
+      FundamentalType (XSCRT::XML::Element<C> &e)
+        : XSCRT::Writer<C> (e)
+      {
+      }
+
+      using XSCRT::Writer<C>::top_;
+      using XSCRT::Writer<C>::attr_;
+
+      virtual void
+      traverse (XSCRT::FundamentalType<bool> const &o)
+      {
+        using namespace XSCRT::XML;
+
+        std::basic_ostringstream<C> os;
+
+        if (o)
+          {
+            os << "true";
+          }
+        else
+          {
+            os << "false";
+          }
+
+        if (Attribute<C>* a = attr_ ())
+        {
+          a->value (os.str ());
+        }
+        else
+        {
+          top_().value (os.str ());
+        }
+      }
+
+    protected:
+      virtual void
+      traverse (XSCRT::FundamentalType<bool> &t)
+      {
+        Traversal::Traverser<XSCRT::FundamentalType<bool> >::traverse (t);
+      }
+
+      FundamentalType ()
+      {
+      }
+    };
+
 
     template <typename C>
     struct IDREF : Traversal::Traverser<XMLSchema::IDREF<C> >,
@@ -89,13 +142,13 @@ namespace XMLSchema
       }
 
     protected:
-      
+
       virtual void
       traverse (typename Traversal::Traverser<XMLSchema::IDREF<C> >::Type &o)
       {
         Traversal::Traverser<XMLSchema::IDREF<C> >::traverse (o);
       }
-      
+
       IDREF ()
       {
       }
diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index 8c4caa05475..a592f756cf1 100644
--- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -11,7 +11,7 @@
 #include "Deployment.hpp"
 #include "DP_Handler.h"
 #include "ciao/Deployment_DataC.h"
-
+#include "ciao/CIAO_common.h"
 
 
 namespace CIAO
@@ -27,6 +27,8 @@ namespace CIAO
     bool
     XML_File_Intf::read_process_file (const char *file)
     {
+      CIAO_TRACE("XML_File_Intf::read_process_file");
+
       XML_Helper helper;
 
       if (!helper.is_initialized ())
@@ -51,16 +53,19 @@ namespace CIAO
 
       return false;
     }
- 
+
     ::Deployment::DeploymentPlan const *
     XML_File_Intf::get_plan (void) const
     {
+      CIAO_TRACE("get_plan");
       return this->idl_dp_.get ();
     }
 
     ::Deployment::DeploymentPlan *
     XML_File_Intf::get_plan (void)
     {
+      CIAO_TRACE("XML_File_Intf::get_plan");
+
       return this->idl_dp_.release ();
     }
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h
index 4a7216e78ef..9f5869b20fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h
+++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  XML_File_Intf.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
+*  @file  XML_File_Intf.h
+*
+*  $Id$
+*
+*  @author Bala Natarajan <bala@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_XML_FILE_INTF_H
@@ -23,29 +23,29 @@
 
 namespace Deployment
 {
-  struct DeploymentPlan ;
+struct DeploymentPlan ;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class Config_Handlers_Export XML_File_Intf
-    {
-    public:
-      XML_File_Intf (const char *file);
+namespace Config_Handlers
+{
+class Config_Handlers_Export XML_File_Intf
+{
+public:
+XML_File_Intf (const char *file);
 
-      ::Deployment::DeploymentPlan const *get_plan (void) const;
-      ::Deployment::DeploymentPlan *get_plan (void);
+::Deployment::DeploymentPlan const *get_plan (void) const;
+::Deployment::DeploymentPlan *get_plan (void);
 
-    protected:
+protected:
 
-      bool read_process_file (const char *file);
+bool read_process_file (const char *file);
 
-    private:
-      ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
-    };
-  }
+private:
+ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
+};
+}
 }
 #include /**/ "ace/post.h"
 #endif /*CIAO_CONFIG_XML_FILE_INTF_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
index 06d6801d83d..0d84a6bc28a 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
@@ -333,12 +333,12 @@ namespace XSCRT
     }
 
   public:
-    
+
     operator X const& () const
     {
       return x_;
     }
-    /* 
+    /*
     operator X& ()
     {
       return x_;
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
index 51f1930eea9..e2ab4b64956 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
@@ -36,7 +36,7 @@ namespace XSCRT
     friend std::ostream&
     operator << (std::ostream& os, TypeId const& t);
     */
-    
+
   public:
     char const*
     name () const
@@ -162,7 +162,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;
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
index 6745c9ad28c..6c4fba2cf88 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
@@ -6,7 +6,7 @@
 /*
  *  @@HACK: Visual Studio.
  *  I think the return value for operator== for type_info
- *  in VC7 (perhaps others) is int when is should be bool. 
+ *  in VC7 (perhaps others) is int when is should be bool.
  *  This causes a warning about converting the return value from
  *  int to bool.
  */
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
index 588cb61dc84..b12fda738d2 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
@@ -144,29 +144,29 @@ namespace XSCRT
     template <typename C>
     std::basic_string<C>
     ns_prefix (std::basic_string<C> const& ns, Element<C> const& e);
-    
+
     // Casting helpers, made necessary by the Xerces project's braindead
     // avoidance of RTTI.
     template <typename DERIVED> struct dom_traits;
-    
+
     // Specializations for different node types
     template <>
     struct dom_traits<xercesc::DOMElement *>
     {
       enum { node_type = xercesc::DOMNode::ELEMENT_NODE };
     };
-    
+
     template <>
     struct dom_traits<xercesc::DOMAttr *>
     {
       enum { node_type = xercesc::DOMNode::ATTRIBUTE_NODE };
     };
-    
+
     template <typename DERIVED_PTR>
     DERIVED_PTR dom_cast (xercesc::DOMNode *node)
     {
       DERIVED_PTR elem = 0;
-      if ((node != 0) && 
+      if ((node != 0) &&
           (node->getNodeType () == dom_traits<DERIVED_PTR>::node_type))
         {
           elem = reinterpret_cast <DERIVED_PTR> (node);
diff --git a/TAO/CIAO/tools/Config_Handlers/ccd.cpp b/TAO/CIAO/tools/Config_Handlers/ccd.cpp
index 3c561e8f1af..66743f01e2e 100644
--- a/TAO/CIAO/tools/Config_Handlers/ccd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ccd.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 "ccd.hpp"
 
 namespace CIAO
@@ -16,26 +16,26 @@ namespace CIAO
   namespace Config_Handlers
   {
     // ComponentInterfaceDescription
-    // 
+    //
 
     ComponentInterfaceDescription::
     ComponentInterfaceDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
     {
     }
 
     ComponentInterfaceDescription::
     ComponentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s)
-    :
-    ::XSCRT::Type (),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+        UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+          specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0),
+            contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+              href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+                regulator__ ()
     {
       if (label_.get ()) label_->container (this);
       if (UUID_.get ()) UUID_->container (this);
@@ -121,7 +121,7 @@ namespace CIAO
 
 
     // ComponentInterfaceDescription
-    // 
+    //
     bool ComponentInterfaceDescription::
     label_p () const
     {
@@ -138,19 +138,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-      {
-        *label_ = e;
-      }
+        {
+          *label_ = e;
+        }
 
       else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
+        {
+          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          label_->container (this);
+        }
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     bool ComponentInterfaceDescription::
     UUID_p () const
     {
@@ -167,19 +167,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+        {
+          *UUID_ = e;
+        }
 
       else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
+        {
+          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          UUID_->container (this);
+        }
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     bool ComponentInterfaceDescription::
     specificType_p () const
     {
@@ -196,19 +196,19 @@ namespace CIAO
     specificType (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (specificType_.get ())
-      {
-        *specificType_ = e;
-      }
+        {
+          *specificType_ = e;
+        }
 
       else
-      {
-        specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        specificType_->container (this);
-      }
+        {
+          specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          specificType_->container (this);
+        }
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::supportedType_iterator ComponentInterfaceDescription::
     begin_supportedType ()
     {
@@ -246,7 +246,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::idlFile_iterator ComponentInterfaceDescription::
     begin_idlFile ()
     {
@@ -284,7 +284,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::configProperty_iterator ComponentInterfaceDescription::
     begin_configProperty ()
     {
@@ -322,7 +322,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::port_iterator ComponentInterfaceDescription::
     begin_port ()
     {
@@ -360,7 +360,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::property_iterator ComponentInterfaceDescription::
     begin_property ()
     {
@@ -398,7 +398,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     ComponentInterfaceDescription::infoProperty_iterator ComponentInterfaceDescription::
     begin_infoProperty ()
     {
@@ -436,7 +436,7 @@ namespace CIAO
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     bool ComponentInterfaceDescription::
     contentLocation_p () const
     {
@@ -453,19 +453,19 @@ namespace CIAO
     contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
+        {
+          *contentLocation_ = e;
+        }
 
       else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
-      }
+        {
+          contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          contentLocation_->container (this);
+        }
     }
 
     // ComponentInterfaceDescription
-    // 
+    //
     bool ComponentInterfaceDescription::
     href_p () const
     {
@@ -488,15 +488,15 @@ namespace CIAO
     href (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (href_.get ())
-      {
-        *href_ = e;
-      }
+        {
+          *href_ = e;
+        }
 
       else
-      {
-        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        href_->container (this);
-      }
+        {
+          href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          href_->container (this);
+        }
     }
   }
 }
@@ -510,95 +510,95 @@ namespace CIAO
 
     ComponentInterfaceDescription::
     ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+      :Base__ (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
-
-        else if (n == "specificType")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          specificType (t);
-        }
-
-        else if (n == "supportedType")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_supportedType (t);
-        }
-
-        else if (n == "idlFile")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_idlFile (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_configProperty (t);
-        }
-
-        else if (n == "port")
-        {
-          ::CIAO::Config_Handlers::ComponentPortDescription t (e);
-          add_port (t);
-        }
-
-        else if (n == "property")
-        {
-          ::CIAO::Config_Handlers::ComponentPropertyDescription t (e);
-          add_property (t);
-        }
-
-        else if (n == "infoProperty")
         {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_infoProperty (t);
+          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+          if (n == "label")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              label (t);
+            }
+
+          else if (n == "UUID")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              UUID (t);
+            }
+
+          else if (n == "specificType")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              specificType (t);
+            }
+
+          else if (n == "supportedType")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              add_supportedType (t);
+            }
+
+          else if (n == "idlFile")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              add_idlFile (t);
+            }
+
+          else if (n == "configProperty")
+            {
+              ::CIAO::Config_Handlers::Property t (e);
+              add_configProperty (t);
+            }
+
+          else if (n == "port")
+            {
+              ::CIAO::Config_Handlers::ComponentPortDescription t (e);
+              add_port (t);
+            }
+
+          else if (n == "property")
+            {
+              ::CIAO::Config_Handlers::ComponentPropertyDescription t (e);
+              add_property (t);
+            }
+
+          else if (n == "infoProperty")
+            {
+              ::CIAO::Config_Handlers::Property t (e);
+              add_infoProperty (t);
+            }
+
+          else if (n == "contentLocation")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              contentLocation (t);
+            }
+
+          else
+            {
+            }
         }
 
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-
       while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "href")
         {
-          ::XMLSchema::string< ACE_TCHAR > t (a);
-          href (t);
+          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+          if (n == "href")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (a);
+              href (t);
+            }
+
+          else
+            {
+            }
         }
-
-        else 
-        {
-        }
-      }
     }
   }
 }
@@ -777,17 +777,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
         if (b != e)
-        {
-          supportedType_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) supportedType_next (o);
+            supportedType_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) supportedType_next (o);
+              }
+
+            supportedType_post (o);
           }
 
-          supportedType_post (o);
-        }
-
         else supportedType_none (o);
       }
 
@@ -799,17 +799,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType());
 
         if (b != e)
-        {
-          supportedType_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) supportedType_next (o);
+            supportedType_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) supportedType_next (o);
+              }
+
+            supportedType_post (o);
           }
 
-          supportedType_post (o);
-        }
-
         else supportedType_none (o);
       }
 
@@ -861,17 +861,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::idlFile_iterator b (o.begin_idlFile()), e (o.end_idlFile());
 
         if (b != e)
-        {
-          idlFile_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) idlFile_next (o);
+            idlFile_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) idlFile_next (o);
+              }
+
+            idlFile_post (o);
           }
 
-          idlFile_post (o);
-        }
-
         else idlFile_none (o);
       }
 
@@ -883,17 +883,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::idlFile_const_iterator b (o.begin_idlFile()), e (o.end_idlFile());
 
         if (b != e)
-        {
-          idlFile_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) idlFile_next (o);
+            idlFile_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) idlFile_next (o);
+              }
+
+            idlFile_post (o);
           }
 
-          idlFile_post (o);
-        }
-
         else idlFile_none (o);
       }
 
@@ -945,17 +945,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
         if (b != e)
-        {
-          configProperty_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
+            configProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) configProperty_next (o);
+              }
+
+            configProperty_post (o);
           }
 
-          configProperty_post (o);
-        }
-
         else configProperty_none (o);
       }
 
@@ -967,17 +967,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
         if (b != e)
-        {
-          configProperty_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
+            configProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) configProperty_next (o);
+              }
+
+            configProperty_post (o);
           }
 
-          configProperty_post (o);
-        }
-
         else configProperty_none (o);
       }
 
@@ -1029,17 +1029,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::port_iterator b (o.begin_port()), e (o.end_port());
 
         if (b != e)
-        {
-          port_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) port_next (o);
+            port_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) port_next (o);
+              }
+
+            port_post (o);
           }
 
-          port_post (o);
-        }
-
         else port_none (o);
       }
 
@@ -1051,17 +1051,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::port_const_iterator b (o.begin_port()), e (o.end_port());
 
         if (b != e)
-        {
-          port_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) port_next (o);
+            port_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) port_next (o);
+              }
+
+            port_post (o);
           }
 
-          port_post (o);
-        }
-
         else port_none (o);
       }
 
@@ -1113,17 +1113,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
 
         if (b != e)
-        {
-          property_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) property_next (o);
+            property_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) property_next (o);
+              }
+
+            property_post (o);
           }
 
-          property_post (o);
-        }
-
         else property_none (o);
       }
 
@@ -1135,17 +1135,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
 
         if (b != e)
-        {
-          property_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) property_next (o);
+            property_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) property_next (o);
+              }
+
+            property_post (o);
           }
 
-          property_post (o);
-        }
-
         else property_none (o);
       }
 
@@ -1197,17 +1197,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
-        {
-          infoProperty_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
+            infoProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1219,17 +1219,17 @@ namespace CIAO
         ComponentInterfaceDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
-        {
-          infoProperty_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
+            infoProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1342,7 +1342,7 @@ namespace CIAO
 
       ComponentInterfaceDescription::
       ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/ccd.hpp b/TAO/CIAO/tools/Config_Handlers/ccd.hpp
index ab460a46a7d..74368eb7fc4 100644
--- a/TAO/CIAO/tools/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/ccd.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,10 +27,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class ComponentInterfaceDescription;
-  }
+namespace Config_Handlers
+{
+class ComponentInterfaceDescription;
+}
 }
 
 #include <memory>
@@ -41,738 +41,738 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export ComponentInterfaceDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // specificType
-      // 
-      public:
-      bool specificType_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& specificType () const;
-      void specificType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
-
-      // supportedType
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator;
-      supportedType_iterator begin_supportedType ();
-      supportedType_iterator end_supportedType ();
-      supportedType_const_iterator begin_supportedType () const;
-      supportedType_const_iterator end_supportedType () const;
-      void add_supportedType (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_supportedType (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
-
-      // idlFile
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator idlFile_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator idlFile_const_iterator;
-      idlFile_iterator begin_idlFile ();
-      idlFile_iterator end_idlFile ();
-      idlFile_const_iterator begin_idlFile () const;
-      idlFile_const_iterator end_idlFile () const;
-      void add_idlFile (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_idlFile (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > idlFile_;
-
-      // configProperty
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
-      configProperty_iterator begin_configProperty ();
-      configProperty_iterator end_configProperty ();
-      configProperty_const_iterator begin_configProperty () const;
-      configProperty_const_iterator end_configProperty () const;
-      void add_configProperty (::CIAO::Config_Handlers::Property const& );
-      size_t count_configProperty (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // port
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::const_iterator port_const_iterator;
-      port_iterator begin_port ();
-      port_iterator end_port ();
-      port_const_iterator begin_port () const;
-      port_const_iterator end_port () const;
-      void add_port (::CIAO::Config_Handlers::ComponentPortDescription const& );
-      size_t count_port (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription > port_;
-
-      // property
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::iterator property_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::const_iterator property_const_iterator;
-      property_iterator begin_property ();
-      property_iterator end_property ();
-      property_const_iterator begin_property () const;
-      property_const_iterator end_property () const;
-      void add_property (::CIAO::Config_Handlers::ComponentPropertyDescription const& );
-      size_t count_property (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription > property_;
-
-      // infoProperty
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-      infoProperty_iterator begin_infoProperty ();
-      infoProperty_iterator end_infoProperty ();
-      infoProperty_const_iterator begin_infoProperty () const;
-      infoProperty_const_iterator end_infoProperty () const;
-      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-      size_t count_infoProperty (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      // 
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-      // href
-      // 
-      public:
-      bool href_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& href () const;
-      ::XMLSchema::string< ACE_TCHAR >& href ();
-      void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-      public:
-      ComponentInterfaceDescription ();
-
-      ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentInterfaceDescription (ComponentInterfaceDescription const& s);
-
-      ComponentInterfaceDescription&
-      operator= (ComponentInterfaceDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export ComponentInterfaceDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// specificType
+//
+public:
+bool specificType_p () const;
+::XMLSchema::string< ACE_TCHAR > const& specificType () const;
+void specificType (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
+
+// supportedType
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator;
+supportedType_iterator begin_supportedType ();
+supportedType_iterator end_supportedType ();
+supportedType_const_iterator begin_supportedType () const;
+supportedType_const_iterator end_supportedType () const;
+void add_supportedType (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_supportedType (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
+
+// idlFile
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator idlFile_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator idlFile_const_iterator;
+idlFile_iterator begin_idlFile ();
+idlFile_iterator end_idlFile ();
+idlFile_const_iterator begin_idlFile () const;
+idlFile_const_iterator end_idlFile () const;
+void add_idlFile (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_idlFile (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > idlFile_;
+
+// configProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+configProperty_iterator begin_configProperty ();
+configProperty_iterator end_configProperty ();
+configProperty_const_iterator begin_configProperty () const;
+configProperty_const_iterator end_configProperty () const;
+void add_configProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_configProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+// port
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentPortDescription >::const_iterator port_const_iterator;
+port_iterator begin_port ();
+port_iterator end_port ();
+port_const_iterator begin_port () const;
+port_const_iterator end_port () const;
+void add_port (::CIAO::Config_Handlers::ComponentPortDescription const& );
+size_t count_port (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ComponentPortDescription > port_;
+
+// property
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::iterator property_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription >::const_iterator property_const_iterator;
+property_iterator begin_property ();
+property_iterator end_property ();
+property_const_iterator begin_property () const;
+property_const_iterator end_property () const;
+void add_property (::CIAO::Config_Handlers::ComponentPropertyDescription const& );
+size_t count_property (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ComponentPropertyDescription > property_;
+
+// infoProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+infoProperty_iterator begin_infoProperty ();
+infoProperty_iterator end_infoProperty ();
+infoProperty_const_iterator begin_infoProperty () const;
+infoProperty_const_iterator end_infoProperty () const;
+void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_infoProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+// contentLocation
+//
+public:
+bool contentLocation_p () const;
+::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+// href
+//
+public:
+bool href_p () const;
+::XMLSchema::string< ACE_TCHAR > const& href () const;
+::XMLSchema::string< ACE_TCHAR >& href ();
+void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+public:
+ComponentInterfaceDescription ();
+
+ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentInterfaceDescription (ComponentInterfaceDescription const& s);
+
+ComponentInterfaceDescription&
+operator= (ComponentInterfaceDescription const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export ComponentInterfaceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentInterfaceDescription >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export ComponentInterfaceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentInterfaceDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+label (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        specificType (Type&);
+virtual void
+specificType (Type&);
 
-        virtual void
-        specificType (Type const&);
+virtual void
+specificType (Type const&);
 
-        virtual void
-        specificType_none (Type&);
+virtual void
+specificType_none (Type&);
 
-        virtual void
-        specificType_none (Type const&);
+virtual void
+specificType_none (Type const&);
 
-        virtual void
-        supportedType (Type&);
+virtual void
+supportedType (Type&);
 
-        virtual void
-        supportedType (Type const&);
+virtual void
+supportedType (Type const&);
 
-        virtual void
-        supportedType_pre (Type&);
+virtual void
+supportedType_pre (Type&);
 
-        virtual void
-        supportedType_pre (Type const&);
+virtual void
+supportedType_pre (Type const&);
 
-        virtual void
-        supportedType_next (Type&);
+virtual void
+supportedType_next (Type&);
 
-        virtual void
-        supportedType_next (Type const&);
+virtual void
+supportedType_next (Type const&);
 
-        virtual void
-        supportedType_post (Type&);
+virtual void
+supportedType_post (Type&);
 
-        virtual void
-        supportedType_post (Type const&);
+virtual void
+supportedType_post (Type const&);
 
-        virtual void
-        supportedType_none (Type&);
+virtual void
+supportedType_none (Type&);
 
-        virtual void
-        supportedType_none (Type const&);
+virtual void
+supportedType_none (Type const&);
 
-        virtual void
-        idlFile (Type&);
+virtual void
+idlFile (Type&);
 
-        virtual void
-        idlFile (Type const&);
+virtual void
+idlFile (Type const&);
 
-        virtual void
-        idlFile_pre (Type&);
+virtual void
+idlFile_pre (Type&);
 
-        virtual void
-        idlFile_pre (Type const&);
+virtual void
+idlFile_pre (Type const&);
 
-        virtual void
-        idlFile_next (Type&);
+virtual void
+idlFile_next (Type&);
 
-        virtual void
-        idlFile_next (Type const&);
+virtual void
+idlFile_next (Type const&);
 
-        virtual void
-        idlFile_post (Type&);
+virtual void
+idlFile_post (Type&);
 
-        virtual void
-        idlFile_post (Type const&);
+virtual void
+idlFile_post (Type const&);
 
-        virtual void
-        idlFile_none (Type&);
+virtual void
+idlFile_none (Type&);
 
-        virtual void
-        idlFile_none (Type const&);
+virtual void
+idlFile_none (Type const&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        configProperty_pre (Type&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        configProperty_pre (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        configProperty_next (Type&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        configProperty_next (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        configProperty_post (Type&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        configProperty_post (Type const&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        port (Type&);
+virtual void
+port (Type&);
 
-        virtual void
-        port (Type const&);
+virtual void
+port (Type const&);
 
-        virtual void
-        port_pre (Type&);
+virtual void
+port_pre (Type&);
 
-        virtual void
-        port_pre (Type const&);
+virtual void
+port_pre (Type const&);
 
-        virtual void
-        port_next (Type&);
+virtual void
+port_next (Type&);
 
-        virtual void
-        port_next (Type const&);
+virtual void
+port_next (Type const&);
 
-        virtual void
-        port_post (Type&);
+virtual void
+port_post (Type&);
 
-        virtual void
-        port_post (Type const&);
+virtual void
+port_post (Type const&);
 
-        virtual void
-        port_none (Type&);
+virtual void
+port_none (Type&);
 
-        virtual void
-        port_none (Type const&);
+virtual void
+port_none (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        property_pre (Type&);
+virtual void
+property_pre (Type&);
 
-        virtual void
-        property_pre (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void
-        property_next (Type&);
+virtual void
+property_next (Type&);
 
-        virtual void
-        property_next (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void
-        property_post (Type&);
+virtual void
+property_post (Type&);
 
-        virtual void
-        property_post (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void
-        property_none (Type&);
+virtual void
+property_none (Type&);
 
-        virtual void
-        property_none (Type const&);
+virtual void
+property_none (Type const&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        infoProperty_pre (Type&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        infoProperty_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        infoProperty_next (Type&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        infoProperty_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        infoProperty_post (Type&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        infoProperty_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+contentLocation (Type&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+contentLocation_none (Type&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+contentLocation_none (Type const&);
 
-        virtual void
-        href (Type&);
+virtual void
+href (Type&);
 
-        virtual void
-        href (Type const&);
+virtual void
+href (Type const&);
 
-        virtual void
-        href_none (Type&);
+virtual void
+href_none (Type&);
 
-        virtual void
-        href_none (Type const&);
+virtual void
+href_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct ComponentInterfaceDescription : Traversal::ComponentInterfaceDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentInterfaceDescription Type;
-        ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct ComponentInterfaceDescription : Traversal::ComponentInterfaceDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentInterfaceDescription Type;
+ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->label (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+UUID (Type &o)
+{
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+this->UUID (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void 
-        specificType (Type &o)
-        {
+virtual void
+specificType (Type &o)
+{
 
-          this->specificType (const_cast <Type const &> (o));
-        }
+this->specificType (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        specificType (Type const&);
+virtual void
+specificType (Type const&);
 
-        virtual void 
-        supportedType_pre (Type &o)
-        {
+virtual void
+supportedType_pre (Type &o)
+{
 
-          this->supportedType_pre (const_cast <Type const &> (o));
-        }
+this->supportedType_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        supportedType_pre (Type const&);
+virtual void
+supportedType_pre (Type const&);
 
-        virtual void 
-        supportedType_next (Type &o)
-        {
+virtual void
+supportedType_next (Type &o)
+{
 
-          this->supportedType_next (const_cast <Type const &> (o));
-        }
+this->supportedType_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        supportedType_next (Type const&);
+virtual void
+supportedType_next (Type const&);
 
-        virtual void 
-        supportedType_post (Type &o)
-        {
+virtual void
+supportedType_post (Type &o)
+{
 
-          this->supportedType_post (const_cast <Type const &> (o));
-        }
+this->supportedType_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        supportedType_post (Type const&);
+virtual void
+supportedType_post (Type const&);
 
-        virtual void 
-        idlFile_pre (Type &o)
-        {
+virtual void
+idlFile_pre (Type &o)
+{
 
-          this->idlFile_pre (const_cast <Type const &> (o));
-        }
+this->idlFile_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        idlFile_pre (Type const&);
+virtual void
+idlFile_pre (Type const&);
 
-        virtual void 
-        idlFile_next (Type &o)
-        {
+virtual void
+idlFile_next (Type &o)
+{
 
-          this->idlFile_next (const_cast <Type const &> (o));
-        }
+this->idlFile_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        idlFile_next (Type const&);
+virtual void
+idlFile_next (Type const&);
 
-        virtual void 
-        idlFile_post (Type &o)
-        {
+virtual void
+idlFile_post (Type &o)
+{
 
-          this->idlFile_post (const_cast <Type const &> (o));
-        }
+this->idlFile_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        idlFile_post (Type const&);
+virtual void
+idlFile_post (Type const&);
 
-        virtual void 
-        configProperty_pre (Type &o)
-        {
+virtual void
+configProperty_pre (Type &o)
+{
 
-          this->configProperty_pre (const_cast <Type const &> (o));
-        }
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        configProperty_pre (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void 
-        configProperty_next (Type &o)
-        {
+virtual void
+configProperty_next (Type &o)
+{
 
-          this->configProperty_next (const_cast <Type const &> (o));
-        }
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        configProperty_next (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void 
-        configProperty_post (Type &o)
-        {
+virtual void
+configProperty_post (Type &o)
+{
 
-          this->configProperty_post (const_cast <Type const &> (o));
-        }
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        configProperty_post (Type const&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void 
-        port_pre (Type &o)
-        {
+virtual void
+port_pre (Type &o)
+{
 
-          this->port_pre (const_cast <Type const &> (o));
-        }
+this->port_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        port_pre (Type const&);
+virtual void
+port_pre (Type const&);
 
-        virtual void 
-        port_next (Type &o)
-        {
+virtual void
+port_next (Type &o)
+{
 
-          this->port_next (const_cast <Type const &> (o));
-        }
+this->port_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        port_next (Type const&);
+virtual void
+port_next (Type const&);
 
-        virtual void 
-        port_post (Type &o)
-        {
+virtual void
+port_post (Type &o)
+{
 
-          this->port_post (const_cast <Type const &> (o));
-        }
+this->port_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        port_post (Type const&);
+virtual void
+port_post (Type const&);
 
-        virtual void 
-        property_pre (Type &o)
-        {
+virtual void
+property_pre (Type &o)
+{
 
-          this->property_pre (const_cast <Type const &> (o));
-        }
+this->property_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        property_pre (Type const&);
+virtual void
+property_pre (Type const&);
 
-        virtual void 
-        property_next (Type &o)
-        {
+virtual void
+property_next (Type &o)
+{
 
-          this->property_next (const_cast <Type const &> (o));
-        }
+this->property_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        property_next (Type const&);
+virtual void
+property_next (Type const&);
 
-        virtual void 
-        property_post (Type &o)
-        {
+virtual void
+property_post (Type &o)
+{
 
-          this->property_post (const_cast <Type const &> (o));
-        }
+this->property_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        property_post (Type const&);
+virtual void
+property_post (Type const&);
 
-        virtual void 
-        infoProperty_pre (Type &o)
-        {
+virtual void
+infoProperty_pre (Type &o)
+{
 
-          this->infoProperty_pre (const_cast <Type const &> (o));
-        }
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void 
-        infoProperty_next (Type &o)
-        {
+virtual void
+infoProperty_next (Type &o)
+{
 
-          this->infoProperty_next (const_cast <Type const &> (o));
-        }
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void 
-        infoProperty_post (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->infoProperty_post (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void 
-        contentLocation (Type &o)
-        {
+virtual void
+contentLocation (Type &o)
+{
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
+this->contentLocation (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void 
-        href (Type &o)
-        {
+virtual void
+href (Type &o)
+{
 
-          this->href (const_cast <Type const &> (o));
-        }
+this->href (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        href (Type const&);
+virtual void
+href (Type const&);
 
-        protected:
-        ComponentInterfaceDescription ();
-      };
-    }
-  }
+protected:
+ComponentInterfaceDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CCD_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/cdd.cpp b/TAO/CIAO/tools/Config_Handlers/cdd.cpp
index 2b2f8cb2927..081ff061ea8 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.cpp
@@ -1,14 +1,15 @@
+
 /* $Id$
  * This code was generated by the XML Schema Compiler.
  *
  * 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 "cdd.hpp"
 
 namespace CIAO
@@ -16,32 +17,23 @@ namespace CIAO
   namespace Config_Handlers
   {
     // Domain
-    // 
+    //
 
     Domain::
-    Domain (::CIAO::Config_Handlers::Interconnect const& interconnect__,
-            ::CIAO::Config_Handlers::Bridge const& bridge__)
-    : 
-    ::XSCRT::Type (), 
-    interconnect_ (new ::CIAO::Config_Handlers::Interconnect (interconnect__)),
-    bridge_ (new ::CIAO::Config_Handlers::Bridge (bridge__)),
-    regulator__ ()
+    Domain ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
     {
-      interconnect_->container (this);
-      bridge_->container (this);
     }
 
     Domain::
     Domain (::CIAO::Config_Handlers::Domain const& s)
-    :
-    ::XSCRT::Type (),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    interconnect_ (new ::CIAO::Config_Handlers::Interconnect (*s.interconnect_)),
-    bridge_ (new ::CIAO::Config_Handlers::Bridge (*s.bridge_)),
-    sharedResource_ (s.sharedResource_.get () ? new ::CIAO::Config_Handlers::SharedResource (*s.sharedResource_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+        label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+          regulator__ ()
     {
       if (UUID_.get ()) UUID_->container (this);
       if (label_.get ()) label_->container (this);
@@ -49,10 +41,21 @@ namespace CIAO
         for (node_const_iterator i (s.node_.begin ());i != s.node_.end ();++i) add_node (*i);
       }
 
-      interconnect_->container (this);
-      bridge_->container (this);
-      if (sharedResource_.get ()) sharedResource_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
+      {
+        for (interconnect_const_iterator i (s.interconnect_.begin ());i != s.interconnect_.end ();++i) add_interconnect (*i);
+      }
+
+      {
+        for (bridge_const_iterator i (s.bridge_.begin ());i != s.bridge_.end ();++i) add_bridge (*i);
+      }
+
+      {
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+      }
+
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
     }
 
     ::CIAO::Config_Handlers::Domain& Domain::
@@ -69,22 +72,32 @@ namespace CIAO
         for (node_const_iterator i (s.node_.begin ());i != s.node_.end ();++i) add_node (*i);
       }
 
-      interconnect (s.interconnect ());
+      interconnect_.clear ();
+      {
+        for (interconnect_const_iterator i (s.interconnect_.begin ());i != s.interconnect_.end ();++i) add_interconnect (*i);
+      }
 
-      bridge (s.bridge ());
+      bridge_.clear ();
+      {
+        for (bridge_const_iterator i (s.bridge_.begin ());i != s.bridge_.end ();++i) add_bridge (*i);
+      }
 
-      if (s.sharedResource_.get ()) sharedResource (*(s.sharedResource_));
-      else sharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > (0);
+      sharedResource_.clear ();
+      {
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+      }
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+      infoProperty_.clear ();
+      {
+        for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+      }
 
       return *this;
     }
 
 
     // Domain
-    // 
+    //
     bool Domain::
     UUID_p () const
     {
@@ -101,19 +114,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+        {
+          *UUID_ = e;
+        }
 
       else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
+        {
+          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          UUID_->container (this);
+        }
     }
 
     // Domain
-    // 
+    //
     bool Domain::
     label_p () const
     {
@@ -130,19 +143,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-      {
-        *label_ = e;
-      }
+        {
+          *label_ = e;
+        }
 
       else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
+        {
+          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          label_->container (this);
+        }
     }
 
     // Domain
-    // 
+    //
     Domain::node_iterator Domain::
     begin_node ()
     {
@@ -180,2826 +193,3200 @@ namespace CIAO
     }
 
     // Domain
-    // 
-    ::CIAO::Config_Handlers::Interconnect const& Domain::
-    interconnect () const
+    //
+    Domain::interconnect_iterator Domain::
+    begin_interconnect ()
     {
-      return *interconnect_;
+      return interconnect_.begin ();
     }
 
-    void Domain::
-    interconnect (::CIAO::Config_Handlers::Interconnect const& e)
+    Domain::interconnect_iterator Domain::
+    end_interconnect ()
     {
-      *interconnect_ = e;
+      return interconnect_.end ();
     }
 
-    // Domain
-    // 
-    ::CIAO::Config_Handlers::Bridge const& Domain::
-    bridge () const
+    Domain::interconnect_const_iterator Domain::
+    begin_interconnect () const
     {
-      return *bridge_;
+      return interconnect_.begin ();
     }
 
-    void Domain::
-    bridge (::CIAO::Config_Handlers::Bridge const& e)
+    Domain::interconnect_const_iterator Domain::
+    end_interconnect () const
     {
-      *bridge_ = e;
+      return interconnect_.end ();
     }
 
-    // Domain
-    // 
-    bool Domain::
-    sharedResource_p () const
+    void Domain::
+    add_interconnect (::CIAO::Config_Handlers::Interconnect const& e)
     {
-      return sharedResource_.get () != 0;
+      interconnect_.push_back (e);
     }
 
-    ::CIAO::Config_Handlers::SharedResource const& Domain::
-    sharedResource () const
+    size_t Domain::
+    count_interconnect(void) const
     {
-      return *sharedResource_;
+      return interconnect_.size ();
     }
 
-    void Domain::
-    sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
+    // Domain
+    //
+    Domain::bridge_iterator Domain::
+    begin_bridge ()
     {
-      if (sharedResource_.get ())
-      {
-        *sharedResource_ = e;
-      }
-
-      else
-      {
-        sharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > (new ::CIAO::Config_Handlers::SharedResource (e));
-        sharedResource_->container (this);
-      }
+      return bridge_.begin ();
     }
 
-    // Domain
-    // 
-    bool Domain::
-    infoProperty_p () const
+    Domain::bridge_iterator Domain::
+    end_bridge ()
     {
-      return infoProperty_.get () != 0;
+      return bridge_.end ();
     }
 
-    ::CIAO::Config_Handlers::Property const& Domain::
-    infoProperty () const
+    Domain::bridge_const_iterator Domain::
+    begin_bridge () const
     {
-      return *infoProperty_;
+      return bridge_.begin ();
     }
 
-    void Domain::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
+    Domain::bridge_const_iterator Domain::
+    end_bridge () const
     {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
+      return bridge_.end ();
     }
 
-
-    // Bridge
-    // 
-
-    Bridge::
-    Bridge (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
+    void Domain::
+    add_bridge (::CIAO::Config_Handlers::Bridge const& e)
     {
-      name_->container (this);
+      bridge_.push_back (e);
     }
 
-    Bridge::
-    Bridge (::CIAO::Config_Handlers::Bridge const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    regulator__ ()
+    size_t Domain::
+    count_bridge(void) const
     {
-      name_->container (this);
-      if (label_.get ()) label_->container (this);
-      {
-        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-      }
-
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
+      return bridge_.size ();
     }
 
-    ::CIAO::Config_Handlers::Bridge& Bridge::
-    operator= (::CIAO::Config_Handlers::Bridge const& s)
+    // Domain
+    //
+    Domain::sharedResource_iterator Domain::
+    begin_sharedResource ()
     {
-      name (s.name ());
-
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
-
-      connect_.clear ();
-      {
-        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-      }
-
-      resource_.clear ();
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
-
-      return *this;
+      return sharedResource_.begin ();
     }
 
-
-    // Bridge
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Bridge::
-    name () const
+    Domain::sharedResource_iterator Domain::
+    end_sharedResource ()
     {
-      return *name_;
+      return sharedResource_.end ();
     }
 
-    void Bridge::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    Domain::sharedResource_const_iterator Domain::
+    begin_sharedResource () const
     {
-      *name_ = e;
+      return sharedResource_.begin ();
     }
 
-    // Bridge
-    // 
-    bool Bridge::
-    label_p () const
+    Domain::sharedResource_const_iterator Domain::
+    end_sharedResource () const
     {
-      return label_.get () != 0;
+      return sharedResource_.end ();
     }
 
-    ::XMLSchema::string< ACE_TCHAR > const& Bridge::
-    label () const
+    void Domain::
+    add_sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
     {
-      return *label_;
+      sharedResource_.push_back (e);
     }
 
-    void Bridge::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
+    size_t Domain::
+    count_sharedResource(void) const
     {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
+      return sharedResource_.size ();
     }
 
-    // Bridge
-    // 
-    Bridge::connect_iterator Bridge::
-    begin_connect ()
+    // Domain
+    //
+    Domain::infoProperty_iterator Domain::
+    begin_infoProperty ()
     {
-      return connect_.begin ();
+      return infoProperty_.begin ();
     }
 
-    Bridge::connect_iterator Bridge::
-    end_connect ()
+    Domain::infoProperty_iterator Domain::
+    end_infoProperty ()
     {
-      return connect_.end ();
+      return infoProperty_.end ();
     }
 
-    Bridge::connect_const_iterator Bridge::
-    begin_connect () const
+    Domain::infoProperty_const_iterator Domain::
+    begin_infoProperty () const
     {
-      return connect_.begin ();
+      return infoProperty_.begin ();
     }
 
-    Bridge::connect_const_iterator Bridge::
-    end_connect () const
+    Domain::infoProperty_const_iterator Domain::
+    end_infoProperty () const
     {
-      return connect_.end ();
+      return infoProperty_.end ();
     }
 
-    void Bridge::
-    add_connect (::CIAO::Config_Handlers::Interconnect const& e)
+    void Domain::
+    add_infoProperty (::CIAO::Config_Handlers::Property const& e)
     {
-      connect_.push_back (e);
+      infoProperty_.push_back (e);
     }
 
-    size_t Bridge::
-    count_connect(void) const
+    size_t Domain::
+    count_infoProperty(void) const
     {
-      return connect_.size ();
+      return infoProperty_.size ();
     }
 
+
     // Bridge
-    // 
-    Bridge::resource_iterator Bridge::
-    begin_resource ()
-    {
-      return resource_.begin ();
-    }
+    //
 
-    Bridge::resource_iterator Bridge::
-    end_resource ()
-    {
-      return resource_.end ();
-    }
+    Bridge::
+    Bridge (::XMLSchema::string< ACE_TCHAR > const& name__)
+      :
+      ::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    Bridge::resource_const_iterator Bridge::
-    begin_resource () const
-    {
-      return resource_.begin ();
-    }
+Bridge::
+Bridge (::CIAO::Config_Handlers::Bridge const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+regulator__ ()
+{
+name_->container (this);
+if (label_.get ()) label_->container (this);
+{
+for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+}
 
-    Bridge::resource_const_iterator Bridge::
-    end_resource () const
-    {
-      return resource_.end ();
-    }
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
+}
 
-    void Bridge::
-    add_resource (::CIAO::Config_Handlers::Resource const& e)
-    {
-      resource_.push_back (e);
-    }
+::CIAO::Config_Handlers::Bridge& Bridge::
+operator= (::CIAO::Config_Handlers::Bridge const& s)
+{
+name (s.name ());
 
-    size_t Bridge::
-    count_resource(void) const
-    {
-      return resource_.size ();
-    }
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
+connect_.clear ();
+{
+for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+}
 
-    // Interconnect
-    // 
+resource_.clear ();
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
 
-    Interconnect::
-    Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+return *this;
+}
 
-    Interconnect::
-    Interconnect (::CIAO::Config_Handlers::Interconnect const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      if (label_.get ()) label_->container (this);
-      {
-        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-      }
 
-      {
-        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-      }
+// Bridge
+//
+::XMLSchema::string< ACE_TCHAR > const& Bridge::
+name () const
+{
+return *name_;
+}
 
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
-    }
+void Bridge::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    ::CIAO::Config_Handlers::Interconnect& Interconnect::
-    operator= (::CIAO::Config_Handlers::Interconnect const& s)
-    {
-      name (s.name ());
+// Bridge
+//
+bool Bridge::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+::XMLSchema::string< ACE_TCHAR > const& Bridge::
+label () const
+{
+return *label_;
+}
 
-      connection_.clear ();
-      {
-        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-      }
+void Bridge::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-      connect_.clear ();
-      {
-        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
-      }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-      resource_.clear ();
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
+// Bridge
+//
+Bridge::connect_iterator Bridge::
+begin_connect ()
+{
+return connect_.begin ();
+}
 
-      return *this;
-    }
+Bridge::connect_iterator Bridge::
+end_connect ()
+{
+return connect_.end ();
+}
 
+Bridge::connect_const_iterator Bridge::
+begin_connect () const
+{
+return connect_.begin ();
+}
 
-    // Interconnect
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Interconnect::
-    name () const
-    {
-      return *name_;
-    }
+Bridge::connect_const_iterator Bridge::
+end_connect () const
+{
+return connect_.end ();
+}
 
-    void Interconnect::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void Bridge::
+add_connect (::CIAO::Config_Handlers::Interconnect const& e)
+{
+connect_.push_back (e);
+}
 
-    // Interconnect
-    // 
-    bool Interconnect::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+size_t Bridge::
+count_connect(void) const
+{
+return connect_.size ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& Interconnect::
-    label () const
-    {
-      return *label_;
-    }
+// Bridge
+//
+Bridge::resource_iterator Bridge::
+begin_resource ()
+{
+return resource_.begin ();
+}
 
-    void Interconnect::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
+Bridge::resource_iterator Bridge::
+end_resource ()
+{
+return resource_.end ();
+}
 
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+Bridge::resource_const_iterator Bridge::
+begin_resource () const
+{
+return resource_.begin ();
+}
 
-    // Interconnect
-    // 
-    Interconnect::connection_iterator Interconnect::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
+Bridge::resource_const_iterator Bridge::
+end_resource () const
+{
+return resource_.end ();
+}
 
-    Interconnect::connection_iterator Interconnect::
-    end_connection ()
-    {
-      return connection_.end ();
-    }
+void Bridge::
+add_resource (::CIAO::Config_Handlers::Resource const& e)
+{
+resource_.push_back (e);
+}
 
-    Interconnect::connection_const_iterator Interconnect::
-    begin_connection () const
-    {
-      return connection_.begin ();
-    }
+size_t Bridge::
+count_resource(void) const
+{
+return resource_.size ();
+}
 
-    Interconnect::connection_const_iterator Interconnect::
-    end_connection () const
-    {
-      return connection_.end ();
-    }
 
-    void Interconnect::
-    add_connection (::CIAO::Config_Handlers::Bridge const& e)
-    {
-      connection_.push_back (e);
-    }
+// Interconnect
+//
 
-    size_t Interconnect::
-    count_connection(void) const
-    {
-      return connection_.size ();
-    }
+Interconnect::
+Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    // Interconnect
-    // 
-    Interconnect::connect_iterator Interconnect::
-    begin_connect ()
-    {
-      return connect_.begin ();
-    }
+Interconnect::
+Interconnect (::CIAO::Config_Handlers::Interconnect const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+regulator__ ()
+{
+name_->container (this);
+if (label_.get ()) label_->container (this);
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    Interconnect::connect_iterator Interconnect::
-    end_connect ()
-    {
-      return connect_.end ();
-    }
+{
+for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+}
 
-    Interconnect::connect_const_iterator Interconnect::
-    begin_connect () const
-    {
-      return connect_.begin ();
-    }
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
+}
 
-    Interconnect::connect_const_iterator Interconnect::
-    end_connect () const
-    {
-      return connect_.end ();
-    }
+::CIAO::Config_Handlers::Interconnect& Interconnect::
+operator= (::CIAO::Config_Handlers::Interconnect const& s)
+{
+name (s.name ());
 
-    void Interconnect::
-    add_connect (::CIAO::Config_Handlers::Node const& e)
-    {
-      connect_.push_back (e);
-    }
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    size_t Interconnect::
-    count_connect(void) const
-    {
-      return connect_.size ();
-    }
+connection_.clear ();
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    // Interconnect
-    // 
-    Interconnect::resource_iterator Interconnect::
-    begin_resource ()
-    {
-      return resource_.begin ();
-    }
+connect_.clear ();
+{
+for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+}
 
-    Interconnect::resource_iterator Interconnect::
-    end_resource ()
-    {
-      return resource_.end ();
-    }
+resource_.clear ();
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
 
-    Interconnect::resource_const_iterator Interconnect::
-    begin_resource () const
-    {
-      return resource_.begin ();
-    }
+return *this;
+}
 
-    Interconnect::resource_const_iterator Interconnect::
-    end_resource () const
-    {
-      return resource_.end ();
-    }
 
-    void Interconnect::
-    add_resource (::CIAO::Config_Handlers::Resource const& e)
-    {
-      resource_.push_back (e);
-    }
+// Interconnect
+//
+::XMLSchema::string< ACE_TCHAR > const& Interconnect::
+name () const
+{
+return *name_;
+}
 
-    size_t Interconnect::
-    count_resource(void) const
-    {
-      return resource_.size ();
-    }
+void Interconnect::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
+// Interconnect
+//
+bool Interconnect::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    // Node
-    // 
+::XMLSchema::string< ACE_TCHAR > const& Interconnect::
+label () const
+{
+return *label_;
+}
 
-    Node::
-    Node (::XMLSchema::string< ACE_TCHAR > const& name__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    regulator__ ()
-    {
-      name_->container (this);
-    }
+void Interconnect::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    Node::
-    Node (::CIAO::Config_Handlers::Node const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      if (label_.get ()) label_->container (this);
-      {
-        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-      }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-      {
-        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
-      }
+// Interconnect
+//
+Interconnect::connection_iterator Interconnect::
+begin_connection ()
+{
+return connection_.begin ();
+}
 
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
-    }
+Interconnect::connection_iterator Interconnect::
+end_connection ()
+{
+return connection_.end ();
+}
 
-    ::CIAO::Config_Handlers::Node& Node::
-    operator= (::CIAO::Config_Handlers::Node const& s)
-    {
-      name (s.name ());
+Interconnect::connection_const_iterator Interconnect::
+begin_connection () const
+{
+return connection_.begin ();
+}
 
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+Interconnect::connection_const_iterator Interconnect::
+end_connection () const
+{
+return connection_.end ();
+}
 
-      connection_.clear ();
-      {
-        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-      }
+void Interconnect::
+add_connection (::CIAO::Config_Handlers::Bridge const& e)
+{
+connection_.push_back (e);
+}
 
-      sharedResource_.clear ();
-      {
-        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
-      }
+size_t Interconnect::
+count_connection(void) const
+{
+return connection_.size ();
+}
 
-      resource_.clear ();
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
+// Interconnect
+//
+Interconnect::connect_iterator Interconnect::
+begin_connect ()
+{
+return connect_.begin ();
+}
 
-      return *this;
-    }
+Interconnect::connect_iterator Interconnect::
+end_connect ()
+{
+return connect_.end ();
+}
 
+Interconnect::connect_const_iterator Interconnect::
+begin_connect () const
+{
+return connect_.begin ();
+}
 
-    // Node
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& Node::
-    name () const
-    {
-      return *name_;
-    }
+Interconnect::connect_const_iterator Interconnect::
+end_connect () const
+{
+return connect_.end ();
+}
 
-    void Node::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void Interconnect::
+add_connect (::CIAO::Config_Handlers::Node const& e)
+{
+connect_.push_back (e);
+}
 
-    // Node
-    // 
-    bool Node::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+size_t Interconnect::
+count_connect(void) const
+{
+return connect_.size ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& Node::
-    label () const
-    {
-      return *label_;
-    }
+// Interconnect
+//
+Interconnect::resource_iterator Interconnect::
+begin_resource ()
+{
+return resource_.begin ();
+}
 
-    void Node::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
+Interconnect::resource_iterator Interconnect::
+end_resource ()
+{
+return resource_.end ();
+}
 
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+Interconnect::resource_const_iterator Interconnect::
+begin_resource () const
+{
+return resource_.begin ();
+}
 
-    // Node
-    // 
-    Node::connection_iterator Node::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
+Interconnect::resource_const_iterator Interconnect::
+end_resource () const
+{
+return resource_.end ();
+}
 
-    Node::connection_iterator Node::
-    end_connection ()
-    {
-      return connection_.end ();
-    }
+void Interconnect::
+add_resource (::CIAO::Config_Handlers::Resource const& e)
+{
+resource_.push_back (e);
+}
 
-    Node::connection_const_iterator Node::
-    begin_connection () const
-    {
-      return connection_.begin ();
-    }
+size_t Interconnect::
+count_resource(void) const
+{
+return resource_.size ();
+}
 
-    Node::connection_const_iterator Node::
-    end_connection () const
-    {
-      return connection_.end ();
-    }
 
-    void Node::
-    add_connection (::CIAO::Config_Handlers::Interconnect const& e)
-    {
-      connection_.push_back (e);
-    }
+// Node
+//
 
-    size_t Node::
-    count_connection(void) const
-    {
-      return connection_.size ();
-    }
+Node::
+Node (::XMLSchema::string< ACE_TCHAR > const& name__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+regulator__ ()
+{
+name_->container (this);
+}
 
-    // Node
-    // 
-    Node::sharedResource_iterator Node::
-    begin_sharedResource ()
-    {
-      return sharedResource_.begin ();
-    }
+Node::
+Node (::CIAO::Config_Handlers::Node const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+regulator__ ()
+{
+name_->container (this);
+if (label_.get ()) label_->container (this);
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    Node::sharedResource_iterator Node::
-    end_sharedResource ()
-    {
-      return sharedResource_.end ();
-    }
+{
+for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+}
 
-    Node::sharedResource_const_iterator Node::
-    begin_sharedResource () const
-    {
-      return sharedResource_.begin ();
-    }
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
+}
 
-    Node::sharedResource_const_iterator Node::
-    end_sharedResource () const
-    {
-      return sharedResource_.end ();
-    }
+::CIAO::Config_Handlers::Node& Node::
+operator= (::CIAO::Config_Handlers::Node const& s)
+{
+name (s.name ());
 
-    void Node::
-    add_sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
-    {
-      sharedResource_.push_back (e);
-    }
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    size_t Node::
-    count_sharedResource(void) const
-    {
-      return sharedResource_.size ();
-    }
+connection_.clear ();
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    // Node
-    // 
-    Node::resource_iterator Node::
-    begin_resource ()
-    {
-      return resource_.begin ();
-    }
+sharedResource_.clear ();
+{
+for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+}
 
-    Node::resource_iterator Node::
-    end_resource ()
-    {
-      return resource_.end ();
-    }
+resource_.clear ();
+{
+for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+}
 
-    Node::resource_const_iterator Node::
-    begin_resource () const
-    {
-      return resource_.begin ();
-    }
+return *this;
+}
 
-    Node::resource_const_iterator Node::
-    end_resource () const
-    {
-      return resource_.end ();
-    }
 
-    void Node::
-    add_resource (::CIAO::Config_Handlers::Resource const& e)
-    {
-      resource_.push_back (e);
-    }
+// Node
+//
+::XMLSchema::string< ACE_TCHAR > const& Node::
+name () const
+{
+return *name_;
+}
 
-    size_t Node::
-    count_resource(void) const
-    {
-      return resource_.size ();
-    }
+void Node::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
+// Node
+//
+bool Node::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    // SharedResource
-    // 
-
-    SharedResource::
-    SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
-                    ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                    ::CIAO::Config_Handlers::Node const& node__,
-                    ::CIAO::Config_Handlers::SatisfierProperty const& property__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
-    node_ (new ::CIAO::Config_Handlers::Node (node__)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      node_->container (this);
-      property_->container (this);
-    }
+::XMLSchema::string< ACE_TCHAR > const& Node::
+label () const
+{
+return *label_;
+}
 
-    SharedResource::
-    SharedResource (::CIAO::Config_Handlers::SharedResource const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
-    node_ (new ::CIAO::Config_Handlers::Node (*s.node_)),
-    property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      resourceType_->container (this);
-      node_->container (this);
-      property_->container (this);
-    }
+void Node::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    ::CIAO::Config_Handlers::SharedResource& SharedResource::
-    operator= (::CIAO::Config_Handlers::SharedResource const& s)
-    {
-      name (s.name ());
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-      resourceType (s.resourceType ());
+// Node
+//
+Node::connection_iterator Node::
+begin_connection ()
+{
+return connection_.begin ();
+}
 
-      node (s.node ());
+Node::connection_iterator Node::
+end_connection ()
+{
+return connection_.end ();
+}
 
-      property (s.property ());
+Node::connection_const_iterator Node::
+begin_connection () const
+{
+return connection_.begin ();
+}
 
-      return *this;
-    }
+Node::connection_const_iterator Node::
+end_connection () const
+{
+return connection_.end ();
+}
 
+void Node::
+add_connection (::CIAO::Config_Handlers::Interconnect const& e)
+{
+connection_.push_back (e);
+}
 
-    // SharedResource
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SharedResource::
-    name () const
-    {
-      return *name_;
-    }
+size_t Node::
+count_connection(void) const
+{
+return connection_.size ();
+}
 
-    void SharedResource::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+// Node
+//
+Node::sharedResource_iterator Node::
+begin_sharedResource ()
+{
+return sharedResource_.begin ();
+}
 
-    // SharedResource
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SharedResource::
-    resourceType () const
-    {
-      return *resourceType_;
-    }
+Node::sharedResource_iterator Node::
+end_sharedResource ()
+{
+return sharedResource_.end ();
+}
 
-    void SharedResource::
-    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *resourceType_ = e;
-    }
+Node::sharedResource_const_iterator Node::
+begin_sharedResource () const
+{
+return sharedResource_.begin ();
+}
 
-    // SharedResource
-    // 
-    ::CIAO::Config_Handlers::Node const& SharedResource::
-    node () const
-    {
-      return *node_;
-    }
+Node::sharedResource_const_iterator Node::
+end_sharedResource () const
+{
+return sharedResource_.end ();
+}
 
-    void SharedResource::
-    node (::CIAO::Config_Handlers::Node const& e)
-    {
-      *node_ = e;
-    }
+void Node::
+add_sharedResource (::CIAO::Config_Handlers::SharedResource const& e)
+{
+sharedResource_.push_back (e);
+}
 
-    // SharedResource
-    // 
-    ::CIAO::Config_Handlers::SatisfierProperty const& SharedResource::
-    property () const
-    {
-      return *property_;
-    }
+size_t Node::
+count_sharedResource(void) const
+{
+return sharedResource_.size ();
+}
 
-    void SharedResource::
-    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      *property_ = e;
-    }
-  }
+// Node
+//
+Node::resource_iterator Node::
+begin_resource ()
+{
+return resource_.begin ();
+}
+
+Node::resource_iterator Node::
+end_resource ()
+{
+return resource_.end ();
+}
+
+Node::resource_const_iterator Node::
+begin_resource () const
+{
+return resource_.begin ();
+}
+
+Node::resource_const_iterator Node::
+end_resource () const
+{
+return resource_.end ();
+}
+
+void Node::
+add_resource (::CIAO::Config_Handlers::Resource const& e)
+{
+resource_.push_back (e);
+}
+
+size_t Node::
+count_resource(void) const
+{
+return resource_.size ();
+}
+
+
+// SharedResource
+//
+
+SharedResource::
+SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+::CIAO::Config_Handlers::Node const& node__,
+::CIAO::Config_Handlers::SatisfierProperty const& property__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
+node_ (new ::CIAO::Config_Handlers::Node (node__)),
+property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
+regulator__ ()
+{
+name_->container (this);
+resourceType_->container (this);
+node_->container (this);
+property_->container (this);
+}
+
+SharedResource::
+SharedResource (::CIAO::Config_Handlers::SharedResource const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)),
+node_ (new ::CIAO::Config_Handlers::Node (*s.node_)),
+property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
+regulator__ ()
+{
+name_->container (this);
+resourceType_->container (this);
+node_->container (this);
+property_->container (this);
+}
+
+::CIAO::Config_Handlers::SharedResource& SharedResource::
+operator= (::CIAO::Config_Handlers::SharedResource const& s)
+{
+name (s.name ());
+
+resourceType (s.resourceType ());
+
+node (s.node ());
+
+property (s.property ());
+
+return *this;
+}
+
+
+// SharedResource
+//
+::XMLSchema::string< ACE_TCHAR > const& SharedResource::
+name () const
+{
+return *name_;
+}
+
+void SharedResource::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
+
+// SharedResource
+//
+::XMLSchema::string< ACE_TCHAR > const& SharedResource::
+resourceType () const
+{
+return *resourceType_;
+}
+
+void SharedResource::
+resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*resourceType_ = e;
+}
+
+// SharedResource
+//
+::CIAO::Config_Handlers::Node const& SharedResource::
+node () const
+{
+return *node_;
+}
+
+void SharedResource::
+node (::CIAO::Config_Handlers::Node const& e)
+{
+*node_ = e;
+}
+
+// SharedResource
+//
+::CIAO::Config_Handlers::SatisfierProperty const& SharedResource::
+property () const
+{
+return *property_;
+}
+
+void SharedResource::
+property (::CIAO::Config_Handlers::SatisfierProperty const& e)
+{
+*property_ = e;
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    // Domain
-    //
+namespace Config_Handlers
+{
+// Domain
+//
 
-    Domain::
-    Domain (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+Domain::
+Domain (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
+if (n == "UUID")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+UUID (t);
+}
 
-        else if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
+else if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
 
-        else if (n == "node")
-        {
-          ::CIAO::Config_Handlers::Node t (e);
-          add_node (t);
-        }
+else if (n == "node")
+{
+::CIAO::Config_Handlers::Node t (e);
+add_node (t);
+}
 
-        else if (n == "interconnect")
-        {
-          interconnect_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Interconnect > (new ::CIAO::Config_Handlers::Interconnect (e));
-          interconnect_->container (this);
-        }
+else if (n == "interconnect")
+{
+::CIAO::Config_Handlers::Interconnect t (e);
+add_interconnect (t);
+}
 
-        else if (n == "bridge")
-        {
-          bridge_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Bridge > (new ::CIAO::Config_Handlers::Bridge (e));
-          bridge_->container (this);
-        }
+else if (n == "bridge")
+{
+::CIAO::Config_Handlers::Bridge t (e);
+add_bridge (t);
+}
 
-        else if (n == "sharedResource")
-        {
-          ::CIAO::Config_Handlers::SharedResource t (e);
-          sharedResource (t);
-        }
+else if (n == "sharedResource")
+{
+::CIAO::Config_Handlers::SharedResource t (e);
+add_sharedResource (t);
+}
 
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
+else if (n == "infoProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_infoProperty (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // Bridge
-    //
+// Bridge
+//
 
-    Bridge::
-    Bridge (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+Bridge::
+Bridge (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
+else if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
 
-        else if (n == "connect")
-        {
-          ::CIAO::Config_Handlers::Interconnect t (e);
-          add_connect (t);
-        }
+else if (n == "connect")
+{
+::CIAO::Config_Handlers::Interconnect t (e);
+add_connect (t);
+}
 
-        else if (n == "resource")
-        {
-          ::CIAO::Config_Handlers::Resource t (e);
-          add_resource (t);
-        }
+else if (n == "resource")
+{
+::CIAO::Config_Handlers::Resource t (e);
+add_resource (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // Interconnect
-    //
+// Interconnect
+//
 
-    Interconnect::
-    Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+Interconnect::
+Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
+else if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
 
-        else if (n == "connection")
-        {
-          ::CIAO::Config_Handlers::Bridge t (e);
-          add_connection (t);
-        }
+else if (n == "connection")
+{
+::CIAO::Config_Handlers::Bridge t (e);
+add_connection (t);
+}
 
-        else if (n == "connect")
-        {
-          ::CIAO::Config_Handlers::Node t (e);
-          add_connect (t);
-        }
+else if (n == "connect")
+{
+::CIAO::Config_Handlers::Node t (e);
+add_connect (t);
+}
 
-        else if (n == "resource")
-        {
-          ::CIAO::Config_Handlers::Resource t (e);
-          add_resource (t);
-        }
+else if (n == "resource")
+{
+::CIAO::Config_Handlers::Resource t (e);
+add_resource (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // Node
-    //
+// Node
+//
 
-    Node::
-    Node (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+Node::
+Node (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
+else if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
 
-        else if (n == "connection")
-        {
-          ::CIAO::Config_Handlers::Interconnect t (e);
-          add_connection (t);
-        }
+else if (n == "connection")
+{
+::CIAO::Config_Handlers::Interconnect t (e);
+add_connection (t);
+}
 
-        else if (n == "sharedResource")
-        {
-          ::CIAO::Config_Handlers::SharedResource t (e);
-          add_sharedResource (t);
-        }
+else if (n == "sharedResource")
+{
+::CIAO::Config_Handlers::SharedResource t (e);
+add_sharedResource (t);
+}
 
-        else if (n == "resource")
-        {
-          ::CIAO::Config_Handlers::Resource t (e);
-          add_resource (t);
-        }
+else if (n == "resource")
+{
+::CIAO::Config_Handlers::Resource t (e);
+add_resource (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
+}
 
-    // SharedResource
-    //
+// SharedResource
+//
 
-    SharedResource::
-    SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+SharedResource::
+SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else if (n == "resourceType")
-        {
-          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          resourceType_->container (this);
-        }
+else if (n == "resourceType")
+{
+resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+resourceType_->container (this);
+}
 
-        else if (n == "node")
-        {
-          node_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Node > (new ::CIAO::Config_Handlers::Node (e));
-          node_->container (this);
-        }
+else if (n == "node")
+{
+node_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Node > (new ::CIAO::Config_Handlers::Node (e));
+node_->container (this);
+}
 
-        else if (n == "property")
-        {
-          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
-          property_->container (this);
-        }
+else if (n == "property")
+{
+property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
+property_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
-  }
+else
+{
+}
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+namespace Config_Handlers
+{
+namespace
+{
+::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
-      struct DomainTypeInfoInitializer
-      {
-        DomainTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Domain));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct DomainTypeInfoInitializer
+{
+DomainTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Domain));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      DomainTypeInfoInitializer DomainTypeInfoInitializer_;
+DomainTypeInfoInitializer DomainTypeInfoInitializer_;
 
-      struct BridgeTypeInfoInitializer
-      {
-        BridgeTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Bridge));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct BridgeTypeInfoInitializer
+{
+BridgeTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Bridge));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      BridgeTypeInfoInitializer BridgeTypeInfoInitializer_;
+BridgeTypeInfoInitializer BridgeTypeInfoInitializer_;
 
-      struct InterconnectTypeInfoInitializer
-      {
-        InterconnectTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Interconnect));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct InterconnectTypeInfoInitializer
+{
+InterconnectTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Interconnect));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      InterconnectTypeInfoInitializer InterconnectTypeInfoInitializer_;
+InterconnectTypeInfoInitializer InterconnectTypeInfoInitializer_;
 
-      struct NodeTypeInfoInitializer
-      {
-        NodeTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Node));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct NodeTypeInfoInitializer
+{
+NodeTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (Node));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      NodeTypeInfoInitializer NodeTypeInfoInitializer_;
+NodeTypeInfoInitializer NodeTypeInfoInitializer_;
 
-      struct SharedResourceTypeInfoInitializer
-      {
-        SharedResourceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SharedResource));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct SharedResourceTypeInfoInitializer
+{
+SharedResourceTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (SharedResource));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      SharedResourceTypeInfoInitializer SharedResourceTypeInfoInitializer_;
-    }
-  }
+SharedResourceTypeInfoInitializer SharedResourceTypeInfoInitializer_;
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // Domain
-      //
-      //
+namespace Config_Handlers
+{
+namespace Traversal
+{
+// Domain
+//
+//
 
-      void Domain::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        node (o);
-        interconnect (o);
-        bridge (o);
-        if (o.sharedResource_p ()) sharedResource (o);
-        else sharedResource_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        post (o);
-      }
+void Domain::
+traverse (Type& o)
+{
+pre (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+node (o);
+interconnect (o);
+bridge (o);
+sharedResource (o);
+infoProperty (o);
+post (o);
+}
 
-      void Domain::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        node (o);
-        interconnect (o);
-        bridge (o);
-        if (o.sharedResource_p ()) sharedResource (o);
-        else sharedResource_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        post (o);
-      }
+void Domain::
+traverse (Type const& o)
+{
+pre (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+node (o);
+interconnect (o);
+bridge (o);
+sharedResource (o);
+infoProperty (o);
+post (o);
+}
 
-      void Domain::
-      pre (Type&)
-      {
-      }
+void Domain::
+pre (Type&)
+{
+}
 
-      void Domain::
-      pre (Type const&)
-      {
-      }
+void Domain::
+pre (Type const&)
+{
+}
 
-      void Domain::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
+void Domain::
+UUID (Type& o)
+{
+dispatch (o.UUID ());
+}
 
-      void Domain::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
+void Domain::
+UUID (Type const& o)
+{
+dispatch (o.UUID ());
+}
 
-      void Domain::
-      UUID_none (Type&)
-      {
-      }
+void Domain::
+UUID_none (Type&)
+{
+}
 
-      void Domain::
-      UUID_none (Type const&)
-      {
-      }
+void Domain::
+UUID_none (Type const&)
+{
+}
 
-      void Domain::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+label (Type& o)
+{
+dispatch (o.label ());
+}
 
-      void Domain::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
 
-      void Domain::
-      label_none (Type&)
-      {
-      }
+void Domain::
+label_none (Type&)
+{
+}
 
-      void Domain::
-      label_none (Type const&)
-      {
-      }
+void Domain::
+label_none (Type const&)
+{
+}
 
-      void Domain::
-      node (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Domain::Type::node_iterator b (o.begin_node()), e (o.end_node());
+void Domain::
+node (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::node_iterator b (o.begin_node()), e (o.end_node());
 
-        if (b != e)
-        {
-          node_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) node_next (o);
-          }
-
-          node_post (o);
-        }
-      }
+if (b != e)
+{
+node_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) node_next (o);
+}
 
-      void Domain::
-      node (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Domain::Type::node_const_iterator b (o.begin_node()), e (o.end_node());
+node_post (o);
+}
+}
 
-        if (b != e)
-        {
-          node_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) node_next (o);
-          }
-
-          node_post (o);
-        }
-      }
+void Domain::
+node (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::node_const_iterator b (o.begin_node()), e (o.end_node());
 
-      void Domain::
-      node_pre (Type&)
-      {
-      }
+if (b != e)
+{
+node_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) node_next (o);
+}
 
-      void Domain::
-      node_pre (Type const&)
-      {
-      }
+node_post (o);
+}
+}
 
-      void Domain::
-      node_next (Type&)
-      {
-      }
+void Domain::
+node_pre (Type&)
+{
+}
 
-      void Domain::
-      node_next (Type const&)
-      {
-      }
+void Domain::
+node_pre (Type const&)
+{
+}
 
-      void Domain::
-      node_post (Type&)
-      {
-      }
+void Domain::
+node_next (Type&)
+{
+}
 
-      void Domain::
-      node_post (Type const&)
-      {
-      }
+void Domain::
+node_next (Type const&)
+{
+}
 
-      void Domain::
-      interconnect (Type& o)
-      {
-        dispatch (o.interconnect ());
-      }
+void Domain::
+node_post (Type&)
+{
+}
 
-      void Domain::
-      interconnect (Type const& o)
-      {
-        dispatch (o.interconnect ());
-      }
+void Domain::
+node_post (Type const&)
+{
+}
 
-      void Domain::
-      bridge (Type& o)
-      {
-        dispatch (o.bridge ());
-      }
+void Domain::
+interconnect (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::interconnect_iterator b (o.begin_interconnect()), e (o.end_interconnect());
 
-      void Domain::
-      bridge (Type const& o)
-      {
-        dispatch (o.bridge ());
-      }
+if (b != e)
+{
+interconnect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) interconnect_next (o);
+}
 
-      void Domain::
-      sharedResource (Type& o)
-      {
-        dispatch (o.sharedResource ());
-      }
+interconnect_post (o);
+}
 
-      void Domain::
-      sharedResource (Type const& o)
-      {
-        dispatch (o.sharedResource ());
-      }
+else interconnect_none (o);
+}
 
-      void Domain::
-      sharedResource_none (Type&)
-      {
-      }
+void Domain::
+interconnect (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::interconnect_const_iterator b (o.begin_interconnect()), e (o.end_interconnect());
 
-      void Domain::
-      sharedResource_none (Type const&)
-      {
-      }
+if (b != e)
+{
+interconnect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) interconnect_next (o);
+}
 
-      void Domain::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+interconnect_post (o);
+}
 
-      void Domain::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+else interconnect_none (o);
+}
 
-      void Domain::
-      infoProperty_none (Type&)
-      {
-      }
+void Domain::
+interconnect_pre (Type&)
+{
+}
 
-      void Domain::
-      infoProperty_none (Type const&)
-      {
-      }
+void Domain::
+interconnect_pre (Type const&)
+{
+}
 
-      void Domain::
-      post (Type&)
-      {
-      }
+void Domain::
+interconnect_next (Type&)
+{
+}
 
-      void Domain::
-      post (Type const&)
-      {
-      }
+void Domain::
+interconnect_next (Type const&)
+{
+}
 
-      // Bridge
-      //
-      //
+void Domain::
+interconnect_post (Type&)
+{
+}
 
-      void Bridge::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        connect (o);
-        resource (o);
-        post (o);
-      }
+void Domain::
+interconnect_post (Type const&)
+{
+}
 
-      void Bridge::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        connect (o);
-        resource (o);
-        post (o);
-      }
+void Domain::
+interconnect_none (Type&)
+{
+}
 
-      void Bridge::
-      pre (Type&)
-      {
-      }
+void Domain::
+interconnect_none (Type const&)
+{
+}
 
-      void Bridge::
-      pre (Type const&)
-      {
-      }
+void Domain::
+bridge (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::bridge_iterator b (o.begin_bridge()), e (o.end_bridge());
 
-      void Bridge::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+if (b != e)
+{
+bridge_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) bridge_next (o);
+}
 
-      void Bridge::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+bridge_post (o);
+}
 
-      void Bridge::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+else bridge_none (o);
+}
 
-      void Bridge::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+bridge (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::bridge_const_iterator b (o.begin_bridge()), e (o.end_bridge());
 
-      void Bridge::
-      label_none (Type&)
-      {
-      }
+if (b != e)
+{
+bridge_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) bridge_next (o);
+}
 
-      void Bridge::
-      label_none (Type const&)
-      {
-      }
+bridge_post (o);
+}
 
-      void Bridge::
-      connect (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Bridge::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
+else bridge_none (o);
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Domain::
+bridge_pre (Type&)
+{
+}
 
-      void Bridge::
-      connect (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Bridge::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
+void Domain::
+bridge_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Domain::
+bridge_next (Type&)
+{
+}
 
-      void Bridge::
-      connect_pre (Type&)
-      {
-      }
+void Domain::
+bridge_next (Type const&)
+{
+}
 
-      void Bridge::
-      connect_pre (Type const&)
-      {
-      }
+void Domain::
+bridge_post (Type&)
+{
+}
 
-      void Bridge::
-      connect_next (Type&)
-      {
-      }
+void Domain::
+bridge_post (Type const&)
+{
+}
 
-      void Bridge::
-      connect_next (Type const&)
-      {
-      }
+void Domain::
+bridge_none (Type&)
+{
+}
 
-      void Bridge::
-      connect_post (Type&)
-      {
-      }
+void Domain::
+bridge_none (Type const&)
+{
+}
 
-      void Bridge::
-      connect_post (Type const&)
-      {
-      }
+void Domain::
+sharedResource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-      void Bridge::
-      resource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Bridge::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+if (b != e)
+{
+sharedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) sharedResource_next (o);
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+sharedResource_post (o);
+}
 
-        else resource_none (o);
-      }
+else sharedResource_none (o);
+}
 
-      void Bridge::
-      resource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Bridge::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+void Domain::
+sharedResource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+if (b != e)
+{
+sharedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) sharedResource_next (o);
+}
 
-        else resource_none (o);
-      }
+sharedResource_post (o);
+}
 
-      void Bridge::
-      resource_pre (Type&)
-      {
-      }
+else sharedResource_none (o);
+}
 
-      void Bridge::
-      resource_pre (Type const&)
-      {
-      }
+void Domain::
+sharedResource_pre (Type&)
+{
+}
 
-      void Bridge::
-      resource_next (Type&)
-      {
-      }
+void Domain::
+sharedResource_pre (Type const&)
+{
+}
 
-      void Bridge::
-      resource_next (Type const&)
-      {
-      }
+void Domain::
+sharedResource_next (Type&)
+{
+}
 
-      void Bridge::
-      resource_post (Type&)
-      {
-      }
+void Domain::
+sharedResource_next (Type const&)
+{
+}
 
-      void Bridge::
-      resource_post (Type const&)
-      {
-      }
+void Domain::
+sharedResource_post (Type&)
+{
+}
 
-      void Bridge::
-      resource_none (Type&)
-      {
-      }
+void Domain::
+sharedResource_post (Type const&)
+{
+}
 
-      void Bridge::
-      resource_none (Type const&)
-      {
-      }
+void Domain::
+sharedResource_none (Type&)
+{
+}
 
-      void Bridge::
-      post (Type&)
-      {
-      }
+void Domain::
+sharedResource_none (Type const&)
+{
+}
 
-      void Bridge::
-      post (Type const&)
-      {
-      }
+void Domain::
+infoProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
-      // Interconnect
-      //
-      //
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
 
-      void Interconnect::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        connection (o);
-        connect (o);
-        resource (o);
-        post (o);
-      }
+infoProperty_post (o);
+}
 
-      void Interconnect::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        connection (o);
-        connect (o);
-        resource (o);
-        post (o);
-      }
+else infoProperty_none (o);
+}
 
-      void Interconnect::
-      pre (Type&)
-      {
-      }
+void Domain::
+infoProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Domain::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
-      void Interconnect::
-      pre (Type const&)
-      {
-      }
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
 
-      void Interconnect::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+infoProperty_post (o);
+}
 
-      void Interconnect::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+else infoProperty_none (o);
+}
 
-      void Interconnect::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+infoProperty_pre (Type&)
+{
+}
 
-      void Interconnect::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+void Domain::
+infoProperty_pre (Type const&)
+{
+}
 
-      void Interconnect::
-      label_none (Type&)
-      {
-      }
+void Domain::
+infoProperty_next (Type&)
+{
+}
 
-      void Interconnect::
-      label_none (Type const&)
-      {
-      }
+void Domain::
+infoProperty_next (Type const&)
+{
+}
 
-      void Interconnect::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+void Domain::
+infoProperty_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
+void Domain::
+infoProperty_post (Type const&)
+{
+}
 
-        else connection_none (o);
-      }
+void Domain::
+infoProperty_none (Type&)
+{
+}
 
-      void Interconnect::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+void Domain::
+infoProperty_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
+void Domain::
+post (Type&)
+{
+}
 
-        else connection_none (o);
-      }
+void Domain::
+post (Type const&)
+{
+}
 
-      void Interconnect::
-      connection_pre (Type&)
-      {
-      }
+// Bridge
+//
+//
 
-      void Interconnect::
-      connection_pre (Type const&)
-      {
-      }
+void Bridge::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+connect (o);
+resource (o);
+post (o);
+}
 
-      void Interconnect::
-      connection_next (Type&)
-      {
-      }
+void Bridge::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+connect (o);
+resource (o);
+post (o);
+}
 
-      void Interconnect::
-      connection_next (Type const&)
-      {
-      }
+void Bridge::
+pre (Type&)
+{
+}
 
-      void Interconnect::
-      connection_post (Type&)
-      {
-      }
+void Bridge::
+pre (Type const&)
+{
+}
 
-      void Interconnect::
-      connection_post (Type const&)
-      {
-      }
+void Bridge::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void Interconnect::
-      connection_none (Type&)
-      {
-      }
+void Bridge::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Interconnect::
-      connection_none (Type const&)
-      {
-      }
+void Bridge::
+label (Type& o)
+{
+dispatch (o.label ());
+}
 
-      void Interconnect::
-      connect (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
+void Bridge::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Bridge::
+label_none (Type&)
+{
+}
 
-      void Interconnect::
-      connect (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
+void Bridge::
+label_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connect_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connect_next (o);
-          }
-
-          connect_post (o);
-        }
-      }
+void Bridge::
+connect (Type& o)
+{
+// VC6 anathema strikes again
+//
+Bridge::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
 
-      void Interconnect::
-      connect_pre (Type&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Interconnect::
-      connect_pre (Type const&)
-      {
-      }
+connect_post (o);
+}
+}
 
-      void Interconnect::
-      connect_next (Type&)
-      {
-      }
+void Bridge::
+connect (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Bridge::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
 
-      void Interconnect::
-      connect_next (Type const&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Interconnect::
-      connect_post (Type&)
-      {
-      }
+connect_post (o);
+}
+}
 
-      void Interconnect::
-      connect_post (Type const&)
-      {
-      }
+void Bridge::
+connect_pre (Type&)
+{
+}
 
-      void Interconnect::
-      resource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+void Bridge::
+connect_pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+void Bridge::
+connect_next (Type&)
+{
+}
 
-        else resource_none (o);
-      }
+void Bridge::
+connect_next (Type const&)
+{
+}
 
-      void Interconnect::
-      resource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Interconnect::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+void Bridge::
+connect_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+void Bridge::
+connect_post (Type const&)
+{
+}
 
-        else resource_none (o);
-      }
+void Bridge::
+resource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Bridge::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
 
-      void Interconnect::
-      resource_pre (Type&)
-      {
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void Interconnect::
-      resource_pre (Type const&)
-      {
-      }
+resource_post (o);
+}
 
-      void Interconnect::
-      resource_next (Type&)
-      {
-      }
+else resource_none (o);
+}
 
-      void Interconnect::
-      resource_next (Type const&)
-      {
-      }
+void Bridge::
+resource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Bridge::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
 
-      void Interconnect::
-      resource_post (Type&)
-      {
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void Interconnect::
-      resource_post (Type const&)
-      {
-      }
+resource_post (o);
+}
 
-      void Interconnect::
-      resource_none (Type&)
-      {
-      }
+else resource_none (o);
+}
 
-      void Interconnect::
-      resource_none (Type const&)
-      {
-      }
+void Bridge::
+resource_pre (Type&)
+{
+}
 
-      void Interconnect::
-      post (Type&)
-      {
-      }
+void Bridge::
+resource_pre (Type const&)
+{
+}
 
-      void Interconnect::
-      post (Type const&)
-      {
-      }
+void Bridge::
+resource_next (Type&)
+{
+}
 
-      // Node
-      //
-      //
+void Bridge::
+resource_next (Type const&)
+{
+}
 
-      void Node::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        connection (o);
-        sharedResource (o);
-        resource (o);
-        post (o);
-      }
+void Bridge::
+resource_post (Type&)
+{
+}
 
-      void Node::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        connection (o);
-        sharedResource (o);
-        resource (o);
-        post (o);
-      }
+void Bridge::
+resource_post (Type const&)
+{
+}
 
-      void Node::
-      pre (Type&)
-      {
-      }
+void Bridge::
+resource_none (Type&)
+{
+}
 
-      void Node::
-      pre (Type const&)
-      {
-      }
+void Bridge::
+resource_none (Type const&)
+{
+}
 
-      void Node::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Bridge::
+post (Type&)
+{
+}
 
-      void Node::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Bridge::
+post (Type const&)
+{
+}
 
-      void Node::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+// Interconnect
+//
+//
 
-      void Node::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+void Interconnect::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+connection (o);
+connect (o);
+resource (o);
+post (o);
+}
 
-      void Node::
-      label_none (Type&)
-      {
-      }
+void Interconnect::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+connection (o);
+connect (o);
+resource (o);
+post (o);
+}
 
-      void Node::
-      label_none (Type const&)
-      {
-      }
+void Interconnect::
+pre (Type&)
+{
+}
 
-      void Node::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+void Interconnect::
+pre (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
+void Interconnect::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-        else connection_none (o);
-      }
+void Interconnect::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void Node::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+void Interconnect::
+label (Type& o)
+{
+dispatch (o.label ());
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
+void Interconnect::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
 
-        else connection_none (o);
-      }
+void Interconnect::
+label_none (Type&)
+{
+}
 
-      void Node::
-      connection_pre (Type&)
-      {
-      }
+void Interconnect::
+label_none (Type const&)
+{
+}
 
-      void Node::
-      connection_pre (Type const&)
-      {
-      }
+void Interconnect::
+connection (Type& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
-      void Node::
-      connection_next (Type&)
-      {
-      }
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
 
-      void Node::
-      connection_next (Type const&)
-      {
-      }
+connection_post (o);
+}
 
-      void Node::
-      connection_post (Type&)
-      {
-      }
+else connection_none (o);
+}
 
-      void Node::
-      connection_post (Type const&)
-      {
-      }
+void Interconnect::
+connection (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
-      void Node::
-      connection_none (Type&)
-      {
-      }
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
 
-      void Node::
-      connection_none (Type const&)
-      {
-      }
+connection_post (o);
+}
 
-      void Node::
-      sharedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+else connection_none (o);
+}
 
-        if (b != e)
-        {
-          sharedResource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) sharedResource_next (o);
-          }
-
-          sharedResource_post (o);
-        }
+void Interconnect::
+connection_pre (Type&)
+{
+}
 
-        else sharedResource_none (o);
-      }
+void Interconnect::
+connection_pre (Type const&)
+{
+}
 
-      void Node::
-      sharedResource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+void Interconnect::
+connection_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          sharedResource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) sharedResource_next (o);
-          }
-
-          sharedResource_post (o);
-        }
+void Interconnect::
+connection_next (Type const&)
+{
+}
 
-        else sharedResource_none (o);
-      }
+void Interconnect::
+connection_post (Type&)
+{
+}
 
-      void Node::
-      sharedResource_pre (Type&)
-      {
-      }
+void Interconnect::
+connection_post (Type const&)
+{
+}
 
-      void Node::
-      sharedResource_pre (Type const&)
-      {
-      }
+void Interconnect::
+connection_none (Type&)
+{
+}
 
-      void Node::
-      sharedResource_next (Type&)
-      {
-      }
+void Interconnect::
+connection_none (Type const&)
+{
+}
 
-      void Node::
-      sharedResource_next (Type const&)
-      {
-      }
+void Interconnect::
+connect (Type& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::connect_iterator b (o.begin_connect()), e (o.end_connect());
 
-      void Node::
-      sharedResource_post (Type&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Node::
-      sharedResource_post (Type const&)
-      {
-      }
+connect_post (o);
+}
+}
 
-      void Node::
-      sharedResource_none (Type&)
-      {
-      }
+void Interconnect::
+connect (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect());
 
-      void Node::
-      sharedResource_none (Type const&)
-      {
-      }
+if (b != e)
+{
+connect_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connect_next (o);
+}
 
-      void Node::
-      resource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+connect_post (o);
+}
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+void Interconnect::
+connect_pre (Type&)
+{
+}
 
-        else resource_none (o);
-      }
+void Interconnect::
+connect_pre (Type const&)
+{
+}
 
-      void Node::
-      resource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Node::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+void Interconnect::
+connect_next (Type&)
+{
+}
 
-        if (b != e)
-        {
-          resource_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) resource_next (o);
-          }
-
-          resource_post (o);
-        }
+void Interconnect::
+connect_next (Type const&)
+{
+}
 
-        else resource_none (o);
-      }
+void Interconnect::
+connect_post (Type&)
+{
+}
 
-      void Node::
-      resource_pre (Type&)
-      {
-      }
+void Interconnect::
+connect_post (Type const&)
+{
+}
 
-      void Node::
-      resource_pre (Type const&)
-      {
-      }
+void Interconnect::
+resource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
 
-      void Node::
-      resource_next (Type&)
-      {
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void Node::
-      resource_next (Type const&)
-      {
-      }
+resource_post (o);
+}
 
-      void Node::
-      resource_post (Type&)
-      {
-      }
+else resource_none (o);
+}
 
-      void Node::
-      resource_post (Type const&)
-      {
-      }
+void Interconnect::
+resource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Interconnect::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
 
-      void Node::
-      resource_none (Type&)
-      {
-      }
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
 
-      void Node::
-      resource_none (Type const&)
-      {
-      }
+resource_post (o);
+}
 
-      void Node::
-      post (Type&)
-      {
-      }
+else resource_none (o);
+}
 
-      void Node::
-      post (Type const&)
-      {
-      }
+void Interconnect::
+resource_pre (Type&)
+{
+}
 
-      // SharedResource
-      //
-      //
+void Interconnect::
+resource_pre (Type const&)
+{
+}
 
-      void SharedResource::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        node (o);
-        property (o);
-        post (o);
-      }
+void Interconnect::
+resource_next (Type&)
+{
+}
 
-      void SharedResource::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        node (o);
-        property (o);
-        post (o);
-      }
+void Interconnect::
+resource_next (Type const&)
+{
+}
 
-      void SharedResource::
-      pre (Type&)
-      {
-      }
+void Interconnect::
+resource_post (Type&)
+{
+}
 
-      void SharedResource::
-      pre (Type const&)
-      {
-      }
+void Interconnect::
+resource_post (Type const&)
+{
+}
 
-      void SharedResource::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void Interconnect::
+resource_none (Type&)
+{
+}
 
-      void SharedResource::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void Interconnect::
+resource_none (Type const&)
+{
+}
 
-      void SharedResource::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void Interconnect::
+post (Type&)
+{
+}
 
-      void SharedResource::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
+void Interconnect::
+post (Type const&)
+{
+}
 
-      void SharedResource::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
+// Node
+//
+//
 
-      void SharedResource::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
+void Node::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+connection (o);
+sharedResource (o);
+resource (o);
+post (o);
+}
 
-      void SharedResource::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
+void Node::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+connection (o);
+sharedResource (o);
+resource (o);
+post (o);
+}
 
-      void SharedResource::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
+void Node::
+pre (Type&)
+{
+}
 
-      void SharedResource::
-      post (Type&)
-      {
-      }
+void Node::
+pre (Type const&)
+{
+}
 
-      void SharedResource::
-      post (Type const&)
-      {
-      }
-    }
-  }
+void Node::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void Node::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void Node::
+label (Type& o)
+{
+dispatch (o.label ());
+}
+
+void Node::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
+
+void Node::
+label_none (Type&)
+{
+}
+
+void Node::
+label_none (Type const&)
+{
+}
+
+void Node::
+connection (Type& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
+
+connection_post (o);
+}
+
+else connection_none (o);
+}
+
+void Node::
+connection (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
+
+connection_post (o);
+}
+
+else connection_none (o);
+}
+
+void Node::
+connection_pre (Type&)
+{
+}
+
+void Node::
+connection_pre (Type const&)
+{
+}
+
+void Node::
+connection_next (Type&)
+{
+}
+
+void Node::
+connection_next (Type const&)
+{
+}
+
+void Node::
+connection_post (Type&)
+{
+}
+
+void Node::
+connection_post (Type const&)
+{
+}
+
+void Node::
+connection_none (Type&)
+{
+}
+
+void Node::
+connection_none (Type const&)
+{
+}
+
+void Node::
+sharedResource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+
+if (b != e)
+{
+sharedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) sharedResource_next (o);
+}
+
+sharedResource_post (o);
+}
+
+else sharedResource_none (o);
+}
+
+void Node::
+sharedResource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource());
+
+if (b != e)
+{
+sharedResource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) sharedResource_next (o);
+}
+
+sharedResource_post (o);
+}
+
+else sharedResource_none (o);
+}
+
+void Node::
+sharedResource_pre (Type&)
+{
+}
+
+void Node::
+sharedResource_pre (Type const&)
+{
+}
+
+void Node::
+sharedResource_next (Type&)
+{
+}
+
+void Node::
+sharedResource_next (Type const&)
+{
+}
+
+void Node::
+sharedResource_post (Type&)
+{
+}
+
+void Node::
+sharedResource_post (Type const&)
+{
+}
+
+void Node::
+sharedResource_none (Type&)
+{
+}
+
+void Node::
+sharedResource_none (Type const&)
+{
+}
+
+void Node::
+resource (Type& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::resource_iterator b (o.begin_resource()), e (o.end_resource());
+
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
+
+resource_post (o);
+}
+
+else resource_none (o);
+}
+
+void Node::
+resource (Type const& o)
+{
+// VC6 anathema strikes again
+//
+Node::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource());
+
+if (b != e)
+{
+resource_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) resource_next (o);
+}
+
+resource_post (o);
+}
+
+else resource_none (o);
+}
+
+void Node::
+resource_pre (Type&)
+{
+}
+
+void Node::
+resource_pre (Type const&)
+{
+}
+
+void Node::
+resource_next (Type&)
+{
+}
+
+void Node::
+resource_next (Type const&)
+{
+}
+
+void Node::
+resource_post (Type&)
+{
+}
+
+void Node::
+resource_post (Type const&)
+{
+}
+
+void Node::
+resource_none (Type&)
+{
+}
+
+void Node::
+resource_none (Type const&)
+{
+}
+
+void Node::
+post (Type&)
+{
+}
+
+void Node::
+post (Type const&)
+{
+}
+
+// SharedResource
+//
+//
+
+void SharedResource::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+node (o);
+property (o);
+post (o);
+}
+
+void SharedResource::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+resourceType (o);
+node (o);
+property (o);
+post (o);
+}
+
+void SharedResource::
+pre (Type&)
+{
+}
+
+void SharedResource::
+pre (Type const&)
+{
+}
+
+void SharedResource::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void SharedResource::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void SharedResource::
+resourceType (Type& o)
+{
+dispatch (o.resourceType ());
+}
+
+void SharedResource::
+resourceType (Type const& o)
+{
+dispatch (o.resourceType ());
+}
+
+void SharedResource::
+node (Type& o)
+{
+dispatch (o.node ());
+}
+
+void SharedResource::
+node (Type const& o)
+{
+dispatch (o.node ());
+}
+
+void SharedResource::
+property (Type& o)
+{
+dispatch (o.property ());
+}
+
+void SharedResource::
+property (Type const& o)
+{
+dispatch (o.property ());
+}
+
+void SharedResource::
+post (Type&)
+{
+}
+
+void SharedResource::
+post (Type const&)
+{
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // Domain
-      //
-      //
+namespace Config_Handlers
+{
+namespace Writer
+{
+// Domain
+//
+//
 
-      Domain::
-      Domain (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+Domain::
+Domain (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      Domain::
-      Domain ()
-      {
-      }
+Domain::
+Domain ()
+{
+}
 
-      void Domain::
-      traverse (Type const& o)
-      {
-        Traversal::Domain::traverse (o);
-      }
+void Domain::
+traverse (Type const& o)
+{
+Traversal::Domain::traverse (o);
+}
 
-      void Domain::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-        Traversal::Domain::UUID (o);
-        pop_ ();
-      }
+void Domain::
+UUID (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+Traversal::Domain::UUID (o);
+pop_ ();
+}
 
-      void Domain::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::Domain::label (o);
-        pop_ ();
-      }
+void Domain::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::Domain::label (o);
+pop_ ();
+}
 
-      void Domain::
-      node_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-      }
+void Domain::
+node_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+}
 
-      void Domain::
-      node_next (Type const& o)
-      {
-        node_post (o);
-        node_pre (o);
-      }
+void Domain::
+node_next (Type const& o)
+{
+node_post (o);
+node_pre (o);
+}
 
-      void Domain::
-      node_post (Type const&)
-      {
-        pop_ ();
-      }
+void Domain::
+node_post (Type const&)
+{
+pop_ ();
+}
 
-      void Domain::
-      interconnect (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("interconnect", top_ ()));
-        Traversal::Domain::interconnect (o);
-        pop_ ();
-      }
+void Domain::
+interconnect_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("interconnect", top_ ()));
+}
 
-      void Domain::
-      bridge (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bridge", top_ ()));
-        Traversal::Domain::bridge (o);
-        pop_ ();
-      }
+void Domain::
+interconnect_next (Type const& o)
+{
+interconnect_post (o);
+interconnect_pre (o);
+}
 
-      void Domain::
-      sharedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
-        Traversal::Domain::sharedResource (o);
-        pop_ ();
-      }
+void Domain::
+interconnect_post (Type const&)
+{
+pop_ ();
+}
 
-      void Domain::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::Domain::infoProperty (o);
-        pop_ ();
-      }
+void Domain::
+bridge_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bridge", top_ ()));
+}
 
-      // Bridge
-      //
-      //
+void Domain::
+bridge_next (Type const& o)
+{
+bridge_post (o);
+bridge_pre (o);
+}
 
-      Bridge::
-      Bridge (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Domain::
+bridge_post (Type const&)
+{
+pop_ ();
+}
 
-      Bridge::
-      Bridge ()
-      {
-      }
+void Domain::
+sharedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
+}
 
-      void Bridge::
-      traverse (Type const& o)
-      {
-        Traversal::Bridge::traverse (o);
-      }
+void Domain::
+sharedResource_next (Type const& o)
+{
+sharedResource_post (o);
+sharedResource_pre (o);
+}
 
-      void Bridge::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Bridge::name (o);
-        pop_ ();
-      }
+void Domain::
+sharedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void Bridge::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::Bridge::label (o);
-        pop_ ();
-      }
+void Domain::
+infoProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+}
 
-      void Bridge::
-      connect_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
-      }
+void Domain::
+infoProperty_next (Type const& o)
+{
+infoProperty_post (o);
+infoProperty_pre (o);
+}
 
-      void Bridge::
-      connect_next (Type const& o)
-      {
-        connect_post (o);
-        connect_pre (o);
-      }
+void Domain::
+infoProperty_post (Type const&)
+{
+pop_ ();
+}
 
-      void Bridge::
-      connect_post (Type const&)
-      {
-        pop_ ();
-      }
+// Bridge
+//
+//
 
-      void Bridge::
-      resource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-      }
+Bridge::
+Bridge (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Bridge::
-      resource_next (Type const& o)
-      {
-        resource_post (o);
-        resource_pre (o);
-      }
+Bridge::
+Bridge ()
+{
+}
 
-      void Bridge::
-      resource_post (Type const&)
-      {
-        pop_ ();
-      }
+void Bridge::
+traverse (Type const& o)
+{
+Traversal::Bridge::traverse (o);
+}
 
-      // Interconnect
-      //
-      //
+void Bridge::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Bridge::name (o);
+pop_ ();
+}
 
-      Interconnect::
-      Interconnect (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Bridge::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::Bridge::label (o);
+pop_ ();
+}
 
-      Interconnect::
-      Interconnect ()
-      {
-      }
+void Bridge::
+connect_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
+}
 
-      void Interconnect::
-      traverse (Type const& o)
-      {
-        Traversal::Interconnect::traverse (o);
-      }
+void Bridge::
+connect_next (Type const& o)
+{
+connect_post (o);
+connect_pre (o);
+}
 
-      void Interconnect::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Interconnect::name (o);
-        pop_ ();
-      }
+void Bridge::
+connect_post (Type const&)
+{
+pop_ ();
+}
 
-      void Interconnect::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::Interconnect::label (o);
-        pop_ ();
-      }
+void Bridge::
+resource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+}
 
-      void Interconnect::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-      }
+void Bridge::
+resource_next (Type const& o)
+{
+resource_post (o);
+resource_pre (o);
+}
 
-      void Interconnect::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
+void Bridge::
+resource_post (Type const&)
+{
+pop_ ();
+}
 
-      void Interconnect::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
+// Interconnect
+//
+//
 
-      void Interconnect::
-      connect_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
-      }
+Interconnect::
+Interconnect (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Interconnect::
-      connect_next (Type const& o)
-      {
-        connect_post (o);
-        connect_pre (o);
-      }
+Interconnect::
+Interconnect ()
+{
+}
 
-      void Interconnect::
-      connect_post (Type const&)
-      {
-        pop_ ();
-      }
+void Interconnect::
+traverse (Type const& o)
+{
+Traversal::Interconnect::traverse (o);
+}
 
-      void Interconnect::
-      resource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-      }
+void Interconnect::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Interconnect::name (o);
+pop_ ();
+}
 
-      void Interconnect::
-      resource_next (Type const& o)
-      {
-        resource_post (o);
-        resource_pre (o);
-      }
+void Interconnect::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::Interconnect::label (o);
+pop_ ();
+}
 
-      void Interconnect::
-      resource_post (Type const&)
-      {
-        pop_ ();
-      }
+void Interconnect::
+connection_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+}
 
-      // Node
-      //
-      //
+void Interconnect::
+connection_next (Type const& o)
+{
+connection_post (o);
+connection_pre (o);
+}
 
-      Node::
-      Node (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Interconnect::
+connection_post (Type const&)
+{
+pop_ ();
+}
 
-      Node::
-      Node ()
-      {
-      }
+void Interconnect::
+connect_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
+}
 
-      void Node::
-      traverse (Type const& o)
-      {
-        Traversal::Node::traverse (o);
-      }
+void Interconnect::
+connect_next (Type const& o)
+{
+connect_post (o);
+connect_pre (o);
+}
 
-      void Node::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::Node::name (o);
-        pop_ ();
-      }
+void Interconnect::
+connect_post (Type const&)
+{
+pop_ ();
+}
 
-      void Node::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::Node::label (o);
-        pop_ ();
-      }
+void Interconnect::
+resource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+}
 
-      void Node::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-      }
+void Interconnect::
+resource_next (Type const& o)
+{
+resource_post (o);
+resource_pre (o);
+}
 
-      void Node::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
+void Interconnect::
+resource_post (Type const&)
+{
+pop_ ();
+}
 
-      void Node::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
+// Node
+//
+//
 
-      void Node::
-      sharedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
-      }
+Node::
+Node (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void Node::
-      sharedResource_next (Type const& o)
-      {
-        sharedResource_post (o);
-        sharedResource_pre (o);
-      }
+Node::
+Node ()
+{
+}
 
-      void Node::
-      sharedResource_post (Type const&)
-      {
-        pop_ ();
-      }
+void Node::
+traverse (Type const& o)
+{
+Traversal::Node::traverse (o);
+}
 
-      void Node::
-      resource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
-      }
+void Node::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::Node::name (o);
+pop_ ();
+}
 
-      void Node::
-      resource_next (Type const& o)
-      {
-        resource_post (o);
-        resource_pre (o);
-      }
+void Node::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::Node::label (o);
+pop_ ();
+}
 
-      void Node::
-      resource_post (Type const&)
-      {
-        pop_ ();
-      }
+void Node::
+connection_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+}
 
-      // SharedResource
-      //
-      //
+void Node::
+connection_next (Type const& o)
+{
+connection_post (o);
+connection_pre (o);
+}
 
-      SharedResource::
-      SharedResource (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void Node::
+connection_post (Type const&)
+{
+pop_ ();
+}
 
-      SharedResource::
-      SharedResource ()
-      {
-      }
+void Node::
+sharedResource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
+}
 
-      void SharedResource::
-      traverse (Type const& o)
-      {
-        Traversal::SharedResource::traverse (o);
-      }
+void Node::
+sharedResource_next (Type const& o)
+{
+sharedResource_post (o);
+sharedResource_pre (o);
+}
 
-      void SharedResource::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::SharedResource::name (o);
-        pop_ ();
-      }
+void Node::
+sharedResource_post (Type const&)
+{
+pop_ ();
+}
 
-      void SharedResource::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-        Traversal::SharedResource::resourceType (o);
-        pop_ ();
-      }
+void Node::
+resource_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
+}
 
-      void SharedResource::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-        Traversal::SharedResource::node (o);
-        pop_ ();
-      }
+void Node::
+resource_next (Type const& o)
+{
+resource_post (o);
+resource_pre (o);
+}
 
-      void SharedResource::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-        Traversal::SharedResource::property (o);
-        pop_ ();
-      }
-    }
-  }
+void Node::
+resource_post (Type const&)
+{
+pop_ ();
+}
+
+// SharedResource
+//
+//
+
+SharedResource::
+SharedResource (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+SharedResource::
+SharedResource ()
+{
+}
+
+void SharedResource::
+traverse (Type const& o)
+{
+Traversal::SharedResource::traverse (o);
+}
+
+void SharedResource::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::SharedResource::name (o);
+pop_ ();
+}
+
+void SharedResource::
+resourceType (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
+Traversal::SharedResource::resourceType (o);
+pop_ ();
+}
+
+void SharedResource::
+node (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
+Traversal::SharedResource::node (o);
+pop_ ();
+}
+
+void SharedResource::
+property (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
+Traversal::SharedResource::property (o);
+pop_ ();
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cdd.hpp b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
index 27ea37d4160..71627524e09 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -20,7 +20,6 @@
 #endif
 
 #include "XSC_XML_Handlers_Export.h"
- 
 #ifndef CDD_HPP
 #define CDD_HPP
 
@@ -28,14 +27,14 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class Domain;
-    class Bridge;
-    class Interconnect;
-    class Node;
-    class SharedResource;
-  }
+namespace Config_Handlers
+{
+class Domain;
+class Bridge;
+class Interconnect;
+class Node;
+class SharedResource;
+}
 }
 
 #include <memory>
@@ -46,1501 +45,1694 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export Domain : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // node
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator node_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator node_const_iterator;
-      node_iterator begin_node ();
-      node_iterator end_node ();
-      node_const_iterator begin_node () const;
-      node_const_iterator end_node () const;
-      void add_node (::CIAO::Config_Handlers::Node const& );
-      size_t count_node (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Node > node_;
-
-      // interconnect
-      // 
-      public:
-      ::CIAO::Config_Handlers::Interconnect const& interconnect () const;
-      void interconnect (::CIAO::Config_Handlers::Interconnect const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Interconnect > interconnect_;
-
-      // bridge
-      // 
-      public:
-      ::CIAO::Config_Handlers::Bridge const& bridge () const;
-      void bridge (::CIAO::Config_Handlers::Bridge const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Bridge > bridge_;
-
-      // sharedResource
-      // 
-      public:
-      bool sharedResource_p () const;
-      ::CIAO::Config_Handlers::SharedResource const& sharedResource () const;
-      void sharedResource (::CIAO::Config_Handlers::SharedResource const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      public:
-      Domain (::CIAO::Config_Handlers::Interconnect const& interconnect__,
-              ::CIAO::Config_Handlers::Bridge const& bridge__);
-
-      Domain (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Domain (Domain const& s);
-
-      Domain&
-      operator= (Domain const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export Bridge : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // connect
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connect_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connect_const_iterator;
-      connect_iterator begin_connect ();
-      connect_iterator end_connect ();
-      connect_const_iterator begin_connect () const;
-      connect_const_iterator end_connect () const;
-      void add_connect (::CIAO::Config_Handlers::Interconnect const& );
-      size_t count_connect (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Interconnect > connect_;
-
-      // resource
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
-      resource_iterator begin_resource ();
-      resource_iterator end_resource ();
-      resource_const_iterator begin_resource () const;
-      resource_const_iterator end_resource () const;
-      void add_resource (::CIAO::Config_Handlers::Resource const& );
-      size_t count_resource (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Resource > resource_;
-
-      public:
-      Bridge (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-      Bridge (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Bridge (Bridge const& s);
-
-      Bridge&
-      operator= (Bridge const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export Interconnect : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // connection
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::iterator connection_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::const_iterator connection_const_iterator;
-      connection_iterator begin_connection ();
-      connection_iterator end_connection ();
-      connection_const_iterator begin_connection () const;
-      connection_const_iterator end_connection () const;
-      void add_connection (::CIAO::Config_Handlers::Bridge const& );
-      size_t count_connection (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Bridge > connection_;
-
-      // connect
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator connect_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator connect_const_iterator;
-      connect_iterator begin_connect ();
-      connect_iterator end_connect ();
-      connect_const_iterator begin_connect () const;
-      connect_const_iterator end_connect () const;
-      void add_connect (::CIAO::Config_Handlers::Node const& );
-      size_t count_connect (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Node > connect_;
-
-      // resource
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
-      resource_iterator begin_resource ();
-      resource_iterator end_resource ();
-      resource_const_iterator begin_resource () const;
-      resource_const_iterator end_resource () const;
-      void add_resource (::CIAO::Config_Handlers::Resource const& );
-      size_t count_resource (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Resource > resource_;
-
-      public:
-      Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-      Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Interconnect (Interconnect const& s);
-
-      Interconnect&
-      operator= (Interconnect const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export Node : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // connection
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connection_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connection_const_iterator;
-      connection_iterator begin_connection ();
-      connection_iterator end_connection ();
-      connection_const_iterator begin_connection () const;
-      connection_const_iterator end_connection () const;
-      void add_connection (::CIAO::Config_Handlers::Interconnect const& );
-      size_t count_connection (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Interconnect > connection_;
-
-      // sharedResource
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::iterator sharedResource_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::const_iterator sharedResource_const_iterator;
-      sharedResource_iterator begin_sharedResource ();
-      sharedResource_iterator end_sharedResource ();
-      sharedResource_const_iterator begin_sharedResource () const;
-      sharedResource_const_iterator end_sharedResource () const;
-      void add_sharedResource (::CIAO::Config_Handlers::SharedResource const& );
-      size_t count_sharedResource (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
-
-      // resource
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
-      resource_iterator begin_resource ();
-      resource_iterator end_resource ();
-      resource_const_iterator begin_resource () const;
-      resource_const_iterator end_resource () const;
-      void add_resource (::CIAO::Config_Handlers::Resource const& );
-      size_t count_resource (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Resource > resource_;
-
-      public:
-      Node (::XMLSchema::string< ACE_TCHAR > const& name__);
-
-      Node (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      Node (Node const& s);
-
-      Node&
-      operator= (Node const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export SharedResource : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // resourceType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
-      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
-
-      // node
-      // 
-      public:
-      ::CIAO::Config_Handlers::Node const& node () const;
-      void node (::CIAO::Config_Handlers::Node const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Node > node_;
-
-      // property
-      // 
-      public:
-      ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
-      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
-
-      public:
-      SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
-                      ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                      ::CIAO::Config_Handlers::Node const& node__,
-                      ::CIAO::Config_Handlers::SatisfierProperty const& property__);
-
-      SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SharedResource (SharedResource const& s);
-
-      SharedResource&
-      operator= (SharedResource const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export Domain : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// node
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator node_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator node_const_iterator;
+node_iterator begin_node ();
+node_iterator end_node ();
+node_const_iterator begin_node () const;
+node_const_iterator end_node () const;
+void add_node (::CIAO::Config_Handlers::Node const& );
+size_t count_node (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Node > node_;
+
+// interconnect
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator interconnect_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator interconnect_const_iterator;
+interconnect_iterator begin_interconnect ();
+interconnect_iterator end_interconnect ();
+interconnect_const_iterator begin_interconnect () const;
+interconnect_const_iterator end_interconnect () const;
+void add_interconnect (::CIAO::Config_Handlers::Interconnect const& );
+size_t count_interconnect (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Interconnect > interconnect_;
+
+// bridge
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::iterator bridge_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::const_iterator bridge_const_iterator;
+bridge_iterator begin_bridge ();
+bridge_iterator end_bridge ();
+bridge_const_iterator begin_bridge () const;
+bridge_const_iterator end_bridge () const;
+void add_bridge (::CIAO::Config_Handlers::Bridge const& );
+size_t count_bridge (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Bridge > bridge_;
+
+// sharedResource
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::iterator sharedResource_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::const_iterator sharedResource_const_iterator;
+sharedResource_iterator begin_sharedResource ();
+sharedResource_iterator end_sharedResource ();
+sharedResource_const_iterator begin_sharedResource () const;
+sharedResource_const_iterator end_sharedResource () const;
+void add_sharedResource (::CIAO::Config_Handlers::SharedResource const& );
+size_t count_sharedResource (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
+
+// infoProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+infoProperty_iterator begin_infoProperty ();
+infoProperty_iterator end_infoProperty ();
+infoProperty_const_iterator begin_infoProperty () const;
+infoProperty_const_iterator end_infoProperty () const;
+void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_infoProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+public:
+Domain ();
+
+Domain (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Domain (Domain const& s);
+
+Domain&
+operator= (Domain const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export Bridge : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// connect
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connect_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connect_const_iterator;
+connect_iterator begin_connect ();
+connect_iterator end_connect ();
+connect_const_iterator begin_connect () const;
+connect_const_iterator end_connect () const;
+void add_connect (::CIAO::Config_Handlers::Interconnect const& );
+size_t count_connect (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Interconnect > connect_;
+
+// resource
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
+resource_iterator begin_resource ();
+resource_iterator end_resource ();
+resource_const_iterator begin_resource () const;
+resource_const_iterator end_resource () const;
+void add_resource (::CIAO::Config_Handlers::Resource const& );
+size_t count_resource (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Resource > resource_;
+
+public:
+Bridge (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+Bridge (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Bridge (Bridge const& s);
+
+Bridge&
+operator= (Bridge const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export Interconnect : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// connection
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::iterator connection_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Bridge >::const_iterator connection_const_iterator;
+connection_iterator begin_connection ();
+connection_iterator end_connection ();
+connection_const_iterator begin_connection () const;
+connection_const_iterator end_connection () const;
+void add_connection (::CIAO::Config_Handlers::Bridge const& );
+size_t count_connection (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Bridge > connection_;
+
+// connect
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Node >::iterator connect_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Node >::const_iterator connect_const_iterator;
+connect_iterator begin_connect ();
+connect_iterator end_connect ();
+connect_const_iterator begin_connect () const;
+connect_const_iterator end_connect () const;
+void add_connect (::CIAO::Config_Handlers::Node const& );
+size_t count_connect (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Node > connect_;
+
+// resource
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
+resource_iterator begin_resource ();
+resource_iterator end_resource ();
+resource_const_iterator begin_resource () const;
+resource_const_iterator end_resource () const;
+void add_resource (::CIAO::Config_Handlers::Resource const& );
+size_t count_resource (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Resource > resource_;
+
+public:
+Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Interconnect (Interconnect const& s);
+
+Interconnect&
+operator= (Interconnect const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export Node : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// connection
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::iterator connection_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Interconnect >::const_iterator connection_const_iterator;
+connection_iterator begin_connection ();
+connection_iterator end_connection ();
+connection_const_iterator begin_connection () const;
+connection_const_iterator end_connection () const;
+void add_connection (::CIAO::Config_Handlers::Interconnect const& );
+size_t count_connection (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Interconnect > connection_;
+
+// sharedResource
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::iterator sharedResource_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::SharedResource >::const_iterator sharedResource_const_iterator;
+sharedResource_iterator begin_sharedResource ();
+sharedResource_iterator end_sharedResource ();
+sharedResource_const_iterator begin_sharedResource () const;
+sharedResource_const_iterator end_sharedResource () const;
+void add_sharedResource (::CIAO::Config_Handlers::SharedResource const& );
+size_t count_sharedResource (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
+
+// resource
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Resource >::iterator resource_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Resource >::const_iterator resource_const_iterator;
+resource_iterator begin_resource ();
+resource_iterator end_resource ();
+resource_const_iterator begin_resource () const;
+resource_const_iterator end_resource () const;
+void add_resource (::CIAO::Config_Handlers::Resource const& );
+size_t count_resource (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Resource > resource_;
+
+public:
+Node (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+Node (::XSCRT::XML::Element< ACE_TCHAR > const&);
+Node (Node const& s);
+
+Node&
+operator= (Node const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export SharedResource : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// resourceType
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
+void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+
+// node
+//
+public:
+::CIAO::Config_Handlers::Node const& node () const;
+void node (::CIAO::Config_Handlers::Node const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::Node > node_;
+
+// property
+//
+public:
+::CIAO::Config_Handlers::SatisfierProperty const& property () const;
+void property (::CIAO::Config_Handlers::SatisfierProperty const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+
+public:
+SharedResource (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+::CIAO::Config_Handlers::Node const& node__,
+::CIAO::Config_Handlers::SatisfierProperty const& property__);
+
+SharedResource (::XSCRT::XML::Element< ACE_TCHAR > const&);
+SharedResource (SharedResource const& s);
+
+SharedResource&
+operator= (SharedResource const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export Domain : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Domain >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export Domain : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Domain >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+UUID (Type&);
+
+virtual void
+UUID (Type const&);
+
+virtual void
+UUID_none (Type&);
+
+virtual void
+UUID_none (Type const&);
+
+virtual void
+label (Type&);
+
+virtual void
+label (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+node (Type&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+node (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+node_pre (Type&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+node_pre (Type const&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+node_next (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+node_next (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+node_post (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+node_post (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+interconnect (Type&);
 
-        virtual void
-        node (Type&);
+virtual void
+interconnect (Type const&);
 
-        virtual void
-        node (Type const&);
+virtual void
+interconnect_pre (Type&);
 
-        virtual void
-        node_pre (Type&);
+virtual void
+interconnect_pre (Type const&);
 
-        virtual void
-        node_pre (Type const&);
+virtual void
+interconnect_next (Type&);
 
-        virtual void
-        node_next (Type&);
+virtual void
+interconnect_next (Type const&);
 
-        virtual void
-        node_next (Type const&);
+virtual void
+interconnect_post (Type&);
 
-        virtual void
-        node_post (Type&);
+virtual void
+interconnect_post (Type const&);
 
-        virtual void
-        node_post (Type const&);
+virtual void
+interconnect_none (Type&);
 
-        virtual void
-        interconnect (Type&);
+virtual void
+interconnect_none (Type const&);
 
-        virtual void
-        interconnect (Type const&);
+virtual void
+bridge (Type&);
 
-        virtual void
-        bridge (Type&);
+virtual void
+bridge (Type const&);
 
-        virtual void
-        bridge (Type const&);
+virtual void
+bridge_pre (Type&);
 
-        virtual void
-        sharedResource (Type&);
+virtual void
+bridge_pre (Type const&);
 
-        virtual void
-        sharedResource (Type const&);
+virtual void
+bridge_next (Type&);
 
-        virtual void
-        sharedResource_none (Type&);
+virtual void
+bridge_next (Type const&);
 
-        virtual void
-        sharedResource_none (Type const&);
+virtual void
+bridge_post (Type&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+bridge_post (Type const&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+bridge_none (Type&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+bridge_none (Type const&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+sharedResource (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+sharedResource (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+sharedResource_pre (Type&);
 
-      struct XSC_XML_Handlers_Export Bridge : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Bridge >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+sharedResource_pre (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+sharedResource_next (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+sharedResource_next (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+sharedResource_post (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+sharedResource_post (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+sharedResource_none (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+sharedResource_none (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        connect (Type&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        connect (Type const&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        connect_pre (Type&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        connect_pre (Type const&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        connect_next (Type&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        connect_next (Type const&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        connect_post (Type&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        connect_post (Type const&);
+virtual void
+post (Type&);
 
-        virtual void
-        resource (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        resource (Type const&);
+struct XSC_XML_Handlers_Export Bridge : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Bridge >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+name (Type&);
+
+virtual void
+name (Type const&);
+
+virtual void
+label (Type&);
+
+virtual void
+label (Type const&);
+
+virtual void
+label_none (Type&);
+
+virtual void
+label_none (Type const&);
+
+virtual void
+connect (Type&);
+
+virtual void
+connect (Type const&);
+
+virtual void
+connect_pre (Type&);
+
+virtual void
+connect_pre (Type const&);
+
+virtual void
+connect_next (Type&);
+
+virtual void
+connect_next (Type const&);
+
+virtual void
+connect_post (Type&);
+
+virtual void
+connect_post (Type const&);
 
-        virtual void
-        resource_pre (Type&);
+virtual void
+resource (Type&);
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+resource (Type const&);
 
-        virtual void
-        resource_next (Type&);
+virtual void
+resource_pre (Type&);
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void
-        resource_post (Type&);
+virtual void
+resource_next (Type&);
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+resource_next (Type const&);
 
-        virtual void
-        resource_none (Type&);
+virtual void
+resource_post (Type&);
 
-        virtual void
-        resource_none (Type const&);
+virtual void
+resource_post (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+resource_none (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+resource_none (Type const&);
 
-      struct XSC_XML_Handlers_Export Interconnect : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Interconnect >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        pre (Type&);
+struct XSC_XML_Handlers_Export Interconnect : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Interconnect >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+pre (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+name (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+label (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        connection (Type&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        connection (Type const&);
+virtual void
+connection (Type&);
 
-        virtual void
-        connection_pre (Type&);
+virtual void
+connection (Type const&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connection_pre (Type&);
 
-        virtual void
-        connection_next (Type&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_next (Type&);
 
-        virtual void
-        connection_post (Type&);
+virtual void
+connection_next (Type const&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_post (Type&);
 
-        virtual void
-        connection_none (Type&);
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        connection_none (Type const&);
+virtual void
+connection_none (Type&);
 
-        virtual void
-        connect (Type&);
+virtual void
+connection_none (Type const&);
 
-        virtual void
-        connect (Type const&);
+virtual void
+connect (Type&);
 
-        virtual void
-        connect_pre (Type&);
+virtual void
+connect (Type const&);
 
-        virtual void
-        connect_pre (Type const&);
+virtual void
+connect_pre (Type&);
 
-        virtual void
-        connect_next (Type&);
+virtual void
+connect_pre (Type const&);
 
-        virtual void
-        connect_next (Type const&);
+virtual void
+connect_next (Type&);
 
-        virtual void
-        connect_post (Type&);
+virtual void
+connect_next (Type const&);
 
-        virtual void
-        connect_post (Type const&);
+virtual void
+connect_post (Type&);
 
-        virtual void
-        resource (Type&);
+virtual void
+connect_post (Type const&);
 
-        virtual void
-        resource (Type const&);
+virtual void
+resource (Type&);
 
-        virtual void
-        resource_pre (Type&);
+virtual void
+resource (Type const&);
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+resource_pre (Type&);
 
-        virtual void
-        resource_next (Type&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+resource_next (Type&);
 
-        virtual void
-        resource_post (Type&);
+virtual void
+resource_next (Type const&);
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+resource_post (Type&);
 
-        virtual void
-        resource_none (Type&);
+virtual void
+resource_post (Type const&);
 
-        virtual void
-        resource_none (Type const&);
+virtual void
+resource_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+resource_none (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+post (Type&);
 
-      struct XSC_XML_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type const&);
+};
 
-        virtual void
-        traverse (Type const&);
+struct XSC_XML_Handlers_Export Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+pre (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+name (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+label (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        connection (Type&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        connection (Type const&);
+virtual void
+connection (Type&);
 
-        virtual void
-        connection_pre (Type&);
+virtual void
+connection (Type const&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connection_pre (Type&);
 
-        virtual void
-        connection_next (Type&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_next (Type&);
 
-        virtual void
-        connection_post (Type&);
+virtual void
+connection_next (Type const&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_post (Type&);
 
-        virtual void
-        connection_none (Type&);
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        connection_none (Type const&);
+virtual void
+connection_none (Type&);
 
-        virtual void
-        sharedResource (Type&);
+virtual void
+connection_none (Type const&);
 
-        virtual void
-        sharedResource (Type const&);
+virtual void
+sharedResource (Type&);
 
-        virtual void
-        sharedResource_pre (Type&);
+virtual void
+sharedResource (Type const&);
 
-        virtual void
-        sharedResource_pre (Type const&);
+virtual void
+sharedResource_pre (Type&);
 
-        virtual void
-        sharedResource_next (Type&);
+virtual void
+sharedResource_pre (Type const&);
 
-        virtual void
-        sharedResource_next (Type const&);
+virtual void
+sharedResource_next (Type&);
 
-        virtual void
-        sharedResource_post (Type&);
+virtual void
+sharedResource_next (Type const&);
 
-        virtual void
-        sharedResource_post (Type const&);
+virtual void
+sharedResource_post (Type&);
 
-        virtual void
-        sharedResource_none (Type&);
+virtual void
+sharedResource_post (Type const&);
 
-        virtual void
-        sharedResource_none (Type const&);
+virtual void
+sharedResource_none (Type&);
 
-        virtual void
-        resource (Type&);
+virtual void
+sharedResource_none (Type const&);
 
-        virtual void
-        resource (Type const&);
+virtual void
+resource (Type&);
 
-        virtual void
-        resource_pre (Type&);
+virtual void
+resource (Type const&);
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+resource_pre (Type&);
 
-        virtual void
-        resource_next (Type&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+resource_next (Type&);
 
-        virtual void
-        resource_post (Type&);
+virtual void
+resource_next (Type const&);
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+resource_post (Type&);
 
-        virtual void
-        resource_none (Type&);
+virtual void
+resource_post (Type const&);
 
-        virtual void
-        resource_none (Type const&);
+virtual void
+resource_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+resource_none (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+post (Type&);
 
-      struct XSC_XML_Handlers_Export SharedResource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SharedResource >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export SharedResource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SharedResource >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        resourceType (Type&);
+virtual void
+resourceType (Type&);
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void
-        node (Type&);
+virtual void
+node (Type&);
 
-        virtual void
-        node (Type const&);
+virtual void
+node (Type const&);
 
-        virtual void
-        property (Type&);
+virtual void
+property (Type&);
 
-        virtual void
-        property (Type const&);
+virtual void
+property (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct Domain : Traversal::Domain, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Domain Type;
-        Domain (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct Domain : Traversal::Domain,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Domain Type;
+Domain (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+UUID (Type &o)
+{
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+this->UUID (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->label (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void 
-        node_pre (Type &o)
-        {
+virtual void
+node_pre (Type &o)
+{
 
-          this->node_pre (const_cast <Type const &> (o));
-        }
+this->node_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        node_pre (Type const&);
+virtual void
+node_pre (Type const&);
 
-        virtual void 
-        node_next (Type &o)
-        {
+virtual void
+node_next (Type &o)
+{
+
+this->node_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+node_next (Type const&);
+
+virtual void
+node_post (Type &o)
+{
+
+this->node_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+node_post (Type const&);
+
+virtual void
+interconnect_pre (Type &o)
+{
+
+this->interconnect_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+interconnect_pre (Type const&);
+
+virtual void
+interconnect_next (Type &o)
+{
+
+this->interconnect_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+interconnect_next (Type const&);
+
+virtual void
+interconnect_post (Type &o)
+{
+
+this->interconnect_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+interconnect_post (Type const&);
+
+virtual void
+bridge_pre (Type &o)
+{
+
+this->bridge_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+bridge_pre (Type const&);
+
+virtual void
+bridge_next (Type &o)
+{
+
+this->bridge_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+bridge_next (Type const&);
+
+virtual void
+bridge_post (Type &o)
+{
+
+this->bridge_post (const_cast <Type const &> (o));
+}
 
-          this->node_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+bridge_post (Type const&);
 
-        virtual void
-        node_next (Type const&);
+virtual void
+sharedResource_pre (Type &o)
+{
 
-        virtual void 
-        node_post (Type &o)
-        {
+this->sharedResource_pre (const_cast <Type const &> (o));
+}
 
-          this->node_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+sharedResource_pre (Type const&);
 
-        virtual void
-        node_post (Type const&);
+virtual void
+sharedResource_next (Type &o)
+{
+
+this->sharedResource_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        interconnect (Type &o)
-        {
 
-          this->interconnect (const_cast <Type const &> (o));
-        }
+virtual void
+sharedResource_next (Type const&);
+
+virtual void
+sharedResource_post (Type &o)
+{
+
+this->sharedResource_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        interconnect (Type const&);
+virtual void
+sharedResource_post (Type const&);
 
-        virtual void 
-        bridge (Type &o)
-        {
+virtual void
+infoProperty_pre (Type &o)
+{
 
-          this->bridge (const_cast <Type const &> (o));
-        }
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        bridge (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void 
-        sharedResource (Type &o)
-        {
+virtual void
+infoProperty_next (Type &o)
+{
 
-          this->sharedResource (const_cast <Type const &> (o));
-        }
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        sharedResource (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void 
-        infoProperty (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        protected:
-        Domain ();
-      };
+protected:
+Domain ();
+};
 
-      struct Bridge : Traversal::Bridge, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Bridge Type;
-        Bridge (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct Bridge : Traversal::Bridge,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Bridge Type;
+Bridge (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->label (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void 
-        connect_pre (Type &o)
-        {
+virtual void
+connect_pre (Type &o)
+{
 
-          this->connect_pre (const_cast <Type const &> (o));
-        }
+this->connect_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connect_pre (Type const&);
+virtual void
+connect_pre (Type const&);
 
-        virtual void 
-        connect_next (Type &o)
-        {
+virtual void
+connect_next (Type &o)
+{
 
-          this->connect_next (const_cast <Type const &> (o));
-        }
+this->connect_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connect_next (Type const&);
+virtual void
+connect_next (Type const&);
 
-        virtual void 
-        connect_post (Type &o)
-        {
+virtual void
+connect_post (Type &o)
+{
 
-          this->connect_post (const_cast <Type const &> (o));
-        }
+this->connect_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connect_post (Type const&);
+virtual void
+connect_post (Type const&);
 
-        virtual void 
-        resource_pre (Type &o)
-        {
+virtual void
+resource_pre (Type &o)
+{
 
-          this->resource_pre (const_cast <Type const &> (o));
-        }
+this->resource_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void 
-        resource_next (Type &o)
-        {
+virtual void
+resource_next (Type &o)
+{
 
-          this->resource_next (const_cast <Type const &> (o));
-        }
+this->resource_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+resource_next (Type const&);
 
-        virtual void 
-        resource_post (Type &o)
-        {
+virtual void
+resource_post (Type &o)
+{
 
-          this->resource_post (const_cast <Type const &> (o));
-        }
+this->resource_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+resource_post (Type const&);
 
-        protected:
-        Bridge ();
-      };
+protected:
+Bridge ();
+};
 
-      struct Interconnect : Traversal::Interconnect, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Interconnect Type;
-        Interconnect (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct Interconnect : Traversal::Interconnect,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Interconnect Type;
+Interconnect (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->label (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void 
-        connection_pre (Type &o)
-        {
+virtual void
+connection_pre (Type &o)
+{
 
-          this->connection_pre (const_cast <Type const &> (o));
-        }
+this->connection_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void 
-        connection_next (Type &o)
-        {
+virtual void
+connection_next (Type &o)
+{
 
-          this->connection_next (const_cast <Type const &> (o));
-        }
+this->connection_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_next (Type const&);
 
-        virtual void 
-        connection_post (Type &o)
-        {
+virtual void
+connection_post (Type &o)
+{
 
-          this->connection_post (const_cast <Type const &> (o));
-        }
+this->connection_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_post (Type const&);
 
-        virtual void 
-        connect_pre (Type &o)
-        {
+virtual void
+connect_pre (Type &o)
+{
 
-          this->connect_pre (const_cast <Type const &> (o));
-        }
+this->connect_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connect_pre (Type const&);
+virtual void
+connect_pre (Type const&);
 
-        virtual void 
-        connect_next (Type &o)
-        {
+virtual void
+connect_next (Type &o)
+{
 
-          this->connect_next (const_cast <Type const &> (o));
-        }
+this->connect_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connect_next (Type const&);
+virtual void
+connect_next (Type const&);
 
-        virtual void 
-        connect_post (Type &o)
-        {
+virtual void
+connect_post (Type &o)
+{
 
-          this->connect_post (const_cast <Type const &> (o));
-        }
+this->connect_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connect_post (Type const&);
+virtual void
+connect_post (Type const&);
 
-        virtual void 
-        resource_pre (Type &o)
-        {
+virtual void
+resource_pre (Type &o)
+{
 
-          this->resource_pre (const_cast <Type const &> (o));
-        }
+this->resource_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void 
-        resource_next (Type &o)
-        {
+virtual void
+resource_next (Type &o)
+{
 
-          this->resource_next (const_cast <Type const &> (o));
-        }
+this->resource_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+resource_next (Type const&);
 
-        virtual void 
-        resource_post (Type &o)
-        {
+virtual void
+resource_post (Type &o)
+{
 
-          this->resource_post (const_cast <Type const &> (o));
-        }
+this->resource_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+resource_post (Type const&);
 
-        protected:
-        Interconnect ();
-      };
+protected:
+Interconnect ();
+};
 
-      struct Node : Traversal::Node, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::Node Type;
-        Node (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct Node : Traversal::Node,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::Node Type;
+Node (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->label (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void 
-        connection_pre (Type &o)
-        {
+virtual void
+connection_pre (Type &o)
+{
 
-          this->connection_pre (const_cast <Type const &> (o));
-        }
+this->connection_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void 
-        connection_next (Type &o)
-        {
+virtual void
+connection_next (Type &o)
+{
 
-          this->connection_next (const_cast <Type const &> (o));
-        }
+this->connection_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_next (Type const&);
 
-        virtual void 
-        connection_post (Type &o)
-        {
+virtual void
+connection_post (Type &o)
+{
 
-          this->connection_post (const_cast <Type const &> (o));
-        }
+this->connection_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_post (Type const&);
 
-        virtual void 
-        sharedResource_pre (Type &o)
-        {
+virtual void
+sharedResource_pre (Type &o)
+{
 
-          this->sharedResource_pre (const_cast <Type const &> (o));
-        }
+this->sharedResource_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        sharedResource_pre (Type const&);
+virtual void
+sharedResource_pre (Type const&);
 
-        virtual void 
-        sharedResource_next (Type &o)
-        {
+virtual void
+sharedResource_next (Type &o)
+{
 
-          this->sharedResource_next (const_cast <Type const &> (o));
-        }
+this->sharedResource_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        sharedResource_next (Type const&);
+virtual void
+sharedResource_next (Type const&);
 
-        virtual void 
-        sharedResource_post (Type &o)
-        {
+virtual void
+sharedResource_post (Type &o)
+{
 
-          this->sharedResource_post (const_cast <Type const &> (o));
-        }
+this->sharedResource_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        sharedResource_post (Type const&);
+virtual void
+sharedResource_post (Type const&);
 
-        virtual void 
-        resource_pre (Type &o)
-        {
+virtual void
+resource_pre (Type &o)
+{
 
-          this->resource_pre (const_cast <Type const &> (o));
-        }
+this->resource_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_pre (Type const&);
+virtual void
+resource_pre (Type const&);
 
-        virtual void 
-        resource_next (Type &o)
-        {
+virtual void
+resource_next (Type &o)
+{
 
-          this->resource_next (const_cast <Type const &> (o));
-        }
+this->resource_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_next (Type const&);
+virtual void
+resource_next (Type const&);
 
-        virtual void 
-        resource_post (Type &o)
-        {
+virtual void
+resource_post (Type &o)
+{
 
-          this->resource_post (const_cast <Type const &> (o));
-        }
+this->resource_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resource_post (Type const&);
+virtual void
+resource_post (Type const&);
 
-        protected:
-        Node ();
-      };
+protected:
+Node ();
+};
 
-      struct SharedResource : Traversal::SharedResource, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::SharedResource Type;
-        SharedResource (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct SharedResource : Traversal::SharedResource,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::SharedResource Type;
+SharedResource (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        resourceType (Type &o)
-        {
+virtual void
+resourceType (Type &o)
+{
 
-          this->resourceType (const_cast <Type const &> (o));
-        }
+this->resourceType (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        resourceType (Type const&);
+virtual void
+resourceType (Type const&);
 
-        virtual void 
-        node (Type &o)
-        {
+virtual void
+node (Type &o)
+{
 
-          this->node (const_cast <Type const &> (o));
-        }
+this->node (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        node (Type const&);
+virtual void
+node (Type const&);
 
-        virtual void 
-        property (Type &o)
-        {
+virtual void
+property (Type &o)
+{
 
-          this->property (const_cast <Type const &> (o));
-        }
+this->property (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        property (Type const&);
+virtual void
+property (Type const&);
 
-        protected:
-        SharedResource ();
-      };
-    }
-  }
+protected:
+SharedResource ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CDD_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.cpp b/TAO/CIAO/tools/Config_Handlers/cdp.cpp
index 8603731cd5e..0ba7c13577d 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.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 "cdp.hpp"
 
 namespace CIAO
@@ -16,24 +16,24 @@ namespace CIAO
   namespace Config_Handlers
   {
     // DeploymentPlan
-    // 
+    //
 
     DeploymentPlan::
     DeploymentPlan ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
     {
     }
 
     DeploymentPlan::
     DeploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const& s)
-    :
-    ::XSCRT::Type (),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+        UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+          realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
+          regulator__ ()
     {
       if (label_.get ()) label_->container (this);
       if (UUID_.get ()) UUID_->container (this);
@@ -110,7 +110,7 @@ namespace CIAO
 
 
     // DeploymentPlan
-    // 
+    //
     bool DeploymentPlan::
     label_p () const
     {
@@ -127,19 +127,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-      {
-        *label_ = e;
-      }
+        {
+          *label_ = e;
+        }
 
       else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
+        {
+          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          label_->container (this);
+        }
     }
 
     // DeploymentPlan
-    // 
+    //
     bool DeploymentPlan::
     UUID_p () const
     {
@@ -156,19 +156,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+        {
+          *UUID_ = e;
+        }
 
       else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
+        {
+          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          UUID_->container (this);
+        }
     }
 
     // DeploymentPlan
-    // 
+    //
     bool DeploymentPlan::
     realizes_p () const
     {
@@ -185,19 +185,19 @@ namespace CIAO
     realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
     {
       if (realizes_.get ())
-      {
-        *realizes_ = e;
-      }
+        {
+          *realizes_ = e;
+        }
 
       else
-      {
-        realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-        realizes_->container (this);
-      }
+        {
+          realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+          realizes_->container (this);
+        }
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::implementation_iterator DeploymentPlan::
     begin_implementation ()
     {
@@ -235,7 +235,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::instance_iterator DeploymentPlan::
     begin_instance ()
     {
@@ -273,7 +273,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::connection_iterator DeploymentPlan::
     begin_connection ()
     {
@@ -311,7 +311,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::dependsOn_iterator DeploymentPlan::
     begin_dependsOn ()
     {
@@ -349,7 +349,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::artifact_iterator DeploymentPlan::
     begin_artifact ()
     {
@@ -387,7 +387,7 @@ namespace CIAO
     }
 
     // DeploymentPlan
-    // 
+    //
     DeploymentPlan::infoProperty_iterator DeploymentPlan::
     begin_infoProperty ()
     {
@@ -435,74 +435,74 @@ namespace CIAO
 
     DeploymentPlan::
     DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+      :Base__ (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
-
-        else if (n == "realizes")
-        {
-          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-          realizes (t);
-        }
-
-        else if (n == "implementation")
-        {
-          ::CIAO::Config_Handlers::MonolithicDeploymentDescription t (e);
-          add_implementation (t);
-        }
-
-        else if (n == "instance")
-        {
-          ::CIAO::Config_Handlers::InstanceDeploymentDescription t (e);
-          add_instance (t);
-        }
-
-        else if (n == "connection")
-        {
-          ::CIAO::Config_Handlers::PlanConnectionDescription t (e);
-          add_connection (t);
-        }
-
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::ImplementationDependency t (e);
-          add_dependsOn (t);
-        }
-
-        else if (n == "artifact")
-        {
-          ::CIAO::Config_Handlers::ArtifactDeploymentDescription t (e);
-          add_artifact (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          add_infoProperty (t);
-        }
-
-        else 
         {
+          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+          if (n == "label")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              label (t);
+            }
+
+          else if (n == "UUID")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              UUID (t);
+            }
+
+          else if (n == "realizes")
+            {
+              ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+              realizes (t);
+            }
+
+          else if (n == "implementation")
+            {
+              ::CIAO::Config_Handlers::MonolithicDeploymentDescription t (e);
+              add_implementation (t);
+            }
+
+          else if (n == "instance")
+            {
+              ::CIAO::Config_Handlers::InstanceDeploymentDescription t (e);
+              add_instance (t);
+            }
+
+          else if (n == "connection")
+            {
+              ::CIAO::Config_Handlers::PlanConnectionDescription t (e);
+              add_connection (t);
+            }
+
+          else if (n == "dependsOn")
+            {
+              ::CIAO::Config_Handlers::ImplementationDependency t (e);
+              add_dependsOn (t);
+            }
+
+          else if (n == "artifact")
+            {
+              ::CIAO::Config_Handlers::ArtifactDeploymentDescription t (e);
+              add_artifact (t);
+            }
+
+          else if (n == "infoProperty")
+            {
+              ::CIAO::Config_Handlers::Property t (e);
+              add_infoProperty (t);
+            }
+
+          else
+            {
+            }
         }
-      }
     }
   }
 }
@@ -673,16 +673,16 @@ namespace CIAO
         DeploymentPlan::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
 
         if (b != e)
-        {
-          implementation_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) implementation_next (o);
+            implementation_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) implementation_next (o);
+              }
+
+            implementation_post (o);
           }
-
-          implementation_post (o);
-        }
       }
 
       void DeploymentPlan::
@@ -693,16 +693,16 @@ namespace CIAO
         DeploymentPlan::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
 
         if (b != e)
-        {
-          implementation_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) implementation_next (o);
+            implementation_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) implementation_next (o);
+              }
+
+            implementation_post (o);
           }
-
-          implementation_post (o);
-        }
       }
 
       void DeploymentPlan::
@@ -743,17 +743,17 @@ namespace CIAO
         DeploymentPlan::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
 
         if (b != e)
-        {
-          instance_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
+            instance_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) instance_next (o);
+              }
+
+            instance_post (o);
           }
 
-          instance_post (o);
-        }
-
         else instance_none (o);
       }
 
@@ -765,17 +765,17 @@ namespace CIAO
         DeploymentPlan::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
 
         if (b != e)
-        {
-          instance_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
+            instance_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) instance_next (o);
+              }
+
+            instance_post (o);
           }
 
-          instance_post (o);
-        }
-
         else instance_none (o);
       }
 
@@ -827,17 +827,17 @@ namespace CIAO
         DeploymentPlan::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
         if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
+            connection_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) connection_next (o);
+              }
+
+            connection_post (o);
           }
 
-          connection_post (o);
-        }
-
         else connection_none (o);
       }
 
@@ -849,17 +849,17 @@ namespace CIAO
         DeploymentPlan::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
         if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
+            connection_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) connection_next (o);
+              }
+
+            connection_post (o);
           }
 
-          connection_post (o);
-        }
-
         else connection_none (o);
       }
 
@@ -911,17 +911,17 @@ namespace CIAO
         DeploymentPlan::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
         if (b != e)
-        {
-          dependsOn_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
+            dependsOn_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) dependsOn_next (o);
+              }
+
+            dependsOn_post (o);
           }
 
-          dependsOn_post (o);
-        }
-
         else dependsOn_none (o);
       }
 
@@ -933,17 +933,17 @@ namespace CIAO
         DeploymentPlan::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
         if (b != e)
-        {
-          dependsOn_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
+            dependsOn_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) dependsOn_next (o);
+              }
+
+            dependsOn_post (o);
           }
 
-          dependsOn_post (o);
-        }
-
         else dependsOn_none (o);
       }
 
@@ -995,17 +995,17 @@ namespace CIAO
         DeploymentPlan::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
 
         if (b != e)
-        {
-          artifact_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
+            artifact_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) artifact_next (o);
+              }
+
+            artifact_post (o);
           }
 
-          artifact_post (o);
-        }
-
         else artifact_none (o);
       }
 
@@ -1017,17 +1017,17 @@ namespace CIAO
         DeploymentPlan::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
 
         if (b != e)
-        {
-          artifact_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
+            artifact_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) artifact_next (o);
+              }
+
+            artifact_post (o);
           }
 
-          artifact_post (o);
-        }
-
         else artifact_none (o);
       }
 
@@ -1079,17 +1079,17 @@ namespace CIAO
         DeploymentPlan::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
-        {
-          infoProperty_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
+            infoProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1101,17 +1101,17 @@ namespace CIAO
         DeploymentPlan::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
-        {
-          infoProperty_pre (o);
-          for (; b != e;)
           {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
+            infoProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) infoProperty_next (o);
+              }
+
+            infoProperty_post (o);
           }
 
-          infoProperty_post (o);
-        }
-
         else infoProperty_none (o);
       }
 
@@ -1180,7 +1180,7 @@ namespace CIAO
 
       DeploymentPlan::
       DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.hpp b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
index dc449ab6031..e48eafe1af4 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -28,10 +28,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-  }
+namespace Config_Handlers
+{
+class DeploymentPlan;
+}
 }
 
 #include <memory>
@@ -42,665 +42,665 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // realizes
-      // 
-      public:
-      bool realizes_p () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
-      void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
-
-      // implementation
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::iterator implementation_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::const_iterator implementation_const_iterator;
-      implementation_iterator begin_implementation ();
-      implementation_iterator end_implementation ();
-      implementation_const_iterator begin_implementation () const;
-      implementation_const_iterator end_implementation () const;
-      void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
-      size_t count_implementation (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
-
-      // instance
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator;
-      instance_iterator begin_instance ();
-      instance_iterator end_instance ();
-      instance_const_iterator begin_instance () const;
-      instance_const_iterator end_instance () const;
-      void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& );
-      size_t count_instance (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
-
-      // connection
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator;
-      connection_iterator begin_connection ();
-      connection_iterator end_connection ();
-      connection_const_iterator begin_connection () const;
-      connection_const_iterator end_connection () const;
-      void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& );
-      size_t count_connection (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
-
-      // dependsOn
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
-      dependsOn_iterator begin_dependsOn ();
-      dependsOn_iterator end_dependsOn ();
-      dependsOn_const_iterator begin_dependsOn () const;
-      dependsOn_const_iterator end_dependsOn () const;
-      void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
-      size_t count_dependsOn (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-      // artifact
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator;
-      artifact_iterator begin_artifact ();
-      artifact_iterator end_artifact ();
-      artifact_const_iterator begin_artifact () const;
-      artifact_const_iterator end_artifact () const;
-      void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
-      size_t count_artifact (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
-
-      // infoProperty
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-      infoProperty_iterator begin_infoProperty ();
-      infoProperty_iterator end_infoProperty ();
-      infoProperty_const_iterator begin_infoProperty () const;
-      infoProperty_const_iterator end_infoProperty () const;
-      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-      size_t count_infoProperty (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      public:
-      DeploymentPlan ();
-
-      DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      DeploymentPlan (DeploymentPlan const& s);
-
-      DeploymentPlan&
-      operator= (DeploymentPlan const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// realizes
+//
+public:
+bool realizes_p () const;
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
+void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
+
+// implementation
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::iterator implementation_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::const_iterator implementation_const_iterator;
+implementation_iterator begin_implementation ();
+implementation_iterator end_implementation ();
+implementation_const_iterator begin_implementation () const;
+implementation_const_iterator end_implementation () const;
+void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
+size_t count_implementation (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
+
+// instance
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator;
+instance_iterator begin_instance ();
+instance_iterator end_instance ();
+instance_const_iterator begin_instance () const;
+instance_const_iterator end_instance () const;
+void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& );
+size_t count_instance (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
+
+// connection
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator;
+connection_iterator begin_connection ();
+connection_iterator end_connection ();
+connection_const_iterator begin_connection () const;
+connection_const_iterator end_connection () const;
+void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& );
+size_t count_connection (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
+
+// dependsOn
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
+dependsOn_iterator begin_dependsOn ();
+dependsOn_iterator end_dependsOn ();
+dependsOn_const_iterator begin_dependsOn () const;
+dependsOn_const_iterator end_dependsOn () const;
+void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
+size_t count_dependsOn (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
+
+// artifact
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator;
+artifact_iterator begin_artifact ();
+artifact_iterator end_artifact ();
+artifact_const_iterator begin_artifact () const;
+artifact_const_iterator end_artifact () const;
+void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
+size_t count_artifact (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
+
+// infoProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+infoProperty_iterator begin_infoProperty ();
+infoProperty_iterator end_infoProperty ();
+infoProperty_const_iterator begin_infoProperty () const;
+infoProperty_const_iterator end_infoProperty () const;
+void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_infoProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+public:
+DeploymentPlan ();
+
+DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
+DeploymentPlan (DeploymentPlan const& s);
+
+DeploymentPlan&
+operator= (DeploymentPlan const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        label (Type&);
+virtual void
+label (Type&);
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        realizes (Type&);
+virtual void
+realizes (Type&);
 
-        virtual void
-        realizes (Type const&);
+virtual void
+realizes (Type const&);
 
-        virtual void
-        realizes_none (Type&);
+virtual void
+realizes_none (Type&);
 
-        virtual void
-        realizes_none (Type const&);
+virtual void
+realizes_none (Type const&);
 
-        virtual void
-        implementation (Type&);
+virtual void
+implementation (Type&);
 
-        virtual void
-        implementation (Type const&);
+virtual void
+implementation (Type const&);
 
-        virtual void
-        implementation_pre (Type&);
+virtual void
+implementation_pre (Type&);
 
-        virtual void
-        implementation_pre (Type const&);
+virtual void
+implementation_pre (Type const&);
 
-        virtual void
-        implementation_next (Type&);
+virtual void
+implementation_next (Type&);
 
-        virtual void
-        implementation_next (Type const&);
+virtual void
+implementation_next (Type const&);
 
-        virtual void
-        implementation_post (Type&);
+virtual void
+implementation_post (Type&);
 
-        virtual void
-        implementation_post (Type const&);
+virtual void
+implementation_post (Type const&);
 
-        virtual void
-        instance (Type&);
+virtual void
+instance (Type&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+instance (Type const&);
 
-        virtual void
-        instance_pre (Type&);
+virtual void
+instance_pre (Type&);
 
-        virtual void
-        instance_pre (Type const&);
+virtual void
+instance_pre (Type const&);
 
-        virtual void
-        instance_next (Type&);
+virtual void
+instance_next (Type&);
 
-        virtual void
-        instance_next (Type const&);
+virtual void
+instance_next (Type const&);
 
-        virtual void
-        instance_post (Type&);
+virtual void
+instance_post (Type&);
 
-        virtual void
-        instance_post (Type const&);
+virtual void
+instance_post (Type const&);
 
-        virtual void
-        instance_none (Type&);
+virtual void
+instance_none (Type&);
 
-        virtual void
-        instance_none (Type const&);
+virtual void
+instance_none (Type const&);
 
-        virtual void
-        connection (Type&);
+virtual void
+connection (Type&);
 
-        virtual void
-        connection (Type const&);
+virtual void
+connection (Type const&);
 
-        virtual void
-        connection_pre (Type&);
+virtual void
+connection_pre (Type&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void
-        connection_next (Type&);
+virtual void
+connection_next (Type&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_next (Type const&);
 
-        virtual void
-        connection_post (Type&);
+virtual void
+connection_post (Type&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        connection_none (Type&);
+virtual void
+connection_none (Type&);
 
-        virtual void
-        connection_none (Type const&);
+virtual void
+connection_none (Type const&);
 
-        virtual void
-        dependsOn (Type&);
+virtual void
+dependsOn (Type&);
 
-        virtual void
-        dependsOn (Type const&);
+virtual void
+dependsOn (Type const&);
 
-        virtual void
-        dependsOn_pre (Type&);
+virtual void
+dependsOn_pre (Type&);
 
-        virtual void
-        dependsOn_pre (Type const&);
+virtual void
+dependsOn_pre (Type const&);
 
-        virtual void
-        dependsOn_next (Type&);
+virtual void
+dependsOn_next (Type&);
 
-        virtual void
-        dependsOn_next (Type const&);
+virtual void
+dependsOn_next (Type const&);
 
-        virtual void
-        dependsOn_post (Type&);
+virtual void
+dependsOn_post (Type&);
 
-        virtual void
-        dependsOn_post (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-        virtual void
-        dependsOn_none (Type&);
+virtual void
+dependsOn_none (Type&);
 
-        virtual void
-        dependsOn_none (Type const&);
+virtual void
+dependsOn_none (Type const&);
 
-        virtual void
-        artifact (Type&);
+virtual void
+artifact (Type&);
 
-        virtual void
-        artifact (Type const&);
+virtual void
+artifact (Type const&);
 
-        virtual void
-        artifact_pre (Type&);
+virtual void
+artifact_pre (Type&);
 
-        virtual void
-        artifact_pre (Type const&);
+virtual void
+artifact_pre (Type const&);
 
-        virtual void
-        artifact_next (Type&);
+virtual void
+artifact_next (Type&);
 
-        virtual void
-        artifact_next (Type const&);
+virtual void
+artifact_next (Type const&);
 
-        virtual void
-        artifact_post (Type&);
+virtual void
+artifact_post (Type&);
 
-        virtual void
-        artifact_post (Type const&);
+virtual void
+artifact_post (Type const&);
 
-        virtual void
-        artifact_none (Type&);
+virtual void
+artifact_none (Type&);
 
-        virtual void
-        artifact_none (Type const&);
+virtual void
+artifact_none (Type const&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        infoProperty_pre (Type&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        infoProperty_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        infoProperty_next (Type&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        infoProperty_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        infoProperty_post (Type&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        infoProperty_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct DeploymentPlan : Traversal::DeploymentPlan, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
-        DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct DeploymentPlan : Traversal::DeploymentPlan,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
+DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+label (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->label (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        label (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+UUID (Type &o)
+{
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+this->UUID (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void 
-        realizes (Type &o)
-        {
+virtual void
+realizes (Type &o)
+{
 
-          this->realizes (const_cast <Type const &> (o));
-        }
+this->realizes (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        realizes (Type const&);
+virtual void
+realizes (Type const&);
 
-        virtual void 
-        implementation_pre (Type &o)
-        {
+virtual void
+implementation_pre (Type &o)
+{
 
-          this->implementation_pre (const_cast <Type const &> (o));
-        }
+this->implementation_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        implementation_pre (Type const&);
+virtual void
+implementation_pre (Type const&);
 
-        virtual void 
-        implementation_next (Type &o)
-        {
+virtual void
+implementation_next (Type &o)
+{
 
-          this->implementation_next (const_cast <Type const &> (o));
-        }
+this->implementation_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        implementation_next (Type const&);
+virtual void
+implementation_next (Type const&);
 
-        virtual void 
-        implementation_post (Type &o)
-        {
+virtual void
+implementation_post (Type &o)
+{
 
-          this->implementation_post (const_cast <Type const &> (o));
-        }
+this->implementation_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        implementation_post (Type const&);
+virtual void
+implementation_post (Type const&);
 
-        virtual void 
-        instance_pre (Type &o)
-        {
+virtual void
+instance_pre (Type &o)
+{
 
-          this->instance_pre (const_cast <Type const &> (o));
-        }
+this->instance_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        instance_pre (Type const&);
+virtual void
+instance_pre (Type const&);
 
-        virtual void 
-        instance_next (Type &o)
-        {
+virtual void
+instance_next (Type &o)
+{
 
-          this->instance_next (const_cast <Type const &> (o));
-        }
+this->instance_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        instance_next (Type const&);
+virtual void
+instance_next (Type const&);
 
-        virtual void 
-        instance_post (Type &o)
-        {
+virtual void
+instance_post (Type &o)
+{
 
-          this->instance_post (const_cast <Type const &> (o));
-        }
+this->instance_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        instance_post (Type const&);
+virtual void
+instance_post (Type const&);
 
-        virtual void 
-        connection_pre (Type &o)
-        {
+virtual void
+connection_pre (Type &o)
+{
 
-          this->connection_pre (const_cast <Type const &> (o));
-        }
+this->connection_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void 
-        connection_next (Type &o)
-        {
+virtual void
+connection_next (Type &o)
+{
 
-          this->connection_next (const_cast <Type const &> (o));
-        }
+this->connection_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+connection_next (Type const&);
 
-        virtual void 
-        connection_post (Type &o)
-        {
+virtual void
+connection_post (Type &o)
+{
 
-          this->connection_post (const_cast <Type const &> (o));
-        }
+this->connection_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+connection_post (Type const&);
 
-        virtual void 
-        dependsOn_pre (Type &o)
-        {
+virtual void
+dependsOn_pre (Type &o)
+{
 
-          this->dependsOn_pre (const_cast <Type const &> (o));
-        }
+this->dependsOn_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        dependsOn_pre (Type const&);
+virtual void
+dependsOn_pre (Type const&);
 
-        virtual void 
-        dependsOn_next (Type &o)
-        {
+virtual void
+dependsOn_next (Type &o)
+{
 
-          this->dependsOn_next (const_cast <Type const &> (o));
-        }
+this->dependsOn_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        dependsOn_next (Type const&);
+virtual void
+dependsOn_next (Type const&);
 
-        virtual void 
-        dependsOn_post (Type &o)
-        {
+virtual void
+dependsOn_post (Type &o)
+{
 
-          this->dependsOn_post (const_cast <Type const &> (o));
-        }
+this->dependsOn_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        dependsOn_post (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-        virtual void 
-        artifact_pre (Type &o)
-        {
+virtual void
+artifact_pre (Type &o)
+{
 
-          this->artifact_pre (const_cast <Type const &> (o));
-        }
+this->artifact_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        artifact_pre (Type const&);
+virtual void
+artifact_pre (Type const&);
 
-        virtual void 
-        artifact_next (Type &o)
-        {
+virtual void
+artifact_next (Type &o)
+{
 
-          this->artifact_next (const_cast <Type const &> (o));
-        }
+this->artifact_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        artifact_next (Type const&);
+virtual void
+artifact_next (Type const&);
 
-        virtual void 
-        artifact_post (Type &o)
-        {
+virtual void
+artifact_post (Type &o)
+{
 
-          this->artifact_post (const_cast <Type const &> (o));
-        }
+this->artifact_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        artifact_post (Type const&);
+virtual void
+artifact_post (Type const&);
 
-        virtual void 
-        infoProperty_pre (Type &o)
-        {
+virtual void
+infoProperty_pre (Type &o)
+{
 
-          this->infoProperty_pre (const_cast <Type const &> (o));
-        }
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void 
-        infoProperty_next (Type &o)
-        {
+virtual void
+infoProperty_next (Type &o)
+{
 
-          this->infoProperty_next (const_cast <Type const &> (o));
-        }
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void 
-        infoProperty_post (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->infoProperty_post (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        protected:
-        DeploymentPlan ();
-      };
-    }
-  }
+protected:
+DeploymentPlan ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CDP_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/cid.cpp b/TAO/CIAO/tools/Config_Handlers/cid.cpp
index 37c49aabe18..5cfd51e40d5 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.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 "cid.hpp"
 
 namespace CIAO
@@ -16,38 +16,43 @@ namespace CIAO
   namespace Config_Handlers
   {
     // SubcomponentInstantiationDescription
-    // 
+    //
 
     SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                          ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (package__)),
-    regulator__ ()
+    SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__)
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+        regulator__ ()
     {
       name_->container (this);
-      package_->container (this);
     }
 
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.package_)),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
-    reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+        basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
+        specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0),
+        referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0),
+        importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0),
+        id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+          regulator__ ()
     {
       name_->container (this);
-      package_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (selectRequirement_.get ()) selectRequirement_->container (this);
-      if (reference_.get ()) reference_->container (this);
+      if (basePackage_.get ()) basePackage_->container (this);
+      if (specializedConfig_.get ()) specializedConfig_->container (this);
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
+
+      if (referencedPackage_.get ()) referencedPackage_->container (this);
+      if (importedPackage_.get ()) importedPackage_->container (this);
       if (id_.get ()) id_->container (this);
     }
 
@@ -56,16 +61,27 @@ namespace CIAO
     {
       name (s.name ());
 
-      package (s.package ());
+      if (s.basePackage_.get ()) basePackage (*(s.basePackage_));
+      else basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (0);
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+      if (s.specializedConfig_.get ()) specializedConfig (*(s.specializedConfig_));
+      else specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (0);
 
-      if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
-      else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+      selectRequirement_.clear ();
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      configProperty_.clear ();
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
+
+      if (s.referencedPackage_.get ()) referencedPackage (*(s.referencedPackage_));
+      else referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
 
-      if (s.reference_.get ()) reference (*(s.reference_));
-      else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
+      if (s.importedPackage_.get ()) importedPackage (*(s.importedPackage_));
+      else importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (0);
 
       if (s.id_.get ()) id (*(s.id_));
       else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
@@ -75,7 +91,7 @@ namespace CIAO
 
 
     // SubcomponentInstantiationDescription
-    // 
+    //
     ::XMLSchema::string< ACE_TCHAR > const& SubcomponentInstantiationDescription::
     name () const
     {
@@ -89,108 +105,199 @@ namespace CIAO
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
+    bool SubcomponentInstantiationDescription::
+    basePackage_p () const
+    {
+      return basePackage_.get () != 0;
+    }
+
     ::CIAO::Config_Handlers::ComponentPackageDescription const& SubcomponentInstantiationDescription::
-    package () const
+    basePackage () const
     {
-      return *package_;
+      return *basePackage_;
     }
 
     void SubcomponentInstantiationDescription::
-    package (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
+    basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
     {
-      *package_ = e;
+      if (basePackage_.get ())
+        {
+          *basePackage_ = e;
+        }
+
+      else
+        {
+          basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
+          basePackage_->container (this);
+        }
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
     bool SubcomponentInstantiationDescription::
-    configProperty_p () const
+    specializedConfig_p () const
     {
-      return configProperty_.get () != 0;
+      return specializedConfig_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Property const& SubcomponentInstantiationDescription::
-    configProperty () const
+    ::CIAO::Config_Handlers::PackageConfiguration const& SubcomponentInstantiationDescription::
+    specializedConfig () const
     {
-      return *configProperty_;
+      return *specializedConfig_;
     }
 
     void SubcomponentInstantiationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
+    specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
+      if (specializedConfig_.get ())
+        {
+          *specializedConfig_ = e;
+        }
 
       else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
+        {
+          specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
+          specializedConfig_->container (this);
+        }
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
+    SubcomponentInstantiationDescription::selectRequirement_iterator SubcomponentInstantiationDescription::
+    begin_selectRequirement ()
+    {
+      return selectRequirement_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::selectRequirement_iterator SubcomponentInstantiationDescription::
+    end_selectRequirement ()
+    {
+      return selectRequirement_.end ();
+    }
+
+    SubcomponentInstantiationDescription::selectRequirement_const_iterator SubcomponentInstantiationDescription::
+    begin_selectRequirement () const
+    {
+      return selectRequirement_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::selectRequirement_const_iterator SubcomponentInstantiationDescription::
+    end_selectRequirement () const
+    {
+      return selectRequirement_.end ();
+    }
+
+    void SubcomponentInstantiationDescription::
+    add_selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      selectRequirement_.push_back (e);
+    }
+
+    size_t SubcomponentInstantiationDescription::
+    count_selectRequirement(void) const
+    {
+      return selectRequirement_.size ();
+    }
+
+    // SubcomponentInstantiationDescription
+    //
+    SubcomponentInstantiationDescription::configProperty_iterator SubcomponentInstantiationDescription::
+    begin_configProperty ()
+    {
+      return configProperty_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::configProperty_iterator SubcomponentInstantiationDescription::
+    end_configProperty ()
+    {
+      return configProperty_.end ();
+    }
+
+    SubcomponentInstantiationDescription::configProperty_const_iterator SubcomponentInstantiationDescription::
+    begin_configProperty () const
+    {
+      return configProperty_.begin ();
+    }
+
+    SubcomponentInstantiationDescription::configProperty_const_iterator SubcomponentInstantiationDescription::
+    end_configProperty () const
+    {
+      return configProperty_.end ();
+    }
+
+    void SubcomponentInstantiationDescription::
+    add_configProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      configProperty_.push_back (e);
+    }
+
+    size_t SubcomponentInstantiationDescription::
+    count_configProperty(void) const
+    {
+      return configProperty_.size ();
+    }
+
+    // SubcomponentInstantiationDescription
+    //
     bool SubcomponentInstantiationDescription::
-    selectRequirement_p () const
+    referencedPackage_p () const
     {
-      return selectRequirement_.get () != 0;
+      return referencedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Requirement const& SubcomponentInstantiationDescription::
-    selectRequirement () const
+    ::CIAO::Config_Handlers::ComponentPackageReference const& SubcomponentInstantiationDescription::
+    referencedPackage () const
     {
-      return *selectRequirement_;
+      return *referencedPackage_;
     }
 
     void SubcomponentInstantiationDescription::
-    selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& e)
     {
-      if (selectRequirement_.get ())
-      {
-        *selectRequirement_ = e;
-      }
+      if (referencedPackage_.get ())
+        {
+          *referencedPackage_ = e;
+        }
 
       else
-      {
-        selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        selectRequirement_->container (this);
-      }
+        {
+          referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
+          referencedPackage_->container (this);
+        }
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
     bool SubcomponentInstantiationDescription::
-    reference_p () const
+    importedPackage_p () const
     {
-      return reference_.get () != 0;
+      return importedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::ComponentPackageReference const& SubcomponentInstantiationDescription::
-    reference () const
+    ::CIAO::Config_Handlers::ComponentPackageImport const& SubcomponentInstantiationDescription::
+    importedPackage () const
     {
-      return *reference_;
+      return *importedPackage_;
     }
 
     void SubcomponentInstantiationDescription::
-    reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
+    importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& e)
     {
-      if (reference_.get ())
-      {
-        *reference_ = e;
-      }
+      if (importedPackage_.get ())
+        {
+          *importedPackage_ = e;
+        }
 
       else
-      {
-        reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-        reference_->container (this);
-      }
+        {
+          importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (new ::CIAO::Config_Handlers::ComponentPackageImport (e));
+          importedPackage_->container (this);
+        }
     }
 
     // SubcomponentInstantiationDescription
-    // 
+    //
     bool SubcomponentInstantiationDescription::
     id_p () const
     {
@@ -213,2719 +320,3805 @@ namespace CIAO
     id (::XMLSchema::ID< ACE_TCHAR > const& e)
     {
       if (id_.get ())
-      {
-        *id_ = e;
-      }
+        {
+          *id_ = e;
+        }
 
       else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
+        {
+          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+          id_->container (this);
+        }
     }
 
 
     // SubcomponentPropertyReference
-    // 
+    //
 
     SubcomponentPropertyReference::
     SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-                                   ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
-    : 
-    ::XSCRT::Type (), 
-    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (instance__)),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-    }
+                                   ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+      :
+      ::XSCRT::Type (),
+propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
+instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+regulator__ ()
+{
+propertyName_->container (this);
+instance_->container (this);
+}
 
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-    :
-    ::XSCRT::Type (),
-    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (*s.instance_)),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-    }
+SubcomponentPropertyReference::
+SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
+:
+::XSCRT::Type (),
+propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
+instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+regulator__ ()
+{
+propertyName_->container (this);
+instance_->container (this);
+}
 
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference::
-    operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-    {
-      propertyName (s.propertyName ());
+::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference::
+operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
+{
+propertyName (s.propertyName ());
 
-      instance (s.instance ());
+instance (s.instance ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // SubcomponentPropertyReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SubcomponentPropertyReference::
-    propertyName () const
-    {
-      return *propertyName_;
-    }
+// SubcomponentPropertyReference
+//
+::XMLSchema::string< ACE_TCHAR > const& SubcomponentPropertyReference::
+propertyName () const
+{
+return *propertyName_;
+}
 
-    void SubcomponentPropertyReference::
-    propertyName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *propertyName_ = e;
-    }
+void SubcomponentPropertyReference::
+propertyName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*propertyName_ = e;
+}
 
-    // SubcomponentPropertyReference
-    // 
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& SubcomponentPropertyReference::
-    instance () const
-    {
-      return *instance_;
-    }
+// SubcomponentPropertyReference
+//
+::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPropertyReference::
+instance () const
+{
+return *instance_;
+}
 
-    void SubcomponentPropertyReference::
-    instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
-    {
-      *instance_ = e;
-    }
+void SubcomponentPropertyReference::
+instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+{
+*instance_ = e;
+}
 
 
-    // AssemblyPropertyMapping
-    // 
+// AssemblyPropertyMapping
+//
 
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-                             ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-                             ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (delegatesTo__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->container (this);
-    }
+AssemblyPropertyMapping::
+AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& externalName__)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)),
+regulator__ ()
+{
+name_->container (this);
+externalName_->container (this);
+}
 
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    externalName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.externalName_)),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (*s.delegatesTo_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->container (this);
-    }
+AssemblyPropertyMapping::
+AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
+:
+::XSCRT::Type (),
+name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+externalName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.externalName_)),
+regulator__ ()
+{
+name_->container (this);
+externalName_->container (this);
+{
+for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i);
+}
+}
 
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping::
-    operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-    {
-      name (s.name ());
+::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping::
+operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
+{
+name (s.name ());
 
-      externalName (s.externalName ());
+externalName (s.externalName ());
 
-      delegatesTo (s.delegatesTo ());
+delegatesTo_.clear ();
+{
+for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i);
+}
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // AssemblyPropertyMapping
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
-    name () const
-    {
-      return *name_;
-    }
+// AssemblyPropertyMapping
+//
+::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
+name () const
+{
+return *name_;
+}
 
-    void AssemblyPropertyMapping::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void AssemblyPropertyMapping::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // AssemblyPropertyMapping
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
-    externalName () const
-    {
-      return *externalName_;
-    }
+// AssemblyPropertyMapping
+//
+::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
+externalName () const
+{
+return *externalName_;
+}
 
-    void AssemblyPropertyMapping::
-    externalName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *externalName_ = e;
-    }
+void AssemblyPropertyMapping::
+externalName (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*externalName_ = e;
+}
 
-    // AssemblyPropertyMapping
-    // 
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& AssemblyPropertyMapping::
-    delegatesTo () const
-    {
-      return *delegatesTo_;
-    }
+// AssemblyPropertyMapping
+//
+AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
+begin_delegatesTo ()
+{
+return delegatesTo_.begin ();
+}
 
-    void AssemblyPropertyMapping::
-    delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
-    {
-      *delegatesTo_ = e;
-    }
+AssemblyPropertyMapping::delegatesTo_iterator AssemblyPropertyMapping::
+end_delegatesTo ()
+{
+return delegatesTo_.end ();
+}
 
+AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
+begin_delegatesTo () const
+{
+return delegatesTo_.begin ();
+}
 
-    // ComponentAssemblyDescription
-    // 
+AssemblyPropertyMapping::delegatesTo_const_iterator AssemblyPropertyMapping::
+end_delegatesTo () const
+{
+return delegatesTo_.end ();
+}
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+void AssemblyPropertyMapping::
+add_delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
+{
+delegatesTo_.push_back (e);
+}
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-    :
-    ::XSCRT::Type (),
-    externalProperty_ (s.externalProperty_.get () ? new ::CIAO::Config_Handlers::AssemblyPropertyMapping (*s.externalProperty_) : 0),
-    regulator__ ()
-    {
-      {
-        for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
-      }
+size_t AssemblyPropertyMapping::
+count_delegatesTo(void) const
+{
+return delegatesTo_.size ();
+}
 
-      {
-        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-      }
 
-      if (externalProperty_.get ()) externalProperty_->container (this);
-    }
+// ComponentAssemblyDescription
+//
 
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription::
-    operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-    {
-      instance_.clear ();
-      {
-        for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
-      }
+ComponentAssemblyDescription::
+ComponentAssemblyDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-      connection_.clear ();
-      {
-        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
-      }
+ComponentAssemblyDescription::
+ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+{
+for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
+}
 
-      if (s.externalProperty_.get ()) externalProperty (*(s.externalProperty_));
-      else externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (0);
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-      return *this;
-    }
+{
+for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i);
+}
+}
 
+::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription::
+operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
+{
+instance_.clear ();
+{
+for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
+}
 
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-    begin_instance ()
-    {
-      return instance_.begin ();
-    }
+connection_.clear ();
+{
+for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+}
 
-    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-    end_instance ()
-    {
-      return instance_.end ();
-    }
+externalProperty_.clear ();
+{
+for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i);
+}
 
-    ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
-    begin_instance () const
-    {
-      return instance_.begin ();
-    }
+return *this;
+}
 
-    ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
-    end_instance () const
-    {
-      return instance_.end ();
-    }
 
-    void ComponentAssemblyDescription::
-    add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
-    {
-      instance_.push_back (e);
-    }
+// ComponentAssemblyDescription
+//
+ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+begin_instance ()
+{
+return instance_.begin ();
+}
 
-    size_t ComponentAssemblyDescription::
-    count_instance(void) const
-    {
-      return instance_.size ();
-    }
+ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+end_instance ()
+{
+return instance_.end ();
+}
 
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-    begin_connection ()
-    {
-      return connection_.begin ();
-    }
+ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+begin_instance () const
+{
+return instance_.begin ();
+}
 
-    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-    end_connection ()
-    {
-      return connection_.end ();
-    }
+ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+end_instance () const
+{
+return instance_.end ();
+}
 
-    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-    begin_connection () const
-    {
-      return connection_.begin ();
-    }
+void ComponentAssemblyDescription::
+add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
+{
+instance_.push_back (e);
+}
 
-    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-    end_connection () const
-    {
-      return connection_.end ();
-    }
+size_t ComponentAssemblyDescription::
+count_instance(void) const
+{
+return instance_.size ();
+}
 
-    void ComponentAssemblyDescription::
-    add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
-    {
-      connection_.push_back (e);
-    }
+// ComponentAssemblyDescription
+//
+ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+begin_connection ()
+{
+return connection_.begin ();
+}
 
-    size_t ComponentAssemblyDescription::
-    count_connection(void) const
-    {
-      return connection_.size ();
-    }
+ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+end_connection ()
+{
+return connection_.end ();
+}
 
-    // ComponentAssemblyDescription
-    // 
-    bool ComponentAssemblyDescription::
-    externalProperty_p () const
-    {
-      return externalProperty_.get () != 0;
-    }
+ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+begin_connection () const
+{
+return connection_.begin ();
+}
 
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping const& ComponentAssemblyDescription::
-    externalProperty () const
-    {
-      return *externalProperty_;
-    }
+ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+end_connection () const
+{
+return connection_.end ();
+}
 
-    void ComponentAssemblyDescription::
-    externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
-    {
-      if (externalProperty_.get ())
-      {
-        *externalProperty_ = e;
-      }
+void ComponentAssemblyDescription::
+add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
+{
+connection_.push_back (e);
+}
 
-      else
-      {
-        externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (new ::CIAO::Config_Handlers::AssemblyPropertyMapping (e));
-        externalProperty_->container (this);
-      }
-    }
+size_t ComponentAssemblyDescription::
+count_connection(void) const
+{
+return connection_.size ();
+}
 
+// ComponentAssemblyDescription
+//
+ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
+begin_externalProperty ()
+{
+return externalProperty_.begin ();
+}
 
-    // MonolithicImplementationDescription
-    // 
+ComponentAssemblyDescription::externalProperty_iterator ComponentAssemblyDescription::
+end_externalProperty ()
+{
+return externalProperty_.end ();
+}
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
+begin_externalProperty () const
+{
+return externalProperty_.begin ();
+}
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-    :
-    ::XSCRT::Type (),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::ImplementationRequirement (*s.deployRequirement_) : 0),
-    regulator__ ()
-    {
-      if (execParameter_.get ()) execParameter_->container (this);
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
-      }
+ComponentAssemblyDescription::externalProperty_const_iterator ComponentAssemblyDescription::
+end_externalProperty () const
+{
+return externalProperty_.end ();
+}
 
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-    }
+void ComponentAssemblyDescription::
+add_externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
+{
+externalProperty_.push_back (e);
+}
 
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
-    operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-    {
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+size_t ComponentAssemblyDescription::
+count_externalProperty(void) const
+{
+return externalProperty_.size ();
+}
 
-      primaryArtifact_.clear ();
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
-      }
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (0);
+// MonolithicImplementationDescription
+//
 
-      return *this;
-    }
+MonolithicImplementationDescription::
+MonolithicImplementationDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
+MonolithicImplementationDescription::
+MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+{
+for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i);
+}
 
-    // MonolithicImplementationDescription
-    // 
-    bool MonolithicImplementationDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
+{
+for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
+}
 
-    ::CIAO::Config_Handlers::Property const& MonolithicImplementationDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    void MonolithicImplementationDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
+{
+for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+}
+}
 
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
+::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
+operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
+{
+nodeExecParameter_.clear ();
+{
+for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i);
+}
 
-    // MonolithicImplementationDescription
-    // 
-    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-    begin_primaryArtifact ()
-    {
-      return primaryArtifact_.begin ();
-    }
+componentExecParameter_.clear ();
+{
+for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i);
+}
 
-    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-    end_primaryArtifact ()
-    {
-      return primaryArtifact_.end ();
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-    begin_primaryArtifact () const
-    {
-      return primaryArtifact_.begin ();
-    }
+primaryArtifact_.clear ();
+{
+for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+}
 
-    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-    end_primaryArtifact () const
-    {
-      return primaryArtifact_.end ();
-    }
+return *this;
+}
 
-    void MonolithicImplementationDescription::
-    add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      primaryArtifact_.push_back (e);
-    }
 
-    size_t MonolithicImplementationDescription::
-    count_primaryArtifact(void) const
-    {
-      return primaryArtifact_.size ();
-    }
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
+begin_nodeExecParameter ()
+{
+return nodeExecParameter_.begin ();
+}
 
-    // MonolithicImplementationDescription
-    // 
-    bool MonolithicImplementationDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
+MonolithicImplementationDescription::nodeExecParameter_iterator MonolithicImplementationDescription::
+end_nodeExecParameter ()
+{
+return nodeExecParameter_.end ();
+}
 
-    ::CIAO::Config_Handlers::ImplementationRequirement const& MonolithicImplementationDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
+MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
+begin_nodeExecParameter () const
+{
+return nodeExecParameter_.begin ();
+}
 
-    void MonolithicImplementationDescription::
-    deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
+MonolithicImplementationDescription::nodeExecParameter_const_iterator MonolithicImplementationDescription::
+end_nodeExecParameter () const
+{
+return nodeExecParameter_.end ();
+}
 
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (new ::CIAO::Config_Handlers::ImplementationRequirement (e));
-        deployRequirement_->container (this);
-      }
-    }
+void MonolithicImplementationDescription::
+add_nodeExecParameter (::CIAO::Config_Handlers::Property const& e)
+{
+nodeExecParameter_.push_back (e);
+}
 
+size_t MonolithicImplementationDescription::
+count_nodeExecParameter(void) const
+{
+return nodeExecParameter_.size ();
+}
 
-    // ComponentImplementationDescription
-    // 
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
+begin_componentExecParameter ()
+{
+return componentExecParameter_.begin ();
+}
 
-    ComponentImplementationDescription::
-    ComponentImplementationDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+MonolithicImplementationDescription::componentExecParameter_iterator MonolithicImplementationDescription::
+end_componentExecParameter ()
+{
+return componentExecParameter_.end ();
+}
 
-    ComponentImplementationDescription::
-    ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
-    :
-    ::XSCRT::Type (),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0),
-    assemblyImpl_ (s.assemblyImpl_.get () ? new ::CIAO::Config_Handlers::ComponentAssemblyDescription (*s.assemblyImpl_) : 0),
-    monolithicImpl_ (s.monolithicImpl_.get () ? new ::CIAO::Config_Handlers::MonolithicImplementationDescription (*s.monolithicImpl_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    capability_ (s.capability_.get () ? new ::CIAO::Config_Handlers::Capability (*s.capability_) : 0),
-    dependsOn_ (s.dependsOn_.get () ? new ::CIAO::Config_Handlers::ImplementationDependency (*s.dependsOn_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      if (implements_.get ()) implements_->container (this);
-      if (assemblyImpl_.get ()) assemblyImpl_->container (this);
-      if (monolithicImpl_.get ()) monolithicImpl_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (capability_.get ()) capability_->container (this);
-      if (dependsOn_.get ()) dependsOn_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-      if (href_.get ()) href_->container (this);
-    }
+MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
+begin_componentExecParameter () const
+{
+return componentExecParameter_.begin ();
+}
 
-    ::CIAO::Config_Handlers::ComponentImplementationDescription& ComponentImplementationDescription::
-    operator= (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
-    {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+MonolithicImplementationDescription::componentExecParameter_const_iterator MonolithicImplementationDescription::
+end_componentExecParameter () const
+{
+return componentExecParameter_.end ();
+}
 
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+void MonolithicImplementationDescription::
+add_componentExecParameter (::CIAO::Config_Handlers::Property const& e)
+{
+componentExecParameter_.push_back (e);
+}
 
-      if (s.implements_.get ()) implements (*(s.implements_));
-      else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
+size_t MonolithicImplementationDescription::
+count_componentExecParameter(void) const
+{
+return componentExecParameter_.size ();
+}
 
-      if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
-      else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
 
-      if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
-      else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
+MonolithicImplementationDescription::deployRequirement_iterator MonolithicImplementationDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
 
-      if (s.capability_.get ()) capability (*(s.capability_));
-      else capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (0);
+MonolithicImplementationDescription::deployRequirement_const_iterator MonolithicImplementationDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
 
-      if (s.dependsOn_.get ()) dependsOn (*(s.dependsOn_));
-      else dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (0);
+void MonolithicImplementationDescription::
+add_deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
+{
+deployRequirement_.push_back (e);
+}
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+size_t MonolithicImplementationDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
 
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+// MonolithicImplementationDescription
+//
+MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+begin_primaryArtifact ()
+{
+return primaryArtifact_.begin ();
+}
 
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+end_primaryArtifact ()
+{
+return primaryArtifact_.end ();
+}
 
-      return *this;
-    }
+MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+begin_primaryArtifact () const
+{
+return primaryArtifact_.begin ();
+}
 
+MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+end_primaryArtifact () const
+{
+return primaryArtifact_.end ();
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+void MonolithicImplementationDescription::
+add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+{
+primaryArtifact_.push_back (e);
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    label () const
-    {
-      return *label_;
-    }
+size_t MonolithicImplementationDescription::
+count_primaryArtifact(void) const
+{
+return primaryArtifact_.size ();
+}
 
-    void ComponentImplementationDescription::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
 
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
+ComponentImplementationDescription::
+ComponentImplementationDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
+ComponentImplementationDescription::
+ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
+:
+::XSCRT::Type (),
+label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0),
+assemblyImpl_ (s.assemblyImpl_.get () ? new ::CIAO::Config_Handlers::ComponentAssemblyDescription (*s.assemblyImpl_) : 0),
+monolithicImpl_ (s.monolithicImpl_.get () ? new ::CIAO::Config_Handlers::MonolithicImplementationDescription (*s.monolithicImpl_) : 0),
+contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+regulator__ ()
+{
+if (label_.get ()) label_->container (this);
+if (UUID_.get ()) UUID_->container (this);
+if (implements_.get ()) implements_->container (this);
+if (assemblyImpl_.get ()) assemblyImpl_->container (this);
+if (monolithicImpl_.get ()) monolithicImpl_->container (this);
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-    void ComponentImplementationDescription::
-    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+{
+for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
+}
 
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
-    }
+{
+for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    implements_p () const
-    {
-      return implements_.get () != 0;
-    }
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
-    implements () const
-    {
-      return *implements_;
-    }
+if (contentLocation_.get ()) contentLocation_->container (this);
+if (href_.get ()) href_->container (this);
+}
 
-    void ComponentImplementationDescription::
-    implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
-    {
-      if (implements_.get ())
-      {
-        *implements_ = e;
-      }
+::CIAO::Config_Handlers::ComponentImplementationDescription& ComponentImplementationDescription::
+operator= (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
+{
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      else
-      {
-        implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-        implements_->container (this);
-      }
-    }
+if (s.UUID_.get ()) UUID (*(s.UUID_));
+else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    assemblyImpl_p () const
-    {
-      return assemblyImpl_.get () != 0;
-    }
+if (s.implements_.get ()) implements (*(s.implements_));
+else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
-    assemblyImpl () const
-    {
-      return *assemblyImpl_;
-    }
+if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
+else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
 
-    void ComponentImplementationDescription::
-    assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
-    {
-      if (assemblyImpl_.get ())
-      {
-        *assemblyImpl_ = e;
-      }
+if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
+else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
 
-      else
-      {
-        assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
-        assemblyImpl_->container (this);
-      }
-    }
+configProperty_.clear ();
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    monolithicImpl_p () const
-    {
-      return monolithicImpl_.get () != 0;
-    }
+capability_.clear ();
+{
+for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i);
+}
 
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
-    monolithicImpl () const
-    {
-      return *monolithicImpl_;
-    }
+dependsOn_.clear ();
+{
+for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+}
 
-    void ComponentImplementationDescription::
-    monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
-    {
-      if (monolithicImpl_.get ())
-      {
-        *monolithicImpl_ = e;
-      }
+infoProperty_.clear ();
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-      else
-      {
-        monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
-        monolithicImpl_->container (this);
-      }
-    }
+if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
+if (s.href_.get ()) href (*(s.href_));
+else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
+return *this;
+}
 
-    void ComponentImplementationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
 
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    capability_p () const
-    {
-      return capability_.get () != 0;
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+label () const
+{
+return *label_;
+}
 
-    ::CIAO::Config_Handlers::Capability const& ComponentImplementationDescription::
-    capability () const
-    {
-      return *capability_;
-    }
+void ComponentImplementationDescription::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    void ComponentImplementationDescription::
-    capability (::CIAO::Config_Handlers::Capability const& e)
-    {
-      if (capability_.get ())
-      {
-        *capability_ = e;
-      }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-      else
-      {
-        capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (new ::CIAO::Config_Handlers::Capability (e));
-        capability_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+UUID_p () const
+{
+return UUID_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    dependsOn_p () const
-    {
-      return dependsOn_.get () != 0;
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+UUID () const
+{
+return *UUID_;
+}
 
-    ::CIAO::Config_Handlers::ImplementationDependency const& ComponentImplementationDescription::
-    dependsOn () const
-    {
-      return *dependsOn_;
-    }
+void ComponentImplementationDescription::
+UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (UUID_.get ())
+{
+*UUID_ = e;
+}
 
-    void ComponentImplementationDescription::
-    dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
-    {
-      if (dependsOn_.get ())
-      {
-        *dependsOn_ = e;
-      }
+else
+{
+UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+UUID_->container (this);
+}
+}
 
-      else
-      {
-        dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (new ::CIAO::Config_Handlers::ImplementationDependency (e));
-        dependsOn_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+implements_p () const
+{
+return implements_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
+implements () const
+{
+return *implements_;
+}
 
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
+void ComponentImplementationDescription::
+implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+{
+if (implements_.get ())
+{
+*implements_ = e;
+}
 
-    void ComponentImplementationDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
+else
+{
+implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+implements_->container (this);
+}
+}
 
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+assemblyImpl_p () const
+{
+return assemblyImpl_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
+::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
+assemblyImpl () const
+{
+return *assemblyImpl_;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
+void ComponentImplementationDescription::
+assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
+{
+if (assemblyImpl_.get ())
+{
+*assemblyImpl_ = e;
+}
 
-    void ComponentImplementationDescription::
-    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
+else
+{
+assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
+assemblyImpl_->container (this);
+}
+}
 
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
-      }
-    }
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+monolithicImpl_p () const
+{
+return monolithicImpl_.get () != 0;
+}
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    href_p () const
-    {
-      return href_.get () != 0;
-    }
+::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
+monolithicImpl () const
+{
+return *monolithicImpl_;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    href () const
-    {
-      return *href_;
-    }
+void ComponentImplementationDescription::
+monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
+{
+if (monolithicImpl_.get ())
+{
+*monolithicImpl_ = e;
+}
 
-    ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
-    href ()
-    {
-      return *href_;
-    }
+else
+{
+monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
+monolithicImpl_->container (this);
+}
+}
 
-    void ComponentImplementationDescription::
-    href (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (href_.get ())
-      {
-        *href_ = e;
-      }
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::configProperty_iterator ComponentImplementationDescription::
+begin_configProperty ()
+{
+return configProperty_.begin ();
+}
 
-      else
-      {
-        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        href_->container (this);
-      }
-    }
-  }
+ComponentImplementationDescription::configProperty_iterator ComponentImplementationDescription::
+end_configProperty ()
+{
+return configProperty_.end ();
+}
+
+ComponentImplementationDescription::configProperty_const_iterator ComponentImplementationDescription::
+begin_configProperty () const
+{
+return configProperty_.begin ();
+}
+
+ComponentImplementationDescription::configProperty_const_iterator ComponentImplementationDescription::
+end_configProperty () const
+{
+return configProperty_.end ();
+}
+
+void ComponentImplementationDescription::
+add_configProperty (::CIAO::Config_Handlers::Property const& e)
+{
+configProperty_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_configProperty(void) const
+{
+return configProperty_.size ();
+}
+
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::capability_iterator ComponentImplementationDescription::
+begin_capability ()
+{
+return capability_.begin ();
+}
+
+ComponentImplementationDescription::capability_iterator ComponentImplementationDescription::
+end_capability ()
+{
+return capability_.end ();
+}
+
+ComponentImplementationDescription::capability_const_iterator ComponentImplementationDescription::
+begin_capability () const
+{
+return capability_.begin ();
+}
+
+ComponentImplementationDescription::capability_const_iterator ComponentImplementationDescription::
+end_capability () const
+{
+return capability_.end ();
+}
+
+void ComponentImplementationDescription::
+add_capability (::CIAO::Config_Handlers::Capability const& e)
+{
+capability_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_capability(void) const
+{
+return capability_.size ();
+}
+
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::dependsOn_iterator ComponentImplementationDescription::
+begin_dependsOn ()
+{
+return dependsOn_.begin ();
+}
+
+ComponentImplementationDescription::dependsOn_iterator ComponentImplementationDescription::
+end_dependsOn ()
+{
+return dependsOn_.end ();
+}
+
+ComponentImplementationDescription::dependsOn_const_iterator ComponentImplementationDescription::
+begin_dependsOn () const
+{
+return dependsOn_.begin ();
+}
+
+ComponentImplementationDescription::dependsOn_const_iterator ComponentImplementationDescription::
+end_dependsOn () const
+{
+return dependsOn_.end ();
+}
+
+void ComponentImplementationDescription::
+add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
+{
+dependsOn_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_dependsOn(void) const
+{
+return dependsOn_.size ();
+}
+
+// ComponentImplementationDescription
+//
+ComponentImplementationDescription::infoProperty_iterator ComponentImplementationDescription::
+begin_infoProperty ()
+{
+return infoProperty_.begin ();
+}
+
+ComponentImplementationDescription::infoProperty_iterator ComponentImplementationDescription::
+end_infoProperty ()
+{
+return infoProperty_.end ();
+}
+
+ComponentImplementationDescription::infoProperty_const_iterator ComponentImplementationDescription::
+begin_infoProperty () const
+{
+return infoProperty_.begin ();
+}
+
+ComponentImplementationDescription::infoProperty_const_iterator ComponentImplementationDescription::
+end_infoProperty () const
+{
+return infoProperty_.end ();
+}
+
+void ComponentImplementationDescription::
+add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+{
+infoProperty_.push_back (e);
+}
+
+size_t ComponentImplementationDescription::
+count_infoProperty(void) const
+{
+return infoProperty_.size ();
+}
+
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+contentLocation_p () const
+{
+return contentLocation_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+contentLocation () const
+{
+return *contentLocation_;
+}
+
+void ComponentImplementationDescription::
+contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (contentLocation_.get ())
+{
+*contentLocation_ = e;
+}
+
+else
+{
+contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+contentLocation_->container (this);
+}
+}
+
+// ComponentImplementationDescription
+//
+bool ComponentImplementationDescription::
+href_p () const
+{
+return href_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+href () const
+{
+return *href_;
+}
+
+::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
+href ()
+{
+return *href_;
+}
+
+void ComponentImplementationDescription::
+href (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (href_.get ())
+{
+*href_ = e;
+}
+
+else
+{
+href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+href_->container (this);
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    // SubcomponentInstantiationDescription
-    //
+namespace Config_Handlers
+{
+// SubcomponentInstantiationDescription
+//
 
-    SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+SubcomponentInstantiationDescription::
+SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else if (n == "package")
-        {
-          package_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
-          package_->container (this);
-        }
+else if (n == "basePackage")
+{
+::CIAO::Config_Handlers::ComponentPackageDescription t (e);
+basePackage (t);
+}
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
+else if (n == "specializedConfig")
+{
+::CIAO::Config_Handlers::PackageConfiguration t (e);
+specializedConfig (t);
+}
 
-        else if (n == "selectRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          selectRequirement (t);
-        }
+else if (n == "selectRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_selectRequirement (t);
+}
 
-        else if (n == "reference")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-          reference (t);
-        }
+else if (n == "configProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_configProperty (t);
+}
 
-        else 
-        {
-        }
-      }
+else if (n == "referencedPackage")
+{
+::CIAO::Config_Handlers::ComponentPackageReference t (e);
+referencedPackage (t);
+}
 
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< ACE_TCHAR > t (a);
-          id (t);
-        }
+else if (n == "importedPackage")
+{
+::CIAO::Config_Handlers::ComponentPackageImport t (e);
+importedPackage (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else
+{
+}
+}
 
-    // SubcomponentPropertyReference
-    //
+while (p.more_attributes ())
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+if (n == "id")
+{
+::XMLSchema::ID< ACE_TCHAR > t (a);
+id (t);
+}
 
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// SubcomponentPropertyReference
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+SubcomponentPropertyReference::
+SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "propertyName")
-        {
-          propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          propertyName_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "instance")
-        {
-          instance_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (e));
-          instance_->container (this);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else 
-        {
-        }
-      }
-    }
+if (n == "propertyName")
+{
+propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+propertyName_->container (this);
+}
 
-    // AssemblyPropertyMapping
-    //
+else if (n == "instance")
+{
+instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+instance_->container (this);
+}
 
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// AssemblyPropertyMapping
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+AssemblyPropertyMapping::
+AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "externalName")
-        {
-          externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          externalName_->container (this);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "delegatesTo")
-        {
-          delegatesTo_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (e));
-          delegatesTo_->container (this);
-        }
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "externalName")
+{
+externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+externalName_->container (this);
+}
 
-    // ComponentAssemblyDescription
-    //
+else if (n == "delegatesTo")
+{
+::CIAO::Config_Handlers::SubcomponentPropertyReference t (e);
+add_delegatesTo (t);
+}
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// ComponentAssemblyDescription
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+ComponentAssemblyDescription::
+ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "instance")
-        {
-          ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
-          add_instance (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "connection")
-        {
-          ::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
-          add_connection (t);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "externalProperty")
-        {
-          ::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
-          externalProperty (t);
-        }
+if (n == "instance")
+{
+::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
+add_instance (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "connection")
+{
+::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
+add_connection (t);
+}
 
-    // MonolithicImplementationDescription
-    //
+else if (n == "externalProperty")
+{
+::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
+add_externalProperty (t);
+}
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else
+{
+}
+}
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+// MonolithicImplementationDescription
+//
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+MonolithicImplementationDescription::
+MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "primaryArtifact")
-        {
-          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-          add_primaryArtifact (t);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::ImplementationRequirement t (e);
-          deployRequirement (t);
-        }
+if (n == "nodeExecParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_nodeExecParameter (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
+else if (n == "componentExecParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_componentExecParameter (t);
+}
 
-    // ComponentImplementationDescription
-    //
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::ImplementationRequirement t (e);
+add_deployRequirement (t);
+}
 
-    ComponentImplementationDescription::
-    ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+else if (n == "primaryArtifact")
+{
+::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
+add_primaryArtifact (t);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+else
+{
+}
+}
+}
 
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+// ComponentImplementationDescription
+//
 
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
+ComponentImplementationDescription::
+ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "implements")
-        {
-          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-          implements (t);
-        }
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        else if (n == "assemblyImpl")
-        {
-          ::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
-          assemblyImpl (t);
-        }
+if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
 
-        else if (n == "monolithicImpl")
-        {
-          ::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
-          monolithicImpl (t);
-        }
+else if (n == "UUID")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+UUID (t);
+}
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
+else if (n == "implements")
+{
+::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+implements (t);
+}
 
-        else if (n == "capability")
-        {
-          ::CIAO::Config_Handlers::Capability t (e);
-          capability (t);
-        }
+else if (n == "assemblyImpl")
+{
+::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
+assemblyImpl (t);
+}
 
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::ImplementationDependency t (e);
-          dependsOn (t);
-        }
+else if (n == "monolithicImpl")
+{
+::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
+monolithicImpl (t);
+}
 
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
+else if (n == "configProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_configProperty (t);
+}
 
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
-        }
+else if (n == "capability")
+{
+::CIAO::Config_Handlers::Capability t (e);
+add_capability (t);
+}
 
-        else 
-        {
-        }
-      }
+else if (n == "dependsOn")
+{
+::CIAO::Config_Handlers::ImplementationDependency t (e);
+add_dependsOn (t);
+}
 
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "href")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (a);
-          href (t);
-        }
+else if (n == "infoProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_infoProperty (t);
+}
 
-        else 
-        {
-        }
-      }
-    }
-  }
+else if (n == "contentLocation")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+contentLocation (t);
+}
+
+else
+{
+}
+}
+
+while (p.more_attributes ())
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+if (n == "href")
+{
+::XMLSchema::string< ACE_TCHAR > t (a);
+href (t);
+}
+
+else
+{
+}
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+namespace Config_Handlers
+{
+namespace
+{
+::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
-      struct SubcomponentInstantiationDescriptionTypeInfoInitializer
-      {
-        SubcomponentInstantiationDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SubcomponentInstantiationDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct SubcomponentInstantiationDescriptionTypeInfoInitializer
+{
+SubcomponentInstantiationDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (SubcomponentInstantiationDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      SubcomponentInstantiationDescriptionTypeInfoInitializer SubcomponentInstantiationDescriptionTypeInfoInitializer_;
+SubcomponentInstantiationDescriptionTypeInfoInitializer SubcomponentInstantiationDescriptionTypeInfoInitializer_;
 
-      struct SubcomponentPropertyReferenceTypeInfoInitializer
-      {
-        SubcomponentPropertyReferenceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SubcomponentPropertyReference));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct SubcomponentPropertyReferenceTypeInfoInitializer
+{
+SubcomponentPropertyReferenceTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (SubcomponentPropertyReference));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      SubcomponentPropertyReferenceTypeInfoInitializer SubcomponentPropertyReferenceTypeInfoInitializer_;
+SubcomponentPropertyReferenceTypeInfoInitializer SubcomponentPropertyReferenceTypeInfoInitializer_;
 
-      struct AssemblyPropertyMappingTypeInfoInitializer
-      {
-        AssemblyPropertyMappingTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (AssemblyPropertyMapping));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct AssemblyPropertyMappingTypeInfoInitializer
+{
+AssemblyPropertyMappingTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (AssemblyPropertyMapping));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      AssemblyPropertyMappingTypeInfoInitializer AssemblyPropertyMappingTypeInfoInitializer_;
+AssemblyPropertyMappingTypeInfoInitializer AssemblyPropertyMappingTypeInfoInitializer_;
 
-      struct ComponentAssemblyDescriptionTypeInfoInitializer
-      {
-        ComponentAssemblyDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentAssemblyDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ComponentAssemblyDescriptionTypeInfoInitializer
+{
+ComponentAssemblyDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ComponentAssemblyDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ComponentAssemblyDescriptionTypeInfoInitializer ComponentAssemblyDescriptionTypeInfoInitializer_;
+ComponentAssemblyDescriptionTypeInfoInitializer ComponentAssemblyDescriptionTypeInfoInitializer_;
 
-      struct MonolithicImplementationDescriptionTypeInfoInitializer
-      {
-        MonolithicImplementationDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (MonolithicImplementationDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct MonolithicImplementationDescriptionTypeInfoInitializer
+{
+MonolithicImplementationDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (MonolithicImplementationDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      MonolithicImplementationDescriptionTypeInfoInitializer MonolithicImplementationDescriptionTypeInfoInitializer_;
+MonolithicImplementationDescriptionTypeInfoInitializer MonolithicImplementationDescriptionTypeInfoInitializer_;
 
-      struct ComponentImplementationDescriptionTypeInfoInitializer
-      {
-        ComponentImplementationDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentImplementationDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
+struct ComponentImplementationDescriptionTypeInfoInitializer
+{
+ComponentImplementationDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ComponentImplementationDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
 
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
 
-      ComponentImplementationDescriptionTypeInfoInitializer ComponentImplementationDescriptionTypeInfoInitializer_;
-    }
-  }
+ComponentImplementationDescriptionTypeInfoInitializer ComponentImplementationDescriptionTypeInfoInitializer_;
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // SubcomponentInstantiationDescription
-      //
-      //
+namespace Config_Handlers
+{
+namespace Traversal
+{
+// SubcomponentInstantiationDescription
+//
+//
 
-      void SubcomponentInstantiationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        package (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+if (o.basePackage_p ()) basePackage (o);
+else basePackage_none (o);
+if (o.specializedConfig_p ()) specializedConfig (o);
+else specializedConfig_none (o);
+selectRequirement (o);
+configProperty (o);
+if (o.referencedPackage_p ()) referencedPackage (o);
+else referencedPackage_none (o);
+if (o.importedPackage_p ()) importedPackage (o);
+else importedPackage_none (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        package (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+if (o.basePackage_p ()) basePackage (o);
+else basePackage_none (o);
+if (o.specializedConfig_p ()) specializedConfig (o);
+else specializedConfig_none (o);
+selectRequirement (o);
+configProperty (o);
+if (o.referencedPackage_p ()) referencedPackage (o);
+else referencedPackage_none (o);
+if (o.importedPackage_p ()) importedPackage (o);
+else importedPackage_none (o);
+if (o.id_p ()) id (o);
+else id_none (o);
+post (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+pre (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+pre (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void SubcomponentInstantiationDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void SubcomponentInstantiationDescription::
-      package (Type& o)
-      {
-        dispatch (o.package ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage (Type& o)
+{
+dispatch (o.basePackage ());
+}
 
-      void SubcomponentInstantiationDescription::
-      package (Type const& o)
-      {
-        dispatch (o.package ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage (Type const& o)
+{
+dispatch (o.basePackage ());
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage_none (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
+void SubcomponentInstantiationDescription::
+basePackage_none (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty_none (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig (Type& o)
+{
+dispatch (o.specializedConfig ());
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty_none (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig (Type const& o)
+{
+dispatch (o.specializedConfig ());
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig_none (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type const& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig_none (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement_none (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+SubcomponentInstantiationDescription::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement_none (Type const&)
-      {
-      }
+if (b != e)
+{
+selectRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) selectRequirement_next (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      reference (Type& o)
-      {
-        dispatch (o.reference ());
-      }
+selectRequirement_post (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      reference (Type const& o)
-      {
-        dispatch (o.reference ());
-      }
+else selectRequirement_none (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      reference_none (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+SubcomponentInstantiationDescription::Type::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
 
-      void SubcomponentInstantiationDescription::
-      reference_none (Type const&)
-      {
-      }
+if (b != e)
+{
+selectRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) selectRequirement_next (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
+selectRequirement_post (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
+else selectRequirement_none (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id_none (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_pre (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      id_none (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_pre (Type const&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      post (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_next (Type&)
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      post (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_next (Type const&)
+{
+}
 
-      // SubcomponentPropertyReference
-      //
-      //
+void SubcomponentInstantiationDescription::
+selectRequirement_post (Type&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      traverse (Type& o)
-      {
-        pre (o);
-        propertyName (o);
-        instance (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_post (Type const&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      traverse (Type const& o)
-      {
-        pre (o);
-        propertyName (o);
-        instance (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_none (Type&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_none (Type const&)
+{
+}
 
-      void SubcomponentPropertyReference::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+SubcomponentInstantiationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      void SubcomponentPropertyReference::
-      propertyName (Type& o)
-      {
-        dispatch (o.propertyName ());
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void SubcomponentPropertyReference::
-      propertyName (Type const& o)
-      {
-        dispatch (o.propertyName ());
-      }
+configProperty_post (o);
+}
 
-      void SubcomponentPropertyReference::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
+else configProperty_none (o);
+}
 
-      void SubcomponentPropertyReference::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+SubcomponentInstantiationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
 
-      void SubcomponentPropertyReference::
-      post (Type&)
-      {
-      }
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
 
-      void SubcomponentPropertyReference::
-      post (Type const&)
-      {
-      }
+configProperty_post (o);
+}
 
-      // AssemblyPropertyMapping
-      //
-      //
+else configProperty_none (o);
+}
 
-      void AssemblyPropertyMapping::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        externalName (o);
-        delegatesTo (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+configProperty_pre (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        externalName (o);
-        delegatesTo (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+configProperty_pre (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_next (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_next (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_post (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_post (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      externalName (Type& o)
-      {
-        dispatch (o.externalName ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_none (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      externalName (Type const& o)
-      {
-        dispatch (o.externalName ());
-      }
+void SubcomponentInstantiationDescription::
+configProperty_none (Type const&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      delegatesTo (Type& o)
-      {
-        dispatch (o.delegatesTo ());
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage (Type& o)
+{
+dispatch (o.referencedPackage ());
+}
 
-      void AssemblyPropertyMapping::
-      delegatesTo (Type const& o)
-      {
-        dispatch (o.delegatesTo ());
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage (Type const& o)
+{
+dispatch (o.referencedPackage ());
+}
 
-      void AssemblyPropertyMapping::
-      post (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage_none (Type&)
+{
+}
 
-      void AssemblyPropertyMapping::
-      post (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage_none (Type const&)
+{
+}
 
-      // ComponentAssemblyDescription
-      //
-      //
+void SubcomponentInstantiationDescription::
+importedPackage (Type& o)
+{
+dispatch (o.importedPackage ());
+}
 
-      void ComponentAssemblyDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        instance (o);
-        connection (o);
-        if (o.externalProperty_p ()) externalProperty (o);
-        else externalProperty_none (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+importedPackage (Type const& o)
+{
+dispatch (o.importedPackage ());
+}
 
-      void ComponentAssemblyDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        instance (o);
-        connection (o);
-        if (o.externalProperty_p ()) externalProperty (o);
-        else externalProperty_none (o);
-        post (o);
-      }
+void SubcomponentInstantiationDescription::
+importedPackage_none (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+importedPackage_none (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      pre (Type const&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+id (Type& o)
+{
+dispatch (o.id ());
+}
 
-      void ComponentAssemblyDescription::
-      instance (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
+void SubcomponentInstantiationDescription::
+id (Type const& o)
+{
+dispatch (o.id ());
+}
 
-        if (b != e)
-        {
-          instance_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-      }
+void SubcomponentInstantiationDescription::
+id_none (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      instance (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
+void SubcomponentInstantiationDescription::
+id_none (Type const&)
+{
+}
 
-        if (b != e)
-        {
-          instance_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-      }
+void SubcomponentInstantiationDescription::
+post (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      instance_pre (Type&)
-      {
-      }
+void SubcomponentInstantiationDescription::
+post (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      instance_pre (Type const&)
-      {
-      }
+// SubcomponentPropertyReference
+//
+//
 
-      void ComponentAssemblyDescription::
-      instance_next (Type&)
-      {
-      }
+void SubcomponentPropertyReference::
+traverse (Type& o)
+{
+pre (o);
+propertyName (o);
+instance (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      instance_next (Type const&)
-      {
-      }
+void SubcomponentPropertyReference::
+traverse (Type const& o)
+{
+pre (o);
+propertyName (o);
+instance (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      instance_post (Type&)
-      {
-      }
+void SubcomponentPropertyReference::
+pre (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      instance_post (Type const&)
-      {
-      }
+void SubcomponentPropertyReference::
+pre (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+void SubcomponentPropertyReference::
+propertyName (Type& o)
+{
+dispatch (o.propertyName ());
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-      }
+void SubcomponentPropertyReference::
+propertyName (Type const& o)
+{
+dispatch (o.propertyName ());
+}
 
-      void ComponentAssemblyDescription::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+void SubcomponentPropertyReference::
+instance (Type& o)
+{
+dispatch (o.instance ());
+}
 
-        if (b != e)
-        {
-          connection_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-      }
+void SubcomponentPropertyReference::
+instance (Type const& o)
+{
+dispatch (o.instance ());
+}
 
-      void ComponentAssemblyDescription::
-      connection_pre (Type&)
-      {
-      }
+void SubcomponentPropertyReference::
+post (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      connection_pre (Type const&)
-      {
-      }
+void SubcomponentPropertyReference::
+post (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      connection_next (Type&)
-      {
-      }
+// AssemblyPropertyMapping
+//
+//
 
-      void ComponentAssemblyDescription::
-      connection_next (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+externalName (o);
+delegatesTo (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      connection_post (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+externalName (o);
+delegatesTo (o);
+post (o);
+}
 
-      void ComponentAssemblyDescription::
-      connection_post (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+pre (Type&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty (Type& o)
-      {
-        dispatch (o.externalProperty ());
-      }
+void AssemblyPropertyMapping::
+pre (Type const&)
+{
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty (Type const& o)
-      {
-        dispatch (o.externalProperty ());
-      }
+void AssemblyPropertyMapping::
+name (Type& o)
+{
+dispatch (o.name ());
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty_none (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty_none (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+externalName (Type& o)
+{
+dispatch (o.externalName ());
+}
 
-      void ComponentAssemblyDescription::
-      post (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+externalName (Type const& o)
+{
+dispatch (o.externalName ());
+}
 
-      void ComponentAssemblyDescription::
-      post (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+delegatesTo (Type& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyPropertyMapping::Type::delegatesTo_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
 
-      // MonolithicImplementationDescription
-      //
-      //
+if (b != e)
+{
+delegatesTo_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) delegatesTo_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        primaryArtifact (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        post (o);
-      }
+delegatesTo_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        primaryArtifact (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        post (o);
-      }
+void AssemblyPropertyMapping::
+delegatesTo (Type const& o)
+{
+// VC6 anathema strikes again
+//
+AssemblyPropertyMapping::Type::delegatesTo_const_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo());
 
-      void MonolithicImplementationDescription::
-      pre (Type&)
-      {
-      }
+if (b != e)
+{
+delegatesTo_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) delegatesTo_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      pre (Type const&)
-      {
-      }
+delegatesTo_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      execParameter (Type& o)
-      {
-        dispatch (o.execParameter ());
-      }
+void AssemblyPropertyMapping::
+delegatesTo_pre (Type&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      execParameter (Type const& o)
-      {
-        dispatch (o.execParameter ());
-      }
+void AssemblyPropertyMapping::
+delegatesTo_pre (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      execParameter_none (Type&)
-      {
-      }
+void AssemblyPropertyMapping::
+delegatesTo_next (Type&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      execParameter_none (Type const&)
-      {
-      }
+void AssemblyPropertyMapping::
+delegatesTo_next (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+void AssemblyPropertyMapping::
+delegatesTo_post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          primaryArtifact_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) primaryArtifact_next (o);
-          }
-
-          primaryArtifact_post (o);
-        }
-      }
+void AssemblyPropertyMapping::
+delegatesTo_post (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+void AssemblyPropertyMapping::
+post (Type&)
+{
+}
 
-        if (b != e)
-        {
-          primaryArtifact_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) primaryArtifact_next (o);
-          }
-
-          primaryArtifact_post (o);
-        }
-      }
+void AssemblyPropertyMapping::
+post (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type&)
-      {
-      }
+// ComponentAssemblyDescription
+//
+//
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+traverse (Type& o)
+{
+pre (o);
+instance (o);
+connection (o);
+externalProperty (o);
+post (o);
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+traverse (Type const& o)
+{
+pre (o);
+instance (o);
+connection (o);
+externalProperty (o);
+post (o);
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+pre (Type&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+pre (Type const&)
+{
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
 
-      void MonolithicImplementationDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+if (b != e)
+{
+instance_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) instance_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
+instance_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      deployRequirement_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
 
-      void MonolithicImplementationDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
+if (b != e)
+{
+instance_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) instance_next (o);
+}
 
-      void MonolithicImplementationDescription::
-      post (Type&)
-      {
-      }
+instance_post (o);
+}
+}
 
-      void MonolithicImplementationDescription::
-      post (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_pre (Type&)
+{
+}
 
-      // ComponentImplementationDescription
-      //
-      //
+void ComponentAssemblyDescription::
+instance_pre (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.implements_p ()) implements (o);
-        else implements_none (o);
-        if (o.assemblyImpl_p ()) assemblyImpl (o);
-        else assemblyImpl_none (o);
-        if (o.monolithicImpl_p ()) monolithicImpl (o);
-        else monolithicImpl_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.capability_p ()) capability (o);
-        else capability_none (o);
-        if (o.dependsOn_p ()) dependsOn (o);
-        else dependsOn_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
+void ComponentAssemblyDescription::
+instance_next (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.implements_p ()) implements (o);
-        else implements_none (o);
-        if (o.assemblyImpl_p ()) assemblyImpl (o);
-        else assemblyImpl_none (o);
-        if (o.monolithicImpl_p ()) monolithicImpl (o);
-        else monolithicImpl_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.capability_p ()) capability (o);
-        else capability_none (o);
-        if (o.dependsOn_p ()) dependsOn (o);
-        else dependsOn_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
+void ComponentAssemblyDescription::
+instance_next (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      pre (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      pre (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
+void ComponentAssemblyDescription::
+connection (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
-      void ComponentImplementationDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
 
-      void ComponentImplementationDescription::
-      label_none (Type&)
-      {
-      }
+connection_post (o);
+}
 
-      void ComponentImplementationDescription::
-      label_none (Type const&)
-      {
-      }
+else connection_none (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
+void ComponentAssemblyDescription::
+connection (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
-      void ComponentImplementationDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
+if (b != e)
+{
+connection_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) connection_next (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID_none (Type&)
-      {
-      }
+connection_post (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID_none (Type const&)
-      {
-      }
+else connection_none (o);
+}
 
-      void ComponentImplementationDescription::
-      implements (Type& o)
-      {
-        dispatch (o.implements ());
-      }
+void ComponentAssemblyDescription::
+connection_pre (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      implements (Type const& o)
-      {
-        dispatch (o.implements ());
-      }
+void ComponentAssemblyDescription::
+connection_pre (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      implements_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_next (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      implements_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_next (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl (Type& o)
-      {
-        dispatch (o.assemblyImpl ());
-      }
+void ComponentAssemblyDescription::
+connection_post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl (Type const& o)
-      {
-        dispatch (o.assemblyImpl ());
-      }
+void ComponentAssemblyDescription::
+connection_post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_none (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+connection_none (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl (Type& o)
-      {
-        dispatch (o.monolithicImpl ());
-      }
+void ComponentAssemblyDescription::
+externalProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::externalProperty_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
 
-      void ComponentImplementationDescription::
-      monolithicImpl (Type const& o)
-      {
-        dispatch (o.monolithicImpl ());
-      }
+if (b != e)
+{
+externalProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalProperty_next (o);
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl_none (Type&)
-      {
-      }
+externalProperty_post (o);
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl_none (Type const&)
-      {
-      }
+else externalProperty_none (o);
+}
 
-      void ComponentImplementationDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
+void ComponentAssemblyDescription::
+externalProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentAssemblyDescription::Type::externalProperty_const_iterator b (o.begin_externalProperty()), e (o.end_externalProperty());
 
-      void ComponentImplementationDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
+if (b != e)
+{
+externalProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) externalProperty_next (o);
+}
 
-      void ComponentImplementationDescription::
-      configProperty_none (Type&)
-      {
-      }
+externalProperty_post (o);
+}
 
-      void ComponentImplementationDescription::
-      configProperty_none (Type const&)
-      {
-      }
+else externalProperty_none (o);
+}
 
-      void ComponentImplementationDescription::
-      capability (Type& o)
-      {
-        dispatch (o.capability ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_pre (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      capability (Type const& o)
-      {
-        dispatch (o.capability ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_pre (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      capability_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_next (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      capability_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_next (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn (Type& o)
-      {
-        dispatch (o.dependsOn ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn (Type const& o)
-      {
-        dispatch (o.dependsOn ());
-      }
+void ComponentAssemblyDescription::
+externalProperty_post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn_none (Type&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_none (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      dependsOn_none (Type const&)
-      {
-      }
+void ComponentAssemblyDescription::
+externalProperty_none (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+void ComponentAssemblyDescription::
+post (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
+void ComponentAssemblyDescription::
+post (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      infoProperty_none (Type&)
-      {
-      }
+// MonolithicImplementationDescription
+//
+//
 
-      void ComponentImplementationDescription::
-      infoProperty_none (Type const&)
-      {
-      }
+void MonolithicImplementationDescription::
+traverse (Type& o)
+{
+pre (o);
+nodeExecParameter (o);
+componentExecParameter (o);
+deployRequirement (o);
+primaryArtifact (o);
+post (o);
+}
 
-      void ComponentImplementationDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
+void MonolithicImplementationDescription::
+traverse (Type const& o)
+{
+pre (o);
+nodeExecParameter (o);
+componentExecParameter (o);
+deployRequirement (o);
+primaryArtifact (o);
+post (o);
+}
 
-      void ComponentImplementationDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
+void MonolithicImplementationDescription::
+pre (Type&)
+{
+}
 
-      void ComponentImplementationDescription::
-      contentLocation_none (Type&)
-      {
-      }
+void MonolithicImplementationDescription::
+pre (Type const&)
+{
+}
 
-      void ComponentImplementationDescription::
-      contentLocation_none (Type const&)
-      {
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::nodeExecParameter_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
 
-      void ComponentImplementationDescription::
-      href (Type& o)
-      {
-        dispatch (o.href ());
-      }
+if (b != e)
+{
+nodeExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) nodeExecParameter_next (o);
+}
 
-      void ComponentImplementationDescription::
-      href (Type const& o)
-      {
-        dispatch (o.href ());
-      }
+nodeExecParameter_post (o);
+}
 
-      void ComponentImplementationDescription::
-      href_none (Type&)
-      {
-      }
+else nodeExecParameter_none (o);
+}
 
-      void ComponentImplementationDescription::
-      href_none (Type const&)
-      {
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::nodeExecParameter_const_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter());
 
-      void ComponentImplementationDescription::
-      post (Type&)
-      {
-      }
+if (b != e)
+{
+nodeExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) nodeExecParameter_next (o);
+}
 
-      void ComponentImplementationDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
+nodeExecParameter_post (o);
+}
+
+else nodeExecParameter_none (o);
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_none (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+nodeExecParameter_none (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::componentExecParameter_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter());
+
+if (b != e)
+{
+componentExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) componentExecParameter_next (o);
+}
+
+componentExecParameter_post (o);
+}
+
+else componentExecParameter_none (o);
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::componentExecParameter_const_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter());
+
+if (b != e)
+{
+componentExecParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) componentExecParameter_next (o);
+}
+
+componentExecParameter_post (o);
+}
+
+else componentExecParameter_none (o);
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_none (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+componentExecParameter_none (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
+
+deployRequirement_post (o);
+}
+
+else deployRequirement_none (o);
+}
+
+void MonolithicImplementationDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
+
+deployRequirement_post (o);
+}
+
+else deployRequirement_none (o);
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_none (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+deployRequirement_none (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact (Type& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+
+if (b != e)
+{
+primaryArtifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) primaryArtifact_next (o);
+}
+
+primaryArtifact_post (o);
+}
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact (Type const& o)
+{
+// VC6 anathema strikes again
+//
+MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
+
+if (b != e)
+{
+primaryArtifact_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) primaryArtifact_next (o);
+}
+
+primaryArtifact_post (o);
+}
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_pre (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_pre (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_next (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_next (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_post (Type const&)
+{
+}
+
+void MonolithicImplementationDescription::
+post (Type&)
+{
+}
+
+void MonolithicImplementationDescription::
+post (Type const&)
+{
+}
+
+// ComponentImplementationDescription
+//
+//
+
+void ComponentImplementationDescription::
+traverse (Type& o)
+{
+pre (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+if (o.implements_p ()) implements (o);
+else implements_none (o);
+if (o.assemblyImpl_p ()) assemblyImpl (o);
+else assemblyImpl_none (o);
+if (o.monolithicImpl_p ()) monolithicImpl (o);
+else monolithicImpl_none (o);
+configProperty (o);
+capability (o);
+dependsOn (o);
+infoProperty (o);
+if (o.contentLocation_p ()) contentLocation (o);
+else contentLocation_none (o);
+if (o.href_p ()) href (o);
+else href_none (o);
+post (o);
+}
+
+void ComponentImplementationDescription::
+traverse (Type const& o)
+{
+pre (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+if (o.implements_p ()) implements (o);
+else implements_none (o);
+if (o.assemblyImpl_p ()) assemblyImpl (o);
+else assemblyImpl_none (o);
+if (o.monolithicImpl_p ()) monolithicImpl (o);
+else monolithicImpl_none (o);
+configProperty (o);
+capability (o);
+dependsOn (o);
+infoProperty (o);
+if (o.contentLocation_p ()) contentLocation (o);
+else contentLocation_none (o);
+if (o.href_p ()) href (o);
+else href_none (o);
+post (o);
+}
+
+void ComponentImplementationDescription::
+pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+label (Type& o)
+{
+dispatch (o.label ());
+}
+
+void ComponentImplementationDescription::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
+
+void ComponentImplementationDescription::
+label_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+label_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+UUID (Type& o)
+{
+dispatch (o.UUID ());
+}
+
+void ComponentImplementationDescription::
+UUID (Type const& o)
+{
+dispatch (o.UUID ());
+}
+
+void ComponentImplementationDescription::
+UUID_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+UUID_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+implements (Type& o)
+{
+dispatch (o.implements ());
+}
+
+void ComponentImplementationDescription::
+implements (Type const& o)
+{
+dispatch (o.implements ());
+}
+
+void ComponentImplementationDescription::
+implements_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+implements_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+assemblyImpl (Type& o)
+{
+dispatch (o.assemblyImpl ());
+}
+
+void ComponentImplementationDescription::
+assemblyImpl (Type const& o)
+{
+dispatch (o.assemblyImpl ());
+}
+
+void ComponentImplementationDescription::
+assemblyImpl_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+assemblyImpl_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+monolithicImpl (Type& o)
+{
+dispatch (o.monolithicImpl ());
+}
+
+void ComponentImplementationDescription::
+monolithicImpl (Type const& o)
+{
+dispatch (o.monolithicImpl ());
+}
+
+void ComponentImplementationDescription::
+monolithicImpl_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+monolithicImpl_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
+
+configProperty_post (o);
+}
+
+else configProperty_none (o);
+}
+
+void ComponentImplementationDescription::
+configProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
+
+configProperty_post (o);
+}
+
+else configProperty_none (o);
+}
+
+void ComponentImplementationDescription::
+configProperty_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+configProperty_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::capability_iterator b (o.begin_capability()), e (o.end_capability());
+
+if (b != e)
+{
+capability_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) capability_next (o);
+}
+
+capability_post (o);
+}
+
+else capability_none (o);
+}
+
+void ComponentImplementationDescription::
+capability (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::capability_const_iterator b (o.begin_capability()), e (o.end_capability());
+
+if (b != e)
+{
+capability_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) capability_next (o);
+}
+
+capability_post (o);
+}
+
+else capability_none (o);
+}
+
+void ComponentImplementationDescription::
+capability_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+capability_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+
+if (b != e)
+{
+dependsOn_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) dependsOn_next (o);
+}
+
+dependsOn_post (o);
+}
+
+else dependsOn_none (o);
+}
+
+void ComponentImplementationDescription::
+dependsOn (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+
+if (b != e)
+{
+dependsOn_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) dependsOn_next (o);
+}
+
+dependsOn_post (o);
+}
+
+else dependsOn_none (o);
+}
+
+void ComponentImplementationDescription::
+dependsOn_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+dependsOn_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
+
+infoProperty_post (o);
+}
+
+else infoProperty_none (o);
+}
+
+void ComponentImplementationDescription::
+infoProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentImplementationDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
+
+infoProperty_post (o);
+}
+
+else infoProperty_none (o);
+}
+
+void ComponentImplementationDescription::
+infoProperty_pre (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_pre (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_next (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_next (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_post (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+infoProperty_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+contentLocation (Type& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ComponentImplementationDescription::
+contentLocation (Type const& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ComponentImplementationDescription::
+contentLocation_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+contentLocation_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+href (Type& o)
+{
+dispatch (o.href ());
+}
+
+void ComponentImplementationDescription::
+href (Type const& o)
+{
+dispatch (o.href ());
+}
+
+void ComponentImplementationDescription::
+href_none (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+href_none (Type const&)
+{
+}
+
+void ComponentImplementationDescription::
+post (Type&)
+{
+}
+
+void ComponentImplementationDescription::
+post (Type const&)
+{
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // SubcomponentInstantiationDescription
-      //
-      //
+namespace Config_Handlers
+{
+namespace Writer
+{
+// SubcomponentInstantiationDescription
+//
+//
 
-      SubcomponentInstantiationDescription::
-      SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+SubcomponentInstantiationDescription::
+SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      SubcomponentInstantiationDescription::
-      SubcomponentInstantiationDescription ()
-      {
-      }
+SubcomponentInstantiationDescription::
+SubcomponentInstantiationDescription ()
+{
+}
 
-      void SubcomponentInstantiationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentInstantiationDescription::traverse (o);
-      }
+void SubcomponentInstantiationDescription::
+traverse (Type const& o)
+{
+Traversal::SubcomponentInstantiationDescription::traverse (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::name (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::SubcomponentInstantiationDescription::name (o);
+pop_ ();
+}
 
-      void SubcomponentInstantiationDescription::
-      package (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("package", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::package (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+basePackage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
+Traversal::SubcomponentInstantiationDescription::basePackage (o);
+pop_ ();
+}
 
-      void SubcomponentInstantiationDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::configProperty (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+specializedConfig (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
+Traversal::SubcomponentInstantiationDescription::specializedConfig (o);
+pop_ ();
+}
 
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::selectRequirement (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
+}
 
-      void SubcomponentInstantiationDescription::
-      reference (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reference", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::reference (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_next (Type const& o)
+{
+selectRequirement_post (o);
+selectRequirement_pre (o);
+}
 
-      void SubcomponentInstantiationDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::SubcomponentInstantiationDescription::id (o);
-        attr_ (0);
-      }
+void SubcomponentInstantiationDescription::
+selectRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      // SubcomponentPropertyReference
-      //
-      //
+void SubcomponentInstantiationDescription::
+configProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+}
 
-      SubcomponentPropertyReference::
-      SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_next (Type const& o)
+{
+configProperty_post (o);
+configProperty_pre (o);
+}
 
-      SubcomponentPropertyReference::
-      SubcomponentPropertyReference ()
-      {
-      }
+void SubcomponentInstantiationDescription::
+configProperty_post (Type const&)
+{
+pop_ ();
+}
 
-      void SubcomponentPropertyReference::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentPropertyReference::traverse (o);
-      }
+void SubcomponentInstantiationDescription::
+referencedPackage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
+Traversal::SubcomponentInstantiationDescription::referencedPackage (o);
+pop_ ();
+}
 
-      void SubcomponentPropertyReference::
-      propertyName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("propertyName", top_ ()));
-        Traversal::SubcomponentPropertyReference::propertyName (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+importedPackage (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
+Traversal::SubcomponentInstantiationDescription::importedPackage (o);
+pop_ ();
+}
 
-      void SubcomponentPropertyReference::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-        Traversal::SubcomponentPropertyReference::instance (o);
-        pop_ ();
-      }
+void SubcomponentInstantiationDescription::
+id (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
+attr_ (&a);
+Traversal::SubcomponentInstantiationDescription::id (o);
+attr_ (0);
+}
 
-      // AssemblyPropertyMapping
-      //
-      //
+// SubcomponentPropertyReference
+//
+//
 
-      AssemblyPropertyMapping::
-      AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+SubcomponentPropertyReference::
+SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      AssemblyPropertyMapping::
-      AssemblyPropertyMapping ()
-      {
-      }
+SubcomponentPropertyReference::
+SubcomponentPropertyReference ()
+{
+}
 
-      void AssemblyPropertyMapping::
-      traverse (Type const& o)
-      {
-        Traversal::AssemblyPropertyMapping::traverse (o);
-      }
+void SubcomponentPropertyReference::
+traverse (Type const& o)
+{
+Traversal::SubcomponentPropertyReference::traverse (o);
+}
 
-      void AssemblyPropertyMapping::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::AssemblyPropertyMapping::name (o);
-        pop_ ();
-      }
+void SubcomponentPropertyReference::
+propertyName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("propertyName", top_ ()));
+Traversal::SubcomponentPropertyReference::propertyName (o);
+pop_ ();
+}
 
-      void AssemblyPropertyMapping::
-      externalName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalName", top_ ()));
-        Traversal::AssemblyPropertyMapping::externalName (o);
-        pop_ ();
-      }
+void SubcomponentPropertyReference::
+instance (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+Traversal::SubcomponentPropertyReference::instance (o);
+pop_ ();
+}
 
-      void AssemblyPropertyMapping::
-      delegatesTo (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("delegatesTo", top_ ()));
-        Traversal::AssemblyPropertyMapping::delegatesTo (o);
-        pop_ ();
-      }
+// AssemblyPropertyMapping
+//
+//
 
-      // ComponentAssemblyDescription
-      //
-      //
+AssemblyPropertyMapping::
+AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      ComponentAssemblyDescription::
-      ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+AssemblyPropertyMapping::
+AssemblyPropertyMapping ()
+{
+}
 
-      ComponentAssemblyDescription::
-      ComponentAssemblyDescription ()
-      {
-      }
+void AssemblyPropertyMapping::
+traverse (Type const& o)
+{
+Traversal::AssemblyPropertyMapping::traverse (o);
+}
 
-      void ComponentAssemblyDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentAssemblyDescription::traverse (o);
-      }
+void AssemblyPropertyMapping::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::AssemblyPropertyMapping::name (o);
+pop_ ();
+}
 
-      void ComponentAssemblyDescription::
-      instance_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
-      }
+void AssemblyPropertyMapping::
+externalName (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalName", top_ ()));
+Traversal::AssemblyPropertyMapping::externalName (o);
+pop_ ();
+}
 
-      void ComponentAssemblyDescription::
-      instance_next (Type const& o)
-      {
-        instance_post (o);
-        instance_pre (o);
-      }
+void AssemblyPropertyMapping::
+delegatesTo_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("delegatesTo", top_ ()));
+}
 
-      void ComponentAssemblyDescription::
-      instance_post (Type const&)
-      {
-        pop_ ();
-      }
+void AssemblyPropertyMapping::
+delegatesTo_next (Type const& o)
+{
+delegatesTo_post (o);
+delegatesTo_pre (o);
+}
 
-      void ComponentAssemblyDescription::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
-      }
+void AssemblyPropertyMapping::
+delegatesTo_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentAssemblyDescription::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
+// ComponentAssemblyDescription
+//
+//
 
-      void ComponentAssemblyDescription::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
+ComponentAssemblyDescription::
+ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ComponentAssemblyDescription::
-      externalProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalProperty", top_ ()));
-        Traversal::ComponentAssemblyDescription::externalProperty (o);
-        pop_ ();
-      }
+ComponentAssemblyDescription::
+ComponentAssemblyDescription ()
+{
+}
 
-      // MonolithicImplementationDescription
-      //
-      //
+void ComponentAssemblyDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentAssemblyDescription::traverse (o);
+}
 
-      MonolithicImplementationDescription::
-      MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+void ComponentAssemblyDescription::
+instance_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
+}
 
-      MonolithicImplementationDescription::
-      MonolithicImplementationDescription ()
-      {
-      }
+void ComponentAssemblyDescription::
+instance_next (Type const& o)
+{
+instance_post (o);
+instance_pre (o);
+}
 
-      void MonolithicImplementationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::MonolithicImplementationDescription::traverse (o);
-      }
+void ComponentAssemblyDescription::
+instance_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicImplementationDescription::
-      execParameter (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-        Traversal::MonolithicImplementationDescription::execParameter (o);
-        pop_ ();
-      }
+void ComponentAssemblyDescription::
+connection_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("primaryArtifact", top_ ()));
-      }
+void ComponentAssemblyDescription::
+connection_next (Type const& o)
+{
+connection_post (o);
+connection_pre (o);
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type const& o)
-      {
-        primaryArtifact_post (o);
-        primaryArtifact_pre (o);
-      }
+void ComponentAssemblyDescription::
+connection_post (Type const&)
+{
+pop_ ();
+}
 
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type const&)
-      {
-        pop_ ();
-      }
+void ComponentAssemblyDescription::
+externalProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalProperty", top_ ()));
+}
 
-      void MonolithicImplementationDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-        Traversal::MonolithicImplementationDescription::deployRequirement (o);
-        pop_ ();
-      }
+void ComponentAssemblyDescription::
+externalProperty_next (Type const& o)
+{
+externalProperty_post (o);
+externalProperty_pre (o);
+}
 
-      // ComponentImplementationDescription
-      //
-      //
+void ComponentAssemblyDescription::
+externalProperty_post (Type const&)
+{
+pop_ ();
+}
 
-      ComponentImplementationDescription::
-      ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
+// MonolithicImplementationDescription
+//
+//
 
-      ComponentImplementationDescription::
-      ComponentImplementationDescription ()
-      {
-      }
+MonolithicImplementationDescription::
+MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
 
-      void ComponentImplementationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentImplementationDescription::traverse (o);
-      }
+MonolithicImplementationDescription::
+MonolithicImplementationDescription ()
+{
+}
 
-      void ComponentImplementationDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::ComponentImplementationDescription::label (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+traverse (Type const& o)
+{
+Traversal::MonolithicImplementationDescription::traverse (o);
+}
 
-      void ComponentImplementationDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-        Traversal::ComponentImplementationDescription::UUID (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nodeExecParameter", top_ ()));
+}
 
-      void ComponentImplementationDescription::
-      implements (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implements", top_ ()));
-        Traversal::ComponentImplementationDescription::implements (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter_next (Type const& o)
+{
+nodeExecParameter_post (o);
+nodeExecParameter_pre (o);
+}
 
-      void ComponentImplementationDescription::
-      assemblyImpl (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("assemblyImpl", top_ ()));
-        Traversal::ComponentImplementationDescription::assemblyImpl (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+nodeExecParameter_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentImplementationDescription::
-      monolithicImpl (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("monolithicImpl", top_ ()));
-        Traversal::ComponentImplementationDescription::monolithicImpl (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+componentExecParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentExecParameter", top_ ()));
+}
 
-      void ComponentImplementationDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::ComponentImplementationDescription::configProperty (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+componentExecParameter_next (Type const& o)
+{
+componentExecParameter_post (o);
+componentExecParameter_pre (o);
+}
 
-      void ComponentImplementationDescription::
-      capability (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("capability", top_ ()));
-        Traversal::ComponentImplementationDescription::capability (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+componentExecParameter_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentImplementationDescription::
-      dependsOn (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
-        Traversal::ComponentImplementationDescription::dependsOn (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
 
-      void ComponentImplementationDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::ComponentImplementationDescription::infoProperty (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
 
-      void ComponentImplementationDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
-        Traversal::ComponentImplementationDescription::contentLocation (o);
-        pop_ ();
-      }
+void MonolithicImplementationDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
 
-      void ComponentImplementationDescription::
-      href (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-        attr_ (&a);
-        Traversal::ComponentImplementationDescription::href (o);
-        attr_ (0);
-      }
-    }
-  }
+void MonolithicImplementationDescription::
+primaryArtifact_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("primaryArtifact", top_ ()));
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_next (Type const& o)
+{
+primaryArtifact_post (o);
+primaryArtifact_pre (o);
+}
+
+void MonolithicImplementationDescription::
+primaryArtifact_post (Type const&)
+{
+pop_ ();
+}
+
+// ComponentImplementationDescription
+//
+//
+
+ComponentImplementationDescription::
+ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+ComponentImplementationDescription::
+ComponentImplementationDescription ()
+{
+}
+
+void ComponentImplementationDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentImplementationDescription::traverse (o);
+}
+
+void ComponentImplementationDescription::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::ComponentImplementationDescription::label (o);
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+UUID (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+Traversal::ComponentImplementationDescription::UUID (o);
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+implements (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implements", top_ ()));
+Traversal::ComponentImplementationDescription::implements (o);
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+assemblyImpl (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("assemblyImpl", top_ ()));
+Traversal::ComponentImplementationDescription::assemblyImpl (o);
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+monolithicImpl (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("monolithicImpl", top_ ()));
+Traversal::ComponentImplementationDescription::monolithicImpl (o);
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+configProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+}
+
+void ComponentImplementationDescription::
+configProperty_next (Type const& o)
+{
+configProperty_post (o);
+configProperty_pre (o);
+}
+
+void ComponentImplementationDescription::
+configProperty_post (Type const&)
+{
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+capability_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("capability", top_ ()));
+}
+
+void ComponentImplementationDescription::
+capability_next (Type const& o)
+{
+capability_post (o);
+capability_pre (o);
+}
+
+void ComponentImplementationDescription::
+capability_post (Type const&)
+{
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+dependsOn_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
+}
+
+void ComponentImplementationDescription::
+dependsOn_next (Type const& o)
+{
+dependsOn_post (o);
+dependsOn_pre (o);
+}
+
+void ComponentImplementationDescription::
+dependsOn_post (Type const&)
+{
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+infoProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+}
+
+void ComponentImplementationDescription::
+infoProperty_next (Type const& o)
+{
+infoProperty_post (o);
+infoProperty_pre (o);
+}
+
+void ComponentImplementationDescription::
+infoProperty_post (Type const&)
+{
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+contentLocation (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
+Traversal::ComponentImplementationDescription::contentLocation (o);
+pop_ ();
+}
+
+void ComponentImplementationDescription::
+href (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+attr_ (&a);
+Traversal::ComponentImplementationDescription::href (o);
+attr_ (0);
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cid.hpp b/TAO/CIAO/tools/Config_Handlers/cid.hpp
index 7439935c8df..478892ad630 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,15 +27,15 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class SubcomponentInstantiationDescription;
-    class SubcomponentPropertyReference;
-    class AssemblyPropertyMapping;
-    class ComponentAssemblyDescription;
-    class MonolithicImplementationDescription;
-    class ComponentImplementationDescription;
-  }
+namespace Config_Handlers
+{
+class SubcomponentInstantiationDescription;
+class SubcomponentPropertyReference;
+class AssemblyPropertyMapping;
+class ComponentAssemblyDescription;
+class MonolithicImplementationDescription;
+class ComponentImplementationDescription;
+}
 }
 
 #include <memory>
@@ -48,1409 +48,2017 @@ namespace CIAO
 
 #include "iad.hpp"
 
+#include "pcd.hpp"
+
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // package
-      // 
-      public:
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& package () const;
-      void package (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > package_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // selectRequirement
-      // 
-      public:
-      bool selectRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
-      void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-      // reference
-      // 
-      public:
-      bool reference_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
-      void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
-
-      // id
-      // 
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-      public:
-      SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                            ::CIAO::Config_Handlers::ComponentPackageDescription const& package__);
-
-      SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
-
-      SubcomponentInstantiationDescription&
-      operator= (SubcomponentInstantiationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // propertyName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& propertyName () const;
-      void propertyName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > propertyName_;
-
-      // instance
-      // 
-      public:
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance () const;
-      void instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-      public:
-      SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-                                     ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__);
-
-      SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
-
-      SubcomponentPropertyReference&
-      operator= (SubcomponentPropertyReference const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // externalName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& externalName () const;
-      void externalName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > externalName_;
-
-      // delegatesTo
-      // 
-      public:
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo () const;
-      void delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
-
-      public:
-      AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-                               ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-                               ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__);
-
-      AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
-
-      AssemblyPropertyMapping&
-      operator= (AssemblyPropertyMapping const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // instance
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
-      instance_iterator begin_instance ();
-      instance_iterator end_instance ();
-      instance_const_iterator begin_instance () const;
-      instance_const_iterator end_instance () const;
-      void add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
-      size_t count_instance (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-      // connection
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
-      connection_iterator begin_connection ();
-      connection_iterator end_connection ();
-      connection_const_iterator begin_connection () const;
-      connection_const_iterator end_connection () const;
-      void add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& );
-      size_t count_connection (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
-
-      // externalProperty
-      // 
-      public:
-      bool externalProperty_p () const;
-      ::CIAO::Config_Handlers::AssemblyPropertyMapping const& externalProperty () const;
-      void externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > externalProperty_;
-
-      public:
-      ComponentAssemblyDescription ();
-
-      ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentAssemblyDescription (ComponentAssemblyDescription const& s);
-
-      ComponentAssemblyDescription&
-      operator= (ComponentAssemblyDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // execParameter
-      // 
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // primaryArtifact
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
-      primaryArtifact_iterator begin_primaryArtifact ();
-      primaryArtifact_iterator end_primaryArtifact ();
-      primaryArtifact_const_iterator begin_primaryArtifact () const;
-      primaryArtifact_const_iterator end_primaryArtifact () const;
-      void add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
-      size_t count_primaryArtifact (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::ImplementationRequirement const& deployRequirement () const;
-      void deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
-
-      public:
-      MonolithicImplementationDescription ();
-
-      MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      MonolithicImplementationDescription (MonolithicImplementationDescription const& s);
-
-      MonolithicImplementationDescription&
-      operator= (MonolithicImplementationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // implements
-      // 
-      public:
-      bool implements_p () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
-      void implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
-
-      // assemblyImpl
-      // 
-      public:
-      bool assemblyImpl_p () const;
-      ::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
-      void assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
-
-      // monolithicImpl
-      // 
-      public:
-      bool monolithicImpl_p () const;
-      ::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
-      void monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // capability
-      // 
-      public:
-      bool capability_p () const;
-      ::CIAO::Config_Handlers::Capability const& capability () const;
-      void capability (::CIAO::Config_Handlers::Capability const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > capability_;
-
-      // dependsOn
-      // 
-      public:
-      bool dependsOn_p () const;
-      ::CIAO::Config_Handlers::ImplementationDependency const& dependsOn () const;
-      void dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      // 
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-      // href
-      // 
-      public:
-      bool href_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& href () const;
-      ::XMLSchema::string< ACE_TCHAR >& href ();
-      void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-      public:
-      ComponentImplementationDescription ();
-
-      ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentImplementationDescription (ComponentImplementationDescription const& s);
-
-      ComponentImplementationDescription&
-      operator= (ComponentImplementationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// basePackage
+//
+public:
+bool basePackage_p () const;
+::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
+void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
+
+// specializedConfig
+//
+public:
+bool specializedConfig_p () const;
+::CIAO::Config_Handlers::PackageConfiguration const& specializedConfig () const;
+void specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > specializedConfig_;
+
+// selectRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator selectRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator selectRequirement_const_iterator;
+selectRequirement_iterator begin_selectRequirement ();
+selectRequirement_iterator end_selectRequirement ();
+selectRequirement_const_iterator begin_selectRequirement () const;
+selectRequirement_const_iterator end_selectRequirement () const;
+void add_selectRequirement (::CIAO::Config_Handlers::Requirement const& );
+size_t count_selectRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
+
+// configProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+configProperty_iterator begin_configProperty ();
+configProperty_iterator end_configProperty ();
+configProperty_const_iterator begin_configProperty () const;
+configProperty_const_iterator end_configProperty () const;
+void add_configProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_configProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+// referencedPackage
+//
+public:
+bool referencedPackage_p () const;
+::CIAO::Config_Handlers::ComponentPackageReference const& referencedPackage () const;
+void referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > referencedPackage_;
+
+// importedPackage
+//
+public:
+bool importedPackage_p () const;
+::CIAO::Config_Handlers::ComponentPackageImport const& importedPackage () const;
+void importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > importedPackage_;
+
+// id
+//
+public:
+bool id_p () const;
+::XMLSchema::ID< ACE_TCHAR > const& id () const;
+::XMLSchema::ID< ACE_TCHAR >& id ();
+void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+public:
+SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
+
+SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
+
+SubcomponentInstantiationDescription&
+operator= (SubcomponentInstantiationDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// propertyName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& propertyName () const;
+void propertyName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > propertyName_;
+
+// instance
+//
+public:
+::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
+void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+
+public:
+SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
+::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+
+SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
+SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
+
+SubcomponentPropertyReference&
+operator= (SubcomponentPropertyReference const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// externalName
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& externalName () const;
+void externalName (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > externalName_;
+
+// delegatesTo
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference >::iterator delegatesTo_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference >::const_iterator delegatesTo_const_iterator;
+delegatesTo_iterator begin_delegatesTo ();
+delegatesTo_iterator end_delegatesTo ();
+delegatesTo_const_iterator begin_delegatesTo () const;
+delegatesTo_const_iterator end_delegatesTo () const;
+void add_delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
+size_t count_delegatesTo (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
+
+public:
+AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
+::XMLSchema::string< ACE_TCHAR > const& externalName__);
+
+AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const&);
+AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
+
+AssemblyPropertyMapping&
+operator= (AssemblyPropertyMapping const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// instance
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
+instance_iterator begin_instance ();
+instance_iterator end_instance ();
+instance_const_iterator begin_instance () const;
+instance_const_iterator end_instance () const;
+void add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
+size_t count_instance (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
+
+// connection
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
+connection_iterator begin_connection ();
+connection_iterator end_connection ();
+connection_const_iterator begin_connection () const;
+connection_const_iterator end_connection () const;
+void add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& );
+size_t count_connection (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
+
+// externalProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping >::iterator externalProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping >::const_iterator externalProperty_const_iterator;
+externalProperty_iterator begin_externalProperty ();
+externalProperty_iterator end_externalProperty ();
+externalProperty_const_iterator begin_externalProperty () const;
+externalProperty_const_iterator end_externalProperty () const;
+void add_externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
+size_t count_externalProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::AssemblyPropertyMapping > externalProperty_;
+
+public:
+ComponentAssemblyDescription ();
+
+ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentAssemblyDescription (ComponentAssemblyDescription const& s);
+
+ComponentAssemblyDescription&
+operator= (ComponentAssemblyDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// nodeExecParameter
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator nodeExecParameter_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator nodeExecParameter_const_iterator;
+nodeExecParameter_iterator begin_nodeExecParameter ();
+nodeExecParameter_iterator end_nodeExecParameter ();
+nodeExecParameter_const_iterator begin_nodeExecParameter () const;
+nodeExecParameter_const_iterator end_nodeExecParameter () const;
+void add_nodeExecParameter (::CIAO::Config_Handlers::Property const& );
+size_t count_nodeExecParameter (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > nodeExecParameter_;
+
+// componentExecParameter
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator componentExecParameter_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator componentExecParameter_const_iterator;
+componentExecParameter_iterator begin_componentExecParameter ();
+componentExecParameter_iterator end_componentExecParameter ();
+componentExecParameter_const_iterator begin_componentExecParameter () const;
+componentExecParameter_const_iterator end_componentExecParameter () const;
+void add_componentExecParameter (::CIAO::Config_Handlers::Property const& );
+size_t count_componentExecParameter (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > componentExecParameter_;
+
+// deployRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationRequirement >::iterator deployRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationRequirement >::const_iterator deployRequirement_const_iterator;
+deployRequirement_iterator begin_deployRequirement ();
+deployRequirement_iterator end_deployRequirement ();
+deployRequirement_const_iterator begin_deployRequirement () const;
+deployRequirement_const_iterator end_deployRequirement () const;
+void add_deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
+size_t count_deployRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
+
+// primaryArtifact
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
+primaryArtifact_iterator begin_primaryArtifact ();
+primaryArtifact_iterator end_primaryArtifact ();
+primaryArtifact_const_iterator begin_primaryArtifact () const;
+primaryArtifact_const_iterator end_primaryArtifact () const;
+void add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
+size_t count_primaryArtifact (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
+
+public:
+MonolithicImplementationDescription ();
+
+MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+MonolithicImplementationDescription (MonolithicImplementationDescription const& s);
+
+MonolithicImplementationDescription&
+operator= (MonolithicImplementationDescription const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// implements
+//
+public:
+bool implements_p () const;
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
+void implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
+
+// assemblyImpl
+//
+public:
+bool assemblyImpl_p () const;
+::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
+void assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
+
+// monolithicImpl
+//
+public:
+bool monolithicImpl_p () const;
+::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
+void monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
+
+// configProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+configProperty_iterator begin_configProperty ();
+configProperty_iterator end_configProperty ();
+configProperty_const_iterator begin_configProperty () const;
+configProperty_const_iterator end_configProperty () const;
+void add_configProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_configProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+// capability
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Capability >::iterator capability_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Capability >::const_iterator capability_const_iterator;
+capability_iterator begin_capability ();
+capability_iterator end_capability ();
+capability_const_iterator begin_capability () const;
+capability_const_iterator end_capability () const;
+void add_capability (::CIAO::Config_Handlers::Capability const& );
+size_t count_capability (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Capability > capability_;
+
+// dependsOn
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
+dependsOn_iterator begin_dependsOn ();
+dependsOn_iterator end_dependsOn ();
+dependsOn_const_iterator begin_dependsOn () const;
+dependsOn_const_iterator end_dependsOn () const;
+void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
+size_t count_dependsOn (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
+
+// infoProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+infoProperty_iterator begin_infoProperty ();
+infoProperty_iterator end_infoProperty ();
+infoProperty_const_iterator begin_infoProperty () const;
+infoProperty_const_iterator end_infoProperty () const;
+void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_infoProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+// contentLocation
+//
+public:
+bool contentLocation_p () const;
+::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+// href
+//
+public:
+bool href_p () const;
+::XMLSchema::string< ACE_TCHAR > const& href () const;
+::XMLSchema::string< ACE_TCHAR >& href ();
+void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+public:
+ComponentImplementationDescription ();
+
+ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentImplementationDescription (ComponentImplementationDescription const& s);
+
+ComponentImplementationDescription&
+operator= (ComponentImplementationDescription const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        package (Type&);
+virtual void
+basePackage (Type&);
 
-        virtual void
-        package (Type const&);
+virtual void
+basePackage (Type const&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+basePackage_none (Type&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+basePackage_none (Type const&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+specializedConfig (Type&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+specializedConfig (Type const&);
 
-        virtual void
-        selectRequirement (Type&);
+virtual void
+specializedConfig_none (Type&);
 
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+specializedConfig_none (Type const&);
 
-        virtual void
-        selectRequirement_none (Type&);
+virtual void
+selectRequirement (Type&);
 
-        virtual void
-        selectRequirement_none (Type const&);
+virtual void
+selectRequirement (Type const&);
 
-        virtual void
-        reference (Type&);
+virtual void
+selectRequirement_pre (Type&);
 
-        virtual void
-        reference (Type const&);
+virtual void
+selectRequirement_pre (Type const&);
 
-        virtual void
-        reference_none (Type&);
+virtual void
+selectRequirement_next (Type&);
 
-        virtual void
-        reference_none (Type const&);
+virtual void
+selectRequirement_next (Type const&);
 
-        virtual void
-        id (Type&);
+virtual void
+selectRequirement_post (Type&);
 
-        virtual void
-        id (Type const&);
+virtual void
+selectRequirement_post (Type const&);
 
-        virtual void
-        id_none (Type&);
+virtual void
+selectRequirement_none (Type&);
 
-        virtual void
-        id_none (Type const&);
+virtual void
+selectRequirement_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+configProperty (Type const&);
 
-      struct XSC_XML_Handlers_Export SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        propertyName (Type&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        propertyName (Type const&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        instance (Type&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+referencedPackage (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+referencedPackage (Type const&);
 
-      struct XSC_XML_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+referencedPackage_none (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+referencedPackage_none (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+importedPackage (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+importedPackage (Type const&);
 
-        virtual void
-        name (Type&);
+virtual void
+importedPackage_none (Type&);
 
-        virtual void
-        name (Type const&);
+virtual void
+importedPackage_none (Type const&);
 
-        virtual void
-        externalName (Type&);
+virtual void
+id (Type&);
 
-        virtual void
-        externalName (Type const&);
+virtual void
+id (Type const&);
 
-        virtual void
-        delegatesTo (Type&);
+virtual void
+id_none (Type&);
 
-        virtual void
-        delegatesTo (Type const&);
+virtual void
+id_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+post (Type const&);
+};
 
-      struct XSC_XML_Handlers_Export ComponentAssemblyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentAssemblyDescription >
-      {
-        virtual void
-        traverse (Type&);
+struct XSC_XML_Handlers_Export SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+propertyName (Type&);
 
-        virtual void
-        instance (Type&);
+virtual void
+propertyName (Type const&);
 
-        virtual void
-        instance (Type const&);
+virtual void
+instance (Type&);
 
-        virtual void
-        instance_pre (Type&);
+virtual void
+instance (Type const&);
 
-        virtual void
-        instance_pre (Type const&);
+virtual void
+post (Type&);
 
-        virtual void
-        instance_next (Type&);
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        instance_next (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        instance_post (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        instance_post (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        connection (Type&);
+virtual void
+name (Type&);
 
-        virtual void
-        connection (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void
-        connection_pre (Type&);
+virtual void
+externalName (Type&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+externalName (Type const&);
 
-        virtual void
-        connection_next (Type&);
+virtual void
+delegatesTo (Type&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+delegatesTo (Type const&);
 
-        virtual void
-        connection_post (Type&);
+virtual void
+delegatesTo_pre (Type&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+delegatesTo_pre (Type const&);
 
-        virtual void
-        externalProperty (Type&);
+virtual void
+delegatesTo_next (Type&);
 
-        virtual void
-        externalProperty (Type const&);
+virtual void
+delegatesTo_next (Type const&);
 
-        virtual void
-        externalProperty_none (Type&);
+virtual void
+delegatesTo_post (Type&);
 
-        virtual void
-        externalProperty_none (Type const&);
+virtual void
+delegatesTo_post (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ComponentAssemblyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentAssemblyDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+traverse (Type const&);
 
-      struct XSC_XML_Handlers_Export MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        pre (Type&);
+virtual void
+instance (Type&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+instance (Type const&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+instance_pre (Type&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+instance_pre (Type const&);
 
-        virtual void
-        execParameter_none (Type&);
+virtual void
+instance_next (Type&);
 
-        virtual void
-        execParameter_none (Type const&);
+virtual void
+instance_next (Type const&);
 
-        virtual void
-        primaryArtifact (Type&);
+virtual void
+instance_post (Type&);
 
-        virtual void
-        primaryArtifact (Type const&);
+virtual void
+instance_post (Type const&);
 
-        virtual void
-        primaryArtifact_pre (Type&);
+virtual void
+connection (Type&);
 
-        virtual void
-        primaryArtifact_pre (Type const&);
+virtual void
+connection (Type const&);
 
-        virtual void
-        primaryArtifact_next (Type&);
+virtual void
+connection_pre (Type&);
 
-        virtual void
-        primaryArtifact_next (Type const&);
+virtual void
+connection_pre (Type const&);
 
-        virtual void
-        primaryArtifact_post (Type&);
+virtual void
+connection_next (Type&);
 
-        virtual void
-        primaryArtifact_post (Type const&);
+virtual void
+connection_next (Type const&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+connection_post (Type&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+connection_none (Type&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+connection_none (Type const&);
+
+virtual void
+externalProperty (Type&);
+
+virtual void
+externalProperty (Type const&);
+
+virtual void
+externalProperty_pre (Type&);
+
+virtual void
+externalProperty_pre (Type const&);
+
+virtual void
+externalProperty_next (Type&);
+
+virtual void
+externalProperty_next (Type const&);
+
+virtual void
+externalProperty_post (Type&);
+
+virtual void
+externalProperty_post (Type const&);
+
+virtual void
+externalProperty_none (Type&);
+
+virtual void
+externalProperty_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+pre (Type&);
 
-      struct XSC_XML_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+nodeExecParameter (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+nodeExecParameter (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+nodeExecParameter_pre (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+nodeExecParameter_pre (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+nodeExecParameter_next (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+nodeExecParameter_next (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+nodeExecParameter_post (Type&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+nodeExecParameter_post (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+nodeExecParameter_none (Type&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+nodeExecParameter_none (Type const&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+componentExecParameter (Type&);
 
-        virtual void
-        implements (Type&);
+virtual void
+componentExecParameter (Type const&);
 
-        virtual void
-        implements (Type const&);
+virtual void
+componentExecParameter_pre (Type&);
 
-        virtual void
-        implements_none (Type&);
+virtual void
+componentExecParameter_pre (Type const&);
+
+virtual void
+componentExecParameter_next (Type&);
+
+virtual void
+componentExecParameter_next (Type const&);
+
+virtual void
+componentExecParameter_post (Type&);
+
+virtual void
+componentExecParameter_post (Type const&);
+
+virtual void
+componentExecParameter_none (Type&);
+
+virtual void
+componentExecParameter_none (Type const&);
+
+virtual void
+deployRequirement (Type&);
+
+virtual void
+deployRequirement (Type const&);
+
+virtual void
+deployRequirement_pre (Type&);
+
+virtual void
+deployRequirement_pre (Type const&);
+
+virtual void
+deployRequirement_next (Type&);
+
+virtual void
+deployRequirement_next (Type const&);
+
+virtual void
+deployRequirement_post (Type&);
+
+virtual void
+deployRequirement_post (Type const&);
+
+virtual void
+deployRequirement_none (Type&);
+
+virtual void
+deployRequirement_none (Type const&);
+
+virtual void
+primaryArtifact (Type&);
+
+virtual void
+primaryArtifact (Type const&);
+
+virtual void
+primaryArtifact_pre (Type&);
+
+virtual void
+primaryArtifact_pre (Type const&);
+
+virtual void
+primaryArtifact_next (Type&);
+
+virtual void
+primaryArtifact_next (Type const&);
+
+virtual void
+primaryArtifact_post (Type&);
+
+virtual void
+primaryArtifact_post (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        implements_none (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        assemblyImpl (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        assemblyImpl (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        assemblyImpl_none (Type&);
+virtual void
+label (Type&);
 
-        virtual void
-        assemblyImpl_none (Type const&);
+virtual void
+label (Type const&);
 
-        virtual void
-        monolithicImpl (Type&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        monolithicImpl (Type const&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        monolithicImpl_none (Type&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        monolithicImpl_none (Type const&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+implements (Type&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+implements (Type const&);
 
-        virtual void
-        capability (Type&);
+virtual void
+implements_none (Type&);
 
-        virtual void
-        capability (Type const&);
+virtual void
+implements_none (Type const&);
 
-        virtual void
-        capability_none (Type&);
+virtual void
+assemblyImpl (Type&);
 
-        virtual void
-        capability_none (Type const&);
+virtual void
+assemblyImpl (Type const&);
 
-        virtual void
-        dependsOn (Type&);
+virtual void
+assemblyImpl_none (Type&);
 
-        virtual void
-        dependsOn (Type const&);
+virtual void
+assemblyImpl_none (Type const&);
 
-        virtual void
-        dependsOn_none (Type&);
+virtual void
+monolithicImpl (Type&);
 
-        virtual void
-        dependsOn_none (Type const&);
+virtual void
+monolithicImpl (Type const&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+monolithicImpl_none (Type&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+monolithicImpl_none (Type const&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        href (Type&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        href (Type const&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        href_none (Type&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        href_none (Type const&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+capability (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+capability (Type const&);
+
+virtual void
+capability_pre (Type&);
+
+virtual void
+capability_pre (Type const&);
+
+virtual void
+capability_next (Type&);
+
+virtual void
+capability_next (Type const&);
+
+virtual void
+capability_post (Type&);
+
+virtual void
+capability_post (Type const&);
+
+virtual void
+capability_none (Type&);
+
+virtual void
+capability_none (Type const&);
+
+virtual void
+dependsOn (Type&);
+
+virtual void
+dependsOn (Type const&);
+
+virtual void
+dependsOn_pre (Type&);
+
+virtual void
+dependsOn_pre (Type const&);
+
+virtual void
+dependsOn_next (Type&);
+
+virtual void
+dependsOn_next (Type const&);
+
+virtual void
+dependsOn_post (Type&);
+
+virtual void
+dependsOn_post (Type const&);
+
+virtual void
+dependsOn_none (Type&);
+
+virtual void
+dependsOn_none (Type const&);
+
+virtual void
+infoProperty (Type&);
+
+virtual void
+infoProperty (Type const&);
+
+virtual void
+infoProperty_pre (Type&);
+
+virtual void
+infoProperty_pre (Type const&);
+
+virtual void
+infoProperty_next (Type&);
+
+virtual void
+infoProperty_next (Type const&);
+
+virtual void
+infoProperty_post (Type&);
+
+virtual void
+infoProperty_post (Type const&);
+
+virtual void
+infoProperty_none (Type&);
+
+virtual void
+infoProperty_none (Type const&);
+
+virtual void
+contentLocation (Type&);
+
+virtual void
+contentLocation (Type const&);
+
+virtual void
+contentLocation_none (Type&);
+
+virtual void
+contentLocation_none (Type const&);
+
+virtual void
+href (Type&);
+
+virtual void
+href (Type const&);
+
+virtual void
+href_none (Type&);
+
+virtual void
+href_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::SubcomponentInstantiationDescription Type;
-        SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::SubcomponentInstantiationDescription Type;
+SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        package (Type &o)
-        {
+virtual void
+basePackage (Type &o)
+{
 
-          this->package (const_cast <Type const &> (o));
-        }
+this->basePackage (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        package (Type const&);
+virtual void
+basePackage (Type const&);
 
-        virtual void 
-        configProperty (Type &o)
-        {
+virtual void
+specializedConfig (Type &o)
+{
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
+this->specializedConfig (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+specializedConfig (Type const&);
 
-        virtual void 
-        selectRequirement (Type &o)
-        {
+virtual void
+selectRequirement_pre (Type &o)
+{
 
-          this->selectRequirement (const_cast <Type const &> (o));
-        }
+this->selectRequirement_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+selectRequirement_pre (Type const&);
 
-        virtual void 
-        reference (Type &o)
-        {
+virtual void
+selectRequirement_next (Type &o)
+{
 
-          this->reference (const_cast <Type const &> (o));
-        }
+this->selectRequirement_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        reference (Type const&);
+virtual void
+selectRequirement_next (Type const&);
 
-        virtual void 
-        id (Type &o)
-        {
+virtual void
+selectRequirement_post (Type &o)
+{
+
+this->selectRequirement_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+selectRequirement_post (Type const&);
+
+virtual void
+configProperty_pre (Type &o)
+{
+
+this->configProperty_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_pre (Type const&);
+
+virtual void
+configProperty_next (Type &o)
+{
+
+this->configProperty_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_next (Type const&);
+
+virtual void
+configProperty_post (Type &o)
+{
+
+this->configProperty_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_post (Type const&);
+
+virtual void
+referencedPackage (Type &o)
+{
+
+this->referencedPackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+referencedPackage (Type const&);
+
+virtual void
+importedPackage (Type &o)
+{
+
+this->importedPackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+importedPackage (Type const&);
+
+virtual void
+id (Type &o)
+{
+
+this->id (const_cast <Type const &> (o));
+}
+
+
+virtual void
+id (Type const&);
+
+protected:
+SubcomponentInstantiationDescription ();
+};
+
+struct SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
+SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+propertyName (Type &o)
+{
+
+this->propertyName (const_cast <Type const &> (o));
+}
+
+
+virtual void
+propertyName (Type const&);
+
+virtual void
+instance (Type &o)
+{
+
+this->instance (const_cast <Type const &> (o));
+}
+
+
+virtual void
+instance (Type const&);
+
+protected:
+SubcomponentPropertyReference ();
+};
+
+struct AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
+AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+name (Type &o)
+{
+
+this->name (const_cast <Type const &> (o));
+}
+
+
+virtual void
+name (Type const&);
+
+virtual void
+externalName (Type &o)
+{
+
+this->externalName (const_cast <Type const &> (o));
+}
+
+
+virtual void
+externalName (Type const&);
+
+virtual void
+delegatesTo_pre (Type &o)
+{
+
+this->delegatesTo_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+delegatesTo_pre (Type const&);
+
+virtual void
+delegatesTo_next (Type &o)
+{
+
+this->delegatesTo_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+delegatesTo_next (Type const&);
+
+virtual void
+delegatesTo_post (Type &o)
+{
+
+this->delegatesTo_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+delegatesTo_post (Type const&);
+
+protected:
+AssemblyPropertyMapping ();
+};
+
+struct ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
+ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+instance_pre (Type &o)
+{
+
+this->instance_pre (const_cast <Type const &> (o));
+}
 
-          this->id (const_cast <Type const &> (o));
-        }
 
+virtual void
+instance_pre (Type const&);
 
-        virtual void
-        id (Type const&);
+virtual void
+instance_next (Type &o)
+{
 
-        protected:
-        SubcomponentInstantiationDescription ();
-      };
+this->instance_next (const_cast <Type const &> (o));
+}
 
-      struct SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
-        SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+instance_next (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+instance_post (Type &o)
+{
 
+this->instance_post (const_cast <Type const &> (o));
+}
 
-        virtual void
-        traverse (Type const&);
 
-        virtual void 
-        propertyName (Type &o)
-        {
+virtual void
+instance_post (Type const&);
 
-          this->propertyName (const_cast <Type const &> (o));
-        }
+virtual void
+connection_pre (Type &o)
+{
 
+this->connection_pre (const_cast <Type const &> (o));
+}
 
-        virtual void
-        propertyName (Type const&);
 
-        virtual void 
-        instance (Type &o)
-        {
+virtual void
+connection_pre (Type const&);
 
-          this->instance (const_cast <Type const &> (o));
-        }
+virtual void
+connection_next (Type &o)
+{
 
+this->connection_next (const_cast <Type const &> (o));
+}
 
-        virtual void
-        instance (Type const&);
 
-        protected:
-        SubcomponentPropertyReference ();
-      };
+virtual void
+connection_next (Type const&);
 
-      struct AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
-        AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+connection_post (Type &o)
+{
 
-        virtual void 
-        traverse (Type &o)
-        {
+this->connection_post (const_cast <Type const &> (o));
+}
 
-          this->traverse (const_cast <Type const &> (o));
-        }
 
+virtual void
+connection_post (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+externalProperty_pre (Type &o)
+{
 
-        virtual void 
-        name (Type &o)
-        {
+this->externalProperty_pre (const_cast <Type const &> (o));
+}
 
-          this->name (const_cast <Type const &> (o));
-        }
 
+virtual void
+externalProperty_pre (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+externalProperty_next (Type &o)
+{
 
-        virtual void 
-        externalName (Type &o)
-        {
+this->externalProperty_next (const_cast <Type const &> (o));
+}
 
-          this->externalName (const_cast <Type const &> (o));
-        }
 
+virtual void
+externalProperty_next (Type const&);
 
-        virtual void
-        externalName (Type const&);
+virtual void
+externalProperty_post (Type &o)
+{
 
-        virtual void 
-        delegatesTo (Type &o)
-        {
+this->externalProperty_post (const_cast <Type const &> (o));
+}
 
-          this->delegatesTo (const_cast <Type const &> (o));
-        }
 
+virtual void
+externalProperty_post (Type const&);
 
-        virtual void
-        delegatesTo (Type const&);
+protected:
+ComponentAssemblyDescription ();
+};
 
-        protected:
-        AssemblyPropertyMapping ();
-      };
+struct MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
+MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-      struct ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
-        ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+traverse (Type &o)
+{
 
-        virtual void 
-        traverse (Type &o)
-        {
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->traverse (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+nodeExecParameter_pre (Type &o)
+{
 
-        virtual void 
-        instance_pre (Type &o)
-        {
+this->nodeExecParameter_pre (const_cast <Type const &> (o));
+}
 
-          this->instance_pre (const_cast <Type const &> (o));
-        }
 
+virtual void
+nodeExecParameter_pre (Type const&);
 
-        virtual void
-        instance_pre (Type const&);
+virtual void
+nodeExecParameter_next (Type &o)
+{
 
-        virtual void 
-        instance_next (Type &o)
-        {
+this->nodeExecParameter_next (const_cast <Type const &> (o));
+}
 
-          this->instance_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+nodeExecParameter_next (Type const&);
 
-        virtual void
-        instance_next (Type const&);
+virtual void
+nodeExecParameter_post (Type &o)
+{
 
-        virtual void 
-        instance_post (Type &o)
-        {
+this->nodeExecParameter_post (const_cast <Type const &> (o));
+}
 
-          this->instance_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+nodeExecParameter_post (Type const&);
 
-        virtual void
-        instance_post (Type const&);
+virtual void
+componentExecParameter_pre (Type &o)
+{
 
-        virtual void 
-        connection_pre (Type &o)
-        {
+this->componentExecParameter_pre (const_cast <Type const &> (o));
+}
 
-          this->connection_pre (const_cast <Type const &> (o));
-        }
 
+virtual void
+componentExecParameter_pre (Type const&);
 
-        virtual void
-        connection_pre (Type const&);
+virtual void
+componentExecParameter_next (Type &o)
+{
 
-        virtual void 
-        connection_next (Type &o)
-        {
+this->componentExecParameter_next (const_cast <Type const &> (o));
+}
 
-          this->connection_next (const_cast <Type const &> (o));
-        }
 
+virtual void
+componentExecParameter_next (Type const&);
 
-        virtual void
-        connection_next (Type const&);
+virtual void
+componentExecParameter_post (Type &o)
+{
 
-        virtual void 
-        connection_post (Type &o)
-        {
+this->componentExecParameter_post (const_cast <Type const &> (o));
+}
 
-          this->connection_post (const_cast <Type const &> (o));
-        }
 
+virtual void
+componentExecParameter_post (Type const&);
 
-        virtual void
-        connection_post (Type const&);
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-        virtual void 
-        externalProperty (Type &o)
-        {
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
-          this->externalProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        externalProperty (Type const&);
+virtual void
+deployRequirement_next (Type &o)
+{
 
-        protected:
-        ComponentAssemblyDescription ();
-      };
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
-      struct MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
-        MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+deployRequirement_next (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+deployRequirement_post (Type &o)
+{
 
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
-        virtual void
-        traverse (Type const&);
 
-        virtual void 
-        execParameter (Type &o)
-        {
+virtual void
+deployRequirement_post (Type const&);
 
-          this->execParameter (const_cast <Type const &> (o));
-        }
+virtual void
+primaryArtifact_pre (Type &o)
+{
 
+this->primaryArtifact_pre (const_cast <Type const &> (o));
+}
 
-        virtual void
-        execParameter (Type const&);
 
-        virtual void 
-        primaryArtifact_pre (Type &o)
-        {
+virtual void
+primaryArtifact_pre (Type const&);
 
-          this->primaryArtifact_pre (const_cast <Type const &> (o));
-        }
+virtual void
+primaryArtifact_next (Type &o)
+{
 
+this->primaryArtifact_next (const_cast <Type const &> (o));
+}
 
-        virtual void
-        primaryArtifact_pre (Type const&);
 
-        virtual void 
-        primaryArtifact_next (Type &o)
-        {
+virtual void
+primaryArtifact_next (Type const&);
 
-          this->primaryArtifact_next (const_cast <Type const &> (o));
-        }
+virtual void
+primaryArtifact_post (Type &o)
+{
 
+this->primaryArtifact_post (const_cast <Type const &> (o));
+}
 
-        virtual void
-        primaryArtifact_next (Type const&);
 
-        virtual void 
-        primaryArtifact_post (Type &o)
-        {
+virtual void
+primaryArtifact_post (Type const&);
 
-          this->primaryArtifact_post (const_cast <Type const &> (o));
-        }
+protected:
+MonolithicImplementationDescription ();
+};
 
+struct ComponentImplementationDescription : Traversal::ComponentImplementationDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
+ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
-        primaryArtifact_post (Type const&);
+virtual void
+traverse (Type &o)
+{
 
-        virtual void 
-        deployRequirement (Type &o)
-        {
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->deployRequirement (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+label (Type &o)
+{
 
-        protected:
-        MonolithicImplementationDescription ();
-      };
+this->label (const_cast <Type const &> (o));
+}
 
-      struct ComponentImplementationDescription : Traversal::ComponentImplementationDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
-        ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+label (Type const&);
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+UUID (Type &o)
+{
 
+this->UUID (const_cast <Type const &> (o));
+}
 
-        virtual void
-        traverse (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+UUID (Type const&);
 
-          this->label (const_cast <Type const &> (o));
-        }
+virtual void
+implements (Type &o)
+{
 
+this->implements (const_cast <Type const &> (o));
+}
 
-        virtual void
-        label (Type const&);
 
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+implements (Type const&);
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+virtual void
+assemblyImpl (Type &o)
+{
 
+this->assemblyImpl (const_cast <Type const &> (o));
+}
 
-        virtual void
-        UUID (Type const&);
 
-        virtual void 
-        implements (Type &o)
-        {
+virtual void
+assemblyImpl (Type const&);
 
-          this->implements (const_cast <Type const &> (o));
-        }
+virtual void
+monolithicImpl (Type &o)
+{
 
+this->monolithicImpl (const_cast <Type const &> (o));
+}
 
-        virtual void
-        implements (Type const&);
 
-        virtual void 
-        assemblyImpl (Type &o)
-        {
+virtual void
+monolithicImpl (Type const&);
 
-          this->assemblyImpl (const_cast <Type const &> (o));
-        }
+virtual void
+configProperty_pre (Type &o)
+{
 
+this->configProperty_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_pre (Type const&);
+
+virtual void
+configProperty_next (Type &o)
+{
+
+this->configProperty_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_next (Type const&);
+
+virtual void
+configProperty_post (Type &o)
+{
+
+this->configProperty_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+configProperty_post (Type const&);
+
+virtual void
+capability_pre (Type &o)
+{
+
+this->capability_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+capability_pre (Type const&);
+
+virtual void
+capability_next (Type &o)
+{
+
+this->capability_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+capability_next (Type const&);
+
+virtual void
+capability_post (Type &o)
+{
+
+this->capability_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+capability_post (Type const&);
+
+virtual void
+dependsOn_pre (Type &o)
+{
+
+this->dependsOn_pre (const_cast <Type const &> (o));
+}
 
-        virtual void
-        assemblyImpl (Type const&);
 
-        virtual void 
-        monolithicImpl (Type &o)
-        {
+virtual void
+dependsOn_pre (Type const&);
 
-          this->monolithicImpl (const_cast <Type const &> (o));
-        }
+virtual void
+dependsOn_next (Type &o)
+{
 
+this->dependsOn_next (const_cast <Type const &> (o));
+}
 
-        virtual void
-        monolithicImpl (Type const&);
 
-        virtual void 
-        configProperty (Type &o)
-        {
+virtual void
+dependsOn_next (Type const&);
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
+virtual void
+dependsOn_post (Type &o)
+{
+
+this->dependsOn_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-        virtual void 
-        capability (Type &o)
-        {
+virtual void
+infoProperty_pre (Type &o)
+{
 
-          this->capability (const_cast <Type const &> (o));
-        }
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        capability (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void 
-        dependsOn (Type &o)
-        {
+virtual void
+infoProperty_next (Type &o)
+{
 
-          this->dependsOn (const_cast <Type const &> (o));
-        }
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        dependsOn (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void 
-        infoProperty (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void 
-        contentLocation (Type &o)
-        {
+virtual void
+contentLocation (Type &o)
+{
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
+this->contentLocation (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void 
-        href (Type &o)
-        {
+virtual void
+href (Type &o)
+{
 
-          this->href (const_cast <Type const &> (o));
-        }
+this->href (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        href (Type const&);
+virtual void
+href (Type const&);
 
-        protected:
-        ComponentImplementationDescription ();
-      };
-    }
-  }
+protected:
+ComponentImplementationDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CID_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/cpd.cpp b/TAO/CIAO/tools/Config_Handlers/cpd.cpp
index f4e49fad6de..234843d14d4 100644
--- a/TAO/CIAO/tools/Config_Handlers/cpd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cpd.cpp
@@ -3,29 +3,29 @@
  *
  * 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 "cpd.hpp"
 
+#include "cpd.hpp"
+#include <iostream>
 namespace CIAO
 {
   namespace Config_Handlers
   {
     // PackagedComponentImplementation
-    // 
+    //
 
     PackagedComponentImplementation::
     PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
                                      ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+        referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
+        regulator__ ()
     {
       name_->container (this);
       referencedImplementation_->container (this);
@@ -33,984 +33,1236 @@ namespace CIAO
 
     PackagedComponentImplementation::
     PackagedComponentImplementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (*s.referencedImplementation_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedImplementation_->container (this);
-    }
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (*s.referencedImplementation_)),
+regulator__ ()
+{
+name_->container (this);
+referencedImplementation_->container (this);
+}
 
-    ::CIAO::Config_Handlers::PackagedComponentImplementation& PackagedComponentImplementation::
-    operator= (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
-    {
-      name (s.name ());
+::CIAO::Config_Handlers::PackagedComponentImplementation& PackagedComponentImplementation::
+operator= (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
+{
+name (s.name ());
 
-      referencedImplementation (s.referencedImplementation ());
+referencedImplementation (s.referencedImplementation ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // PackagedComponentImplementation
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& PackagedComponentImplementation::
-    name () const
-    {
-      return *name_;
-    }
+// PackagedComponentImplementation
+//
+::XMLSchema::string< ACE_TCHAR > const& PackagedComponentImplementation::
+name () const
+{
+return *name_;
+}
 
-    void PackagedComponentImplementation::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void PackagedComponentImplementation::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // PackagedComponentImplementation
-    // 
-    ::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
-    referencedImplementation () const
-    {
-      return *referencedImplementation_;
-    }
+// PackagedComponentImplementation
+//
+::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
+referencedImplementation () const
+{
+return *referencedImplementation_;
+}
 
-    void PackagedComponentImplementation::
-    referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& e)
-    {
-      *referencedImplementation_ = e;
-    }
+void PackagedComponentImplementation::
+referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& e)
+{
+*referencedImplementation_ = e;
+}
 
 
-    // ComponentPackageDescription
-    // 
+// ComponentPackageDescription
+//
 
-    ComponentPackageDescription::
-    ComponentPackageDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+ComponentPackageDescription::
+ComponentPackageDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-    ComponentPackageDescription::
-    ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
-    :
-    ::XSCRT::Type (),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    implementation_ (s.implementation_.get () ? new ::CIAO::Config_Handlers::PackagedComponentImplementation (*s.implementation_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      if (realizes_.get ()) realizes_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (implementation_.get ()) implementation_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-      if (href_.get ()) href_->container (this);
-    }
+ComponentPackageDescription::
+ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
+:
+::XSCRT::Type (),
+label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
+contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+regulator__ ()
+{
+if (label_.get ()) label_->container (this);
+if (UUID_.get ()) UUID_->container (this);
+if (realizes_.get ()) realizes_->container (this);
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-    ::CIAO::Config_Handlers::ComponentPackageDescription& ComponentPackageDescription::
-    operator= (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
-    {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+{
+for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
+}
 
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-      if (s.realizes_.get ()) realizes (*(s.realizes_));
-      else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
+if (contentLocation_.get ()) contentLocation_->container (this);
+if (href_.get ()) href_->container (this);
+}
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+::CIAO::Config_Handlers::ComponentPackageDescription& ComponentPackageDescription::
+operator= (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
+{
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.implementation_.get ()) implementation (*(s.implementation_));
-      else implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > (0);
+if (s.UUID_.get ()) UUID (*(s.UUID_));
+else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+if (s.realizes_.get ()) realizes (*(s.realizes_));
+else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+configProperty_.clear ();
+{
+for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+}
 
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+implementation_.clear ();
+{
+for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i);
+}
 
-      return *this;
-    }
+infoProperty_.clear ();
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
+if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+if (s.href_.get ()) href (*(s.href_));
+else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    label () const
-    {
-      return *label_;
-    }
+return *this;
+}
 
-    void ComponentPackageDescription::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+label () const
+{
+return *label_;
+}
 
-    void ComponentPackageDescription::
-    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
-    }
+void ComponentPackageDescription::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    realizes_p () const
-    {
-      return realizes_.get () != 0;
-    }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageDescription::
-    realizes () const
-    {
-      return *realizes_;
-    }
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+UUID_p () const
+{
+return UUID_.get () != 0;
+}
 
-    void ComponentPackageDescription::
-    realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
-    {
-      if (realizes_.get ())
-      {
-        *realizes_ = e;
-      }
-
-      else
-      {
-        realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-        realizes_->container (this);
-      }
-    }
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+UUID () const
+{
+return *UUID_;
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
+void ComponentPackageDescription::
+UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (UUID_.get ())
+{
+*UUID_ = e;
+}
 
-    ::CIAO::Config_Handlers::Property const& ComponentPackageDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
+else
+{
+UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+UUID_->container (this);
+}
+}
 
-    void ComponentPackageDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
-
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+realizes_p () const
+{
+return realizes_.get () != 0;
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    implementation_p () const
-    {
-      return implementation_.get () != 0;
-    }
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageDescription::
+realizes () const
+{
+return *realizes_;
+}
 
-    ::CIAO::Config_Handlers::PackagedComponentImplementation const& ComponentPackageDescription::
-    implementation () const
-    {
-      return *implementation_;
-    }
+void ComponentPackageDescription::
+realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+{
+if (realizes_.get ())
+{
+*realizes_ = e;
+}
 
-    void ComponentPackageDescription::
-    implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& e)
-    {
-      if (implementation_.get ())
-      {
-        *implementation_ = e;
-      }
-
-      else
-      {
-        implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > (new ::CIAO::Config_Handlers::PackagedComponentImplementation (e));
-        implementation_->container (this);
-      }
-    }
+else
+{
+realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+realizes_->container (this);
+}
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+// ComponentPackageDescription
+//
+ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
+begin_configProperty ()
+{
+return configProperty_.begin ();
+}
 
-    ::CIAO::Config_Handlers::Property const& ComponentPackageDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
+ComponentPackageDescription::configProperty_iterator ComponentPackageDescription::
+end_configProperty ()
+{
+return configProperty_.end ();
+}
 
-    void ComponentPackageDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
+ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
+begin_configProperty () const
+{
+return configProperty_.begin ();
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
+ComponentPackageDescription::configProperty_const_iterator ComponentPackageDescription::
+end_configProperty () const
+{
+return configProperty_.end ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
+void ComponentPackageDescription::
+add_configProperty (::CIAO::Config_Handlers::Property const& e)
+{
+configProperty_.push_back (e);
+}
 
-    void ComponentPackageDescription::
-    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
-
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
-      }
-    }
+size_t ComponentPackageDescription::
+count_configProperty(void) const
+{
+return configProperty_.size ();
+}
 
-    // ComponentPackageDescription
-    // 
-    bool ComponentPackageDescription::
-    href_p () const
-    {
-      return href_.get () != 0;
-    }
+// ComponentPackageDescription
+//
+ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
+begin_implementation ()
+{
+return implementation_.begin ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
-    href () const
-    {
-      return *href_;
-    }
+ComponentPackageDescription::implementation_iterator ComponentPackageDescription::
+end_implementation ()
+{
+return implementation_.end ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR >& ComponentPackageDescription::
-    href ()
-    {
-      return *href_;
-    }
+ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
+begin_implementation () const
+{
+return implementation_.begin ();
+}
 
-    void ComponentPackageDescription::
-    href (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (href_.get ())
-      {
-        *href_ = e;
-      }
-
-      else
-      {
-        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        href_->container (this);
-      }
-    }
-  }
+ComponentPackageDescription::implementation_const_iterator ComponentPackageDescription::
+end_implementation () const
+{
+return implementation_.end ();
+}
+
+void ComponentPackageDescription::
+add_implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& e)
+{
+implementation_.push_back (e);
+}
+
+size_t ComponentPackageDescription::
+count_implementation(void) const
+{
+return implementation_.size ();
+}
+
+// ComponentPackageDescription
+//
+ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
+begin_infoProperty ()
+{
+return infoProperty_.begin ();
+}
+
+ComponentPackageDescription::infoProperty_iterator ComponentPackageDescription::
+end_infoProperty ()
+{
+return infoProperty_.end ();
+}
+
+ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
+begin_infoProperty () const
+{
+return infoProperty_.begin ();
+}
+
+ComponentPackageDescription::infoProperty_const_iterator ComponentPackageDescription::
+end_infoProperty () const
+{
+return infoProperty_.end ();
+}
+
+void ComponentPackageDescription::
+add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+{
+infoProperty_.push_back (e);
+}
+
+size_t ComponentPackageDescription::
+count_infoProperty(void) const
+{
+return infoProperty_.size ();
+}
+
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+contentLocation_p () const
+{
+return contentLocation_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+contentLocation () const
+{
+return *contentLocation_;
+}
+
+void ComponentPackageDescription::
+contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (contentLocation_.get ())
+{
+*contentLocation_ = e;
+}
+
+else
+{
+contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+contentLocation_->container (this);
+}
+}
+
+// ComponentPackageDescription
+//
+bool ComponentPackageDescription::
+href_p () const
+{
+return href_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+href () const
+{
+return *href_;
+}
+
+::XMLSchema::string< ACE_TCHAR >& ComponentPackageDescription::
+href ()
+{
+return *href_;
+}
+
+void ComponentPackageDescription::
+href (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (href_.get ())
+{
+*href_ = e;
+}
+
+else
+{
+href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+href_->container (this);
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    // PackagedComponentImplementation
-    //
+namespace Config_Handlers
+{
+// PackagedComponentImplementation
+//
 
-    PackagedComponentImplementation::
-    PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+PackagedComponentImplementation::
+PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
-
-        else if (n == "referencedImplementation")
-        {
-          referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e));
-          referencedImplementation_->container (this);
-        }
-
-        else 
-        {
-        }
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    // ComponentPackageDescription
-    //
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-    ComponentPackageDescription::
-    ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
-
-        else if (n == "realizes")
-        {
-          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-          realizes (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
-
-        else if (n == "implementation")
-        {
-          ::CIAO::Config_Handlers::PackagedComponentImplementation t (e);
-          implementation (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "href")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (a);
-          href (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
+else if (n == "referencedImplementation")
+{
+referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e));
+referencedImplementation_->container (this);
+}
+
+else
+{
+}
+}
+}
+
+// ComponentPackageDescription
+//
+
+ComponentPackageDescription::
+ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
+
+else if (n == "UUID")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+UUID (t);
+}
+
+else if (n == "realizes")
+{
+::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+realizes (t);
+}
+
+else if (n == "configProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_configProperty (t);
+}
+
+else if (n == "implementation")
+{
+::CIAO::Config_Handlers::PackagedComponentImplementation t (e);
+add_implementation (t);
+}
+
+else if (n == "infoProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_infoProperty (t);
+}
+
+else if (n == "contentLocation")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+contentLocation (t);
+}
+
+else
+{
+}
+}
+
+while (p.more_attributes ())
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+if (n == "href")
+{
+::XMLSchema::string< ACE_TCHAR > t (a);
+href (t);
+}
+
+else
+{
+}
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct PackagedComponentImplementationTypeInfoInitializer
-      {
-        PackagedComponentImplementationTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PackagedComponentImplementation));
-          ::XSCRT::ExtendedTypeInfo nf (id);
-
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
-
-      PackagedComponentImplementationTypeInfoInitializer PackagedComponentImplementationTypeInfoInitializer_;
-
-      struct ComponentPackageDescriptionTypeInfoInitializer
-      {
-        ComponentPackageDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPackageDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
-
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
-
-      ComponentPackageDescriptionTypeInfoInitializer ComponentPackageDescriptionTypeInfoInitializer_;
-    }
-  }
+namespace Config_Handlers
+{
+namespace
+{
+::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+
+struct PackagedComponentImplementationTypeInfoInitializer
+{
+PackagedComponentImplementationTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (PackagedComponentImplementation));
+::XSCRT::ExtendedTypeInfo nf (id);
+
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
+
+PackagedComponentImplementationTypeInfoInitializer PackagedComponentImplementationTypeInfoInitializer_;
+
+struct ComponentPackageDescriptionTypeInfoInitializer
+{
+ComponentPackageDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ComponentPackageDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
+
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
+
+ComponentPackageDescriptionTypeInfoInitializer ComponentPackageDescriptionTypeInfoInitializer_;
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // PackagedComponentImplementation
-      //
-      //
-
-      void PackagedComponentImplementation::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        referencedImplementation (o);
-        post (o);
-      }
-
-      void PackagedComponentImplementation::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        referencedImplementation (o);
-        post (o);
-      }
-
-      void PackagedComponentImplementation::
-      pre (Type&)
-      {
-      }
-
-      void PackagedComponentImplementation::
-      pre (Type const&)
-      {
-      }
-
-      void PackagedComponentImplementation::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void PackagedComponentImplementation::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void PackagedComponentImplementation::
-      referencedImplementation (Type& o)
-      {
-        dispatch (o.referencedImplementation ());
-      }
-
-      void PackagedComponentImplementation::
-      referencedImplementation (Type const& o)
-      {
-        dispatch (o.referencedImplementation ());
-      }
-
-      void PackagedComponentImplementation::
-      post (Type&)
-      {
-      }
-
-      void PackagedComponentImplementation::
-      post (Type const&)
-      {
-      }
-
-      // ComponentPackageDescription
-      //
-      //
-
-      void ComponentPackageDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.realizes_p ()) realizes (o);
-        else realizes_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.implementation_p ()) implementation (o);
-        else implementation_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
-
-      void ComponentPackageDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.realizes_p ()) realizes (o);
-        else realizes_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.implementation_p ()) implementation (o);
-        else implementation_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
-
-      void ComponentPackageDescription::
-      pre (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentPackageDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentPackageDescription::
-      label_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      label_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentPackageDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentPackageDescription::
-      UUID_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      UUID_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      realizes (Type& o)
-      {
-        dispatch (o.realizes ());
-      }
-
-      void ComponentPackageDescription::
-      realizes (Type const& o)
-      {
-        dispatch (o.realizes ());
-      }
-
-      void ComponentPackageDescription::
-      realizes_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      realizes_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentPackageDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentPackageDescription::
-      configProperty_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type const& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void ComponentPackageDescription::
-      implementation_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      implementation_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ComponentPackageDescription::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentPackageDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentPackageDescription::
-      contentLocation_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      contentLocation_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      href (Type& o)
-      {
-        dispatch (o.href ());
-      }
-
-      void ComponentPackageDescription::
-      href (Type const& o)
-      {
-        dispatch (o.href ());
-      }
-
-      void ComponentPackageDescription::
-      href_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      href_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      post (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
+namespace Config_Handlers
+{
+namespace Traversal
+{
+// PackagedComponentImplementation
+//
+//
+
+void PackagedComponentImplementation::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+referencedImplementation (o);
+post (o);
+}
+
+void PackagedComponentImplementation::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+referencedImplementation (o);
+post (o);
+}
+
+void PackagedComponentImplementation::
+pre (Type&)
+{
+}
+
+void PackagedComponentImplementation::
+pre (Type const&)
+{
+}
+
+void PackagedComponentImplementation::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void PackagedComponentImplementation::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void PackagedComponentImplementation::
+referencedImplementation (Type& o)
+{
+dispatch (o.referencedImplementation ());
+}
+
+void PackagedComponentImplementation::
+referencedImplementation (Type const& o)
+{
+dispatch (o.referencedImplementation ());
+}
+
+void PackagedComponentImplementation::
+post (Type&)
+{
+}
+
+void PackagedComponentImplementation::
+post (Type const&)
+{
+}
+
+// ComponentPackageDescription
+//
+//
+
+void ComponentPackageDescription::
+traverse (Type& o)
+{
+pre (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+if (o.realizes_p ()) realizes (o);
+else realizes_none (o);
+configProperty (o);
+implementation (o);
+infoProperty (o);
+if (o.contentLocation_p ()) contentLocation (o);
+else contentLocation_none (o);
+if (o.href_p ()) href (o);
+else href_none (o);
+post (o);
+}
+
+void ComponentPackageDescription::
+traverse (Type const& o)
+{
+pre (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+if (o.realizes_p ()) realizes (o);
+else realizes_none (o);
+configProperty (o);
+implementation (o);
+infoProperty (o);
+if (o.contentLocation_p ()) contentLocation (o);
+else contentLocation_none (o);
+if (o.href_p ()) href (o);
+else href_none (o);
+post (o);
+}
+
+void ComponentPackageDescription::
+pre (Type&)
+{
+}
+
+void ComponentPackageDescription::
+pre (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+label (Type& o)
+{
+dispatch (o.label ());
+}
+
+void ComponentPackageDescription::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
+
+void ComponentPackageDescription::
+label_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+label_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+UUID (Type& o)
+{
+dispatch (o.UUID ());
+}
+
+void ComponentPackageDescription::
+UUID (Type const& o)
+{
+dispatch (o.UUID ());
+}
+
+void ComponentPackageDescription::
+UUID_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+UUID_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+realizes (Type& o)
+{
+dispatch (o.realizes ());
+}
+
+void ComponentPackageDescription::
+realizes (Type const& o)
+{
+dispatch (o.realizes ());
+}
+
+void ComponentPackageDescription::
+realizes_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+realizes_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPackageDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
+
+configProperty_post (o);
+}
+
+else configProperty_none (o);
+}
+
+void ComponentPackageDescription::
+configProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPackageDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+if (b != e)
+{
+configProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) configProperty_next (o);
+}
+
+configProperty_post (o);
+}
+
+else configProperty_none (o);
+}
+
+void ComponentPackageDescription::
+configProperty_pre (Type&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty_pre (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty_next (Type&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty_next (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty_post (Type&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty_post (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+configProperty_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+implementation (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPackageDescription::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
+
+if (b != e)
+{
+implementation_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) implementation_next (o);
+}
+
+implementation_post (o);
+}
+
+else implementation_none (o);
+}
+
+void ComponentPackageDescription::
+implementation (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPackageDescription::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
+
+if (b != e)
+{
+implementation_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) implementation_next (o);
+}
+
+implementation_post (o);
+}
+
+else implementation_none (o);
+}
+
+void ComponentPackageDescription::
+implementation_pre (Type&)
+{
+}
+
+void ComponentPackageDescription::
+implementation_pre (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+implementation_next (Type&)
+{
+}
+
+void ComponentPackageDescription::
+implementation_next (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+implementation_post (Type&)
+{
+}
+
+void ComponentPackageDescription::
+implementation_post (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+implementation_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+implementation_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPackageDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
+
+infoProperty_post (o);
+}
+
+else infoProperty_none (o);
+}
+
+void ComponentPackageDescription::
+infoProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ComponentPackageDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
+
+infoProperty_post (o);
+}
+
+else infoProperty_none (o);
+}
+
+void ComponentPackageDescription::
+infoProperty_pre (Type&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty_pre (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty_next (Type&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty_next (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty_post (Type&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty_post (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+infoProperty_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+contentLocation (Type& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ComponentPackageDescription::
+contentLocation (Type const& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ComponentPackageDescription::
+contentLocation_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+contentLocation_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+href (Type& o)
+{
+dispatch (o.href ());
+}
+
+void ComponentPackageDescription::
+href (Type const& o)
+{
+dispatch (o.href ());
+}
+
+void ComponentPackageDescription::
+href_none (Type&)
+{
+}
+
+void ComponentPackageDescription::
+href_none (Type const&)
+{
+}
+
+void ComponentPackageDescription::
+post (Type&)
+{
+}
+
+void ComponentPackageDescription::
+post (Type const&)
+{
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // PackagedComponentImplementation
-      //
-      //
-
-      PackagedComponentImplementation::
-      PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
-
-      PackagedComponentImplementation::
-      PackagedComponentImplementation ()
-      {
-      }
-
-      void PackagedComponentImplementation::
-      traverse (Type const& o)
-      {
-        Traversal::PackagedComponentImplementation::traverse (o);
-      }
-
-      void PackagedComponentImplementation::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::PackagedComponentImplementation::name (o);
-        pop_ ();
-      }
-
-      void PackagedComponentImplementation::
-      referencedImplementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedImplementation", top_ ()));
-        Traversal::PackagedComponentImplementation::referencedImplementation (o);
-        pop_ ();
-      }
-
-      // ComponentPackageDescription
-      //
-      //
-
-      ComponentPackageDescription::
-      ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
-
-      ComponentPackageDescription::
-      ComponentPackageDescription ()
-      {
-      }
-
-      void ComponentPackageDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPackageDescription::traverse (o);
-      }
-
-      void ComponentPackageDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::ComponentPackageDescription::label (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-        Traversal::ComponentPackageDescription::UUID (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      realizes (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("realizes", top_ ()));
-        Traversal::ComponentPackageDescription::realizes (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::ComponentPackageDescription::configProperty (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
-        Traversal::ComponentPackageDescription::implementation (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::ComponentPackageDescription::infoProperty (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
-        Traversal::ComponentPackageDescription::contentLocation (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      href (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-        attr_ (&a);
-        Traversal::ComponentPackageDescription::href (o);
-        attr_ (0);
-      }
-    }
-  }
+namespace Config_Handlers
+{
+namespace Writer
+{
+// PackagedComponentImplementation
+//
+//
+
+PackagedComponentImplementation::
+PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+PackagedComponentImplementation::
+PackagedComponentImplementation ()
+{
+}
+
+void PackagedComponentImplementation::
+traverse (Type const& o)
+{
+Traversal::PackagedComponentImplementation::traverse (o);
+}
+
+void PackagedComponentImplementation::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::PackagedComponentImplementation::name (o);
+pop_ ();
+}
+
+void PackagedComponentImplementation::
+referencedImplementation (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedImplementation", top_ ()));
+Traversal::PackagedComponentImplementation::referencedImplementation (o);
+pop_ ();
+}
+
+// ComponentPackageDescription
+//
+//
+
+ComponentPackageDescription::
+ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+ComponentPackageDescription::
+ComponentPackageDescription ()
+{
+}
+
+void ComponentPackageDescription::
+traverse (Type const& o)
+{
+Traversal::ComponentPackageDescription::traverse (o);
+}
+
+void ComponentPackageDescription::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::ComponentPackageDescription::label (o);
+pop_ ();
+}
+
+void ComponentPackageDescription::
+UUID (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+Traversal::ComponentPackageDescription::UUID (o);
+pop_ ();
+}
+
+void ComponentPackageDescription::
+realizes (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("realizes", top_ ()));
+Traversal::ComponentPackageDescription::realizes (o);
+pop_ ();
+}
+
+void ComponentPackageDescription::
+configProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
+}
+
+void ComponentPackageDescription::
+configProperty_next (Type const& o)
+{
+configProperty_post (o);
+configProperty_pre (o);
+}
+
+void ComponentPackageDescription::
+configProperty_post (Type const&)
+{
+pop_ ();
+}
+
+void ComponentPackageDescription::
+implementation_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
+}
+
+void ComponentPackageDescription::
+implementation_next (Type const& o)
+{
+implementation_post (o);
+implementation_pre (o);
+}
+
+void ComponentPackageDescription::
+implementation_post (Type const&)
+{
+pop_ ();
+}
+
+void ComponentPackageDescription::
+infoProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+}
+
+void ComponentPackageDescription::
+infoProperty_next (Type const& o)
+{
+infoProperty_post (o);
+infoProperty_pre (o);
+}
+
+void ComponentPackageDescription::
+infoProperty_post (Type const&)
+{
+pop_ ();
+}
+
+void ComponentPackageDescription::
+contentLocation (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
+Traversal::ComponentPackageDescription::contentLocation (o);
+pop_ ();
+}
+
+void ComponentPackageDescription::
+href (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+attr_ (&a);
+Traversal::ComponentPackageDescription::href (o);
+attr_ (0);
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cpd.hpp b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
index 5fc156ff616..d8418345115 100644
--- a/TAO/CIAO/tools/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,11 +27,11 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class PackagedComponentImplementation;
-    class ComponentPackageDescription;
-  }
+namespace Config_Handlers
+{
+class PackagedComponentImplementation;
+class ComponentPackageDescription;
+}
 }
 
 #include <memory>
@@ -44,483 +44,618 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export PackagedComponentImplementation : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // referencedImplementation
-      // 
-      public:
-      ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
-      void referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > referencedImplementation_;
-
-      public:
-      PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                       ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__);
-
-      PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      PackagedComponentImplementation (PackagedComponentImplementation const& s);
-
-      PackagedComponentImplementation&
-      operator= (PackagedComponentImplementation const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ComponentPackageDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // realizes
-      // 
-      public:
-      bool realizes_p () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
-      void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // implementation
-      // 
-      public:
-      bool implementation_p () const;
-      ::CIAO::Config_Handlers::PackagedComponentImplementation const& implementation () const;
-      void implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      // 
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-      // href
-      // 
-      public:
-      bool href_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& href () const;
-      ::XMLSchema::string< ACE_TCHAR >& href ();
-      void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-      public:
-      ComponentPackageDescription ();
-
-      ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentPackageDescription (ComponentPackageDescription const& s);
-
-      ComponentPackageDescription&
-      operator= (ComponentPackageDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export PackagedComponentImplementation : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// referencedImplementation
+//
+public:
+::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
+void referencedImplementation (::CIAO::Config_Handlers::ComponentImplementationDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > referencedImplementation_;
+
+public:
+PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__);
+
+PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const&);
+PackagedComponentImplementation (PackagedComponentImplementation const& s);
+
+PackagedComponentImplementation&
+operator= (PackagedComponentImplementation const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ComponentPackageDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// realizes
+//
+public:
+bool realizes_p () const;
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
+void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
+
+// configProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+configProperty_iterator begin_configProperty ();
+configProperty_iterator end_configProperty ();
+configProperty_const_iterator begin_configProperty () const;
+configProperty_const_iterator end_configProperty () const;
+void add_configProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_configProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+// implementation
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation >::iterator implementation_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation >::const_iterator implementation_const_iterator;
+implementation_iterator begin_implementation ();
+implementation_iterator end_implementation ();
+implementation_const_iterator begin_implementation () const;
+implementation_const_iterator end_implementation () const;
+void add_implementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& );
+size_t count_implementation (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
+
+// infoProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+infoProperty_iterator begin_infoProperty ();
+infoProperty_iterator end_infoProperty ();
+infoProperty_const_iterator begin_infoProperty () const;
+infoProperty_const_iterator end_infoProperty () const;
+void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_infoProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+// contentLocation
+//
+public:
+bool contentLocation_p () const;
+::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+// href
+//
+public:
+bool href_p () const;
+::XMLSchema::string< ACE_TCHAR > const& href () const;
+::XMLSchema::string< ACE_TCHAR >& href ();
+void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+public:
+ComponentPackageDescription ();
+
+ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentPackageDescription (ComponentPackageDescription const& s);
+
+ComponentPackageDescription&
+operator= (ComponentPackageDescription const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export PackagedComponentImplementation : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackagedComponentImplementation >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export PackagedComponentImplementation : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackagedComponentImplementation >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+name (Type&);
+
+virtual void
+name (Type const&);
+
+virtual void
+referencedImplementation (Type&);
+
+virtual void
+referencedImplementation (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+label (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+label (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        referencedImplementation (Type&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        referencedImplementation (Type const&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+realizes (Type&);
 
-      struct XSC_XML_Handlers_Export ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+realizes (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+realizes_none (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+realizes_none (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+configProperty (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+configProperty (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+configProperty_pre (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+configProperty_next (Type&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+configProperty_post (Type&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+configProperty_none (Type&);
 
-        virtual void
-        realizes (Type&);
+virtual void
+configProperty_none (Type const&);
 
-        virtual void
-        realizes (Type const&);
+virtual void
+implementation (Type&);
 
-        virtual void
-        realizes_none (Type&);
+virtual void
+implementation (Type const&);
 
-        virtual void
-        realizes_none (Type const&);
+virtual void
+implementation_pre (Type&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+implementation_pre (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+implementation_next (Type&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+implementation_next (Type const&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+implementation_post (Type&);
 
-        virtual void
-        implementation (Type&);
+virtual void
+implementation_post (Type const&);
 
-        virtual void
-        implementation (Type const&);
+virtual void
+implementation_none (Type&);
 
-        virtual void
-        implementation_none (Type&);
+virtual void
+implementation_none (Type const&);
 
-        virtual void
-        implementation_none (Type const&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        href (Type&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        href (Type const&);
+virtual void
+contentLocation (Type&);
 
-        virtual void
-        href_none (Type&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void
-        href_none (Type const&);
+virtual void
+contentLocation_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+contentLocation_none (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+href (Type&);
+
+virtual void
+href (Type const&);
+
+virtual void
+href_none (Type&);
+
+virtual void
+href_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct PackagedComponentImplementation : Traversal::PackagedComponentImplementation, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::PackagedComponentImplementation Type;
-        PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct PackagedComponentImplementation : Traversal::PackagedComponentImplementation,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::PackagedComponentImplementation Type;
+PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        name (Type &o)
-        {
+virtual void
+name (Type &o)
+{
 
-          this->name (const_cast <Type const &> (o));
-        }
+this->name (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        name (Type const&);
+virtual void
+name (Type const&);
 
-        virtual void 
-        referencedImplementation (Type &o)
-        {
+virtual void
+referencedImplementation (Type &o)
+{
 
-          this->referencedImplementation (const_cast <Type const &> (o));
-        }
+this->referencedImplementation (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        referencedImplementation (Type const&);
+virtual void
+referencedImplementation (Type const&);
 
-        protected:
-        PackagedComponentImplementation ();
-      };
+protected:
+PackagedComponentImplementation ();
+};
 
-      struct ComponentPackageDescription : Traversal::ComponentPackageDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
-        ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+struct ComponentPackageDescription : Traversal::ComponentPackageDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
+ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
 
-          this->traverse (const_cast <Type const &> (o));
-        }
 
+virtual void
+traverse (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+label (Type &o)
+{
 
-        virtual void 
-        label (Type &o)
-        {
+this->label (const_cast <Type const &> (o));
+}
 
-          this->label (const_cast <Type const &> (o));
-        }
 
+virtual void
+label (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+UUID (Type &o)
+{
 
-        virtual void 
-        UUID (Type &o)
-        {
+this->UUID (const_cast <Type const &> (o));
+}
 
-          this->UUID (const_cast <Type const &> (o));
-        }
 
+virtual void
+UUID (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+realizes (Type &o)
+{
 
-        virtual void 
-        realizes (Type &o)
-        {
+this->realizes (const_cast <Type const &> (o));
+}
 
-          this->realizes (const_cast <Type const &> (o));
-        }
 
+virtual void
+realizes (Type const&);
 
-        virtual void
-        realizes (Type const&);
+virtual void
+configProperty_pre (Type &o)
+{
 
-        virtual void 
-        configProperty (Type &o)
-        {
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+configProperty_next (Type &o)
+{
 
-        virtual void 
-        implementation (Type &o)
-        {
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
-          this->implementation (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        implementation (Type const&);
+virtual void
+configProperty_post (Type &o)
+{
 
-        virtual void 
-        infoProperty (Type &o)
-        {
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+implementation_pre (Type &o)
+{
 
-        virtual void 
-        contentLocation (Type &o)
-        {
+this->implementation_pre (const_cast <Type const &> (o));
+}
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
 
+virtual void
+implementation_pre (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+implementation_next (Type &o)
+{
 
-        virtual void 
-        href (Type &o)
-        {
+this->implementation_next (const_cast <Type const &> (o));
+}
 
-          this->href (const_cast <Type const &> (o));
-        }
 
+virtual void
+implementation_next (Type const&);
 
-        virtual void
-        href (Type const&);
+virtual void
+implementation_post (Type &o)
+{
 
-        protected:
-        ComponentPackageDescription ();
-      };
-    }
-  }
+this->implementation_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+implementation_post (Type const&);
+
+virtual void
+infoProperty_pre (Type &o)
+{
+
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+infoProperty_pre (Type const&);
+
+virtual void
+infoProperty_next (Type &o)
+{
+
+this->infoProperty_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+infoProperty_next (Type const&);
+
+virtual void
+infoProperty_post (Type &o)
+{
+
+this->infoProperty_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+infoProperty_post (Type const&);
+
+virtual void
+contentLocation (Type &o)
+{
+
+this->contentLocation (const_cast <Type const &> (o));
+}
+
+
+virtual void
+contentLocation (Type const&);
+
+virtual void
+href (Type &o)
+{
+
+this->href (const_cast <Type const &> (o));
+}
+
+
+virtual void
+href (Type const&);
+
+protected:
+ComponentPackageDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CPD_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/iad.cpp b/TAO/CIAO/tools/Config_Handlers/iad.cpp
index 0c0b1f32942..e799fd544fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/iad.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/iad.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 "iad.hpp"
 
 namespace CIAO
@@ -16,16 +16,16 @@ namespace CIAO
   namespace Config_Handlers
   {
     // NamedImplementationArtifact
-    // 
+    //
 
     NamedImplementationArtifact::
     NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
                                  ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
-    : 
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+        referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
+        regulator__ ()
     {
       name_->container (this);
       referencedArtifact_->container (this);
@@ -33,1226 +33,1478 @@ namespace CIAO
 
     NamedImplementationArtifact::
     NamedImplementationArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
-    :
-    ::XSCRT::Type (),
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (*s.referencedArtifact_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedArtifact_->container (this);
-    }
+      :
+      ::XSCRT::Type (),
+      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (*s.referencedArtifact_)),
+regulator__ ()
+{
+name_->container (this);
+referencedArtifact_->container (this);
+}
 
-    ::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact::
-    operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
-    {
-      name (s.name ());
+::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact::
+operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
+{
+name (s.name ());
 
-      referencedArtifact (s.referencedArtifact ());
+referencedArtifact (s.referencedArtifact ());
 
-      return *this;
-    }
+return *this;
+}
 
 
-    // NamedImplementationArtifact
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
-    name () const
-    {
-      return *name_;
-    }
+// NamedImplementationArtifact
+//
+::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
+name () const
+{
+return *name_;
+}
 
-    void NamedImplementationArtifact::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+void NamedImplementationArtifact::
+name (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+*name_ = e;
+}
 
-    // NamedImplementationArtifact
-    // 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
-    referencedArtifact () const
-    {
-      return *referencedArtifact_;
-    }
+// NamedImplementationArtifact
+//
+::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
+referencedArtifact () const
+{
+return *referencedArtifact_;
+}
 
-    void NamedImplementationArtifact::
-    referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
-    {
-      *referencedArtifact_ = e;
-    }
+void NamedImplementationArtifact::
+referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
+{
+*referencedArtifact_ = e;
+}
 
 
-    // ImplementationArtifactDescription
-    // 
+// ImplementationArtifactDescription
+//
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
-    {
-    }
+ImplementationArtifactDescription::
+ImplementationArtifactDescription ()
+:
+::XSCRT::Type (),
+regulator__ ()
+{
+}
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
-    :
-    ::XSCRT::Type (),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      {
-        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-      }
-
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
-      }
-
-      if (execParameter_.get ()) execParameter_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-      if (href_.get ()) href_->container (this);
-    }
+ImplementationArtifactDescription::
+ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
+:
+::XSCRT::Type (),
+label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+regulator__ ()
+{
+if (label_.get ()) label_->container (this);
+if (UUID_.get ()) UUID_->container (this);
+{
+for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+}
 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription& ImplementationArtifactDescription::
-    operator= (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
-    {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+{
+for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+}
 
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
-      location_.clear ();
-      {
-        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
-      }
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-      dependsOn_.clear ();
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
-      }
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+if (contentLocation_.get ()) contentLocation_->container (this);
+if (href_.get ()) href_->container (this);
+}
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+::CIAO::Config_Handlers::ImplementationArtifactDescription& ImplementationArtifactDescription::
+operator= (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
+{
+if (s.label_.get ()) label (*(s.label_));
+else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+if (s.UUID_.get ()) UUID (*(s.UUID_));
+else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+location_.clear ();
+{
+for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+}
 
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+dependsOn_.clear ();
+{
+for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+}
 
-      return *this;
-    }
+execParameter_.clear ();
+{
+for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+}
 
+infoProperty_.clear ();
+{
+for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    label_p () const
-    {
-      return label_.get () != 0;
-    }
+deployRequirement_.clear ();
+{
+for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    label () const
-    {
-      return *label_;
-    }
+if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    void ImplementationArtifactDescription::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
-
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+if (s.href_.get ()) href (*(s.href_));
+else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
+return *this;
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    UUID () const
-    {
-      return *UUID_;
-    }
 
-    void ImplementationArtifactDescription::
-    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
-
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
-    }
+// ImplementationArtifactDescription
+//
+bool ImplementationArtifactDescription::
+label_p () const
+{
+return label_.get () != 0;
+}
 
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    begin_location ()
-    {
-      return location_.begin ();
-    }
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+label () const
+{
+return *label_;
+}
 
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    end_location ()
-    {
-      return location_.end ();
-    }
+void ImplementationArtifactDescription::
+label (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (label_.get ())
+{
+*label_ = e;
+}
 
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    begin_location () const
-    {
-      return location_.begin ();
-    }
+else
+{
+label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+label_->container (this);
+}
+}
 
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    end_location () const
-    {
-      return location_.end ();
-    }
+// ImplementationArtifactDescription
+//
+bool ImplementationArtifactDescription::
+UUID_p () const
+{
+return UUID_.get () != 0;
+}
 
-    void ImplementationArtifactDescription::
-    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      location_.push_back (e);
-    }
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+UUID () const
+{
+return *UUID_;
+}
 
-    size_t ImplementationArtifactDescription::
-    count_location(void) const
-    {
-      return location_.size ();
-    }
+void ImplementationArtifactDescription::
+UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (UUID_.get ())
+{
+*UUID_ = e;
+}
 
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    begin_dependsOn ()
-    {
-      return dependsOn_.begin ();
-    }
+else
+{
+UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+UUID_->container (this);
+}
+}
 
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    end_dependsOn ()
-    {
-      return dependsOn_.end ();
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+begin_location ()
+{
+return location_.begin ();
+}
 
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    begin_dependsOn () const
-    {
-      return dependsOn_.begin ();
-    }
+ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+end_location ()
+{
+return location_.end ();
+}
 
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    end_dependsOn () const
-    {
-      return dependsOn_.end ();
-    }
+ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+begin_location () const
+{
+return location_.begin ();
+}
 
-    void ImplementationArtifactDescription::
-    add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      dependsOn_.push_back (e);
-    }
+ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+end_location () const
+{
+return location_.end ();
+}
 
-    size_t ImplementationArtifactDescription::
-    count_dependsOn(void) const
-    {
-      return dependsOn_.size ();
-    }
+void ImplementationArtifactDescription::
+add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+location_.push_back (e);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
+size_t ImplementationArtifactDescription::
+count_location(void) const
+{
+return location_.size ();
+}
 
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    execParameter () const
-    {
-      return *execParameter_;
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+begin_dependsOn ()
+{
+return dependsOn_.begin ();
+}
 
-    void ImplementationArtifactDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
-
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
+ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+end_dependsOn ()
+{
+return dependsOn_.end ();
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
+ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+begin_dependsOn () const
+{
+return dependsOn_.begin ();
+}
 
-    ::CIAO::Config_Handlers::Requirement const& ImplementationArtifactDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
+ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+end_dependsOn () const
+{
+return dependsOn_.end ();
+}
 
-    void ImplementationArtifactDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
-    }
+void ImplementationArtifactDescription::
+add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+{
+dependsOn_.push_back (e);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+size_t ImplementationArtifactDescription::
+count_dependsOn(void) const
+{
+return dependsOn_.size ();
+}
 
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
+begin_execParameter ()
+{
+return execParameter_.begin ();
+}
 
-    void ImplementationArtifactDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (infoProperty_.get ())
-      {
-        *infoProperty_ = e;
-      }
-
-      else
-      {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
-      }
-    }
+ImplementationArtifactDescription::execParameter_iterator ImplementationArtifactDescription::
+end_execParameter ()
+{
+return execParameter_.end ();
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
+ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
+begin_execParameter () const
+{
+return execParameter_.begin ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
+ImplementationArtifactDescription::execParameter_const_iterator ImplementationArtifactDescription::
+end_execParameter () const
+{
+return execParameter_.end ();
+}
 
-    void ImplementationArtifactDescription::
-    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
-
-      else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
-      }
-    }
+void ImplementationArtifactDescription::
+add_execParameter (::CIAO::Config_Handlers::Property const& e)
+{
+execParameter_.push_back (e);
+}
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    href_p () const
-    {
-      return href_.get () != 0;
-    }
+size_t ImplementationArtifactDescription::
+count_execParameter(void) const
+{
+return execParameter_.size ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    href () const
-    {
-      return *href_;
-    }
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
+begin_infoProperty ()
+{
+return infoProperty_.begin ();
+}
 
-    ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
-    href ()
-    {
-      return *href_;
-    }
+ImplementationArtifactDescription::infoProperty_iterator ImplementationArtifactDescription::
+end_infoProperty ()
+{
+return infoProperty_.end ();
+}
 
-    void ImplementationArtifactDescription::
-    href (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (href_.get ())
-      {
-        *href_ = e;
-      }
-
-      else
-      {
-        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        href_->container (this);
-      }
-    }
-  }
+ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
+begin_infoProperty () const
+{
+return infoProperty_.begin ();
+}
+
+ImplementationArtifactDescription::infoProperty_const_iterator ImplementationArtifactDescription::
+end_infoProperty () const
+{
+return infoProperty_.end ();
+}
+
+void ImplementationArtifactDescription::
+add_infoProperty (::CIAO::Config_Handlers::Property const& e)
+{
+infoProperty_.push_back (e);
+}
+
+size_t ImplementationArtifactDescription::
+count_infoProperty(void) const
+{
+return infoProperty_.size ();
+}
+
+// ImplementationArtifactDescription
+//
+ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
+begin_deployRequirement ()
+{
+return deployRequirement_.begin ();
+}
+
+ImplementationArtifactDescription::deployRequirement_iterator ImplementationArtifactDescription::
+end_deployRequirement ()
+{
+return deployRequirement_.end ();
+}
+
+ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
+begin_deployRequirement () const
+{
+return deployRequirement_.begin ();
+}
+
+ImplementationArtifactDescription::deployRequirement_const_iterator ImplementationArtifactDescription::
+end_deployRequirement () const
+{
+return deployRequirement_.end ();
+}
+
+void ImplementationArtifactDescription::
+add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+{
+deployRequirement_.push_back (e);
+}
+
+size_t ImplementationArtifactDescription::
+count_deployRequirement(void) const
+{
+return deployRequirement_.size ();
+}
+
+// ImplementationArtifactDescription
+//
+bool ImplementationArtifactDescription::
+contentLocation_p () const
+{
+return contentLocation_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+contentLocation () const
+{
+return *contentLocation_;
+}
+
+void ImplementationArtifactDescription::
+contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (contentLocation_.get ())
+{
+*contentLocation_ = e;
+}
+
+else
+{
+contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+contentLocation_->container (this);
+}
+}
+
+// ImplementationArtifactDescription
+//
+bool ImplementationArtifactDescription::
+href_p () const
+{
+return href_.get () != 0;
+}
+
+::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+href () const
+{
+return *href_;
+}
+
+::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
+href ()
+{
+return *href_;
+}
+
+void ImplementationArtifactDescription::
+href (::XMLSchema::string< ACE_TCHAR > const& e)
+{
+if (href_.get ())
+{
+*href_ = e;
+}
+
+else
+{
+href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+href_->container (this);
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    // NamedImplementationArtifact
-    //
+namespace Config_Handlers
+{
+// NamedImplementationArtifact
+//
 
-    NamedImplementationArtifact::
-    NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+NamedImplementationArtifact::
+NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
-
-        else if (n == "referencedArtifact")
-        {
-          referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e));
-          referencedArtifact_->container (this);
-        }
-
-        else 
-        {
-        }
-      }
-    }
+::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    // ImplementationArtifactDescription
-    //
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+if (n == "name")
+{
+name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+name_->container (this);
+}
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-      while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
-
-        else if (n == "location")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_location (t);
-        }
-
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-          add_dependsOn (t);
-        }
-
-        else if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
-      }
-
-      while (p.more_attributes ())
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "href")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (a);
-          href (t);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-  }
+else if (n == "referencedArtifact")
+{
+referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e));
+referencedArtifact_->container (this);
+}
+
+else
+{
+}
+}
+}
+
+// ImplementationArtifactDescription
+//
+
+ImplementationArtifactDescription::
+ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+:Base__ (e), regulator__ ()
+{
+
+::XSCRT::Parser< ACE_TCHAR > p (e);
+
+while (p.more_elements ())
+{
+::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+if (n == "label")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+label (t);
+}
+
+else if (n == "UUID")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+UUID (t);
+}
+
+else if (n == "location")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+add_location (t);
+}
+
+else if (n == "dependsOn")
+{
+::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
+add_dependsOn (t);
+}
+
+else if (n == "execParameter")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_execParameter (t);
+}
+
+else if (n == "infoProperty")
+{
+::CIAO::Config_Handlers::Property t (e);
+add_infoProperty (t);
+}
+
+else if (n == "deployRequirement")
+{
+::CIAO::Config_Handlers::Requirement t (e);
+add_deployRequirement (t);
+}
+
+else if (n == "contentLocation")
+{
+::XMLSchema::string< ACE_TCHAR > t (e);
+contentLocation (t);
+}
+
+else
+{
+}
+}
+
+while (p.more_attributes ())
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+if (n == "href")
+{
+::XMLSchema::string< ACE_TCHAR > t (a);
+href (t);
+}
+
+else
+{
+}
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/TypeInfo.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct NamedImplementationArtifactTypeInfoInitializer
-      {
-        NamedImplementationArtifactTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (NamedImplementationArtifact));
-          ::XSCRT::ExtendedTypeInfo nf (id);
-
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
-
-      NamedImplementationArtifactTypeInfoInitializer NamedImplementationArtifactTypeInfoInitializer_;
-
-      struct ImplementationArtifactDescriptionTypeInfoInitializer
-      {
-        ImplementationArtifactDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationArtifactDescription));
-          ::XSCRT::ExtendedTypeInfo nf (id);
-
-          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-        }
-      };
-
-      ImplementationArtifactDescriptionTypeInfoInitializer ImplementationArtifactDescriptionTypeInfoInitializer_;
-    }
-  }
+namespace Config_Handlers
+{
+namespace
+{
+::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+
+struct NamedImplementationArtifactTypeInfoInitializer
+{
+NamedImplementationArtifactTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (NamedImplementationArtifact));
+::XSCRT::ExtendedTypeInfo nf (id);
+
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
+
+NamedImplementationArtifactTypeInfoInitializer NamedImplementationArtifactTypeInfoInitializer_;
+
+struct ImplementationArtifactDescriptionTypeInfoInitializer
+{
+ImplementationArtifactDescriptionTypeInfoInitializer ()
+{
+::XSCRT::TypeId id (typeid (ImplementationArtifactDescription));
+::XSCRT::ExtendedTypeInfo nf (id);
+
+nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+}
+};
+
+ImplementationArtifactDescriptionTypeInfoInitializer ImplementationArtifactDescriptionTypeInfoInitializer_;
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // NamedImplementationArtifact
-      //
-      //
-
-      void NamedImplementationArtifact::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        referencedArtifact (o);
-        post (o);
-      }
-
-      void NamedImplementationArtifact::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        referencedArtifact (o);
-        post (o);
-      }
-
-      void NamedImplementationArtifact::
-      pre (Type&)
-      {
-      }
-
-      void NamedImplementationArtifact::
-      pre (Type const&)
-      {
-      }
-
-      void NamedImplementationArtifact::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void NamedImplementationArtifact::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void NamedImplementationArtifact::
-      referencedArtifact (Type& o)
-      {
-        dispatch (o.referencedArtifact ());
-      }
-
-      void NamedImplementationArtifact::
-      referencedArtifact (Type const& o)
-      {
-        dispatch (o.referencedArtifact ());
-      }
-
-      void NamedImplementationArtifact::
-      post (Type&)
-      {
-      }
-
-      void NamedImplementationArtifact::
-      post (Type const&)
-      {
-      }
-
-      // ImplementationArtifactDescription
-      //
-      //
-
-      void ImplementationArtifactDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        location (o);
-        dependsOn (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
-
-      void ImplementationArtifactDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        location (o);
-        dependsOn (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        if (o.href_p ()) href (o);
-        else href_none (o);
-        post (o);
-      }
-
-      void ImplementationArtifactDescription::
-      pre (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ImplementationArtifactDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ImplementationArtifactDescription::
-      label_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      label_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ImplementationArtifactDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ImplementationArtifactDescription::
-      UUID_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      UUID_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
-
-        if (b != e)
-        {
-          location_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-
-        else location_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      location (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
-
-        if (b != e)
-        {
-          location_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-
-        else location_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      location_pre (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_pre (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_next (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_next (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_post (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_post (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-        if (b != e)
-        {
-          dependsOn_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
-          }
-
-          dependsOn_post (o);
-        }
-
-        else dependsOn_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-        if (b != e)
-        {
-          dependsOn_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
-          }
-
-          dependsOn_post (o);
-        }
-
-        else dependsOn_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_pre (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_pre (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_next (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_next (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_post (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_post (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter (Type& o)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter (Type const& o)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      href (Type& o)
-      {
-        dispatch (o.href ());
-      }
-
-      void ImplementationArtifactDescription::
-      href (Type const& o)
-      {
-        dispatch (o.href ());
-      }
-
-      void ImplementationArtifactDescription::
-      href_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      href_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      post (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
+namespace Config_Handlers
+{
+namespace Traversal
+{
+// NamedImplementationArtifact
+//
+//
+
+void NamedImplementationArtifact::
+traverse (Type& o)
+{
+pre (o);
+name (o);
+referencedArtifact (o);
+post (o);
+}
+
+void NamedImplementationArtifact::
+traverse (Type const& o)
+{
+pre (o);
+name (o);
+referencedArtifact (o);
+post (o);
+}
+
+void NamedImplementationArtifact::
+pre (Type&)
+{
+}
+
+void NamedImplementationArtifact::
+pre (Type const&)
+{
+}
+
+void NamedImplementationArtifact::
+name (Type& o)
+{
+dispatch (o.name ());
+}
+
+void NamedImplementationArtifact::
+name (Type const& o)
+{
+dispatch (o.name ());
+}
+
+void NamedImplementationArtifact::
+referencedArtifact (Type& o)
+{
+dispatch (o.referencedArtifact ());
+}
+
+void NamedImplementationArtifact::
+referencedArtifact (Type const& o)
+{
+dispatch (o.referencedArtifact ());
+}
+
+void NamedImplementationArtifact::
+post (Type&)
+{
+}
+
+void NamedImplementationArtifact::
+post (Type const&)
+{
+}
+
+// ImplementationArtifactDescription
+//
+//
+
+void ImplementationArtifactDescription::
+traverse (Type& o)
+{
+pre (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+location (o);
+dependsOn (o);
+execParameter (o);
+infoProperty (o);
+deployRequirement (o);
+if (o.contentLocation_p ()) contentLocation (o);
+else contentLocation_none (o);
+if (o.href_p ()) href (o);
+else href_none (o);
+post (o);
+}
+
+void ImplementationArtifactDescription::
+traverse (Type const& o)
+{
+pre (o);
+if (o.label_p ()) label (o);
+else label_none (o);
+if (o.UUID_p ()) UUID (o);
+else UUID_none (o);
+location (o);
+dependsOn (o);
+execParameter (o);
+infoProperty (o);
+deployRequirement (o);
+if (o.contentLocation_p ()) contentLocation (o);
+else contentLocation_none (o);
+if (o.href_p ()) href (o);
+else href_none (o);
+post (o);
+}
+
+void ImplementationArtifactDescription::
+pre (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+pre (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+label (Type& o)
+{
+dispatch (o.label ());
+}
+
+void ImplementationArtifactDescription::
+label (Type const& o)
+{
+dispatch (o.label ());
+}
+
+void ImplementationArtifactDescription::
+label_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+label_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+UUID (Type& o)
+{
+dispatch (o.UUID ());
+}
+
+void ImplementationArtifactDescription::
+UUID (Type const& o)
+{
+dispatch (o.UUID ());
+}
+
+void ImplementationArtifactDescription::
+UUID_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+UUID_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+location (Type& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
+
+if (b != e)
+{
+location_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) location_next (o);
+}
+
+location_post (o);
+}
+
+else location_none (o);
+}
+
+void ImplementationArtifactDescription::
+location (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
+
+if (b != e)
+{
+location_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) location_next (o);
+}
+
+location_post (o);
+}
+
+else location_none (o);
+}
+
+void ImplementationArtifactDescription::
+location_pre (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+location_pre (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+location_next (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+location_next (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+location_post (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+location_post (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+location_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+location_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn (Type& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+
+if (b != e)
+{
+dependsOn_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) dependsOn_next (o);
+}
+
+dependsOn_post (o);
+}
+
+else dependsOn_none (o);
+}
+
+void ImplementationArtifactDescription::
+dependsOn (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+
+if (b != e)
+{
+dependsOn_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) dependsOn_next (o);
+}
+
+dependsOn_post (o);
+}
+
+else dependsOn_none (o);
+}
+
+void ImplementationArtifactDescription::
+dependsOn_pre (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn_pre (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn_next (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn_next (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn_post (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn_post (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+dependsOn_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter (Type& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
+
+execParameter_post (o);
+}
+
+else execParameter_none (o);
+}
+
+void ImplementationArtifactDescription::
+execParameter (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
+
+if (b != e)
+{
+execParameter_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) execParameter_next (o);
+}
+
+execParameter_post (o);
+}
+
+else execParameter_none (o);
+}
+
+void ImplementationArtifactDescription::
+execParameter_pre (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter_pre (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter_next (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter_next (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter_post (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter_post (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+execParameter_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty (Type& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
+
+infoProperty_post (o);
+}
+
+else infoProperty_none (o);
+}
+
+void ImplementationArtifactDescription::
+infoProperty (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+
+if (b != e)
+{
+infoProperty_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) infoProperty_next (o);
+}
+
+infoProperty_post (o);
+}
+
+else infoProperty_none (o);
+}
+
+void ImplementationArtifactDescription::
+infoProperty_pre (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty_pre (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty_next (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty_next (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty_post (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty_post (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+infoProperty_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement (Type& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
+
+deployRequirement_post (o);
+}
+
+else deployRequirement_none (o);
+}
+
+void ImplementationArtifactDescription::
+deployRequirement (Type const& o)
+{
+// VC6 anathema strikes again
+//
+ImplementationArtifactDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
+
+if (b != e)
+{
+deployRequirement_pre (o);
+for (; b != e;)
+{
+dispatch (*b);
+if (++b != e) deployRequirement_next (o);
+}
+
+deployRequirement_post (o);
+}
+
+else deployRequirement_none (o);
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_pre (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_pre (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_next (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_next (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_post (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_post (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+contentLocation (Type& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ImplementationArtifactDescription::
+contentLocation (Type const& o)
+{
+dispatch (o.contentLocation ());
+}
+
+void ImplementationArtifactDescription::
+contentLocation_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+contentLocation_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+href (Type& o)
+{
+dispatch (o.href ());
+}
+
+void ImplementationArtifactDescription::
+href (Type const& o)
+{
+dispatch (o.href ());
+}
+
+void ImplementationArtifactDescription::
+href_none (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+href_none (Type const&)
+{
+}
+
+void ImplementationArtifactDescription::
+post (Type&)
+{
+}
+
+void ImplementationArtifactDescription::
+post (Type const&)
+{
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // NamedImplementationArtifact
-      //
-      //
-
-      NamedImplementationArtifact::
-      NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
-
-      NamedImplementationArtifact::
-      NamedImplementationArtifact ()
-      {
-      }
-
-      void NamedImplementationArtifact::
-      traverse (Type const& o)
-      {
-        Traversal::NamedImplementationArtifact::traverse (o);
-      }
-
-      void NamedImplementationArtifact::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-        Traversal::NamedImplementationArtifact::name (o);
-        pop_ ();
-      }
-
-      void NamedImplementationArtifact::
-      referencedArtifact (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedArtifact", top_ ()));
-        Traversal::NamedImplementationArtifact::referencedArtifact (o);
-        pop_ ();
-      }
-
-      // ImplementationArtifactDescription
-      //
-      //
-
-      ImplementationArtifactDescription::
-      ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
-      {
-      }
-
-      ImplementationArtifactDescription::
-      ImplementationArtifactDescription ()
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationArtifactDescription::traverse (o);
-      }
-
-      void ImplementationArtifactDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
-        Traversal::ImplementationArtifactDescription::label (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
-        Traversal::ImplementationArtifactDescription::UUID (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      location_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
-      }
-
-      void ImplementationArtifactDescription::
-      location_next (Type const& o)
-      {
-        location_post (o);
-        location_pre (o);
-      }
-
-      void ImplementationArtifactDescription::
-      location_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_next (Type const& o)
-      {
-        dependsOn_post (o);
-        dependsOn_pre (o);
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
-        Traversal::ImplementationArtifactDescription::execParameter (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
-        Traversal::ImplementationArtifactDescription::deployRequirement (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
-        Traversal::ImplementationArtifactDescription::infoProperty (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
-        Traversal::ImplementationArtifactDescription::contentLocation (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      href (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
-        attr_ (&a);
-        Traversal::ImplementationArtifactDescription::href (o);
-        attr_ (0);
-      }
-    }
-  }
+namespace Config_Handlers
+{
+namespace Writer
+{
+// NamedImplementationArtifact
+//
+//
+
+NamedImplementationArtifact::
+NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+NamedImplementationArtifact::
+NamedImplementationArtifact ()
+{
+}
+
+void NamedImplementationArtifact::
+traverse (Type const& o)
+{
+Traversal::NamedImplementationArtifact::traverse (o);
+}
+
+void NamedImplementationArtifact::
+name (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+Traversal::NamedImplementationArtifact::name (o);
+pop_ ();
+}
+
+void NamedImplementationArtifact::
+referencedArtifact (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedArtifact", top_ ()));
+Traversal::NamedImplementationArtifact::referencedArtifact (o);
+pop_ ();
+}
+
+// ImplementationArtifactDescription
+//
+//
+
+ImplementationArtifactDescription::
+ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
+: ::XSCRT::Writer< ACE_TCHAR > (e)
+{
+}
+
+ImplementationArtifactDescription::
+ImplementationArtifactDescription ()
+{
+}
+
+void ImplementationArtifactDescription::
+traverse (Type const& o)
+{
+Traversal::ImplementationArtifactDescription::traverse (o);
+}
+
+void ImplementationArtifactDescription::
+label (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+Traversal::ImplementationArtifactDescription::label (o);
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+UUID (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+Traversal::ImplementationArtifactDescription::UUID (o);
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+location_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+}
+
+void ImplementationArtifactDescription::
+location_next (Type const& o)
+{
+location_post (o);
+location_pre (o);
+}
+
+void ImplementationArtifactDescription::
+location_post (Type const&)
+{
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+dependsOn_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
+}
+
+void ImplementationArtifactDescription::
+dependsOn_next (Type const& o)
+{
+dependsOn_post (o);
+dependsOn_pre (o);
+}
+
+void ImplementationArtifactDescription::
+dependsOn_post (Type const&)
+{
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+execParameter_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
+}
+
+void ImplementationArtifactDescription::
+execParameter_next (Type const& o)
+{
+execParameter_post (o);
+execParameter_pre (o);
+}
+
+void ImplementationArtifactDescription::
+execParameter_post (Type const&)
+{
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+infoProperty_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
+}
+
+void ImplementationArtifactDescription::
+infoProperty_next (Type const& o)
+{
+infoProperty_post (o);
+infoProperty_pre (o);
+}
+
+void ImplementationArtifactDescription::
+infoProperty_post (Type const&)
+{
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_pre (Type const&)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_next (Type const& o)
+{
+deployRequirement_post (o);
+deployRequirement_pre (o);
+}
+
+void ImplementationArtifactDescription::
+deployRequirement_post (Type const&)
+{
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+contentLocation (Type const& o)
+{
+push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
+Traversal::ImplementationArtifactDescription::contentLocation (o);
+pop_ ();
+}
+
+void ImplementationArtifactDescription::
+href (Type const& o)
+{
+::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+attr_ (&a);
+Traversal::ImplementationArtifactDescription::href (o);
+attr_ (0);
+}
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/iad.hpp b/TAO/CIAO/tools/Config_Handlers/iad.hpp
index c45b689338e..e4583f0fc7e 100644
--- a/TAO/CIAO/tools/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/iad.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,11 +27,11 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class NamedImplementationArtifact;
-    class ImplementationArtifactDescription;
-  }
+namespace Config_Handlers
+{
+class NamedImplementationArtifact;
+class ImplementationArtifactDescription;
+}
 }
 
 #include <memory>
@@ -42,606 +42,741 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // referencedArtifact
-      // 
-      public:
-      ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
-      void referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_;
-
-      public:
-      NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                   ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
-
-      NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      NamedImplementationArtifact (NamedImplementationArtifact const& s);
-
-      NamedImplementationArtifact&
-      operator= (NamedImplementationArtifact const& s);
-
-      private:
-      char regulator__;
-    };
-
-
-    class XSC_XML_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // location
-      // 
-      public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
-      location_iterator begin_location ();
-      location_iterator end_location ();
-      location_const_iterator begin_location () const;
-      location_const_iterator end_location () const;
-      void add_location (::XMLSchema::string< ACE_TCHAR > const& );
-      size_t count_location (void) const;
-
-      protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
-
-      // dependsOn
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
-      dependsOn_iterator begin_dependsOn ();
-      dependsOn_iterator end_dependsOn ();
-      dependsOn_const_iterator begin_dependsOn () const;
-      dependsOn_const_iterator end_dependsOn () const;
-      void add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
-      size_t count_dependsOn (void) const;
-
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
-
-      // execParameter
-      // 
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      // 
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-      // href
-      // 
-      public:
-      bool href_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& href () const;
-      ::XMLSchema::string< ACE_TCHAR >& href ();
-      void href (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
-
-      public:
-      ImplementationArtifactDescription ();
-
-      ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ImplementationArtifactDescription (ImplementationArtifactDescription const& s);
-
-      ImplementationArtifactDescription&
-      operator= (ImplementationArtifactDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// name
+//
+public:
+::XMLSchema::string< ACE_TCHAR > const& name () const;
+void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+// referencedArtifact
+//
+public:
+::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
+void referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_;
+
+public:
+NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
+::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
+
+NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const&);
+NamedImplementationArtifact (NamedImplementationArtifact const& s);
+
+NamedImplementationArtifact&
+operator= (NamedImplementationArtifact const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// location
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
+location_iterator begin_location ();
+location_iterator end_location ();
+location_const_iterator begin_location () const;
+location_const_iterator end_location () const;
+void add_location (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_location (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+// dependsOn
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
+dependsOn_iterator begin_dependsOn ();
+dependsOn_iterator end_dependsOn ();
+dependsOn_const_iterator begin_dependsOn () const;
+dependsOn_const_iterator end_dependsOn () const;
+void add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
+size_t count_dependsOn (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
+
+// execParameter
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator;
+execParameter_iterator begin_execParameter ();
+execParameter_iterator end_execParameter ();
+execParameter_const_iterator begin_execParameter () const;
+execParameter_const_iterator end_execParameter () const;
+void add_execParameter (::CIAO::Config_Handlers::Property const& );
+size_t count_execParameter (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > execParameter_;
+
+// infoProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+infoProperty_iterator begin_infoProperty ();
+infoProperty_iterator end_infoProperty ();
+infoProperty_const_iterator begin_infoProperty () const;
+infoProperty_const_iterator end_infoProperty () const;
+void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_infoProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+// deployRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator;
+deployRequirement_iterator begin_deployRequirement ();
+deployRequirement_iterator end_deployRequirement ();
+deployRequirement_const_iterator begin_deployRequirement () const;
+deployRequirement_const_iterator end_deployRequirement () const;
+void add_deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+size_t count_deployRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+// contentLocation
+//
+public:
+bool contentLocation_p () const;
+::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+// href
+//
+public:
+bool href_p () const;
+::XMLSchema::string< ACE_TCHAR > const& href () const;
+::XMLSchema::string< ACE_TCHAR >& href ();
+void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+public:
+ImplementationArtifactDescription ();
+
+ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ImplementationArtifactDescription (ImplementationArtifactDescription const& s);
+
+ImplementationArtifactDescription&
+operator= (ImplementationArtifactDescription const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export NamedImplementationArtifact : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedImplementationArtifact >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export NamedImplementationArtifact : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedImplementationArtifact >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+name (Type&);
+
+virtual void
+name (Type const&);
+
+virtual void
+referencedArtifact (Type&);
+
+virtual void
+referencedArtifact (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+label (Type&);
+
+virtual void
+label (Type const&);
+
+virtual void
+label_none (Type&);
+
+virtual void
+label_none (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        name (Type&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        name (Type const&);
+virtual void
+location (Type&);
 
-        virtual void
-        referencedArtifact (Type&);
+virtual void
+location (Type const&);
 
-        virtual void
-        referencedArtifact (Type const&);
+virtual void
+location_pre (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+location_pre (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
+virtual void
+location_next (Type&);
 
-      struct XSC_XML_Handlers_Export ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
-      {
-        virtual void
-        traverse (Type&);
+virtual void
+location_next (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+location_post (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+location_post (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+location_none (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+location_none (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+dependsOn (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+dependsOn (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+dependsOn_pre (Type&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+dependsOn_pre (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+dependsOn_next (Type&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+dependsOn_next (Type const&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+dependsOn_post (Type&);
 
-        virtual void
-        location (Type&);
+virtual void
+dependsOn_post (Type const&);
 
-        virtual void
-        location (Type const&);
+virtual void
+dependsOn_none (Type&);
 
-        virtual void
-        location_pre (Type&);
+virtual void
+dependsOn_none (Type const&);
 
-        virtual void
-        location_pre (Type const&);
+virtual void
+execParameter (Type&);
 
-        virtual void
-        location_next (Type&);
+virtual void
+execParameter (Type const&);
 
-        virtual void
-        location_next (Type const&);
+virtual void
+execParameter_pre (Type&);
 
-        virtual void
-        location_post (Type&);
+virtual void
+execParameter_pre (Type const&);
 
-        virtual void
-        location_post (Type const&);
+virtual void
+execParameter_next (Type&);
 
-        virtual void
-        location_none (Type&);
+virtual void
+execParameter_next (Type const&);
 
-        virtual void
-        location_none (Type const&);
+virtual void
+execParameter_post (Type&);
 
-        virtual void
-        dependsOn (Type&);
+virtual void
+execParameter_post (Type const&);
 
-        virtual void
-        dependsOn (Type const&);
+virtual void
+execParameter_none (Type&);
 
-        virtual void
-        dependsOn_pre (Type&);
+virtual void
+execParameter_none (Type const&);
 
-        virtual void
-        dependsOn_pre (Type const&);
+virtual void
+infoProperty (Type&);
 
-        virtual void
-        dependsOn_next (Type&);
+virtual void
+infoProperty (Type const&);
 
-        virtual void
-        dependsOn_next (Type const&);
+virtual void
+infoProperty_pre (Type&);
 
-        virtual void
-        dependsOn_post (Type&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void
-        dependsOn_post (Type const&);
+virtual void
+infoProperty_next (Type&);
 
-        virtual void
-        dependsOn_none (Type&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void
-        dependsOn_none (Type const&);
+virtual void
+infoProperty_post (Type&);
 
-        virtual void
-        execParameter (Type&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+infoProperty_none (Type&);
 
-        virtual void
-        execParameter_none (Type&);
+virtual void
+infoProperty_none (Type const&);
 
-        virtual void
-        execParameter_none (Type const&);
+virtual void
+deployRequirement (Type&);
 
-        virtual void
-        deployRequirement (Type&);
+virtual void
+deployRequirement (Type const&);
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+deployRequirement_pre (Type&);
 
-        virtual void
-        deployRequirement_none (Type&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void
-        deployRequirement_none (Type const&);
+virtual void
+deployRequirement_next (Type&);
 
-        virtual void
-        infoProperty (Type&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+deployRequirement_post (Type&);
 
-        virtual void
-        infoProperty_none (Type&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void
-        infoProperty_none (Type const&);
+virtual void
+deployRequirement_none (Type&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+deployRequirement_none (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+contentLocation_none (Type&);
 
-        virtual void
-        href (Type&);
+virtual void
+contentLocation_none (Type const&);
 
-        virtual void
-        href (Type const&);
+virtual void
+href (Type&);
 
-        virtual void
-        href_none (Type&);
+virtual void
+href (Type const&);
 
-        virtual void
-        href_none (Type const&);
+virtual void
+href_none (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+href_none (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct NamedImplementationArtifact : Traversal::NamedImplementationArtifact, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::NamedImplementationArtifact Type;
-        NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct NamedImplementationArtifact : Traversal::NamedImplementationArtifact,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::NamedImplementationArtifact Type;
+NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+name (Type &o)
+{
+
+this->name (const_cast <Type const &> (o));
+}
+
+
+virtual void
+name (Type const&);
+
+virtual void
+referencedArtifact (Type &o)
+{
+
+this->referencedArtifact (const_cast <Type const &> (o));
+}
+
+
+virtual void
+referencedArtifact (Type const&);
+
+protected:
+NamedImplementationArtifact ();
+};
+
+struct ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
+ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+label (Type &o)
+{
+
+this->label (const_cast <Type const &> (o));
+}
 
-          this->traverse (const_cast <Type const &> (o));
-        }
 
+virtual void
+label (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+UUID (Type &o)
+{
+
+this->UUID (const_cast <Type const &> (o));
+}
+
+
+virtual void
+UUID (Type const&);
+
+virtual void
+location_pre (Type &o)
+{
+
+this->location_pre (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        name (Type &o)
-        {
 
-          this->name (const_cast <Type const &> (o));
-        }
+virtual void
+location_pre (Type const&);
 
+virtual void
+location_next (Type &o)
+{
 
-        virtual void
-        name (Type const&);
+this->location_next (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        referencedArtifact (Type &o)
-        {
 
-          this->referencedArtifact (const_cast <Type const &> (o));
-        }
+virtual void
+location_next (Type const&);
 
+virtual void
+location_post (Type &o)
+{
 
-        virtual void
-        referencedArtifact (Type const&);
+this->location_post (const_cast <Type const &> (o));
+}
 
-        protected:
-        NamedImplementationArtifact ();
-      };
 
-      struct ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
-        ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+virtual void
+location_post (Type const&);
 
-        virtual void 
-        traverse (Type &o)
-        {
+virtual void
+dependsOn_pre (Type &o)
+{
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+this->dependsOn_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        traverse (Type const&);
+virtual void
+dependsOn_pre (Type const&);
 
-        virtual void 
-        label (Type &o)
-        {
+virtual void
+dependsOn_next (Type &o)
+{
 
-          this->label (const_cast <Type const &> (o));
-        }
+this->dependsOn_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        label (Type const&);
+virtual void
+dependsOn_next (Type const&);
 
-        virtual void 
-        UUID (Type &o)
-        {
+virtual void
+dependsOn_post (Type &o)
+{
 
-          this->UUID (const_cast <Type const &> (o));
-        }
+this->dependsOn_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        UUID (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-        virtual void 
-        location_pre (Type &o)
-        {
+virtual void
+execParameter_pre (Type &o)
+{
 
-          this->location_pre (const_cast <Type const &> (o));
-        }
+this->execParameter_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        location_pre (Type const&);
+virtual void
+execParameter_pre (Type const&);
 
-        virtual void 
-        location_next (Type &o)
-        {
+virtual void
+execParameter_next (Type &o)
+{
 
-          this->location_next (const_cast <Type const &> (o));
-        }
+this->execParameter_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        location_next (Type const&);
+virtual void
+execParameter_next (Type const&);
 
-        virtual void 
-        location_post (Type &o)
-        {
+virtual void
+execParameter_post (Type &o)
+{
 
-          this->location_post (const_cast <Type const &> (o));
-        }
+this->execParameter_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        location_post (Type const&);
+virtual void
+execParameter_post (Type const&);
 
-        virtual void 
-        dependsOn_pre (Type &o)
-        {
+virtual void
+infoProperty_pre (Type &o)
+{
 
-          this->dependsOn_pre (const_cast <Type const &> (o));
-        }
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        dependsOn_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-        virtual void 
-        dependsOn_next (Type &o)
-        {
+virtual void
+infoProperty_next (Type &o)
+{
 
-          this->dependsOn_next (const_cast <Type const &> (o));
-        }
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        dependsOn_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-        virtual void 
-        dependsOn_post (Type &o)
-        {
+virtual void
+infoProperty_post (Type &o)
+{
 
-          this->dependsOn_post (const_cast <Type const &> (o));
-        }
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        dependsOn_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-        virtual void 
-        execParameter (Type &o)
-        {
+virtual void
+deployRequirement_pre (Type &o)
+{
 
-          this->execParameter (const_cast <Type const &> (o));
-        }
+this->deployRequirement_pre (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        execParameter (Type const&);
+virtual void
+deployRequirement_pre (Type const&);
 
-        virtual void 
-        deployRequirement (Type &o)
-        {
+virtual void
+deployRequirement_next (Type &o)
+{
 
-          this->deployRequirement (const_cast <Type const &> (o));
-        }
+this->deployRequirement_next (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        deployRequirement (Type const&);
+virtual void
+deployRequirement_next (Type const&);
 
-        virtual void 
-        infoProperty (Type &o)
-        {
+virtual void
+deployRequirement_post (Type &o)
+{
 
-          this->infoProperty (const_cast <Type const &> (o));
-        }
+this->deployRequirement_post (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        infoProperty (Type const&);
+virtual void
+deployRequirement_post (Type const&);
 
-        virtual void 
-        contentLocation (Type &o)
-        {
+virtual void
+contentLocation (Type &o)
+{
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
+this->contentLocation (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+contentLocation (Type const&);
 
-        virtual void 
-        href (Type &o)
-        {
+virtual void
+href (Type &o)
+{
 
-          this->href (const_cast <Type const &> (o));
-        }
+this->href (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        href (Type const&);
+virtual void
+href (Type const&);
 
-        protected:
-        ImplementationArtifactDescription ();
-      };
-    }
-  }
+protected:
+ImplementationArtifactDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // IAD_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/pcd.cpp b/TAO/CIAO/tools/Config_Handlers/pcd.cpp
index 7403102c879..1021d178ad6 100644
--- a/TAO/CIAO/tools/Config_Handlers/pcd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/pcd.cpp
@@ -3,49 +3,132 @@
  *
  * 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 "pcd.hpp"
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
+    // ComponentPackageImport
+    //
+
+    ComponentPackageImport::
+    ComponentPackageImport ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
+    {
+    }
+
+    ComponentPackageImport::
+    ComponentPackageImport (::CIAO::Config_Handlers::ComponentPackageImport const& s)
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
+    {
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
+    }
+
+    ::CIAO::Config_Handlers::ComponentPackageImport& ComponentPackageImport::
+    operator= (::CIAO::Config_Handlers::ComponentPackageImport const& s)
+    {
+      location_.clear ();
+      {
+        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+      }
+
+      return *this;
+    }
+
+
+    // ComponentPackageImport
+    //
+    ComponentPackageImport::location_iterator ComponentPackageImport::
+    begin_location ()
+    {
+      return location_.begin ();
+    }
+
+    ComponentPackageImport::location_iterator ComponentPackageImport::
+    end_location ()
+    {
+      return location_.end ();
+    }
+
+    ComponentPackageImport::location_const_iterator ComponentPackageImport::
+    begin_location () const
+    {
+      return location_.begin ();
+    }
+
+    ComponentPackageImport::location_const_iterator ComponentPackageImport::
+    end_location () const
+    {
+      return location_.end ();
+    }
+
+    void ComponentPackageImport::
+    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      location_.push_back (e);
+    }
+
+    size_t ComponentPackageImport::
+    count_location(void) const
+    {
+      return location_.size ();
+    }
+
+
     // PackageConfiguration
-    // 
+    //
 
     PackageConfiguration::
     PackageConfiguration ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      regulator__ ()
     {
     }
 
     PackageConfiguration::
     PackageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s)
-    :
-    ::XSCRT::Type (),
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
-    reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 0),
-    selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+        UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+          basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
+          specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0),
+          importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0),
+          referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0),
+          contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+            href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+              regulator__ ()
     {
       if (label_.get ()) label_->container (this);
       if (UUID_.get ()) UUID_->container (this);
       if (basePackage_.get ()) basePackage_->container (this);
-      if (reference_.get ()) reference_->container (this);
-      if (selectRequirement_.get ()) selectRequirement_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
+      if (specializedConfig_.get ()) specializedConfig_->container (this);
+      if (importedPackage_.get ()) importedPackage_->container (this);
+      if (referencedPackage_.get ()) referencedPackage_->container (this);
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
+
       if (contentLocation_.get ()) contentLocation_->container (this);
+      if (href_.get ()) href_->container (this);
     }
 
     ::CIAO::Config_Handlers::PackageConfiguration& PackageConfiguration::
@@ -60,24 +143,37 @@ namespace CIAO
       if (s.basePackage_.get ()) basePackage (*(s.basePackage_));
       else basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (0);
 
-      if (s.reference_.get ()) reference (*(s.reference_));
-      else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
+      if (s.specializedConfig_.get ()) specializedConfig (*(s.specializedConfig_));
+      else specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (0);
 
-      if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
-      else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+      if (s.importedPackage_.get ()) importedPackage (*(s.importedPackage_));
+      else importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (0);
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+      if (s.referencedPackage_.get ()) referencedPackage (*(s.referencedPackage_));
+      else referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
+
+      selectRequirement_.clear ();
+      {
+        for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i);
+      }
+
+      configProperty_.clear ();
+      {
+        for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
+      }
 
       if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
       else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
+      if (s.href_.get ()) href (*(s.href_));
+      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
       return *this;
     }
 
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
     label_p () const
     {
@@ -94,19 +190,19 @@ namespace CIAO
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
-      {
-        *label_ = e;
-      }
+        {
+          *label_ = e;
+        }
 
       else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
+        {
+          label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          label_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
     UUID_p () const
     {
@@ -123,19 +219,19 @@ namespace CIAO
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+        {
+          *UUID_ = e;
+        }
 
       else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
+        {
+          UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          UUID_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
     basePackage_p () const
     {
@@ -152,106 +248,182 @@ namespace CIAO
     basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
     {
       if (basePackage_.get ())
-      {
-        *basePackage_ = e;
-      }
+        {
+          *basePackage_ = e;
+        }
 
       else
-      {
-        basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
-        basePackage_->container (this);
-      }
+        {
+          basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
+          basePackage_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
-    reference_p () const
+    specializedConfig_p () const
     {
-      return reference_.get () != 0;
+      return specializedConfig_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::ComponentPackageReference const& PackageConfiguration::
-    reference () const
+    ::CIAO::Config_Handlers::PackageConfiguration const& PackageConfiguration::
+    specializedConfig () const
     {
-      return *reference_;
+      return *specializedConfig_;
     }
 
     void PackageConfiguration::
-    reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
+    specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
-      if (reference_.get ())
-      {
-        *reference_ = e;
-      }
+      if (specializedConfig_.get ())
+        {
+          *specializedConfig_ = e;
+        }
 
       else
-      {
-        reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-        reference_->container (this);
-      }
+        {
+          specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
+          specializedConfig_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
-    selectRequirement_p () const
+    importedPackage_p () const
     {
-      return selectRequirement_.get () != 0;
+      return importedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Requirement const& PackageConfiguration::
-    selectRequirement () const
+    ::CIAO::Config_Handlers::ComponentPackageImport const& PackageConfiguration::
+    importedPackage () const
     {
-      return *selectRequirement_;
+      return *importedPackage_;
     }
 
     void PackageConfiguration::
-    selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& e)
     {
-      if (selectRequirement_.get ())
-      {
-        *selectRequirement_ = e;
-      }
+      if (importedPackage_.get ())
+        {
+          *importedPackage_ = e;
+        }
 
       else
-      {
-        selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        selectRequirement_->container (this);
-      }
+        {
+          importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (new ::CIAO::Config_Handlers::ComponentPackageImport (e));
+          importedPackage_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
     bool PackageConfiguration::
-    configProperty_p () const
+    referencedPackage_p () const
     {
-      return configProperty_.get () != 0;
+      return referencedPackage_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::Property const& PackageConfiguration::
-    configProperty () const
+    ::CIAO::Config_Handlers::ComponentPackageReference const& PackageConfiguration::
+    referencedPackage () const
     {
-      return *configProperty_;
+      return *referencedPackage_;
     }
 
     void PackageConfiguration::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
+    referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& e)
     {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
+      if (referencedPackage_.get ())
+        {
+          *referencedPackage_ = e;
+        }
 
       else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
+        {
+          referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
+          referencedPackage_->container (this);
+        }
     }
 
     // PackageConfiguration
-    // 
+    //
+    PackageConfiguration::selectRequirement_iterator PackageConfiguration::
+    begin_selectRequirement ()
+    {
+      return selectRequirement_.begin ();
+    }
+
+    PackageConfiguration::selectRequirement_iterator PackageConfiguration::
+    end_selectRequirement ()
+    {
+      return selectRequirement_.end ();
+    }
+
+    PackageConfiguration::selectRequirement_const_iterator PackageConfiguration::
+    begin_selectRequirement () const
+    {
+      return selectRequirement_.begin ();
+    }
+
+    PackageConfiguration::selectRequirement_const_iterator PackageConfiguration::
+    end_selectRequirement () const
+    {
+      return selectRequirement_.end ();
+    }
+
+    void PackageConfiguration::
+    add_selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+    {
+      selectRequirement_.push_back (e);
+    }
+
+    size_t PackageConfiguration::
+    count_selectRequirement(void) const
+    {
+      return selectRequirement_.size ();
+    }
+
+    // PackageConfiguration
+    //
+    PackageConfiguration::configProperty_iterator PackageConfiguration::
+    begin_configProperty ()
+    {
+      return configProperty_.begin ();
+    }
+
+    PackageConfiguration::configProperty_iterator PackageConfiguration::
+    end_configProperty ()
+    {
+      return configProperty_.end ();
+    }
+
+    PackageConfiguration::configProperty_const_iterator PackageConfiguration::
+    begin_configProperty () const
+    {
+      return configProperty_.begin ();
+    }
+
+    PackageConfiguration::configProperty_const_iterator PackageConfiguration::
+    end_configProperty () const
+    {
+      return configProperty_.end ();
+    }
+
+    void PackageConfiguration::
+    add_configProperty (::CIAO::Config_Handlers::Property const& e)
+    {
+      configProperty_.push_back (e);
+    }
+
+    size_t PackageConfiguration::
+    count_configProperty(void) const
+    {
+      return configProperty_.size ();
+    }
+
+    // PackageConfiguration
+    //
     bool PackageConfiguration::
     contentLocation_p () const
     {
@@ -268,15 +440,50 @@ namespace CIAO
     contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (contentLocation_.get ())
-      {
-        *contentLocation_ = e;
-      }
+        {
+          *contentLocation_ = e;
+        }
 
       else
-      {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
-      }
+        {
+          contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          contentLocation_->container (this);
+        }
+    }
+
+    // PackageConfiguration
+    //
+    bool PackageConfiguration::
+    href_p () const
+    {
+      return href_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& PackageConfiguration::
+    href () const
+    {
+      return *href_;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR >& PackageConfiguration::
+    href ()
+    {
+      return *href_;
+    }
+
+    void PackageConfiguration::
+    href (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (href_.get ())
+        {
+          *href_ = e;
+        }
+
+      else
+        {
+          href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          href_->container (this);
+        }
     }
   }
 }
@@ -285,67 +492,121 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    // PackageConfiguration
+    // ComponentPackageImport
     //
 
-    PackageConfiguration::
-    PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    ComponentPackageImport::
+    ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+      :Base__ (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
         {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
-
-        else if (n == "basePackage")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
-          basePackage (t);
+          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+          if (n == "location")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              add_location (t);
+            }
+
+          else
+            {
+            }
         }
+    }
 
-        else if (n == "reference")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-          reference (t);
-        }
+    // PackageConfiguration
+    //
 
-        else if (n == "selectRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          selectRequirement (t);
-        }
+    PackageConfiguration::
+    PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+      :Base__ (e), regulator__ ()
+    {
 
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-        else if (n == "contentLocation")
+      while (p.more_elements ())
         {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
+          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+          if (n == "label")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              label (t);
+            }
+
+          else if (n == "UUID")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              UUID (t);
+            }
+
+          else if (n == "basePackage")
+            {
+              ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
+              basePackage (t);
+            }
+
+          else if (n == "specializedConfig")
+            {
+              ::CIAO::Config_Handlers::PackageConfiguration t (e);
+              specializedConfig (t);
+            }
+
+          else if (n == "importedPackage")
+            {
+              ::CIAO::Config_Handlers::ComponentPackageImport t (e);
+              importedPackage (t);
+            }
+
+          else if (n == "referencedPackage")
+            {
+              ::CIAO::Config_Handlers::ComponentPackageReference t (e);
+              referencedPackage (t);
+            }
+
+          else if (n == "selectRequirement")
+            {
+              ::CIAO::Config_Handlers::Requirement t (e);
+              add_selectRequirement (t);
+            }
+
+          else if (n == "configProperty")
+            {
+              ::CIAO::Config_Handlers::Property t (e);
+              add_configProperty (t);
+            }
+
+          else if (n == "contentLocation")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (e);
+              contentLocation (t);
+            }
+
+          else
+            {
+            }
         }
 
-        else 
+      while (p.more_attributes ())
         {
+          ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+          if (n == "href")
+            {
+              ::XMLSchema::string< ACE_TCHAR > t (a);
+              href (t);
+            }
+
+          else
+            {
+            }
         }
-      }
     }
   }
 }
@@ -367,6 +628,20 @@ namespace CIAO
     {
       ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
+      struct ComponentPackageImportTypeInfoInitializer
+      {
+        ComponentPackageImportTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentPackageImport));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      ComponentPackageImportTypeInfoInitializer ComponentPackageImportTypeInfoInitializer_;
+
       struct PackageConfigurationTypeInfoInitializer
       {
         PackageConfigurationTypeInfoInitializer ()
@@ -390,6 +665,116 @@ namespace CIAO
   {
     namespace Traversal
     {
+      // ComponentPackageImport
+      //
+      //
+
+      void ComponentPackageImport::
+      traverse (Type& o)
+      {
+        pre (o);
+        location (o);
+        post (o);
+      }
+
+      void ComponentPackageImport::
+      traverse (Type const& o)
+      {
+        pre (o);
+        location (o);
+        post (o);
+      }
+
+      void ComponentPackageImport::
+      pre (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      pre (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageImport::Type::location_iterator b (o.begin_location()), e (o.end_location());
+
+        if (b != e)
+          {
+            location_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) location_next (o);
+              }
+
+            location_post (o);
+          }
+      }
+
+      void ComponentPackageImport::
+      location (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ComponentPackageImport::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
+
+        if (b != e)
+          {
+            location_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) location_next (o);
+              }
+
+            location_post (o);
+          }
+      }
+
+      void ComponentPackageImport::
+      location_pre (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_pre (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_next (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_next (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_post (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      location_post (Type const&)
+      {
+      }
+
+      void ComponentPackageImport::
+      post (Type&)
+      {
+      }
+
+      void ComponentPackageImport::
+      post (Type const&)
+      {
+      }
+
       // PackageConfiguration
       //
       //
@@ -404,14 +789,18 @@ namespace CIAO
         else UUID_none (o);
         if (o.basePackage_p ()) basePackage (o);
         else basePackage_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
+        if (o.specializedConfig_p ()) specializedConfig (o);
+        else specializedConfig_none (o);
+        if (o.importedPackage_p ()) importedPackage (o);
+        else importedPackage_none (o);
+        if (o.referencedPackage_p ()) referencedPackage (o);
+        else referencedPackage_none (o);
+        selectRequirement (o);
+        configProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
         post (o);
       }
 
@@ -425,14 +814,18 @@ namespace CIAO
         else UUID_none (o);
         if (o.basePackage_p ()) basePackage (o);
         else basePackage_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
+        if (o.specializedConfig_p ()) specializedConfig (o);
+        else specializedConfig_none (o);
+        if (o.importedPackage_p ()) importedPackage (o);
+        else importedPackage_none (o);
+        if (o.referencedPackage_p ()) referencedPackage (o);
+        else referencedPackage_none (o);
+        selectRequirement (o);
+        configProperty (o);
         if (o.contentLocation_p ()) contentLocation (o);
         else contentLocation_none (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
         post (o);
       }
 
@@ -513,37 +906,143 @@ namespace CIAO
       }
 
       void PackageConfiguration::
-      reference (Type& o)
+      specializedConfig (Type& o)
+      {
+        dispatch (o.specializedConfig ());
+      }
+
+      void PackageConfiguration::
+      specializedConfig (Type const& o)
+      {
+        dispatch (o.specializedConfig ());
+      }
+
+      void PackageConfiguration::
+      specializedConfig_none (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      specializedConfig_none (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      importedPackage (Type& o)
       {
-        dispatch (o.reference ());
+        dispatch (o.importedPackage ());
       }
 
       void PackageConfiguration::
-      reference (Type const& o)
+      importedPackage (Type const& o)
       {
-        dispatch (o.reference ());
+        dispatch (o.importedPackage ());
       }
 
       void PackageConfiguration::
-      reference_none (Type&)
+      importedPackage_none (Type&)
       {
       }
 
       void PackageConfiguration::
-      reference_none (Type const&)
+      importedPackage_none (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      referencedPackage (Type& o)
+      {
+        dispatch (o.referencedPackage ());
+      }
+
+      void PackageConfiguration::
+      referencedPackage (Type const& o)
+      {
+        dispatch (o.referencedPackage ());
+      }
+
+      void PackageConfiguration::
+      referencedPackage_none (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      referencedPackage_none (Type const&)
       {
       }
 
       void PackageConfiguration::
       selectRequirement (Type& o)
       {
-        dispatch (o.selectRequirement ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
+
+        if (b != e)
+          {
+            selectRequirement_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) selectRequirement_next (o);
+              }
+
+            selectRequirement_post (o);
+          }
+
+        else selectRequirement_none (o);
       }
 
       void PackageConfiguration::
       selectRequirement (Type const& o)
       {
-        dispatch (o.selectRequirement ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::Type::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement());
+
+        if (b != e)
+          {
+            selectRequirement_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) selectRequirement_next (o);
+              }
+
+            selectRequirement_post (o);
+          }
+
+        else selectRequirement_none (o);
+      }
+
+      void PackageConfiguration::
+      selectRequirement_pre (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_pre (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_next (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_next (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_post (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      selectRequirement_post (Type const&)
+      {
       }
 
       void PackageConfiguration::
@@ -559,13 +1058,75 @@ namespace CIAO
       void PackageConfiguration::
       configProperty (Type& o)
       {
-        dispatch (o.configProperty ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+        if (b != e)
+          {
+            configProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) configProperty_next (o);
+              }
+
+            configProperty_post (o);
+          }
+
+        else configProperty_none (o);
       }
 
       void PackageConfiguration::
       configProperty (Type const& o)
       {
-        dispatch (o.configProperty ());
+        // VC6 anathema strikes again
+        //
+        PackageConfiguration::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
+
+        if (b != e)
+          {
+            configProperty_pre (o);
+            for (; b != e;)
+              {
+                dispatch (*b);
+                if (++b != e) configProperty_next (o);
+              }
+
+            configProperty_post (o);
+          }
+
+        else configProperty_none (o);
+      }
+
+      void PackageConfiguration::
+      configProperty_pre (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_pre (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_next (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_next (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_post (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      configProperty_post (Type const&)
+      {
       }
 
       void PackageConfiguration::
@@ -601,6 +1162,28 @@ namespace CIAO
       }
 
       void PackageConfiguration::
+      href (Type& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void PackageConfiguration::
+      href (Type const& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void PackageConfiguration::
+      href_none (Type&)
+      {
+      }
+
+      void PackageConfiguration::
+      href_none (Type const&)
+      {
+      }
+
+      void PackageConfiguration::
       post (Type&)
       {
       }
@@ -619,13 +1202,53 @@ namespace CIAO
   {
     namespace Writer
     {
+      // ComponentPackageImport
+      //
+      //
+
+      ComponentPackageImport::
+      ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR >& e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ComponentPackageImport::
+      ComponentPackageImport ()
+      {
+      }
+
+      void ComponentPackageImport::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentPackageImport::traverse (o);
+      }
+
+      void ComponentPackageImport::
+      location_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
+      }
+
+      void ComponentPackageImport::
+      location_next (Type const& o)
+      {
+        location_post (o);
+        location_pre (o);
+      }
+
+      void ComponentPackageImport::
+      location_post (Type const&)
+      {
+        pop_ ();
+      }
+
       // PackageConfiguration
       //
       //
 
       PackageConfiguration::
       PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -665,26 +1288,64 @@ namespace CIAO
       }
 
       void PackageConfiguration::
-      reference (Type const& o)
+      specializedConfig (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reference", top_ ()));
-        Traversal::PackageConfiguration::reference (o);
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
+        Traversal::PackageConfiguration::specializedConfig (o);
         pop_ ();
       }
 
       void PackageConfiguration::
-      selectRequirement (Type const& o)
+      importedPackage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
+        Traversal::PackageConfiguration::importedPackage (o);
+        pop_ ();
+      }
+
+      void PackageConfiguration::
+      referencedPackage (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
+        Traversal::PackageConfiguration::referencedPackage (o);
+        pop_ ();
+      }
+
+      void PackageConfiguration::
+      selectRequirement_pre (Type const&)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
-        Traversal::PackageConfiguration::selectRequirement (o);
+      }
+
+      void PackageConfiguration::
+      selectRequirement_next (Type const& o)
+      {
+        selectRequirement_post (o);
+        selectRequirement_pre (o);
+      }
+
+      void PackageConfiguration::
+      selectRequirement_post (Type const&)
+      {
         pop_ ();
       }
 
       void PackageConfiguration::
-      configProperty (Type const& o)
+      configProperty_pre (Type const&)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
-        Traversal::PackageConfiguration::configProperty (o);
+      }
+
+      void PackageConfiguration::
+      configProperty_next (Type const& o)
+      {
+        configProperty_post (o);
+        configProperty_pre (o);
+      }
+
+      void PackageConfiguration::
+      configProperty_post (Type const&)
+      {
         pop_ ();
       }
 
@@ -695,6 +1356,15 @@ namespace CIAO
         Traversal::PackageConfiguration::contentLocation (o);
         pop_ ();
       }
+
+      void PackageConfiguration::
+      href (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+        attr_ (&a);
+        Traversal::PackageConfiguration::href (o);
+        attr_ (0);
+      }
     }
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/pcd.hpp b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
index ff4d123c6b0..3288de6aac6 100644
--- a/TAO/CIAO/tools/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,10 +27,11 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class PackageConfiguration;
-  }
+namespace Config_Handlers
+{
+class ComponentPackageImport;
+class PackageConfiguration;
+}
 }
 
 #include <memory>
@@ -43,335 +44,658 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export PackageConfiguration : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // basePackage
-      // 
-      public:
-      bool basePackage_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
-      void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
-
-      // reference
-      // 
-      public:
-      bool reference_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
-      void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
-
-      // selectRequirement
-      // 
-      public:
-      bool selectRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
-      void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // contentLocation
-      // 
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-      public:
-      PackageConfiguration ();
-
-      PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      PackageConfiguration (PackageConfiguration const& s);
-
-      PackageConfiguration&
-      operator= (PackageConfiguration const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export ComponentPackageImport : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// location
+//
+public:
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
+typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
+location_iterator begin_location ();
+location_iterator end_location ();
+location_const_iterator begin_location () const;
+location_const_iterator end_location () const;
+void add_location (::XMLSchema::string< ACE_TCHAR > const& );
+size_t count_location (void) const;
+
+protected:
+::std::list< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+public:
+ComponentPackageImport ();
+
+ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR > const&);
+ComponentPackageImport (ComponentPackageImport const& s);
+
+ComponentPackageImport&
+operator= (ComponentPackageImport const& s);
+
+private:
+char regulator__;
+};
+
+
+class XSC_XML_Handlers_Export PackageConfiguration : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// basePackage
+//
+public:
+bool basePackage_p () const;
+::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
+void basePackage (::CIAO::Config_Handlers::ComponentPackageDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
+
+// specializedConfig
+//
+public:
+bool specializedConfig_p () const;
+::CIAO::Config_Handlers::PackageConfiguration const& specializedConfig () const;
+void specializedConfig (::CIAO::Config_Handlers::PackageConfiguration const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > specializedConfig_;
+
+// importedPackage
+//
+public:
+bool importedPackage_p () const;
+::CIAO::Config_Handlers::ComponentPackageImport const& importedPackage () const;
+void importedPackage (::CIAO::Config_Handlers::ComponentPackageImport const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > importedPackage_;
+
+// referencedPackage
+//
+public:
+bool referencedPackage_p () const;
+::CIAO::Config_Handlers::ComponentPackageReference const& referencedPackage () const;
+void referencedPackage (::CIAO::Config_Handlers::ComponentPackageReference const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > referencedPackage_;
+
+// selectRequirement
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator selectRequirement_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator selectRequirement_const_iterator;
+selectRequirement_iterator begin_selectRequirement ();
+selectRequirement_iterator end_selectRequirement ();
+selectRequirement_const_iterator begin_selectRequirement () const;
+selectRequirement_const_iterator end_selectRequirement () const;
+void add_selectRequirement (::CIAO::Config_Handlers::Requirement const& );
+size_t count_selectRequirement (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
+
+// configProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator;
+configProperty_iterator begin_configProperty ();
+configProperty_iterator end_configProperty ();
+configProperty_const_iterator begin_configProperty () const;
+configProperty_const_iterator end_configProperty () const;
+void add_configProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_configProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
+
+// contentLocation
+//
+public:
+bool contentLocation_p () const;
+::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+// href
+//
+public:
+bool href_p () const;
+::XMLSchema::string< ACE_TCHAR > const& href () const;
+::XMLSchema::string< ACE_TCHAR >& href ();
+void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+public:
+PackageConfiguration ();
+
+PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR > const&);
+PackageConfiguration (PackageConfiguration const& s);
+
+PackageConfiguration&
+operator= (PackageConfiguration const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
-      {
-        virtual void
-        traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export ComponentPackageImport : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageImport >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
+
+virtual void
+location (Type&);
+
+virtual void
+location (Type const&);
+
+virtual void
+location_pre (Type&);
+
+virtual void
+location_pre (Type const&);
+
+virtual void
+location_next (Type&);
+
+virtual void
+location_next (Type const&);
+
+virtual void
+location_post (Type&);
+
+virtual void
+location_post (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+
+struct XSC_XML_Handlers_Export PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
+{
+virtual void
+traverse (Type&);
+
+virtual void
+traverse (Type const&);
+
+virtual void
+pre (Type&);
+
+virtual void
+pre (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+label (Type&);
 
-        virtual void
-        pre (Type&);
+virtual void
+label (Type const&);
 
-        virtual void
-        pre (Type const&);
+virtual void
+label_none (Type&);
 
-        virtual void
-        label (Type&);
+virtual void
+label_none (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+UUID (Type&);
 
-        virtual void
-        label_none (Type&);
+virtual void
+UUID (Type const&);
 
-        virtual void
-        label_none (Type const&);
+virtual void
+UUID_none (Type&);
 
-        virtual void
-        UUID (Type&);
+virtual void
+UUID_none (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+basePackage (Type&);
 
-        virtual void
-        UUID_none (Type&);
+virtual void
+basePackage (Type const&);
 
-        virtual void
-        UUID_none (Type const&);
+virtual void
+basePackage_none (Type&);
 
-        virtual void
-        basePackage (Type&);
+virtual void
+basePackage_none (Type const&);
 
-        virtual void
-        basePackage (Type const&);
+virtual void
+specializedConfig (Type&);
 
-        virtual void
-        basePackage_none (Type&);
+virtual void
+specializedConfig (Type const&);
 
-        virtual void
-        basePackage_none (Type const&);
+virtual void
+specializedConfig_none (Type&);
 
-        virtual void
-        reference (Type&);
+virtual void
+specializedConfig_none (Type const&);
 
-        virtual void
-        reference (Type const&);
+virtual void
+importedPackage (Type&);
 
-        virtual void
-        reference_none (Type&);
+virtual void
+importedPackage (Type const&);
 
-        virtual void
-        reference_none (Type const&);
+virtual void
+importedPackage_none (Type&);
 
-        virtual void
-        selectRequirement (Type&);
+virtual void
+importedPackage_none (Type const&);
 
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+referencedPackage (Type&);
 
-        virtual void
-        selectRequirement_none (Type&);
+virtual void
+referencedPackage (Type const&);
 
-        virtual void
-        selectRequirement_none (Type const&);
+virtual void
+referencedPackage_none (Type&);
 
-        virtual void
-        configProperty (Type&);
+virtual void
+referencedPackage_none (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+selectRequirement (Type&);
 
-        virtual void
-        configProperty_none (Type&);
+virtual void
+selectRequirement (Type const&);
 
-        virtual void
-        configProperty_none (Type const&);
+virtual void
+selectRequirement_pre (Type&);
 
-        virtual void
-        contentLocation (Type&);
+virtual void
+selectRequirement_pre (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+selectRequirement_next (Type&);
 
-        virtual void
-        contentLocation_none (Type&);
+virtual void
+selectRequirement_next (Type const&);
 
-        virtual void
-        contentLocation_none (Type const&);
+virtual void
+selectRequirement_post (Type&);
 
-        virtual void
-        post (Type&);
+virtual void
+selectRequirement_post (Type const&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+selectRequirement_none (Type&);
+
+virtual void
+selectRequirement_none (Type const&);
+
+virtual void
+configProperty (Type&);
+
+virtual void
+configProperty (Type const&);
+
+virtual void
+configProperty_pre (Type&);
+
+virtual void
+configProperty_pre (Type const&);
+
+virtual void
+configProperty_next (Type&);
+
+virtual void
+configProperty_next (Type const&);
+
+virtual void
+configProperty_post (Type&);
+
+virtual void
+configProperty_post (Type const&);
+
+virtual void
+configProperty_none (Type&);
+
+virtual void
+configProperty_none (Type const&);
+
+virtual void
+contentLocation (Type&);
+
+virtual void
+contentLocation (Type const&);
+
+virtual void
+contentLocation_none (Type&);
+
+virtual void
+contentLocation_none (Type const&);
+
+virtual void
+href (Type&);
+
+virtual void
+href (Type const&);
+
+virtual void
+href_none (Type&);
+
+virtual void
+href_none (Type const&);
+
+virtual void
+post (Type&);
+
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct PackageConfiguration : Traversal::PackageConfiguration, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
-        PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct ComponentPackageImport : Traversal::ComponentPackageImport,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::ComponentPackageImport Type;
+ComponentPackageImport (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+location_pre (Type &o)
+{
+
+this->location_pre (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_pre (Type const&);
+
+virtual void
+location_next (Type &o)
+{
+
+this->location_next (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_next (Type const&);
+
+virtual void
+location_post (Type &o)
+{
+
+this->location_post (const_cast <Type const &> (o));
+}
+
+
+virtual void
+location_post (Type const&);
+
+protected:
+ComponentPackageImport ();
+};
+
+struct PackageConfiguration : Traversal::PackageConfiguration,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
+PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+virtual void
+traverse (Type &o)
+{
+
+this->traverse (const_cast <Type const &> (o));
+}
+
+
+virtual void
+traverse (Type const&);
+
+virtual void
+label (Type &o)
+{
+
+this->label (const_cast <Type const &> (o));
+}
+
+
+virtual void
+label (Type const&);
+
+virtual void
+UUID (Type &o)
+{
+
+this->UUID (const_cast <Type const &> (o));
+}
 
-        virtual void 
-        traverse (Type &o)
-        {
 
-          this->traverse (const_cast <Type const &> (o));
-        }
+virtual void
+UUID (Type const&);
 
+virtual void
+basePackage (Type &o)
+{
+
+this->basePackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+basePackage (Type const&);
+
+virtual void
+specializedConfig (Type &o)
+{
+
+this->specializedConfig (const_cast <Type const &> (o));
+}
+
+
+virtual void
+specializedConfig (Type const&);
+
+virtual void
+importedPackage (Type &o)
+{
+
+this->importedPackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+importedPackage (Type const&);
+
+virtual void
+referencedPackage (Type &o)
+{
+
+this->referencedPackage (const_cast <Type const &> (o));
+}
+
+
+virtual void
+referencedPackage (Type const&);
 
-        virtual void
-        traverse (Type const&);
+virtual void
+selectRequirement_pre (Type &o)
+{
 
-        virtual void 
-        label (Type &o)
-        {
+this->selectRequirement_pre (const_cast <Type const &> (o));
+}
 
-          this->label (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_pre (Type const&);
 
-        virtual void
-        label (Type const&);
+virtual void
+selectRequirement_next (Type &o)
+{
 
-        virtual void 
-        UUID (Type &o)
-        {
+this->selectRequirement_next (const_cast <Type const &> (o));
+}
 
-          this->UUID (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_next (Type const&);
 
-        virtual void
-        UUID (Type const&);
+virtual void
+selectRequirement_post (Type &o)
+{
 
-        virtual void 
-        basePackage (Type &o)
-        {
+this->selectRequirement_post (const_cast <Type const &> (o));
+}
 
-          this->basePackage (const_cast <Type const &> (o));
-        }
 
+virtual void
+selectRequirement_post (Type const&);
 
-        virtual void
-        basePackage (Type const&);
+virtual void
+configProperty_pre (Type &o)
+{
 
-        virtual void 
-        reference (Type &o)
-        {
+this->configProperty_pre (const_cast <Type const &> (o));
+}
 
-          this->reference (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_pre (Type const&);
 
-        virtual void
-        reference (Type const&);
+virtual void
+configProperty_next (Type &o)
+{
 
-        virtual void 
-        selectRequirement (Type &o)
-        {
+this->configProperty_next (const_cast <Type const &> (o));
+}
 
-          this->selectRequirement (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_next (Type const&);
 
-        virtual void
-        selectRequirement (Type const&);
+virtual void
+configProperty_post (Type &o)
+{
 
-        virtual void 
-        configProperty (Type &o)
-        {
+this->configProperty_post (const_cast <Type const &> (o));
+}
 
-          this->configProperty (const_cast <Type const &> (o));
-        }
 
+virtual void
+configProperty_post (Type const&);
 
-        virtual void
-        configProperty (Type const&);
+virtual void
+contentLocation (Type &o)
+{
 
-        virtual void 
-        contentLocation (Type &o)
-        {
+this->contentLocation (const_cast <Type const &> (o));
+}
 
-          this->contentLocation (const_cast <Type const &> (o));
-        }
 
+virtual void
+contentLocation (Type const&);
 
-        virtual void
-        contentLocation (Type const&);
+virtual void
+href (Type &o)
+{
 
-        protected:
-        PackageConfiguration ();
-      };
-    }
-  }
+this->href (const_cast <Type const &> (o));
+}
+
+
+virtual void
+href (Type const&);
+
+protected:
+PackageConfiguration ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // PCD_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cdp b/TAO/CIAO/tools/Config_Handlers/test.cdp
index 72839f9c8b8..2430859601b 100644
--- a/TAO/CIAO/tools/Config_Handlers/test.cdp
+++ b/TAO/CIAO/tools/Config_Handlers/test.cdp
@@ -1,211 +1,1827 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Deployment:deploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
 
-  <label>Hello-DeploymentPlan</label>
-
-  <UUID>Hello_Plan_UUID_0001</UUID>
-
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType/>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType>
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false&gt;</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source/>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source/>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation>Hello-Sender-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value>
-    </configProperty>
-    <deployedResource>
-      <resourceUsage>InstanceUsesResource</resourceUsage>
-      <requirementName>testRequirementName</requirementName>
-      <resourceName>testResourceName</resourceName>
-      <resourceValue>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestValue</string>
-        </value>
-      </resourceValue>
-    </deployedResource>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>hell_event_connection</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <kind>EventPublisher</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>click_in</portName>
-      <kind>EventConsumer</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>hello_facet_connection</name>
-    <internalEndpoint>
-      <portName>push_message</portName>
-      <kind>Facet</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>read_message</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-<!--
-  <infoProperty>
-    <name>CIAOServerResources</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>input.csr</string>
-      </value>
-    </value>
-  </infoProperty>
--->
+<UUID>8E8594AF-3310-446F-95E2-4440D622D5CE</UUID>
+
+<implementation id="_2D19FD96-440B-48D4-8D68-4E9B466B2BCC">
+<name>RT1H_Combined.ComponentImplementations.Config_Op_Impl.Config_Op</name>
+<source/>
+<artifact>_304555B7-9E3A-4DC5-9535-FA774FAA5070</artifact>
+<artifact>_358C7270-F290-465E-B0E4-5FD390980B44</artifact>
+<artifact>_C4A896EE-C035-45F1-8F14-2320383B1991</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_DA5C3C13-030E-4971-A0BF-8631563EFDF3">
+<name>RT1H_Combined.ComponentImplementations.Planner_One_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_6C7AA3D5-7A09-4DEF-8D49-60A4E1DE173D</artifact>
+<artifact>_1DAD54BC-F7B5-41E3-9FFC-3E0AE255D989</artifact>
+<artifact>_66E9CA12-F886-4760-A9B3-DB1E3F27B920</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_A7DAA16F-D455-4C63-92CE-05B98DD34B15">
+<name>RT1H_Combined.ComponentImplementations.Planner_Three_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_2748D2D1-AAE5-4934-A43F-1639241C4351</artifact>
+<artifact>_556249CC-E874-4BC6-9411-1B33EB2B895B</artifact>
+<artifact>_458C6E27-87CA-4F77-8036-C9F612511B6F</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_A8181747-270E-43FF-B723-50825AA8EA74">
+<name>RT1H_Combined.ComponentImplementations.Env_Dectector_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_1A46D81D-989F-406B-9E87-A57D63ADDF43</artifact>
+<artifact>_208D7378-B123-4F15-B376-CAA58B5CB1E0</artifact>
+<artifact>_5D7CAC69-4E3B-45F9-BACD-B12D3A86AC7A</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_05FAFE3F-76B3-4C6E-A86B-0225B9E76909">
+<name>RT1H_Combined.ComponentImplementations.Effector_Main_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>_D40E03AB-CE43-49D6-A7FF-C1231FE98898</artifact>
+<artifact>_840618C0-5513-4389-97A4-C53EB87B29A0</artifact>
+<artifact>_E1AF706E-0B37-480B-8B26-E844FE2E9C3E</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_8D45FC0E-C3DD-4671-926D-A08430B37D37">
+<name>RT1H_Combined.ComponentImplementations.Effector_Secondary_Impl.MonolithicImplementation</name>
+<source/>
+<artifact>__31B2C21F-86C7-4306-AA10-33687687B5D0</artifact>
+<artifact>__C7A0B01C-6C13-4EAA-8527-155035BF1A00</artifact>
+<artifact>__2F43BA6B-2749-4744-B9C4-18F4AEAC16C9</artifact>
+<execParameter>
+<name>LoadAverage</name>
+<value>
+<type>
+<kind>tk_double</kind>
+</type>
+<value>
+<double>.25</double>
+</value>
+</value>
+</execParameter>
+</implementation>
+
+<implementation id="_2DF6D3BE-F1A2-43E1-BEA0-54576784FF96">
+<name>RT1H_Combined.CUTS_ComponentImplementations.BDC_Implementation.BDC_Monolithic_Impl</name>
+<source/>
+<artifact>__55C2DCD4-30B1-46A3-86B2-229896D74D0D</artifact>
+<artifact>__BF5CDECF-AF12-4876-9B6C-211B7BF0B22F</artifact>
+<artifact>_0E615519-6CC8-4EA5-B67A-65FF73586F04</artifact>
+</implementation>
+
+<implementation id="_BA0C4535-191E-4BE0-9BF4-A054EB2C4139">
+<name>RT1H_Combined.CUTS_ComponentImplementations.BDC_Ex_Implementation.BDC_Ex_Impl</name>
+<source/>
+<artifact>_2DBFA82B-1D1F-48C6-9BDC-014E789E6A77</artifact>
+<artifact>_5CE1793F-38DD-427D-A21E-E6D870E769E4</artifact>
+<artifact>_0B8A6C29-8962-4DA6-99F4-25FEECD77E97</artifact>
+</implementation>
+
+<implementation id="_D98AF36F-11FA-43A4-8FAD-C14A461437FF">
+<name>RT1H_Combined.RACE_ComponentImplementations.ControllerImplementation.ControllerMonolithicImpl</name>
+<source/>
+<artifact>__032AE7B6-3ABD-478A-B0D7-56BC4AAEF0B7</artifact>
+<artifact>__00B105AB-50F5-49B7-A822-9B267F2D8896</artifact>
+<artifact>__BF4AE6A2-BE32-4B8E-9919-C812EC18BF00</artifact>
+</implementation>
+
+<implementation id="_CA363CD1-4E23-4A4B-B25B-C38B939E2B25">
+<name>RT1H_Combined.RACE_ComponentImplementations.TargetManagerImplImplementation.TargetManagerImplMonolithicImpl</name>
+<source/>
+<artifact>__C22D0B06-6CDA-4652-B1CE-586E0C23251F</artifact>
+<artifact>__9CB3A43B-397F-4FA9-97AA-EBFC3A22BFEC</artifact>
+<artifact>__0F176DA2-9953-482A-9268-7DA5E69A88FE</artifact>
+</implementation>
+
+<implementation id="_7A233158-69BB-4382-BDE0-72432BF3D48E">
+<name>RT1H_Combined.RA_ComponentImplementations.AnalyzerImplementation.AnalyzerMonolithicImpl</name>
+<source/>
+<artifact>__315FC65C-0582-4E0E-BB8B-C23A1238C67F</artifact>
+<artifact>__7AD332BC-90DC-4E7D-B026-8D5053F2552E</artifact>
+<artifact>__84974D39-AE18-4C0A-B81A-B1EC349E93BB</artifact>
+</implementation>
+
+<implementation id="_14E77757-BC3A-49F4-8D45-FB447FA7F626">
+<name>RT1H_Combined.RA_ComponentImplementations.SimpleAllocationAnalyzerImplementation.SimpleAllocationAnalyzerMonolithicImpl</name>
+<source/>
+<artifact>__6BDE830C-FFA8-4F2D-9733-34F02F35020F</artifact>
+<artifact>__138A0FE1-D8AA-4C1E-BB5E-4EC9714F4CA8</artifact>
+<artifact>__621F3412-C507-4945-836B-CF9B81BDCC99</artifact>
+</implementation>
+
+<implementation id="_E4DC8736-E532-44DC-9C9B-789EBA3D6B27">
+<name>RT1H_Combined.RA_ComponentImplementations.Input_AdapterImplementation.Input_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__DC22BCBB-DB20-4072-AA64-161AFD7A9C10</artifact>
+<artifact>__3E362049-0CF5-4F01-905F-67CAD769FFD5</artifact>
+<artifact>__3B466B60-F8C2-4E48-A6E4-3D3D7EED9F03</artifact>
+</implementation>
+
+<implementation id="_73898E70-9FB1-4881-9313-A2DE181EE48E">
+<name>RT1H_Combined.RA_ComponentImplementations.Interactive_Input_AdapterImplementation.Interactive_Input_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__AD4B52E0-103C-49E2-BE47-29CAE978676F</artifact>
+<artifact>__E4AF24BF-5A39-46B1-8217-6343D7D53298</artifact>
+<artifact>__76A0CEFE-E2F7-4BF7-BB91-F309FB5AD33C</artifact>
+</implementation>
+
+<implementation id="_796D9731-1CD9-4855-83F2-025AECB90C93">
+<name>RT1H_Combined.RA_ComponentImplementations.Output_AdapterImplementation.Output_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__864DB99C-C60B-4FDD-A47D-AFD5C1599892</artifact>
+<artifact>__D6EB8E01-F794-4C43-AB14-A3AFB9767D01</artifact>
+<artifact>__4C78C4F9-FEF4-45AA-84A4-FFB10255A1EC</artifact>
+</implementation>
+
+<implementation id="_A22015F9-9BC9-4767-A861-FAFF737E074B">
+<name>RT1H_Combined.RA_ComponentImplementations.Output_ManagerImplementation.Output_ManagerMonolithicImpl</name>
+<source/>
+<artifact>__AB498B7F-A0E8-4F59-BF24-BBB9D125EED3</artifact>
+<artifact>__1BB4CD4A-38A8-4BBA-9303-4A10F5B8BC57</artifact>
+<artifact>__280E6118-F4C7-4DE4-A0A4-A50637282EAE</artifact>
+</implementation>
+
+<implementation id="_219DB379-DB2E-44D2-8308-D91FC5A42A9D">
+<name>RT1H_Combined.RA_ComponentImplementations.DAnCE_Output_AdapterImplementation.DAnCE_Output_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__A47095F9-2E08-485E-96B4-CC0829051DF3</artifact>
+<artifact>__E54AE941-14CA-48FC-BAAA-1B93269EF79B</artifact>
+<artifact>__ACA6BD67-D92A-4DBF-827A-7C0B15EA3F6D</artifact>
+</implementation>
+
+<implementation id="_5A98D073-1392-4C85-AB88-1AD6E61BF34D">
+<name>RT1H_Combined.RA_ComponentImplementations.XML_Output_AdapterImplementation.XML_Output_AdapterMonolithicImpl</name>
+<source/>
+<artifact>__CF7C6C9B-C6E3-4356-B9F1-598FA0B4A5B7</artifact>
+<artifact>__437B6234-9DD3-40E4-9AE0-0923EBAF4548</artifact>
+<artifact>__E2F1EA75-127C-4579-B692-ADD1026C6F23</artifact>
+</implementation>
+
+<implementation id="_571F6ECC-579F-4F69-88AB-EA1603B422E8">
+<name>RT1H_Combined.RA_ComponentImplementations.PlannerImplementation.PlannerMonolithicImpl</name>
+<source/>
+<artifact>__B28C1F32-0231-4F7F-8FE2-164321942B87</artifact>
+<artifact>__2021EE2F-3480-4BF9-9A3A-D146A99D251D</artifact>
+<artifact>__D952F988-841F-43BA-9650-86846B08DF5F</artifact>
+</implementation>
+
+<implementation id="_38C5B64C-72FD-48FF-B095-260669E2A488">
+<name>RT1H_Combined.RA_ComponentImplementations.SimpleBinPackerImplementation.SimpleBinPackerMonolithicImpl</name>
+<source/>
+<artifact>__2B5FE9E6-AF4C-4BC1-92A2-58101B2ECCA8</artifact>
+<artifact>__4D375D8F-5470-4236-8614-EF07D08020E3</artifact>
+<artifact>__D6176B6C-58E4-43D4-BFC9-3DCF98249044</artifact>
+</implementation>
+
+<implementation id="_FD120510-765E-4B02-803D-7DADF3F5E4E6">
+<name>RT1H_Combined.RA_ComponentImplementations.Planner_ManagerImplementation.Planner_ManagerMonolithicImpl</name>
+<source/>
+<artifact>__5B614077-C99E-428C-B8BE-252ADD7905B7</artifact>
+<artifact>__0BEB188E-3967-4D91-A6A1-CDF08EF81718</artifact>
+<artifact>__A65A1FA0-8F4D-4807-9AE9-90D344154D2C</artifact>
+</implementation>
+
+<implementation id="_5D6641D2-640C-4F80-B055-10DC69C7A636">
+<name>RT1H_Combined.RA_ComponentImplementations.Plan_AnalyzerImplementation.Plan_AnalyzerMonolithicImpl</name>
+<source/>
+<artifact>__1CC443DF-7EE3-4130-8ACE-EE4181AC96CD</artifact>
+<artifact>__57123764-8624-4D79-9C5B-7ADF929536E6</artifact>
+<artifact>__CDC7061A-483C-447B-8151-E68250566E86</artifact>
+</implementation>
+
+<instance id="_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetector1</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_AC6DB008-DCCB-45D7-B52D-628B74B49AC9">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetector2</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_7529501D-B22A-42F9-A75B-0E71DC97D3AA">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetecto3</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_FEBD6AD3-6310-4E25-A0E5-957DED0B6509">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.EnvDetector4</name>
+<node>blade44</node>
+<source/>
+<implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Env_Detector.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector3</name>
+<node>blade43</node>
+<source/>
+<implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Secondary.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_EC0045E5-7501-4E2B-B755-D8CE22BF4816">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector2</name>
+<node>blade43</node>
+<source/>
+<implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Secondary.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_57B08287-3528-4862-9110-ACACD713360B">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector4</name>
+<node>blade43</node>
+<source/>
+<implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Secondary.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_AB189D2B-6D86-4020-88BD-74DBECC7F7B8">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Planner_Three</name>
+<node>blade39</node>
+<source/>
+<implementation>_A7DAA16F-D455-4C63-92CE-05B98DD34B15</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Planner_Three.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_002D7B3A-A628-43E3-AD53-B1AB8636001E">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Planner_One</name>
+<node>blade42</node>
+<source/>
+<implementation>_DA5C3C13-030E-4971-A0BF-8631563EFDF3</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Planner_One.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_015ACD88-117F-42C9-8D04-3FFAB9F6C98E">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Effector_Main</name>
+<node>blade41</node>
+<source/>
+<implementation>_05FAFE3F-76B3-4C6E-A86B-0225B9E76909</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Effectory_Main.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_34C61830-1F54-494F-95DE-4003BCD428C5">
+<name>RT1H_Combined.ComponentImplementations.RT1H.RT1H.Config_Op</name>
+<node>blade40</node>
+<source/>
+<implementation>_2D19FD96-440B-48D4-8D68-4E9B466B2BCC</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>Config_Op.ior</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<instance id="_7AE0BE73-48F8-4717-A5FF-524D454C58DD">
+<name>RT1H_Combined.ComponentImplementations.RACE.RACE.Benchmark_Data_Collector_Ex</name>
+<node>blade10</node>
+<source/>
+<implementation>_BA0C4535-191E-4BE0-9BF4-A054EB2C4139</implementation>
+<configProperty>
+<name>ComponentIOR</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>BDC_Ex.ior</string>
+</value>
+</value>
+</configProperty>
+<configProperty>
+<name>server_name</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>blade10.isislab.vanderbilt.edu</string>
+</value>
+</value>
+</configProperty>
+</instance>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_002D7B3A-A628-43E3-AD53-B1AB8636001E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_57B08287-3528-4862-9110-ACACD713360B</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_EC0045E5-7501-4E2B-B755-D8CE22BF4816</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_FEBD6AD3-6310-4E25-A0E5-957DED0B6509</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_7529501D-B22A-42F9-A75B-0E71DC97D3AA</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_AC6DB008-DCCB-45D7-B52D-628B74B49AC9</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>cuts_testing_service_testing_service</name>
+<internalEndpoint>
+<portName>cuts_testing_service</portName>
+<kind>SimplexReceptacle</kind>
+<instance>_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>testing_service</portName>
+<kind>Facet</kind>
+<instance>_7AE0BE73-48F8-4717-A5FF-524D454C58DD</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_EC0045E5-7501-4E2B-B755-D8CE22BF4816</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_57B08287-3528-4862-9110-ACACD713360B</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>status_status</name>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventPublisher</kind>
+<instance>_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>status</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_57B08287-3528-4862-9110-ACACD713360B</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_EC0045E5-7501-4E2B-B755-D8CE22BF4816</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_015ACD88-117F-42C9-8D04-3FFAB9F6C98E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_2F3B1B72-DB17-47E7-BA21-1ABEF84032EC</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>assessment_assessment</name>
+<internalEndpoint>
+<portName>assessment</portName>
+<kind>EventPublisher</kind>
+<instance>_002D7B3A-A628-43E3-AD53-B1AB8636001E</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>assessment</portName>
+<kind>EventConsumer</kind>
+<instance>_34C61830-1F54-494F-95DE-4003BCD428C5</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>situation_situation</name>
+<internalEndpoint>
+<portName>situation</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>situation</portName>
+<kind>EventConsumer</kind>
+<instance>_002D7B3A-A628-43E3-AD53-B1AB8636001E</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_FEBD6AD3-6310-4E25-A0E5-957DED0B6509</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_7529501D-B22A-42F9-A75B-0E71DC97D3AA</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>command_command</name>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventPublisher</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>command</portName>
+<kind>EventConsumer</kind>
+<instance>_AC6DB008-DCCB-45D7-B52D-628B74B49AC9</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_FEBD6AD3-6310-4E25-A0E5-957DED0B6509</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_7529501D-B22A-42F9-A75B-0E71DC97D3AA</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_AC6DB008-DCCB-45D7-B52D-628B74B49AC9</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<connection>
+<name>track_track</name>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventPublisher</kind>
+<instance>_3FD684C5-47B0-4E8C-88D0-8AD9CEB11FEB</instance>
+</internalEndpoint>
+<internalEndpoint>
+<portName>track</portName>
+<kind>EventConsumer</kind>
+<instance>_AB189D2B-6D86-4020-88BD-74DBECC7F7B8</instance>
+</internalEndpoint>
+</connection>
+
+<artifact id="_358C7270-F290-465E-B0E4-5FD390980B44">
+<name>RT1H_Combined.ImplementationArtifacts.Config_Op_Artifacts.Config_Op_stub</name>
+<source/>
+<node/>
+<location>Config_Op_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_304555B7-9E3A-4DC5-9535-FA774FAA5070">
+<name>RT1H_Combined.ImplementationArtifacts.Config_Op_Artifacts.Config_Op_svnt</name>
+<source/>
+<node/>
+<location>Config_Op_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Config_Op_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_C4A896EE-C035-45F1-8F14-2320383B1991">
+<name>RT1H_Combined.ImplementationArtifacts.Config_Op_Artifacts.Config_Op_exec</name>
+<source/>
+<node/>
+<location>Config_Op_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Config_Op_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_208D7378-B123-4F15-B376-CAA58B5CB1E0">
+<name>RT1H_Combined.ImplementationArtifacts.Env_Dectector_Artifacts.Env_Detector_exec</name>
+<source/>
+<node/>
+<location>Env_Detector_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Env_Detector_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_5D7CAC69-4E3B-45F9-BACD-B12D3A86AC7A">
+<name>RT1H_Combined.ImplementationArtifacts.Env_Dectector_Artifacts.Env_Dectector_stub</name>
+<source/>
+<node/>
+<location>Env_Detector_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_1A46D81D-989F-406B-9E87-A57D63ADDF43">
+<name>RT1H_Combined.ImplementationArtifacts.Env_Dectector_Artifacts.Env_Detector_svnt</name>
+<source/>
+<node/>
+<location>Env_Detector_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Env_Detector_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_1DAD54BC-F7B5-41E3-9FFC-3E0AE255D989">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_One_Artifacts.Planner_One_stub</name>
+<source/>
+<node/>
+<location>Planner_One_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_6C7AA3D5-7A09-4DEF-8D49-60A4E1DE173D">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_One_Artifacts.Planner_One_svnt</name>
+<source/>
+<node/>
+<location>Planner_One_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_One_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_66E9CA12-F886-4760-A9B3-DB1E3F27B920">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_One_Artifacts.Planner_One_exec</name>
+<source/>
+<node/>
+<location>Planner_One_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_One_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__C7A0B01C-6C13-4EAA-8527-155035BF1A00">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Secondary_Artifacts.Effector_Secondary_svnt</name>
+<source/>
+<node/>
+<location>Effector_Secondary_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Secondary_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__31B2C21F-86C7-4306-AA10-33687687B5D0">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Secondary_Artifacts.Effector_Secondary_stub</name>
+<source/>
+<node/>
+<location>Effector_Secondary_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="__2F43BA6B-2749-4744-B9C4-18F4AEAC16C9">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Secondary_Artifacts.Effector_Secondary_exec</name>
+<source/>
+<node/>
+<location>Effector_Secondary_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Secondary_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_840618C0-5513-4389-97A4-C53EB87B29A0">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Main_Artifacts.Effector_Main_svnt</name>
+<source/>
+<node/>
+<location>Effector_Main_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Main_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_E1AF706E-0B37-480B-8B26-E844FE2E9C3E">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Main_Artifacts.Effector_Main_exec</name>
+<source/>
+<node/>
+<location>Effector_Main_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Effector_Main_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_D40E03AB-CE43-49D6-A7FF-C1231FE98898">
+<name>RT1H_Combined.ImplementationArtifacts.Effector_Main_Artifacts.Effector_Main_stub</name>
+<source/>
+<node/>
+<location>Effector_Main_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="_556249CC-E874-4BC6-9411-1B33EB2B895B">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_Three_Artifacts.Planner_Three_svnt</name>
+<source/>
+<node/>
+<location>Planner_Three_CoWorkEr_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_Three_Factory_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_458C6E27-87CA-4F77-8036-C9F612511B6F">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_Three_Artifacts.Planner_Three_exec</name>
+<source/>
+<node/>
+<location>Planner_Three_CoWorkEr_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_TSCE_Planner_Three_Factory_CoWorkEr_Factory_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_2748D2D1-AAE5-4934-A43F-1639241C4351">
+<name>RT1H_Combined.ImplementationArtifacts.Planner_Three_Artifacts.Planner_Three_stub</name>
+<source/>
+<node/>
+<location>Planner_Three_CoWorkEr_stub</location>
+</artifact>
+
+<artifact id="__55C2DCD4-30B1-46A3-86B2-229896D74D0D">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Artifacts.BDC_stub</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_stub</location>
+</artifact>
+
+<artifact id="__BF5CDECF-AF12-4876-9B6C-211B7BF0B22F">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Artifacts.BDC_svnt</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_0E615519-6CC8-4EA5-B67A-65FF73586F04">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Artifacts.BDC_exec</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_0B8A6C29-8962-4DA6-99F4-25FEECD77E97">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Ex_Artifacts.BDC_Ex_exec</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_Ex_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Ex_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="_5CE1793F-38DD-427D-A21E-E6D870E769E4">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Ex_Artifacts.BDC_Ex_stub</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_Ex_stub</location>
+</artifact>
+
+<artifact id="_2DBFA82B-1D1F-48C6-9BDC-014E789E6A77">
+<name>RT1H_Combined.CUTS_ImplementationArtifacts.BDC_Ex_Artifacts.BDC_Ex_svnt</name>
+<source/>
+<node/>
+<location>Benchmark_Data_Collector_Ex_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CUTS_Benchmark_Data_Collector_Ex_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__032AE7B6-3ABD-478A-B0D7-56BC4AAEF0B7">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.ControllerArtifacts.Controller_stub</name>
+<source/>
+<node/>
+<location>Controller_stub</location>
+</artifact>
+
+<artifact id="__00B105AB-50F5-49B7-A822-9B267F2D8896">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.ControllerArtifacts.Controller_svnt</name>
+<source/>
+<node/>
+<location>Controller_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Controller_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__BF4AE6A2-BE32-4B8E-9919-C812EC18BF00">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.ControllerArtifacts.Controller_exec</name>
+<source/>
+<node/>
+<location>Controller_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Controller_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__C22D0B06-6CDA-4652-B1CE-586E0C23251F">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.TargetManagerImplArtifacts.TargetManager_stub</name>
+<source/>
+<node/>
+<location>TargetManager_stub</location>
+</artifact>
+
+<artifact id="__9CB3A43B-397F-4FA9-97AA-EBFC3A22BFEC">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.TargetManagerImplArtifacts.TargetManager_svnt</name>
+<source/>
+<node/>
+<location>TargetManager_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_TargetManagerHome_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__0F176DA2-9953-482A-9268-7DA5E69A88FE">
+<name>RT1H_Combined.RACE_ImplementationArtifacts.TargetManagerImplArtifacts.TargetManager_exec</name>
+<source/>
+<node/>
+<location>TargetManager_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_TargetManagerHome_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__315FC65C-0582-4E0E-BB8B-C23A1238C67F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.AnalyzerArtifacts.Analyzer_stub</name>
+<source/>
+<node/>
+<location>Analyzer_stub</location>
+</artifact>
+
+<artifact id="__7AD332BC-90DC-4E7D-B026-8D5053F2552E">
+<name>RT1H_Combined.RA_ImplementationArtifacts.AnalyzerArtifacts.Analyzer_svnt</name>
+<source/>
+<node/>
+<location>Analyzer_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Analyzer_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__84974D39-AE18-4C0A-B81A-B1EC349E93BB">
+<name>RT1H_Combined.RA_ImplementationArtifacts.AnalyzerArtifacts.Analyzer_exec</name>
+<source/>
+<node/>
+<location>Analyzer_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Analyzer_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__6BDE830C-FFA8-4F2D-9733-34F02F35020F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleAllocationAnalyzerArtifacts.SimpleAllocationAnalyzer_stub</name>
+<source/>
+<node/>
+<location>SimpleAllocationAnalyzer_stub</location>
+</artifact>
+
+<artifact id="__138A0FE1-D8AA-4C1E-BB5E-4EC9714F4CA8">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleAllocationAnalyzerArtifacts.SimpleAllocationAnalyzer_svnt</name>
+<source/>
+<node/>
+<location>SimpleAllocationAnalyzer_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleAllocationAnalyzer_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__621F3412-C507-4945-836B-CF9B81BDCC99">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleAllocationAnalyzerArtifacts.SimpleAllocationAnalyzer_exec</name>
+<source/>
+<node/>
+<location>SimpleAllocationAnalyzer_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleAllocationAnalyzer_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__DC22BCBB-DB20-4072-AA64-161AFD7A9C10">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Input_AdapterArtifacts.Input_Adapter_stub</name>
+<source/>
+<node/>
+<location>Input_Adapter_stub</location>
+</artifact>
+
+<artifact id="__3E362049-0CF5-4F01-905F-67CAD769FFD5">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Input_AdapterArtifacts.Input_Adapter_svnt</name>
+<source/>
+<node/>
+<location>Input_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Input_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__3B466B60-F8C2-4E48-A6E4-3D3D7EED9F03">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Input_AdapterArtifacts.Input_Adapter_exec</name>
+<source/>
+<node/>
+<location>Input_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Input_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__AD4B52E0-103C-49E2-BE47-29CAE978676F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Interactive_Input_AdapterArtifacts.Interactive_Input_Adapter_stub</name>
+<source/>
+<node/>
+<location>Interactive_Input_Adapter_stub</location>
+</artifact>
+
+<artifact id="__E4AF24BF-5A39-46B1-8217-6343D7D53298">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Interactive_Input_AdapterArtifacts.Interactive_Input_Adapter_svnt</name>
+<source/>
+<node/>
+<location>Interactive_Input_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Interactive_Input_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__76A0CEFE-E2F7-4BF7-BB91-F309FB5AD33C">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Interactive_Input_AdapterArtifacts.Interactive_Input_Adapter_exec</name>
+<source/>
+<node/>
+<location>Interactive_Input_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Interactive_Input_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__864DB99C-C60B-4FDD-A47D-AFD5C1599892">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_AdapterArtifacts.Output_Adapter_stub</name>
+<source/>
+<node/>
+<location>Output_Adapter_stub</location>
+</artifact>
+
+<artifact id="__D6EB8E01-F794-4C43-AB14-A3AFB9767D01">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_AdapterArtifacts.Output_Adapter_svnt</name>
+<source/>
+<node/>
+<location>Output_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__4C78C4F9-FEF4-45AA-84A4-FFB10255A1EC">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_AdapterArtifacts.Output_Adapter_exec</name>
+<source/>
+<node/>
+<location>Output_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__AB498B7F-A0E8-4F59-BF24-BBB9D125EED3">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_ManagerArtifacts.Output_Manager_stub</name>
+<source/>
+<node/>
+<location>Output_Manager_stub</location>
+</artifact>
+
+<artifact id="__1BB4CD4A-38A8-4BBA-9303-4A10F5B8BC57">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_ManagerArtifacts.Output_Manager_svnt</name>
+<source/>
+<node/>
+<location>Output_Manager_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Manager_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__280E6118-F4C7-4DE4-A0A4-A50637282EAE">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Output_ManagerArtifacts.Output_Manager_exec</name>
+<source/>
+<node/>
+<location>Output_Manager_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Output_Manager_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__A47095F9-2E08-485E-96B4-CC0829051DF3">
+<name>RT1H_Combined.RA_ImplementationArtifacts.DAnCE_Output_AdapterArtifacts.DAnCE_Output_Adapter_stub</name>
+<source/>
+<node/>
+<location>DAnCE_Output_Adapter_stub</location>
+</artifact>
+
+<artifact id="__E54AE941-14CA-48FC-BAAA-1B93269EF79B">
+<name>RT1H_Combined.RA_ImplementationArtifacts.DAnCE_Output_AdapterArtifacts.DAnCE_Output_Adapter_svnt</name>
+<source/>
+<node/>
+<location>DAnCE_Output_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_DAnCE_Output_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__ACA6BD67-D92A-4DBF-827A-7C0B15EA3F6D">
+<name>RT1H_Combined.RA_ImplementationArtifacts.DAnCE_Output_AdapterArtifacts.DAnCE_Output_Adapter_exec</name>
+<source/>
+<node/>
+<location>DAnCE_Output_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_DAnCE_Output_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__CF7C6C9B-C6E3-4356-B9F1-598FA0B4A5B7">
+<name>RT1H_Combined.RA_ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_stub</name>
+<source/>
+<node/>
+<location>XML_Output_Adapter_stub</location>
+</artifact>
+
+<artifact id="__437B6234-9DD3-40E4-9AE0-0923EBAF4548">
+<name>RT1H_Combined.RA_ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_svnt</name>
+<source/>
+<node/>
+<location>XML_Output_Adapter_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_XML_Output_Adapter_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__E2F1EA75-127C-4579-B692-ADD1026C6F23">
+<name>RT1H_Combined.RA_ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_exec</name>
+<source/>
+<node/>
+<location>XML_Output_Adapter_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_XML_Output_Adapter_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__B28C1F32-0231-4F7F-8FE2-164321942B87">
+<name>RT1H_Combined.RA_ImplementationArtifacts.PlannerArtifacts.Planner_stub</name>
+<source/>
+<node/>
+<location>Planner_stub</location>
+</artifact>
+
+<artifact id="__2021EE2F-3480-4BF9-9A3A-D146A99D251D">
+<name>RT1H_Combined.RA_ImplementationArtifacts.PlannerArtifacts.Planner_svnt</name>
+<source/>
+<node/>
+<location>Planner_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__D952F988-841F-43BA-9650-86846B08DF5F">
+<name>RT1H_Combined.RA_ImplementationArtifacts.PlannerArtifacts.Planner_exec</name>
+<source/>
+<node/>
+<location>Planner_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__2B5FE9E6-AF4C-4BC1-92A2-58101B2ECCA8">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleBinPackerArtifacts.SimpleBinPacker_stub</name>
+<source/>
+<node/>
+<location>SimpleBinPacker_stub</location>
+</artifact>
+
+<artifact id="__4D375D8F-5470-4236-8614-EF07D08020E3">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleBinPackerArtifacts.SimpleBinPacker_svnt</name>
+<source/>
+<node/>
+<location>SimpleBinPacker_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleBinPacker_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__D6176B6C-58E4-43D4-BFC9-3DCF98249044">
+<name>RT1H_Combined.RA_ImplementationArtifacts.SimpleBinPackerArtifacts.SimpleBinPacker_exec</name>
+<source/>
+<node/>
+<location>SimpleBinPacker_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_SimpleBinPacker_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__5B614077-C99E-428C-B8BE-252ADD7905B7">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Planner_ManagerArtifacts.Planner_Manager_stub</name>
+<source/>
+<node/>
+<location>Planner_Manager_stub</location>
+</artifact>
+
+<artifact id="__0BEB188E-3967-4D91-A6A1-CDF08EF81718">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Planner_ManagerArtifacts.Planner_Manager_svnt</name>
+<source/>
+<node/>
+<location>Planner_Manager_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Manager_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__A65A1FA0-8F4D-4807-9AE9-90D344154D2C">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Planner_ManagerArtifacts.Planner_Manager_exec</name>
+<source/>
+<node/>
+<location>Planner_Manager_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Planner_Manager_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__1CC443DF-7EE3-4130-8ACE-EE4181AC96CD">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Plan_AnalyzerArtifacts.Plan_Analyzer_stub</name>
+<source/>
+<node/>
+<location>Plan_Analyzer_stub</location>
+</artifact>
+
+<artifact id="__57123764-8624-4D79-9C5B-7ADF929536E6">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Plan_AnalyzerArtifacts.Plan_Analyzer_svnt</name>
+<source/>
+<node/>
+<location>Plan_Analyzer_svnt</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Plan_Analyzer_Home_Servant</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
+<artifact id="__CDC7061A-483C-447B-8151-E68250566E86">
+<name>RT1H_Combined.RA_ImplementationArtifacts.Plan_AnalyzerArtifacts.Plan_Analyzer_exec</name>
+<source/>
+<node/>
+<location>Plan_Analyzer_exec</location>
+<execParameter>
+<name>entryPoint</name>
+<value>
+<type>
+<kind>tk_string</kind>
+</type>
+<value>
+<string>create_CIAO_RACE_Plan_Analyzer_Home_Impl</string>
+</value>
+</value>
+</execParameter>
+</artifact>
+
 </Deployment:deploymentPlan>
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/test.cpp
index 96c19b6688d..98ea43b6326 100644
--- a/TAO/CIAO/tools/Config_Handlers/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/test.cpp
@@ -33,10 +33,10 @@ parse_args (int argc, char *argv[])
                            "-i <input file> "
                            "\n",
                            argv [0]),
-                          -1); 
+                          -1);
       }
   // Indicates sucessful parsing of the command-line
-  return 0;  
+  return 0;
 }
 
 // Check to see if SRD was imported.
@@ -47,7 +47,7 @@ using namespace CIAO::Config_Handlers;
 
 int main (int argc, char *argv[])
 {
-  
+
   if (parse_args (argc, argv) != 0)
     return 1;
 
@@ -56,33 +56,33 @@ int main (int argc, char *argv[])
 
   //Create an XML_Helper for all the file work
   XML_Helper the_helper;
-  
+
   if (xercesc::DOMDocument *doc = the_helper.create_dom (input_file))
-  {
+    {
       //Read in the XSC type structure from the DOMDocument
       DeploymentPlan dp = deploymentPlan (doc);
 
       //Convert the XSC to an IDL datatype
 
       DP_Handler dp_handler (dp);
-      
+
       std::cout << "Instance document import succeeded.  Dumping contents to file\n";
 
       //Retrieve the newly created IDL structure
       Deployment::DeploymentPlan *idl = dp_handler.plan();
-      
+
       // Check for server resources, if present....
       check_srd (*idl);
-      
+
       //Convert it back to an XSC structure with a new DP_Handler
       DP_Handler reverse_handler(*idl);
-      
+
       //Create a new DOMDocument for writing the XSC into XML
       xercesc::DOMDocument* the_xsc (the_helper.create_dom(0));
 
       //Serialize the XSC into a DOMDocument
       deploymentPlan(*reverse_handler.xsc(), the_xsc);
-      
+
 
       //Write it to test.xml
       the_helper.write_DOM(the_xsc, "test.xml");
@@ -90,7 +90,7 @@ int main (int argc, char *argv[])
       //Cleanliness is next to Godliness
       delete doc;
     }
-  
+
   std::cout << "Test completed!\n";
 
   return 0;
@@ -107,7 +107,7 @@ void check_srd (const Deployment::DeploymentPlan &dp)
                           "CIAOServerResources") == 0)
         {
           CIAO::DAnCE::ServerResource *test;
-          
+
           if (dp.infoProperty[i].value >>= test)
             std::cerr << "ServerResources found and successfully extracted." << std::endl;
           else
diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.cpp b/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
index dd3e4d241a8..25c9a04929d 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.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 "toplevel.hpp"
 
 namespace CIAO
@@ -16,75 +16,49 @@ namespace CIAO
   namespace Config_Handlers
   {
     // TopLevelPackageDescription
-    // 
+    //
 
     TopLevelPackageDescription::
-    TopLevelPackageDescription ()
-    : 
-    ::XSCRT::Type (), 
-    regulator__ ()
+    TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__)
+      :
+      ::XSCRT::Type (),
+      package_ (new ::CIAO::Config_Handlers::PackageConfiguration (package__)),
+      regulator__ ()
     {
+      package_->container (this);
     }
 
     TopLevelPackageDescription::
     TopLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
-    :
-    ::XSCRT::Type (),
-    regulator__ ()
+      :
+      ::XSCRT::Type (),
+      package_ (new ::CIAO::Config_Handlers::PackageConfiguration (*s.package_)),
+      regulator__ ()
     {
-      {
-        for (package_const_iterator i (s.package_.begin ());i != s.package_.end ();++i) add_package (*i);
-      }
+      package_->container (this);
     }
 
     ::CIAO::Config_Handlers::TopLevelPackageDescription& TopLevelPackageDescription::
     operator= (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
     {
-      package_.clear ();
-      {
-        for (package_const_iterator i (s.package_.begin ());i != s.package_.end ();++i) add_package (*i);
-      }
+      package (s.package ());
 
       return *this;
     }
 
 
     // TopLevelPackageDescription
-    // 
-    TopLevelPackageDescription::package_iterator TopLevelPackageDescription::
-    begin_package ()
-    {
-      return package_.begin ();
-    }
-
-    TopLevelPackageDescription::package_iterator TopLevelPackageDescription::
-    end_package ()
-    {
-      return package_.end ();
-    }
-
-    TopLevelPackageDescription::package_const_iterator TopLevelPackageDescription::
-    begin_package () const
-    {
-      return package_.begin ();
-    }
-
-    TopLevelPackageDescription::package_const_iterator TopLevelPackageDescription::
-    end_package () const
+    //
+    ::CIAO::Config_Handlers::PackageConfiguration const& TopLevelPackageDescription::
+    package () const
     {
-      return package_.end ();
+      return *package_;
     }
 
     void TopLevelPackageDescription::
-    add_package (::CIAO::Config_Handlers::PackageConfiguration const& e)
+    package (::CIAO::Config_Handlers::PackageConfiguration const& e)
     {
-      package_.push_back (e);
-    }
-
-    size_t TopLevelPackageDescription::
-    count_package(void) const
-    {
-      return package_.size ();
+      *package_ = e;
     }
   }
 }
@@ -98,26 +72,26 @@ namespace CIAO
 
     TopLevelPackageDescription::
     TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+      :Base__ (e), regulator__ ()
     {
 
       ::XSCRT::Parser< ACE_TCHAR > p (e);
 
       while (p.more_elements ())
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "package")
-        {
-          ::CIAO::Config_Handlers::PackageConfiguration t (e);
-          add_package (t);
-        }
-
-        else 
         {
+          ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+          ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+          if (n == "package")
+            {
+              package_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (new ::CIAO::Config_Handlers::PackageConfiguration (e));
+              package_->container (this);
+            }
+
+          else
+            {
+            }
         }
-      }
     }
   }
 }
@@ -195,71 +169,13 @@ namespace CIAO
       void TopLevelPackageDescription::
       package (Type& o)
       {
-        // VC6 anathema strikes again
-        //
-        TopLevelPackageDescription::Type::package_iterator b (o.begin_package()), e (o.end_package());
-
-        if (b != e)
-        {
-          package_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) package_next (o);
-          }
-
-          package_post (o);
-        }
+        dispatch (o.package ());
       }
 
       void TopLevelPackageDescription::
       package (Type const& o)
       {
-        // VC6 anathema strikes again
-        //
-        TopLevelPackageDescription::Type::package_const_iterator b (o.begin_package()), e (o.end_package());
-
-        if (b != e)
-        {
-          package_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) package_next (o);
-          }
-
-          package_post (o);
-        }
-      }
-
-      void TopLevelPackageDescription::
-      package_pre (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_pre (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type const&)
-      {
+        dispatch (o.package ());
       }
 
       void TopLevelPackageDescription::
@@ -287,7 +203,7 @@ namespace CIAO
 
       TopLevelPackageDescription::
       TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-      : ::XSCRT::Writer< ACE_TCHAR > (e)
+        : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
@@ -303,21 +219,10 @@ namespace CIAO
       }
 
       void TopLevelPackageDescription::
-      package_pre (Type const&)
+      package (Type const& o)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("package", top_ ()));
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type const& o)
-      {
-        package_post (o);
-        package_pre (o);
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type const&)
-      {
+        Traversal::TopLevelPackageDescription::package (o);
         pop_ ();
       }
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
index 559700357f6..cfd85786dfd 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
@@ -1,18 +1,18 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * 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>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* 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>
+*/
 
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -27,10 +27,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class TopLevelPackageDescription;
-  }
+namespace Config_Handlers
+{
+class TopLevelPackageDescription;
+}
 }
 
 #include <memory>
@@ -41,176 +41,130 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      // package
-      // 
-      public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PackageConfiguration >::iterator package_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PackageConfiguration >::const_iterator package_const_iterator;
-      package_iterator begin_package ();
-      package_iterator end_package ();
-      package_const_iterator begin_package () const;
-      package_const_iterator end_package () const;
-      void add_package (::CIAO::Config_Handlers::PackageConfiguration const& );
-      size_t count_package (void) const;
+// package
+//
+public:
+::CIAO::Config_Handlers::PackageConfiguration const& package () const;
+void package (::CIAO::Config_Handlers::PackageConfiguration const& );
 
-      protected:
-      ::std::list< ::CIAO::Config_Handlers::PackageConfiguration > package_;
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > package_;
 
-      public:
-      TopLevelPackageDescription ();
+public:
+TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__);
 
-      TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      TopLevelPackageDescription (TopLevelPackageDescription const& s);
+TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+TopLevelPackageDescription (TopLevelPackageDescription const& s);
 
-      TopLevelPackageDescription&
-      operator= (TopLevelPackageDescription const& s);
+TopLevelPackageDescription&
+operator= (TopLevelPackageDescription const& s);
 
-      private:
-      char regulator__;
-    };
-  }
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        package (Type&);
-
-        virtual void
-        package (Type const&);
-
-        virtual void
-        package_pre (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
+{
+virtual void
+traverse (Type&);
 
-        virtual void
-        package_pre (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void
-        package_next (Type&);
+virtual void
+pre (Type&);
 
-        virtual void
-        package_next (Type const&);
+virtual void
+pre (Type const&);
 
-        virtual void
-        package_post (Type&);
+virtual void
+package (Type&);
 
-        virtual void
-        package_post (Type const&);
+virtual void
+package (Type const&);
 
-        virtual void
-        post (Type&);
+virtual void
+post (Type&);
 
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
-        TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-        virtual void 
-        traverse (Type &o)
-        {
-
-          this->traverse (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void 
-        package_pre (Type &o)
-        {
-
-          this->package_pre (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        package_pre (Type const&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
+TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
-        package_next (Type &o)
-        {
+virtual void
+traverse (Type &o)
+{
 
-          this->package_next (const_cast <Type const &> (o));
-        }
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        package_next (Type const&);
+virtual void
+traverse (Type const&);
 
-        virtual void 
-        package_post (Type &o)
-        {
+virtual void
+package (Type &o)
+{
 
-          this->package_post (const_cast <Type const &> (o));
-        }
+this->package (const_cast <Type const &> (o));
+}
 
 
-        virtual void
-        package_post (Type const&);
+virtual void
+package (Type const&);
 
-        protected:
-        TopLevelPackageDescription ();
-      };
-    }
-  }
+protected:
+TopLevelPackageDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // TOPLEVEL_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/vc6-4786.h b/TAO/CIAO/tools/Config_Handlers/vc6-4786.h
index ab8457de1cd..1696664212f 100644
--- a/TAO/CIAO/tools/Config_Handlers/vc6-4786.h
+++ b/TAO/CIAO/tools/Config_Handlers/vc6-4786.h
@@ -1,10 +1,10 @@
 /**
- * @file vc6-4786.h
- * @author Will Otte <wotte@dre.vanderbilt.edu
- * $Id$
- * Silences that nefarious 4786 warning in a bit cleaner way
- * than sprinkling the same preprocessor directives all over the code.
- */
+* @file vc6-4786.h
+* @author Will Otte <wotte@dre.vanderbilt.edu
+* $Id$
+* Silences that nefarious 4786 warning in a bit cleaner way
+* than sprinkling the same preprocessor directives all over the code.
+*/
 
 #ifndef VC6_4786_H_
 # define VC6_4786_H_
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/README b/TAO/CIAO/tools/IDL3_to_IDL2/README
index 3f3672c2115..a64e6542a74 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/README
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/README
@@ -94,20 +94,20 @@ interface Bar : Components::CCMObject
     Foo objref;
     Components::Cookie ck;
   };
-  
+
   typedef sequence<needs_fooConnection> needs_fooConnections;
-  
+
   Components::Cookie connect_needs_foo (in Foo connection)
     raises (Components::ExceededConnectionLimit, Components::InvalidConnection);
-  
+
   Foo disconnect_needs_foo (in Components::Cookie ck)
     raises (Components::InvalidConnection);
-  
+
   needs_fooConnections get_connections_needs_foo ();
-  
+
   Components::Cookie subscribe_ev_pub (in EvConsumer consumer)
     raises (Components::ExceededConnectionLimit);
-  
+
   EvConsumer unsubscribe_ev_pub (in Components::Cookie ck)
     raises (Components::InvalidConnection);
 };
@@ -122,7 +122,7 @@ interface BarHomeImplicit : Components::KeylessCCMHome
     raises (Components::CreateFailure);
 };
 
-interface BarHome : BarHomeExplicit, BarHomeImplicit 
+interface BarHome : BarHomeExplicit, BarHomeImplicit
 {
 };
 
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.cpp b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.cpp
index 21e6ccc7d6e..dfa6116d8be 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.cpp
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.cpp
@@ -67,7 +67,7 @@ BE_GlobalData::parse_args (long &i, char **av)
   switch (av[i][1])
     {
       // Directory where the generated file is to
-      // be kept. Default is the current directory from which 
+      // be kept. Default is the current directory from which
       // <tao_idl3_to_idl2> is called.
       case 'o':
         if (av[i][2] == '\0')
@@ -120,7 +120,7 @@ BE_GlobalData::generator_init (void)
   AST_Generator *gen = 0;
   ACE_NEW_RETURN (gen,
                   AST_Generator,
-                  0);             
+                  0);
   return gen;
 }
 
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
index 3592635634e..25707b03f0b 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
@@ -55,25 +55,25 @@ public:
 
   const char* output_dir (void) const;
   void output_dir (const char* s);
-  
+
   void parse_args (long &i, char **av);
   // Parse args that affect the backend.
-  
+
   void prep_be_arg (char *s);
   // Special BE arg call factored out of DRV_args.
-  
+
   void arg_post_proc (void);
   // Checks made after parsing args.
-  
+
   void usage (void) const;
   // Usage message for backend options.
-  
+
   AST_Generator *generator_init (void);
   // Create an AST node generator.
-  
+
   void destroy (void);
   // Cleanup.
-  
+
 private:
   char *filename_;
   // Name of the IDL file we are processing.
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_helper.h b/TAO/CIAO/tools/IDL3_to_IDL2/be_helper.h
index bd3b4bc0829..982051a9556 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_helper.h
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_helper.h
@@ -119,7 +119,7 @@ public:
   void gen_ifndef_string (const char *fname,
                           const char *prefix,
                           const char *suffix);
-                          
+
   // =overloaded operators
 
   TAO_OutStream &operator<< (const char *str);
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_produce.cpp b/TAO/CIAO/tools/IDL3_to_IDL2/be_produce.cpp
index 240c10629b0..5ce3701d742 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_produce.cpp
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_produce.cpp
@@ -105,7 +105,7 @@ BE_produce (void)
                   ACE_TEXT ("No Root\n")));
       BE_abort ();
     }
-    
+
   idl3_to_idl2_visitor visitor;
 
   if (visitor.visit_root (ast_root) == -1)
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp b/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
index fe0810a4202..b894e5f4b23 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_sunsoft.cpp
@@ -9,12 +9,12 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (be, 
-           be_sunsoft, 
+ACE_RCSID (be,
+           be_sunsoft,
            "$Id$")
 
-TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void)
-  : TAO_OutStream ()
+  TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void)
+    : TAO_OutStream ()
 {
 }
 
@@ -126,39 +126,39 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           else if ((unsigned char) ev->u.cval > ACE_CHAR_MAX)
             this->TAO_OutStream::print ("%hd", ev->u.cval);
           else if (isprint (ev->u.cval))
-	          this->TAO_OutStream::print ("'%c'", ev->u.cval);
-	        else if (iscntrl (ev->u.cval))
+            this->TAO_OutStream::print ("'%c'", ev->u.cval);
+          else if (iscntrl (ev->u.cval))
             switch (ev->u.cval)
               {
-                case '\n':
-                  this->TAO_OutStream::print ("'\\n'");
-                  break;
-                case '\t':
-                  this->TAO_OutStream::print ("'\\t'");
-                  break;
-                case '\r':
-                  this->TAO_OutStream::print ("'\\r'");
-                  break;
-                case '\v':
-                  this->TAO_OutStream::print ("'\\v'");
-                  break;
-                case '\f':
-                  this->TAO_OutStream::print ("'\\f'");
-                  break;
-                case '\b':
-                  this->TAO_OutStream::print ("'\\b'");
-                  break;
-                case '\a':
-                  this->TAO_OutStream::print ("'\\a'");
-                  break;
-                case '\?':
-                  this->TAO_OutStream::print ("'?'");
-                  break;
+              case '\n':
+                this->TAO_OutStream::print ("'\\n'");
+                break;
+              case '\t':
+                this->TAO_OutStream::print ("'\\t'");
+                break;
+              case '\r':
+                this->TAO_OutStream::print ("'\\r'");
+                break;
+              case '\v':
+                this->TAO_OutStream::print ("'\\v'");
+                break;
+              case '\f':
+                this->TAO_OutStream::print ("'\\f'");
+                break;
+              case '\b':
+                this->TAO_OutStream::print ("'\\b'");
+                break;
+              case '\a':
+                this->TAO_OutStream::print ("'\\a'");
+                break;
+              case '\?':
+                this->TAO_OutStream::print ("'?'");
+                break;
               default:
                 this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
               }
- 	        else
-	          this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
+          else
+            this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
           break;
         case AST_Expression::EV_wchar:
           this->TAO_OutStream::print ("L'%lc'", ev->u.wcval);
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 99a9f7bc7db..d49a33e62b5 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -49,13 +49,13 @@ idl3_to_idl2_visitor::~idl3_to_idl2_visitor (void)
   this->os = 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_decl (AST_Decl *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
 {
   for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
@@ -63,12 +63,12 @@ idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
        si.next ())
     {
       AST_Decl *d = si.item ();
-      
+
       if (d->node_type () == AST_Decl::NT_pre_defined)
         {
           continue;
         }
-        
+
       // Want to skip the uses_xxxConnection structs added by uses
       // multiple ports.
       // @@@ (JP) This will go away when the visitor is finished, since
@@ -78,7 +78,7 @@ idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
         {
           continue;
         }
-      
+
       if (d->ast_accept (this) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -87,76 +87,76 @@ idl3_to_idl2_visitor::visit_scope (UTL_Scope *node)
                             -1);
         }
     }
-       
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_type (AST_Type *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_predefined_type (AST_PredefinedType *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_module (AST_Module *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "module " << node->local_name () << be_nl
       << "{" << be_idt;
-      
+
   this->check_id_and_version (node);
   this->check_prefix (node);
-            
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_module - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_module - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
-  *os << be_uidt_nl 
+
+  *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_interface (AST_Interface *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_local ())
     {
       *os << "local ";
     }
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
-    } 
-    
+    }
+
   *os << "interface " << node->local_name ();
-  
+
   AST_Interface **parents = node->inherits ();
-  
+
   for (long i = 0; i < node->n_inherits (); ++i)
     {
       if (i == 0)
@@ -167,70 +167,70 @@ idl3_to_idl2_visitor::visit_interface (AST_Interface *node)
         {
           *os << ", ";
         }
-        
+
       *os << parents[i]->name ();
     }
-  
+
   *os << be_nl
       << "{" << be_idt;
-      
+
   this->check_id_and_version (node);
   this->check_prefix (node);
-      
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_interface - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_interface - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
-  *os << be_uidt_nl 
+
+  *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_local ())
     {
       *os << "local ";
     }
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
-    } 
-    
+    }
+
   *os << "interface " << node->local_name () << ";";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_valuebox (AST_ValueBox *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "valuetype " << node->local_name ();
-      
+
   AST_Type *bt = node->boxed_type ();
-      
+
   // Keep output statements separate because of side effects.
-  
+
   if (bt->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (bt, node);
@@ -239,41 +239,41 @@ idl3_to_idl2_visitor::visit_valuebox (AST_ValueBox *node)
     {
       *os << this->type_name (bt);
     }
-   
+
   *os << ";";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_valuetype (AST_ValueType *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
     }
-    
+
   if (node->custom ())
     {
       *os << "custom ";
     }
-    
+
   *os << "valuetype " << node->local_name ();
-  
-  AST_Decl::NodeType nt = node->node_type ();    
+
+  AST_Decl::NodeType nt = node->node_type ();
   AST_Interface **parents = node->inherits ();
   long ninherits = node->n_inherits ();
-  
-  long i = 0; 
+
+  long i = 0;
   for (i = 0; i < ninherits; ++i)
     {
       if (i == 0)
@@ -284,18 +284,18 @@ idl3_to_idl2_visitor::visit_valuetype (AST_ValueType *node)
         {
           *os << ", ";
         }
-        
+
       *os << parents[i]->name ();
     }
-    
+
   if (nt == AST_Decl::NT_eventtype)
     {
       *os << (ninherits == 0 ? " : " : ", ")
           << "Components::EventBase";
     }
-    
+
   AST_Interface **supports = node->supports ();
-  
+
   for (i = 0; i < node->n_supports (); ++i)
     {
       if (i == 0)
@@ -306,47 +306,47 @@ idl3_to_idl2_visitor::visit_valuetype (AST_ValueType *node)
         {
           *os << ", ";
         }
-        
+
       *os << supports[i]->name ();
     }
-    
+
   *os << be_nl
       << "{" << be_idt;
-            
+
   this->check_id_and_version (node);
   this->check_prefix (node);
-      
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_valuetype - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_valuetype - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
-  *os << be_uidt_nl 
+
+  *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   if (node->is_abstract ())
     {
       *os << "abstract ";
     }
-    
+
   (void) node->node_type ();
-    
+
   *os << "valuetype " << node->local_name () << ";";
 
   return 0;
@@ -359,90 +359,90 @@ idl3_to_idl2_visitor::visit_component (AST_Component *node)
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "interface " << node->local_name ();
-    
+
   AST_Component *base = node->base_component ();
   long nsupports = node->n_supports ();
-  
-  *os << " : " 
+
+  *os << " : "
       << (base != 0 ? base->full_name () : "Components::CCMObject");
-  
+
   for (long i = 0; i < nsupports; ++i)
     {
       *os << ", " << node->supports ()[i]->name ();
     }
-    
+
   *os << be_nl
       << "{" << be_idt;
-  
+
   this->check_id_and_version (node);
-  
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_component - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_component - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
+
   this->gen_provides (node);
   this->gen_uses (node);
   this->gen_publishes (node);
   this->gen_emits (node);
   this->gen_consumes (node);
-    
+
   *os << be_uidt_nl
       << "};";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_component_fwd (AST_ComponentFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "component " << node->local_name () << ";";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_eventtype (AST_EventType *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   if (this->visit_valuetype (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_eventtype - "
-                          "codegen for valuetype failed\n"),
+                         "idl3_to_idl2_visitor::visit_eventtype - "
+                         "codegen for valuetype failed\n"),
                         -1);
     }
-  
+
   *os << be_nl << be_nl
       << "interface " << node->local_name () << "Consumer : ";
-      
+
   AST_Interface *parent = 0;
   AST_Decl::NodeType nt = AST_Decl::NT_native;
-      
+
   if (node->n_inherits () > 0)
     {
       parent = node->inherits ()[0];
       AST_Type *ut = parent->unaliased_type ();
       nt = ut->node_type ();
     }
-      
+
   if (node->n_inherits () == 0 || nt == AST_Decl::NT_valuetype)
     {
       *os << "Components::EventConsumerBase";
@@ -451,36 +451,36 @@ idl3_to_idl2_visitor::visit_eventtype (AST_EventType *node)
     {
       *os << node->inherits ()[0]->name () << "Consumer";
     }
-      
+
   *os << be_nl
       << "{" << be_idt_nl
       << "void push_" << node->local_name () << " (in "
       << node->local_name () << " the_"
       << node->local_name () << ");" << be_uidt_nl
       << "};";
-     
-  return 0; 
+
+  return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   if (this->visit_valuetype_fwd (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_eventtype_fwd - "
-                          "codegen for valuetype_fwd failed\n"),
+                         "idl3_to_idl2_visitor::visit_eventtype_fwd - "
+                         "codegen for valuetype_fwd failed\n"),
                         -1);
     }
-    
+
   *os << be_nl
       << "interface " << node->local_name () << "Consumer;";
-      
+
   return 0;
 }
 
@@ -491,15 +491,15 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
     {
       return 0;
     }
-    
+
   ACE_CString explicit_name = node->local_name ()->get_string ();
   explicit_name += "Explicit";
-  
+
   *os << be_nl << be_nl
       << "interface " << explicit_name.c_str () << " : ";
-      
+
   AST_Home *base = node->base_home ();
-  
+
   if (base == 0)
     {
       *os << "Components::CCMHome";
@@ -508,20 +508,20 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
     {
       *os << base->name () << "Explicit";
     }
-    
+
   *os << be_nl
       << "{" << be_idt;
-    
+
   this->check_id_and_version (node);
-  
+
   // Create a temporary interface node corresponding to the one we
   // just generated above for the home explicit interface.
-  UTL_ScopedName *sn = 
+  UTL_ScopedName *sn =
     this->create_scoped_name (0,
                               explicit_name.c_str (),
                               0,
                               ScopeAsDecl (node->defined_in ()));
-                      
+
   AST_Interface xplicit (sn,
                          0,
                          0,
@@ -533,64 +533,64 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
 
   // Reset the home's decls to be defined in the explicit home interface.
   this->tranfer_scope_elements (node, xplicit);
-  
+
   this->gen_factories (node, xplicit);
   this->gen_finders (node, xplicit);
-    
+
   *os << be_uidt_nl
       << "};" << be_nl << be_nl;
-      
+
   xplicit.destroy ();
   sn->destroy ();
   delete sn;
   sn = 0;
-      
+
   AST_ValueType *key = node->primary_key ();
-     
-  // Generate the implicit home interface and its operations.   
+
+  // Generate the implicit home interface and its operations.
   *os << "interface " << node->local_name () << "Implicit"
       << (key == 0 ? " : Components::KeylessCCMHome" : "")
       << be_nl
       << "{" << be_idt_nl
       << node->managed_component ()->name () << " create (";
-      
+
   if (key != 0)
     {
       *os << "in " << key->name () << " key";
     }
-    
+
   *os << ")" << be_idt_nl
       << "raises (Components::CreateFailure";
-      
+
   if (key != 0)
     {
       *os << ", Components::InvalidKey, Components::DuplicateKeyValue";
     }
-    
+
   *os << ");" << be_uidt;
-  
+
   if (key != 0)
     {
       *os << be_nl << be_nl
-          << node->managed_component ()->name () 
-          << " find_by_primary_key (in " << key->name () 
+          << node->managed_component ()->name ()
+          << " find_by_primary_key (in " << key->name ()
           << " key)" << be_idt_nl
           << "raises (Components::InvalidKey, Components::UnknownKeyValue, "
           << "Components::FinderFailure);" << be_uidt;
-          
+
       *os << be_nl << be_nl
           << "void remove (in " << key->name () << " key)" << be_idt_nl
           << "raises (Components::InvalidKey, Components::UnknownKeyValue, "
           << "Components::RemoveFailure);" << be_uidt;
-          
+
       *os << be_nl << be_nl
           << key->name () << " get_primary_key (in "
           << node->managed_component ()->name () << " comp);";
     }
-      
+
   *os << be_uidt_nl
       << "};";
-      
+
   // Create equivalent interface.
   *os << be_nl << be_nl
       << "interface " << node->local_name () << " : "
@@ -598,29 +598,29 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
       << node->local_name () << "Implicit" << be_nl
       << "{" << be_nl
       << "};";
-      
+
   return 0;
 }
 
 
-int 
+int
 idl3_to_idl2_visitor::visit_factory  (AST_Factory *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl;
-    
+
   *os << "factory " << node->local_name () << " (";
-  
+
   this->gen_params (node, node->argument_count ());
-  
+
   *os << ")";
-  
+
   this->gen_exception_list (node->exceptions ());
-  
+
   *os << ";";
 
   this->check_id_and_version (node);
@@ -628,16 +628,16 @@ idl3_to_idl2_visitor::visit_factory  (AST_Factory *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_structure (AST_Structure *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "struct " << node->local_name () << be_nl
       << "{" << be_idt;
 
@@ -646,42 +646,42 @@ idl3_to_idl2_visitor::visit_structure (AST_Structure *node)
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_structure - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_structure - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_structure_fwd (AST_StructureFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "struct " << node->local_name () << ";";
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_exception (AST_Exception *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "exception " << node->local_name () << be_nl
       << "{" << be_idt;
 
@@ -690,33 +690,33 @@ idl3_to_idl2_visitor::visit_exception (AST_Exception *node)
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_exception - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_exception - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_expression (AST_Expression *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_enum (AST_Enum *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "enum " << node->local_name () << be_nl
       << "{" << be_idt;
 
@@ -724,28 +724,28 @@ idl3_to_idl2_visitor::visit_enum (AST_Enum *node)
        !i.is_done ();)
     {
       *os << be_nl;
-      
+
       AST_EnumVal *ev = AST_EnumVal::narrow_from_decl (i.item ());
       *os << ev->local_name ();
-      
+
       // Advance here so the check below will work.
       i.next ();
-      
+
       if (!i.is_done ())
         {
           *os << ",";
         }
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_operation (AST_Operation *node)
 {
   *os << be_nl << be_nl;
@@ -754,16 +754,16 @@ idl3_to_idl2_visitor::visit_operation (AST_Operation *node)
     {
       *os << "oneway ";
     }
-    
+
   *os << this->type_name (node->return_type ());
   *os << " " << node->local_name () << " (";
-  
+
   this->gen_params (node, node->argument_count ());
-    
+
   *os << ")";
-  
+
   this->gen_exception_list (node->exceptions ());
-  
+
   *os << ";";
 
   this->check_id_and_version (node);
@@ -771,18 +771,18 @@ idl3_to_idl2_visitor::visit_operation (AST_Operation *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_field (AST_Field *node)
 {
   AST_Field::Visibility v = node->visibility ();
 
   *os << be_nl
-      << (v == AST_Field::vis_PUBLIC 
-          ? "public " 
+      << (v == AST_Field::vis_PUBLIC
+          ? "public "
           : (v == AST_Field::vis_PRIVATE ? "private " : ""));
-  
+
   AST_Type *ft = node->field_type ();
-  
+
   if (ft->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (ft, node);
@@ -793,43 +793,43 @@ idl3_to_idl2_visitor::visit_field (AST_Field *node)
       *os << this->type_name (ft);
       *os << " " << node->local_name ();
     }
-  
+
   *os << ";";
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_argument (AST_Argument *node)
 {
   *os << be_nl;
 
   switch (node->direction ())
     {
-      case AST_Argument::dir_IN:
-        *os << "in ";
-        break;
-      case AST_Argument::dir_INOUT:
-        *os << "inout ";
-        break;
-      case AST_Argument::dir_OUT:
-        *os << "out ";
-        break;        
-      default:
-        return -1;
-    }
-    
-  *os << this->type_name (node->field_type ()) 
+    case AST_Argument::dir_IN:
+      *os << "in ";
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << "inout ";
+      break;
+    case AST_Argument::dir_OUT:
+      *os << "out ";
+      break;
+    default:
+      return -1;
+    }
+
+  *os << this->type_name (node->field_type ())
       << " " << node->local_name ();
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_attribute (AST_Attribute *node)
 {
   idl_bool rd_only = node->readonly ();
-  
+
   // Keep output statements separate because of side effects.
   // No need to check for anonymous array - anonymous types not
   // accepted by parser for attributes.
@@ -837,13 +837,13 @@ idl3_to_idl2_visitor::visit_attribute (AST_Attribute *node)
       << (rd_only ? "readonly " : "") << "attribute ";
   *os << this->type_name (node->field_type ());
   *os << " " << node->local_name ();
-  
+
   this->gen_exception_list (node->get_get_exceptions (),
                             rd_only ? "" : "get");
-                                   
+
   this->gen_exception_list (node->get_set_exceptions (),
                             "set");
-      
+
   *os << ";";
 
   this->check_id_and_version (node);
@@ -851,18 +851,18 @@ idl3_to_idl2_visitor::visit_attribute (AST_Attribute *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union (AST_Union *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   this->disc_type_ = node->disc_type ()->unaliased_type ();
-    
+
   *os << be_nl << be_nl;
-    
+
   *os << "union " << node->local_name () << " switch ("
       << node->disc_type ()->name () << ")" << be_nl
       << "{" << be_idt;
@@ -872,32 +872,32 @@ idl3_to_idl2_visitor::visit_union (AST_Union *node)
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_union - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_union - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_uidt_nl
       << "};";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union_fwd (AST_UnionFwd *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "union " << node->local_name () << ";";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union_branch (AST_UnionBranch *node)
 {
   for (unsigned long i = 0; i < node->label_list_length (); ++i)
@@ -905,14 +905,14 @@ idl3_to_idl2_visitor::visit_union_branch (AST_UnionBranch *node)
       if (this->visit_union_label (node->label (i)) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                              "idl3_to_idl2_visitor::visit_union_branch - "
-                              "codegen for label failed\n"),
+                             "idl3_to_idl2_visitor::visit_union_branch - "
+                             "codegen for label failed\n"),
                             -1);
         }
     }
-    
+
   AST_Type *ft = node->field_type ();
-  
+
   if (ft->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (ft, node);
@@ -922,116 +922,116 @@ idl3_to_idl2_visitor::visit_union_branch (AST_UnionBranch *node)
       *os << this->type_name (ft);
       *os << " " << node->local_name ();
     }
-  
+
   *os << ";";
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_union_label (AST_UnionLabel *node)
 {
   *os << be_nl;
-  
+
   if (node->label_kind () == AST_UnionLabel::UL_default)
     {
       *os << "default: ";
-    } 
+    }
   else
     {
       *os << "case ";
       this->gen_label_value (node);
       *os << ": ";
     }
-    
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_constant (AST_Constant *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-  
+
   *os << "const ";
-  
+
   switch (node->et ())
     {
-      case AST_Expression::EV_short:
-        *os << "short";
-        break;
-      case AST_Expression::EV_ushort:
-        *os << "unsigned short";
-        break;
-      case AST_Expression::EV_long:
-        *os << "long";
-        break;
-      case AST_Expression::EV_ulong:
-        *os << "unsigned long";
-        break;
-      case AST_Expression::EV_longlong:
-        *os << "long long";
-        break;
-      case AST_Expression::EV_ulonglong:
-        *os << "unsigned long long";
-        break;
-      case AST_Expression::EV_char:
-	      *os << "char";
-        break;
-      case AST_Expression::EV_wchar:
-        *os << "wchar";
-        break;
-      case AST_Expression::EV_bool:
-        *os << "boolean";
-        break;
-      case AST_Expression::EV_octet:
-        *os << "octet";
-        break;
-      case AST_Expression::EV_float:
-        *os << "float";
-        break;
-      case AST_Expression::EV_double:
-        *os << "double";
-        break;
-      case AST_Expression::EV_longdouble:
-        *os << "long double";
-        break;
-      case AST_Expression::EV_string:
-        *os << "string";
-        break;
-      case AST_Expression::EV_wstring:
-        *os << "wstring";
-        break;
-      case AST_Expression::EV_enum:
-        *os << node->enum_full_name ();
-        break;
-      default:
-        break;
-    }
-  
-  *os <<  " " 
+    case AST_Expression::EV_short:
+      *os << "short";
+      break;
+    case AST_Expression::EV_ushort:
+      *os << "unsigned short";
+      break;
+    case AST_Expression::EV_long:
+      *os << "long";
+      break;
+    case AST_Expression::EV_ulong:
+      *os << "unsigned long";
+      break;
+    case AST_Expression::EV_longlong:
+      *os << "long long";
+      break;
+    case AST_Expression::EV_ulonglong:
+      *os << "unsigned long long";
+      break;
+    case AST_Expression::EV_char:
+      *os << "char";
+      break;
+    case AST_Expression::EV_wchar:
+      *os << "wchar";
+      break;
+    case AST_Expression::EV_bool:
+      *os << "boolean";
+      break;
+    case AST_Expression::EV_octet:
+      *os << "octet";
+      break;
+    case AST_Expression::EV_float:
+      *os << "float";
+      break;
+    case AST_Expression::EV_double:
+      *os << "double";
+      break;
+    case AST_Expression::EV_longdouble:
+      *os << "long double";
+      break;
+    case AST_Expression::EV_string:
+      *os << "string";
+      break;
+    case AST_Expression::EV_wstring:
+      *os << "wstring";
+      break;
+    case AST_Expression::EV_enum:
+      *os << node->enum_full_name ();
+      break;
+    default:
+      break;
+    }
+
+  *os <<  " "
       << node->local_name () << " = " << node->constant_value () << ";";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_enum_val (AST_EnumVal *)
 {
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_array (AST_Array *node)
 {
   *os << node->base_type ()->name ();
-  
+
   for (unsigned long i = 0; i < node->n_dims (); ++i)
     {
       *os << "[" << node->dims ()[i] << "]";
@@ -1040,53 +1040,53 @@ idl3_to_idl2_visitor::visit_array (AST_Array *node)
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_sequence (AST_Sequence *node)
 {
   // Keep output statements separate because of side effects.
   *os << "sequence<";
   *os << this->type_name (node->base_type ());
-  
+
   if (!node->unbounded ())
     {
       *os << ", " << node->max_size ()->ev ()->u.ulval;
     }
-    
+
   *os << "> ";
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_string (AST_String *node)
 {
   *os << (node->width () > 1 ? "w" : "") << "string";
-  
+
   unsigned long bound = node->max_size ()->ev ()->u.ulval;
-  
+
   if (bound > 0)
     {
       *os << "<" << bound << ">";
     }
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_typedef (AST_Typedef *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl
       << "typedef ";
-      
+
   AST_Type *bt = node->base_type ();
-      
+
   // Keep output statements separate because of side effects.
-  
+
   if (bt->node_type () == AST_Decl::NT_array)
     {
       this->gen_anonymous_array (bt, node);
@@ -1095,60 +1095,60 @@ idl3_to_idl2_visitor::visit_typedef (AST_Typedef *node)
     {
       *os << this->type_name (bt);
       *os << " " << node->local_name ();
-   }
-   
+    }
+
   *os << ";";
-    
+
   this->check_id_and_version (node);
 
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_root (AST_Root *node)
 {
   ACE_NEW_RETURN (this->os,
                   TAO_SunSoft_OutStream,
                   -1);
-           
+
   ACE_CString fn (idl_global->stripped_filename ()->get_string ());
   fn = fn.substr (0, fn.rfind ('.'));
   fn += "_IDL2.idl";
-  
+
   const char *path = be_global->output_dir ();
   ACE_CString target_name;
-  
+
   if (path != 0)
     {
       target_name = path;
       target_name += "/";
     }
-    
+
   target_name += fn;
-  
+
   if (this->os->open (target_name.c_str ()) != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Failed to open file %s for writing.\n",
                   target_name.c_str ()));
-                  
+
       return -1;
     }
-  
+
   os->gen_ifndef_string (fn.c_str (), "_TAO_IDL_", "_IDL_");
-  
+
   ACE_CString raw_filename;
   ACE_CString filename;
-  
+
   for (size_t i = 0; i < idl_global->n_included_idl_files (); ++i)
     {
       if (i == 0)
         {
           *os << be_nl;
         }
-        
+
       raw_filename = idl_global->included_idl_files ()[i];
-      
+
       if (raw_filename.find (".pidl") != ACE_CString::npos
           || raw_filename == "orb.idl"
           || raw_filename == "Components.idl")
@@ -1157,48 +1157,48 @@ idl3_to_idl2_visitor::visit_root (AST_Root *node)
         }
       else
         {
-          filename = 
+          filename =
             raw_filename.substr (0, raw_filename.rfind ('.')) + "_IDL2.idl";
         }
-        
+
       *os << be_nl
           << "#include \"" << filename.c_str () << "\"";
     }
-    
+
   const char *pfix = node->prefix ();
-  
+
   if (ACE_OS::strcmp (pfix, "") != 0)
     {
       *os << be_nl << be_nl
           << "#pragma prefix \"" << pfix << "\"";
     }
-  
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "idl3_to_idl2_visitor::visit_root - "
-                          "codegen for scope failed\n"),
+                         "idl3_to_idl2_visitor::visit_root - "
+                         "codegen for scope failed\n"),
                         -1);
     }
-    
+
   *os << be_nl << be_nl
       << "#endif /* ifndef */" << be_nl << be_nl;
-  
+
   return 0;
 }
 
-int 
+int
 idl3_to_idl2_visitor::visit_native (AST_Native *node)
 {
   if (node->imported ())
     {
       return 0;
     }
-    
+
   *os << be_nl << be_nl;
-  
+
   *os << "native " << node->local_name () << ";";
-    
+
   return 0;
 }
 
@@ -1212,11 +1212,11 @@ idl3_to_idl2_visitor::check_prefix (AST_Decl *d)
 
   const char *the_prefix = d->prefix ();
   AST_Decl *p = ScopeAsDecl (d->defined_in ());
-  
+
   if (ACE_OS::strcmp (the_prefix, p->prefix ()) != 0)
     {
       *os << be_nl
-          << "typeprefix " << d->local_name () 
+          << "typeprefix " << d->local_name ()
           << " \"" << the_prefix << "\";";
     }
 }
@@ -1227,19 +1227,19 @@ idl3_to_idl2_visitor::check_id_and_version (AST_Decl *d)
   if (d->typeid_set ())
     {
       *os << be_nl
-          << "typeid " << d->local_name () 
+          << "typeid " << d->local_name ()
           << " \"" << d->repoID () << "\";";
-          
+
       return;
     }
-    
+
   const char *the_version = d->version ();
   AST_Decl *p = ScopeAsDecl (d->defined_in ());
-  
+
   if (ACE_OS::strcmp (the_version, p->version ()) != 0)
     {
       *os << "\n"
-          << "#pragma version " << d->local_name () 
+          << "#pragma version " << d->local_name ()
           << " " << the_version;
     }
 }
@@ -1251,57 +1251,57 @@ idl3_to_idl2_visitor::type_name (AST_Type *t)
 
   switch (t->node_type ())
     {
-      case AST_Decl::NT_wstring:
-      case AST_Decl::NT_string:
-      case AST_Decl::NT_sequence:
-        // This causes side effects so output statements
-        // sending us here should not be concatenated.
-        (void) t->ast_accept (this);
-        return "";
-      case AST_Decl::NT_pre_defined:
-        pdt = AST_PredefinedType::narrow_from_decl (t);
-        
-        switch (pdt->pt ())
-          {
-            case AST_PredefinedType::PT_pseudo:
-              return t->full_name ();
-            case AST_PredefinedType::PT_object:
-              return "Object";
-            case AST_PredefinedType::PT_any:
-              return "any";
-            case AST_PredefinedType::PT_long:
-              return "long";
-            case AST_PredefinedType::PT_ulong:
-              return "unsigned long";
-            case AST_PredefinedType::PT_longlong:
-              return "long long";
-            case AST_PredefinedType::PT_ulonglong:
-              return "unsigned long long";
-            case AST_PredefinedType::PT_short:
-              return "short";
-            case AST_PredefinedType::PT_ushort:
-              return "unsigned short";
-            case AST_PredefinedType::PT_float:
-              return "float";
-            case AST_PredefinedType::PT_double:
-              return "double";
-            case AST_PredefinedType::PT_longdouble:
-              return "long double";
-            case AST_PredefinedType::PT_char:
-              return "char";
-            case AST_PredefinedType::PT_wchar:
-              return "wchar";
-            case AST_PredefinedType::PT_boolean:
-              return "boolean";
-            case AST_PredefinedType::PT_octet:
-              return "octet";
-            case AST_PredefinedType::PT_void:
-              return "void";
-            default:
-              break;
-          }
-      default:
-        return t->full_name ();
+    case AST_Decl::NT_wstring:
+    case AST_Decl::NT_string:
+    case AST_Decl::NT_sequence:
+      // This causes side effects so output statements
+      // sending us here should not be concatenated.
+      (void) t->ast_accept (this);
+      return "";
+    case AST_Decl::NT_pre_defined:
+      pdt = AST_PredefinedType::narrow_from_decl (t);
+
+      switch (pdt->pt ())
+        {
+        case AST_PredefinedType::PT_pseudo:
+          return t->full_name ();
+        case AST_PredefinedType::PT_object:
+          return "Object";
+        case AST_PredefinedType::PT_any:
+          return "any";
+        case AST_PredefinedType::PT_long:
+          return "long";
+        case AST_PredefinedType::PT_ulong:
+          return "unsigned long";
+        case AST_PredefinedType::PT_longlong:
+          return "long long";
+        case AST_PredefinedType::PT_ulonglong:
+          return "unsigned long long";
+        case AST_PredefinedType::PT_short:
+          return "short";
+        case AST_PredefinedType::PT_ushort:
+          return "unsigned short";
+        case AST_PredefinedType::PT_float:
+          return "float";
+        case AST_PredefinedType::PT_double:
+          return "double";
+        case AST_PredefinedType::PT_longdouble:
+          return "long double";
+        case AST_PredefinedType::PT_char:
+          return "char";
+        case AST_PredefinedType::PT_wchar:
+          return "wchar";
+        case AST_PredefinedType::PT_boolean:
+          return "boolean";
+        case AST_PredefinedType::PT_octet:
+          return "octet";
+        case AST_PredefinedType::PT_void:
+          return "void";
+        default:
+          break;
+        }
+    default:
+      return t->full_name ();
     }
 }
 
@@ -1311,10 +1311,10 @@ idl3_to_idl2_visitor::gen_anonymous_array (AST_Type *a,
 {
   AST_Array *array = AST_Array::narrow_from_decl (a);
   AST_Type *bt = array->base_type ();
-  
+
   *os << this->type_name (bt);
   *os << " " << wrapper->local_name ();
-  
+
   for (unsigned long i = 0; i < array->n_dims (); ++i)
     {
       *os << "[" << array->dims ()[i]->ev ()->u.ulval << "]";
@@ -1326,11 +1326,11 @@ idl3_to_idl2_visitor::gen_label_value (AST_UnionLabel *node)
 {
   AST_Expression *val = node->label_val ();
   AST_Expression::AST_ExprValue *ev = val->ev ();
-  
+
   if (this->disc_type_->node_type () == AST_Decl::NT_enum)
     {
       UTL_Scope *s = this->disc_type_->defined_in ();
-      
+
       if (s == 0)
         {
           *os << val->n ();
@@ -1340,50 +1340,50 @@ idl3_to_idl2_visitor::gen_label_value (AST_UnionLabel *node)
           *os << ScopeAsDecl (s)->name () << "::"
               << val->n ()->last_component ();
         }
-        
+
       return;
     }
 
   switch (ev->et)
     {
-      case AST_Expression::EV_short:
-        *os << ev->u.sval;
-        break;
-      case AST_Expression::EV_ushort:
-        *os << ev->u.usval;
-        break;
-      case AST_Expression::EV_long:
-        *os << ev->u.lval;
-        break;
-      case AST_Expression::EV_ulong:
-        *os << ev->u.ulval;
-        break;
-      case AST_Expression::EV_longlong:
+    case AST_Expression::EV_short:
+      *os << ev->u.sval;
+      break;
+    case AST_Expression::EV_ushort:
+      *os << ev->u.usval;
+      break;
+    case AST_Expression::EV_long:
+      *os << ev->u.lval;
+      break;
+    case AST_Expression::EV_ulong:
+      *os << ev->u.ulval;
+      break;
+    case AST_Expression::EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-        this->os->print ("%ld", ev->u.llval);
+      this->os->print ("%ld", ev->u.llval);
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-        break;
-      case AST_Expression::EV_ulonglong:
+      break;
+    case AST_Expression::EV_ulonglong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-        *os << "ACE_UINT64_LITERAL (";
-        this->os->print (ACE_UINT64_FORMAT_SPECIFIER, ev->u.ullval);
-        *os << ")";
+      *os << "ACE_UINT64_LITERAL (";
+      this->os->print (ACE_UINT64_FORMAT_SPECIFIER, ev->u.ullval);
+      *os << ")";
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-        break;
-      case AST_Expression::EV_char:
-	      *os << ev->u.cval;
-        break;
-      case AST_Expression::EV_wchar:
-        *os << ev->u.wcval;
-        break;
-      case AST_Expression::EV_bool:
-        *os << (ev->u.bval ? "true" : "false");
-        break;
-      case AST_Expression::EV_enum:
-        *os << val->n ();
-        break;
-      default:
-        break;
+      break;
+    case AST_Expression::EV_char:
+      *os << ev->u.cval;
+      break;
+    case AST_Expression::EV_wchar:
+      *os << ev->u.wcval;
+      break;
+    case AST_Expression::EV_bool:
+      *os << (ev->u.bval ? "true" : "false");
+      break;
+    case AST_Expression::EV_enum:
+      *os << val->n ();
+      break;
+    default:
+      break;
     }
 }
 
@@ -1399,7 +1399,7 @@ idl3_to_idl2_visitor::gen_provides (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << pd->impl->name () << " provide_" << pd->id << " ();";
     }
@@ -1417,9 +1417,9 @@ idl3_to_idl2_visitor::gen_uses (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl;
-      
+
       if (pd->is_multiple)
         {
           *os << "struct " << pd->id << "Connection" << be_nl
@@ -1436,14 +1436,14 @@ idl3_to_idl2_visitor::gen_uses (AST_Component *node)
               << "Components::InvalidConnection);" << be_uidt_nl << be_nl
               << pd->impl->name () << " disconnect_" << pd->id
               << " (in Components::Cookie ck)" << be_idt_nl
-              << "raises (Components::InvalidConnection);" 
+              << "raises (Components::InvalidConnection);"
               << be_uidt_nl << be_nl
-              << pd->id << "Connections get_connections_" << pd->id 
+              << pd->id << "Connections get_connections_" << pd->id
               << " ();";
         }
       else
         {
-          *os << "void connect_" << pd->id << " (in " 
+          *os << "void connect_" << pd->id << " (in "
               << pd->impl->name () << " conxn)" << be_idt_nl
               << "raises (Components::AlreadyConnected, "
               << "Components::InvalidConnection);" << be_uidt_nl << be_nl
@@ -1468,10 +1468,10 @@ idl3_to_idl2_visitor::gen_publishes (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << "Components::Cookie subscribe_" << pd->id
-          << " (in " << pd->impl->name () <<"Consumer consumer)" 
+          << " (in " << pd->impl->name () <<"Consumer consumer)"
           << be_idt_nl
           << "raises (Components::ExceededConnectionLimit);"
           << be_uidt_nl << be_nl
@@ -1493,12 +1493,12 @@ idl3_to_idl2_visitor::gen_emits (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << "void connect_" << pd->id
-          << " (in " << pd->impl->name () 
+          << " (in " << pd->impl->name ()
           << "Consumer consumer)" << be_idt_nl
-          << "raises (Components::AlreadyConnected);" 
+          << "raises (Components::AlreadyConnected);"
           << be_uidt_nl << be_nl
           << pd->impl->name () << "Consumer disconnect_" << pd->id
           << " ()" << be_idt_nl
@@ -1518,7 +1518,7 @@ idl3_to_idl2_visitor::gen_consumes (AST_Component *node)
        iter.advance ())
     {
       iter.next (pd);
-      
+
       *os << be_nl << be_nl
           << pd->impl->name () << "Consumer get_consumer_" << pd->id
           << " ();";
@@ -1571,10 +1571,10 @@ idl3_to_idl2_visitor::tranfer_scope_elements (AST_Home *src,
       d->set_name (new_name);
       dst.add_to_scope (d);
     }
-  
+
   // Visit the transferred scope elements normally to generate the IDL.
   // This way referenced items will have the interface's name in the
-  // scoped name instead of the home's name.  
+  // scoped name instead of the home's name.
   for (UTL_ScopeActiveIterator dst_iter (&dst, UTL_Scope::IK_decls);
        ! dst_iter.is_done ();
        dst_iter.next ())
@@ -1599,17 +1599,17 @@ idl3_to_idl2_visitor::gen_factories (AST_Home *node,
        i.advance ())
     {
       i.next (item);
-      
+
       *os << be_nl << be_nl
           << node->managed_component ()->name () << " "
           << (*item)->local_name () << " (";
-          
+
       this->gen_params (*item, (*item)->argument_count ());
-      
+
       *os << ")";
-      
+
       UTL_ExceptList *exceps = (*item)->exceptions ();
-      
+
       if (exceps != 0 && exceps->length () > 0)
         {
           this->gen_exception_list (exceps, "", I_FALSE);
@@ -1619,7 +1619,7 @@ idl3_to_idl2_visitor::gen_factories (AST_Home *node,
           *os << be_idt_nl
               << "raises (";
         }
-      
+
       *os << "Components::CreateFailure);" << be_uidt;
     }
 }
@@ -1635,17 +1635,17 @@ idl3_to_idl2_visitor::gen_finders (AST_Home *node,
        i.advance ())
     {
       i.next (item);
-      
+
       *os << be_nl << be_nl
           << node->managed_component ()->name () << " "
           << (*item)->local_name () << " (";
-          
+
       this->gen_params (*item, (*item)->argument_count ());
-      
+
       *os << ")";
-      
+
       UTL_ExceptList *exceps = (*item)->exceptions ();
-      
+
       if (exceps != 0 && exceps->length () > 0)
         {
           this->gen_exception_list (exceps, "", I_FALSE);
@@ -1655,7 +1655,7 @@ idl3_to_idl2_visitor::gen_finders (AST_Home *node,
           *os << be_idt_nl
               << "raises (";
         }
-      
+
       *os << "Components::FinderFailure);" << be_uidt;
     }
 }
@@ -1666,7 +1666,7 @@ idl3_to_idl2_visitor::gen_params (UTL_Scope *s, int arg_count)
   if (arg_count > 0)
     {
       *os << be_idt << be_idt;
-      
+
       for (UTL_ScopeActiveIterator si (s, UTL_Scope::IK_decls);
            !si.is_done ();)
         {
@@ -1676,17 +1676,17 @@ idl3_to_idl2_visitor::gen_params (UTL_Scope *s, int arg_count)
                           "idl3_to_idl2_visitor::gen_params - "
                           "codegen for parameters failed\n"));
             }
-            
+
           si.next ();
-          
+
           if (!si.is_done ())
             {
               *os << ",";
             }
         }
-        
+
       *os << be_uidt_nl << be_uidt;
-    }   
+    }
 }
 
 void
@@ -1698,23 +1698,23 @@ idl3_to_idl2_visitor::gen_exception_list (UTL_ExceptList *exceptions,
     {
       *os << be_idt_nl
           << prefix << "raises (";
-          
+
       for (UTL_ExceptlistActiveIterator ei (exceptions);
            !ei.is_done ();)
         {
           *os << ei.item ()->name ();
-          
+
           ei.next ();
-        
+
           if (!ei.is_done () || !closed)
             {
               *os << ", ";
             }
         }
-        
+
       if (closed)
-        {  
+        {
           *os << ")" << be_uidt;
         }
-    }  
+    }
 }
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
index e310e2d1cfc..55e8daca26f 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
@@ -82,7 +82,7 @@ public:
   virtual int visit_typedef (AST_Typedef *node);
   virtual int visit_root (AST_Root *node);
   virtual int visit_native (AST_Native *node);
-  
+
 private:
   void check_prefix (AST_Decl *d);
   void check_id_and_version (AST_Decl *d);
@@ -105,7 +105,7 @@ private:
   void gen_exception_list (UTL_ExceptList *exceptions,
                            const char *prefix = "",
                            idl_bool closed = I_TRUE);
-  
+
 private:
   TAO_OutStream *os;
   AST_Type *disc_type_;
diff --git a/TAO/CIAO/tools/tools.mwc b/TAO/CIAO/tools/tools.mwc
index b841dc37dd0..6a3ed022516 100644
--- a/TAO/CIAO/tools/tools.mwc
+++ b/TAO/CIAO/tools/tools.mwc
@@ -3,4 +3,4 @@
 
 workspace {
         Config_Handlers
-}
\ No newline at end of file
+}