Thu Aug 1 11:55:34 UTC 2013 Marcel Smit <msmit@remedy.nl>

* docs/schema/Basic_Deployment_Data.xsd: * tools/Config_Handlers/Any_Handler.cpp: * tools/Config_Handlers/Basic_Deployment_Data.hpp: * tools/Config_Handlers/Basic_Deployment_Data.cpp: * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc: * tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h: * tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: Added support for arrays. Expanded the CIAO Bug_3769_Regression test to test this. Log: commit d76669ffd4319f509fb70a23357bc625bd439394 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Thu Aug 1 13:03:49 2013 +0200 Removed commented out code (issue #1551) * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: commit c48685af6b186881a3dd5c04e3f81bebc594a3c6 Author: Marcel Smit <msmit@remedy.nl> Date: Thu Aug 1 11:57:18 2013 +0200 Changes after review (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: Fixed some faulty error logs. * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: Removed commented out code. * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: Fixed logging. commit 332899620e9b6eaf272f69eff58daf9d8efbd54f Author: Marcel Smit <msmit@remedy.nl> Date: Thu Aug 1 11:03:04 2013 +0200 Removed commented out code (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: commit 9ee6750d39e778a291333c09ec5520add22ab102 Author: Marcel Smit <msmit@remedy.nl> Date: Thu Aug 1 10:02:20 2013 +0200 Fixed compile issues on windows by disabling the long double. Added comments. (refs #1551) * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: commit 075179c1cdf06b39d53bddba009a32285e3bf7ad Author: Marcel Smit <msmit@remedy.nl> Date: Thu Aug 1 09:35:20 2013 +0200 Documented why chars and long doubles are not supported. Removed defaults in arguments of check_array. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: commit 1c90d97e9afceeebad6a71fc5c879cf2d4839f28 Author: Marcel Smit <msmit@remedy.nl> Date: Thu Aug 1 09:20:26 2013 +0200 Removed TODO list. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: commit c781f16d4730a6f5a493fc7df52786d5ffb03f14 Author: Marcel Smit <msmit@remedy.nl> Date: Wed Jul 31 10:16:55 2013 +0200 Layout changes. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: commit 72a9515e4c3e3ee403283711eb3f01cb61299caf Author: Marcel Smit <msmit@remedy.nl> Date: Wed Jul 31 10:02:21 2013 +0200 Added a test for sequences in arrays. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit a6e12df7fe89528a5b168e820590488b053dc062 Author: Marcel Smit <msmit@remedy.nl> Date: Wed Jul 31 09:32:33 2013 +0200 Added a sequence of arrays to test. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 6422409ab6f5ec56e998b1a570aee3234a5edafd Author: Marcel Smit <msmit@remedy.nl> Date: Wed Jul 31 08:44:22 2013 +0200 Disabled long doubles since a longdouble is defined in the xsd as double. We are then creating a long double initialized from a regular double. This is a very tricky conversion and doesn't work in combination with certain (versions of) compilers. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: Removed long double checks * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: Don't assign the type code in case a long double. Added comments above. commit d539f68dc768da7032f08a9f3ae2537bd1fabe1a Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 20:36:49 2013 +0200 Updated todo list. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: commit 4160bc932f390e837244eb800dea190f272bcb85 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 20:35:55 2013 +0200 Added a plain boolean attribute to test. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit a9b2197ca6320b481484f69f0abeb12f474acddf Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 20:24:31 2013 +0200 Added an octet and a long double as attribute to the Foo component. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 2d59676cd472ab12bf14ac0ad17e75d615d46d84 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 30 20:09:35 2013 +0200 Added some more todo * CIAO/tests/Bug_3769_Regression/Foo.idl: commit e8f011ebb02e44895bc158525d6aef13cec64a24 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 16:37:00 2013 +0200 Added checks on the array of octets. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: commit 22970ae42a26d7d0df31e89bf080aa6f83853adb Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 16:26:48 2013 +0200 Enabled an array of octets. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 5345db6e8dfb1acfcaf8082e1ce4b58b48ce8c7d Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 30 16:20:42 2013 +0200 Cleanup octet/longdouble support and logging improvements * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: commit 6e23dde3fa5a79a47e9d20c80bec18b56adba5a9 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 30 15:59:42 2013 +0200 Const fix * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: commit 6769ad6d4e5adc000c84e628ff7783f9b9cf2d2d Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 15:58:29 2013 +0200 References issue #1551 * CIAO/tests/Bug_3769_Regression/Foo_exec.h: Fixed compile issue * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: Enabled long double test again. * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: Work in progress: Hunting the long double bug... commit cacb9ef80d659eb1c925517d1e4a6f5d939daa45 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 14:04:24 2013 +0200 Added an array of booleans. Added char and wstring arrays although these are not supported. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit ba45f218640e65e3c2f6ad23e9bbb06b0ba62a8e Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 13:47:44 2013 +0200 References issue #1551 * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: Added float and longdouble arrays. Long double arrays do appear to have errors. * DAnCE/tools/Config_Handlers/Any_Handler.cpp: Removed newline character in exception logging. commit 804983d47b0061dd55dec0b5d5e254c2a0d40903 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 12:56:34 2013 +0200 Added an array of doubles. Skipped an array of chars since this is not supported. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: Also layout changes commit 3938d99a1a3705e99b888b192a189464f940d032 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 11:11:47 2013 +0200 Added (unsigned) short arrays (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit d563ee6d2dcb4b8b843ee11b20df21a7bf40c035 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 11:03:04 2013 +0200 Added a test for an array with unsigned long long values. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 17dfa9a0d26e48f39d9e41cce5644e05ef01da90 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 10:48:33 2013 +0200 Added a long long array test. Also added a template class which check whether the content of the arrays are correct. This'll prevent multiple times the same code. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 92c6bf4f6d01c70b7b39df632312fc89133db6ef Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 09:55:28 2013 +0200 Added a ulong array as test. Prepared the other basic types in arrays. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 8f76f00815805c094310085928bd2b61f4a132fa Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 08:47:56 2013 +0200 Layout changes. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: commit 756c6c355b7c89ba1b6cefcc91d7b5ee3d738748 Author: Marcel Smit <msmit@remedy.nl> Date: Tue Jul 30 08:37:30 2013 +0200 Added a sequence in sequence test. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 6831e1364639cf497f81c49b9eb33f51b0ea1c20 Author: Marcel Smit <msmit@remedy.nl> Date: Mon Jul 29 16:51:29 2013 +0200 References issue #1551 * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: Added an array in array tests. * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: Fixed issues regarding array in arrays and sequences in arrays. * DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp: Fixed issues regarding sequences in sequences and arrays. Need to add an extra test for this. commit 99c188e25d6ecaecbd4ce57a22cb457adce5c627 Author: Marcel Smit <msmit@remedy.nl> Date: Mon Jul 29 14:31:24 2013 +0200 Added test for a struct, containing one member which is an array of structs. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 8d21f4afe29e0f5d23957614ed74b959cbd3a666 Author: Marcel Smit <msmit@remedy.nl> Date: Mon Jul 29 13:46:34 2013 +0200 Enabled the check on an array of bar structs. Prepared the next check as well. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo.idl: * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 66b903a90ed5166633cd57729796cd2b72a8c76c Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Mon Jul 29 13:22:18 2013 +0200 Remove commented out line * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: commit 21432ee084eae5293a6799fe98091966ba789a14 Author: Marcel Smit <msmit@remedy.nl> Date: Mon Jul 29 13:15:02 2013 +0200 Renamed error_ postfix to success_. (refs #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: commit 34e1be7229a58cccea99581d7657100cea1196ba Author: Marcel Smit <msmit@remedy.nl> Date: Mon Jul 29 13:00:32 2013 +0200 References issue #1551 * CIAO/tests/Bug_3769_Regression/Foo.idl: String array contains 3 instead of 5 entries. * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: Improved naming of booleans by adding 'error_'. commit 47985c348d9fc416c4e0406b8c259048c10e624b Author: Marcel Smit <msmit@remedy.nl> Date: Mon Jul 29 11:52:57 2013 +0200 Added test for arrays of strings. (issue #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit c17d5178d0c5095b2476043bc5d8014e05d55bb0 Author: Marcel Smit <msmit@remedy.nl> Date: Mon Jul 29 11:31:54 2013 +0200 Improved error logging in ccm_activate. (issue #1551) * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: commit 8241a2b161d6e0b5d56b08aaf3626f46f78e4f98 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Wed Jul 24 13:44:39 2013 +0200 Fixed problems introduced by regeneration related to string unicode comparison and wrong namespace * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: commit 87b32e82230e087aae351d59e430b41aa31f86d1 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Wed Jul 24 12:21:07 2013 +0200 Removed comments from tao_idl * CIAO/tests/Bug_3769_Regression/Foo_exec.h: commit 4898ab76fa271668e935891b5ae7bd7f7310a6cf Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Wed Jul 24 11:49:41 2013 +0200 Test long array, commented out the other array, test needs major extensions * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: commit 17a8a51ff550444f7e6d1646f0e94db31265ddb5 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Wed Jul 24 11:37:41 2013 +0200 Added long array to the cdp * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit 26f5dccb4aec965f6b3a7bdfd3afaa004f20cd08 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Wed Jul 24 11:37:29 2013 +0200 Extended IDL * CIAO/tests/Bug_3769_Regression/Foo.idl: commit aa8d6195c6d2359a09c855d979432d911910c4c1 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Wed Jul 24 11:37:15 2013 +0200 Fixed typecode handling * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: commit 15ca519cf1bd8277e518fc846b58aec44cb5e84b Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Wed Jul 24 11:21:21 2013 +0200 First try to add an array to the cdp * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: commit e80ae72952d7253519ccb17873de1e15da023aa0 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 23 21:21:43 2013 +0200 Added length to array definition * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: commit 2a439e37fe257e48b6471e5c8287cd79d46c9b40 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 23 21:16:55 2013 +0200 Implemented some more array handling * DAnCE/docs/schema/Basic_Deployment_Data.xsd: * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h: commit f44210381907f568d4295beb9cbf0a75743375b7 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 23 20:55:24 2013 +0200 Updated array definition * DAnCE/docs/schema/Basic_Deployment_Data.xsd: commit 5309ae3c49a7507b6c626e2c1b05e5cc60bed393 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 23 16:10:14 2013 +0200 Initial copied files for DynArray support * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h: Added. * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: * DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc: commit 1313b0f422d0420208e41c5f466ff0b961180bc9 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 23 16:00:47 2013 +0200 Some initial test extensions * CIAO/tests/Bug_3769_Regression/Foo_exec.cpp: * CIAO/tests/Bug_3769_Regression/Foo_exec.h: * CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: * CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl: * CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl: commit 2fcba7d1938c0b37fff2c94fa0e65b78bef0def8 Author: Johnny Willemsen <jwillemsen@remedy.nl> Date: Tue Jul 23 15:50:30 2013 +0200 Extended xsd with support for arrays * DAnCE/docs/schema/Basic_Deployment_Data.xsd: * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp: * DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp:
author: msmit <msmit@remedy.nl> 2013-08-01 11:57:33 +0000
committer: msmit <msmit@remedy.nl> 2013-08-01 11:57:33 +0000
commit: 91824e74eabe751612022e2167be04423c80e1d0 (patch)
tree: fd6dc66bc5676afe943772cf445bad71e988428f /DAnCE/tools
parent: eeec8b87019d19583882831c18a278c681bdaac3 (diff)
download: ATCD-91824e74eabe751612022e2167be04423c80e1d0.tar.gz
9 files changed, 1237 insertions, 555 deletions
diff --git a/DAnCE/tools/Config_Handlers/Any_Handler.cpp b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
index e8bef14831a..2ffc3d43a06 100644
--- a/DAnCE/tools/Config_Handlers/Any_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
@@ -48,7 +48,7 @@ namespace DAnCE
                            ACE_TEXT (" dynany: %C\n"),
                            ex._info ().c_str ()));
           throw Config_Error (ACE_TEXT (""),
-                              ACE_TEXT ("CORBA Exception while extracting into dynany\n"));
+                              ACE_TEXT ("CORBA Exception while extracting into dynany"));
         }
       catch (Config_Error &ex)
         {
@@ -56,7 +56,7 @@ namespace DAnCE
         }
       catch (...)
         {
-          throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Caught error whilst parsing XML into Any\n"));
+          throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Caught error whilst parsing XML into Any"));
         }
     }
 
diff --git a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp
index 7d60277d096..020440824a0 100644
--- a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -8,13 +8,6 @@
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
-
-// Fix for Borland compilers, which seem to have a broken
-// <string> include.
-#ifdef __BORLANDC__
-# include <string.h>
-#endif
-
 #include "Basic_Deployment_Data.hpp"
 
 namespace DAnCE
@@ -33,7 +26,7 @@ namespace DAnCE
 
     IdRef::
     IdRef (IdRef const& s)
-      : ::XSCRT::Type (),
+    : ::XSCRT::Type (),
     href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
     idref_ (s.idref_.get () ? new ::XMLSchema::IDREF< ACE_TCHAR > (*s.idref_) : 0),
     regulator__ ()
@@ -45,11 +38,14 @@ namespace DAnCE
     IdRef& IdRef::
     operator= (IdRef const& s)
     {
-      if (s.href_.get ()) href (*(s.href_));
-      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      if (&s != this)
+      {
+        if (s.href_.get ()) href (*(s.href_));
+        else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.idref_.get ()) idref (*(s.idref_));
-      else idref_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (0);
+        if (s.idref_.get ()) idref (*(s.idref_));
+        else idref_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (0);
+      }
 
       return *this;
     }
@@ -110,8 +106,7 @@ namespace DAnCE
       return *idref_;
     }
 
-    ::XSCRT::Type* IdRef::
-    idref_ptr ()
+    ::XSCRT::Type* IdRef::idref_ptr ()
     {
         std::basic_string<ACE_TCHAR> temp (idref().id());
       return this->get_idref(temp.c_str());
@@ -184,6 +179,7 @@ namespace DAnCE
     value_ (s.value_.get () ? new ::DAnCE::Config_Handlers::ValueType (*s.value_) : 0),
     sequence_ (s.sequence_.get () ? new ::DAnCE::Config_Handlers::SequenceType (*s.sequence_) : 0),
     alias_ (s.alias_.get () ? new ::DAnCE::Config_Handlers::AliasType (*s.alias_) : 0),
+    array_ (s.array_.get () ? new ::DAnCE::Config_Handlers::ArrayType (*s.array_) : 0),
     id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
     regulator__ ()
     {
@@ -193,41 +189,50 @@ namespace DAnCE
       if (value_.get ()) value_->container (this);
       if (sequence_.get ()) sequence_->container (this);
       if (alias_.get ()) alias_->container (this);
+      if (array_.get ()) array_->container (this);
       if (id_.get ()) id_->container (this);
     }
 
     DataType& DataType::
     operator= (DataType const& s)
     {
-      kind (*s.kind_);
+      if (&s != this)
+      {
+        kind (*s.kind_);
 
-      if (s.enum__.get ())
-        enum_ (*(s.enum__));
-      else
-        enum__.reset (0);
+        if (s.enum__.get ())
+          enum_ (*(s.enum__));
+        else
+          enum__.reset (0);
 
-      if (s.struct__.get ())
-        struct_ (*(s.struct__));
-      else
-        struct__.reset (0);
+        if (s.struct__.get ())
+          struct_ (*(s.struct__));
+        else
+          struct__.reset (0);
 
-      if (s.value_.get ())
-        value (*(s.value_));
-      else
-        value_.reset (0);
+        if (s.value_.get ())
+          value (*(s.value_));
+        else
+          value_.reset (0);
 
-      if (s.sequence_.get ())
-        sequence (*(s.sequence_));
-      else
-        sequence_.reset (0);
+        if (s.sequence_.get ())
+          sequence (*(s.sequence_));
+        else
+          sequence_.reset (0);
 
-      if (s.alias_.get ())
-        alias (*(s.alias_));
-      else
-        alias_.reset (0);
+        if (s.alias_.get ())
+          alias (*(s.alias_));
+        else
+          alias_.reset (0);
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+        if (s.array_.get ())
+          array (*(s.array_));
+        else
+          array_.reset (0);
+
+        if (s.id_.get ()) id (*(s.id_));
+        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      }
 
       return *this;
     }
@@ -395,6 +400,35 @@ namespace DAnCE
     // DataType
     //
     bool DataType::
+    array_p () const
+    {
+      return array_.get () != 0;
+    }
+
+    ::DAnCE::Config_Handlers::ArrayType const& DataType::
+    array () const
+    {
+      return *array_;
+    }
+
+    void DataType::
+    array (::DAnCE::Config_Handlers::ArrayType const& e)
+    {
+      if (array_.get ())
+      {
+        *array_ = e;
+      }
+
+      else
+      {
+        array_ = ::std::auto_ptr< ::DAnCE::Config_Handlers::ArrayType > (new ::DAnCE::Config_Handlers::ArrayType (e));
+        array_->container (this);
+      }
+    }
+
+    // DataType
+    //
+    bool DataType::
     id_p () const
     {
       return id_.get () != 0;
@@ -464,35 +498,38 @@ namespace DAnCE
     DataValue& DataValue::
     operator= (DataValue const& s)
     {
-      short__ = s.short__;
+      if (&s != this)
+      {
+        short__ = s.short__;
 
-      long__ = s.long__;
+        long__ = s.long__;
 
-      ushort_ = s.ushort_;
+        ushort_ = s.ushort_;
 
-      ulong_ = s.ulong_;
+        ulong_ = s.ulong_;
 
-      float__ = s.float__;
+        float__ = s.float__;
 
-      double__ = s.double__;
+        double__ = s.double__;
 
-      boolean_ = s.boolean_;
+        boolean_ = s.boolean_;
 
-      octet_ = s.octet_;
+        octet_ = s.octet_;
 
-      enum__ = s.enum__;
+        enum__ = s.enum__;
 
-      string_ = s.string_;
+        string_ = s.string_;
 
-      longlong_ = s.longlong_;
+        longlong_ = s.longlong_;
 
-      ulonglong_ = s.ulonglong_;
+        ulonglong_ = s.ulonglong_;
 
-      longdouble_ = s.longdouble_;
+        longdouble_ = s.longdouble_;
 
-      element_ = s.element_;
+        element_ = s.element_;
 
-      member_ = s.member_;
+        member_ = s.member_;
+      }
 
       return *this;
     }
@@ -1104,11 +1141,14 @@ namespace DAnCE
     AliasType& AliasType::
     operator= (AliasType const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      typeId (*s.typeId_);
+        typeId (*s.typeId_);
 
-      elementType (*s.elementType_);
+        elementType (*s.elementType_);
+      }
 
       return *this;
     }
@@ -1190,11 +1230,14 @@ namespace DAnCE
     EnumType& EnumType::
     operator= (EnumType const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      typeId (*s.typeId_);
+        typeId (*s.typeId_);
 
-      member_ = s.member_;
+        member_ = s.member_;
+      }
 
       return *this;
     }
@@ -1298,11 +1341,14 @@ namespace DAnCE
     StructType& StructType::
     operator= (StructType const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      typeId (*s.typeId_);
+        typeId (*s.typeId_);
 
-      member_ = s.member_;
+        member_ = s.member_;
+      }
 
       return *this;
     }
@@ -1405,9 +1451,12 @@ namespace DAnCE
     StructMemberType& StructMemberType::
     operator= (StructMemberType const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      type (*s.type_);
+        type (*s.type_);
+      }
 
       return *this;
     }
@@ -1483,15 +1532,18 @@ namespace DAnCE
     ValueType& ValueType::
     operator= (ValueType const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      typeId (*s.typeId_);
+        typeId (*s.typeId_);
 
-      modifier (*s.modifier_);
+        modifier (*s.modifier_);
 
-      baseType (*s.baseType_);
+        baseType (*s.baseType_);
 
-      member_ = s.member_;
+        member_ = s.member_;
+      }
 
       return *this;
     }
@@ -1627,11 +1679,14 @@ namespace DAnCE
     ValueMemberType& ValueMemberType::
     operator= (ValueMemberType const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      visibility (*s.visibility_);
+        visibility (*s.visibility_);
 
-      type (*s.type_);
+        type (*s.type_);
+      }
 
       return *this;
     }
@@ -1710,9 +1765,12 @@ namespace DAnCE
     NamedValue& NamedValue::
     operator= (NamedValue const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      value (*s.value_);
+        value (*s.value_);
+      }
 
       return *this;
     }
@@ -1747,6 +1805,76 @@ namespace DAnCE
     }
 
 
+    // ArrayType
+    //
+
+    ArrayType::
+    ArrayType (::XMLSchema::unsignedInt const& length__,
+               ::DAnCE::Config_Handlers::DataType const& elementType__)
+    :
+    length_ (new ::XMLSchema::unsignedInt (length__)),
+    elementType_ (new ::DAnCE::Config_Handlers::DataType (elementType__)),
+    regulator__ ()
+    {
+      length_->container (this);
+      elementType_->container (this);
+    }
+
+    ArrayType::
+    ArrayType (ArrayType const& s)
+    :
+    ::XSCRT::Type (),
+    length_ (new ::XMLSchema::unsignedInt (*s.length_)),
+    elementType_ (new ::DAnCE::Config_Handlers::DataType (*s.elementType_)),
+    regulator__ ()
+    {
+      length_->container (this);
+      elementType_->container (this);
+    }
+
+    ArrayType& ArrayType::
+    operator= (ArrayType const& s)
+    {
+      if (&s != this)
+      {
+        length (*s.length_);
+
+        elementType (*s.elementType_);
+      }
+
+      return *this;
+    }
+
+
+    // ArrayType
+    //
+    ::XMLSchema::unsignedInt const& ArrayType::
+    length () const
+    {
+      return *length_;
+    }
+
+    void ArrayType::
+    length (::XMLSchema::unsignedInt const& e)
+    {
+      *length_ = e;
+    }
+
+    // ArrayType
+    //
+    ::DAnCE::Config_Handlers::DataType const& ArrayType::
+    elementType () const
+    {
+      return *elementType_;
+    }
+
+    void ArrayType::
+    elementType (::DAnCE::Config_Handlers::DataType const& e)
+    {
+      *elementType_ = e;
+    }
+
+
     // SequenceType
     //
 
@@ -1774,12 +1902,15 @@ namespace DAnCE
     SequenceType& SequenceType::
     operator= (SequenceType const& s)
     {
-      if (s.bound_.get ())
-        bound (*(s.bound_));
-      else
-        bound_.reset (0);
+      if (&s != this)
+      {
+        if (s.bound_.get ())
+          bound (*(s.bound_));
+        else
+          bound_.reset (0);
 
-      elementType (*s.elementType_);
+        elementType (*s.elementType_);
+      }
 
       return *this;
     }
@@ -1859,9 +1990,12 @@ namespace DAnCE
     Any& Any::
     operator= (Any const& s)
     {
-      type (*s.type_);
+      if (&s != this)
+      {
+        type (*s.type_);
 
-      value (*s.value_);
+        value (*s.value_);
+      }
 
       return *this;
     }
@@ -1926,9 +2060,12 @@ namespace DAnCE
     Property& Property::
     operator= (Property const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      value (*s.value_);
+        value (*s.value_);
+      }
 
       return *this;
     }
@@ -2030,13 +2167,16 @@ namespace DAnCE
     SatisfierProperty& SatisfierProperty::
     operator= (SatisfierProperty const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      kind (*s.kind_);
+        kind (*s.kind_);
 
-      dynamic (*s.dynamic_);
+        dynamic (*s.dynamic_);
 
-      value (*s.value_);
+        value (*s.value_);
+      }
 
       return *this;
     }
@@ -2128,11 +2268,14 @@ namespace DAnCE
     Resource& Resource::
     operator= (Resource const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      resourceType_ = s.resourceType_;
+        resourceType_ = s.resourceType_;
 
-      property_ = s.property_;
+        property_ = s.property_;
+      }
 
       return *this;
     }
@@ -2260,11 +2403,14 @@ namespace DAnCE
     Requirement& Requirement::
     operator= (Requirement const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      resourceType (*s.resourceType_);
+        resourceType (*s.resourceType_);
 
-      property_ = s.property_;
+        property_ = s.property_;
+      }
 
       return *this;
     }
@@ -2368,11 +2514,14 @@ namespace DAnCE
     ResourceDeploymentDescription& ResourceDeploymentDescription::
     operator= (ResourceDeploymentDescription const& s)
     {
-      requirementName (*s.requirementName_);
+      if (&s != this)
+      {
+        requirementName (*s.requirementName_);
 
-      resourceName (*s.resourceName_);
+        resourceName (*s.resourceName_);
 
-      property_ = s.property_;
+        property_ = s.property_;
+      }
 
       return *this;
     }
@@ -2482,22 +2631,25 @@ namespace DAnCE
     ArtifactDeploymentDescription& ArtifactDeploymentDescription::
     operator= (ArtifactDeploymentDescription const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      source_ = s.source_;
+        source_ = s.source_;
 
-      node (*s.node_);
+        node (*s.node_);
 
-      location_ = s.location_;
+        location_ = s.location_;
 
-      execParameter_ = s.execParameter_;
+        execParameter_ = s.execParameter_;
 
-      deployRequirement_ = s.deployRequirement_;
+        deployRequirement_ = s.deployRequirement_;
 
-      deployedResource_ = s.deployedResource_;
+        deployedResource_ = s.deployedResource_;
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+        if (s.id_.get ()) id (*(s.id_));
+        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      }
 
       return *this;
     }
@@ -2788,18 +2940,21 @@ namespace DAnCE
     MonolithicDeploymentDescription& MonolithicDeploymentDescription::
     operator= (MonolithicDeploymentDescription const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      source_ = s.source_;
+        source_ = s.source_;
 
-      artifact_ = s.artifact_;
+        artifact_ = s.artifact_;
 
-      execParameter_ = s.execParameter_;
+        execParameter_ = s.execParameter_;
 
-      deployRequirement_ = s.deployRequirement_;
+        deployRequirement_ = s.deployRequirement_;
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+        if (s.id_.get ()) id (*(s.id_));
+        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      }
 
       return *this;
     }
@@ -3070,13 +3225,16 @@ namespace DAnCE
     InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription::
     operator= (InstanceResourceDeploymentDescription const& s)
     {
-      resourceUsage (*s.resourceUsage_);
+      if (&s != this)
+      {
+        resourceUsage (*s.resourceUsage_);
 
-      requirementName (*s.requirementName_);
+        requirementName (*s.requirementName_);
 
-      resourceName (*s.resourceName_);
+        resourceName (*s.resourceName_);
 
-      property_ = s.property_;
+        property_ = s.property_;
+      }
 
       return *this;
     }
@@ -3209,25 +3367,28 @@ namespace DAnCE
     InstanceDeploymentDescription& InstanceDeploymentDescription::
     operator= (InstanceDeploymentDescription const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      node (*s.node_);
+        node (*s.node_);
 
-      source (*s.source_);
+        source (*s.source_);
 
-      implementation (*s.implementation_);
+        implementation (*s.implementation_);
 
-      configProperty_ = s.configProperty_;
+        configProperty_ = s.configProperty_;
 
-      deployedResource_ = s.deployedResource_;
+        deployedResource_ = s.deployedResource_;
 
-      if (s.deployedSharedResource_.get ())
-        deployedSharedResource (*(s.deployedSharedResource_));
-      else
-        deployedSharedResource_.reset (0);
+        if (s.deployedSharedResource_.get ())
+          deployedSharedResource (*(s.deployedSharedResource_));
+        else
+          deployedSharedResource_.reset (0);
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+        if (s.id_.get ()) id (*(s.id_));
+        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      }
 
       return *this;
     }
@@ -3511,26 +3672,29 @@ namespace DAnCE
     ComponentPortDescription& ComponentPortDescription::
     operator= (ComponentPortDescription const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      if (s.specificType_.get ())
-        specificType (*(s.specificType_));
-      else
-        specificType_.reset (0);
+        if (s.specificType_.get ())
+          specificType (*(s.specificType_));
+        else
+          specificType_.reset (0);
 
-      supportedType_ = s.supportedType_;
+        supportedType_ = s.supportedType_;
 
-      provider (*s.provider_);
+        provider (*s.provider_);
 
-      exclusiveProvider (*s.exclusiveProvider_);
+        exclusiveProvider (*s.exclusiveProvider_);
 
-      exclusiveUser (*s.exclusiveUser_);
+        exclusiveUser (*s.exclusiveUser_);
 
-      optional (*s.optional_);
+        optional (*s.optional_);
 
-      kind (*s.kind_);
+        kind (*s.kind_);
 
-      templateParam_ = s.templateParam_;
+        templateParam_ = s.templateParam_;
+      }
 
       return *this;
     }
@@ -3756,9 +3920,12 @@ namespace DAnCE
     ComponentPropertyDescription& ComponentPropertyDescription::
     operator= (ComponentPropertyDescription const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      type (*s.type_);
+        type (*s.type_);
+      }
 
       return *this;
     }
@@ -3818,7 +3985,10 @@ namespace DAnCE
     ComponentExternalPortEndpoint& ComponentExternalPortEndpoint::
     operator= (ComponentExternalPortEndpoint const& s)
     {
-      portName (*s.portName_);
+      if (&s != this)
+      {
+        portName (*s.portName_);
+      }
 
       return *this;
     }
@@ -3876,16 +4046,19 @@ namespace DAnCE
     PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint::
     operator= (PlanSubcomponentPortEndpoint const& s)
     {
-      portName (*s.portName_);
+      if (&s != this)
+      {
+        portName (*s.portName_);
 
-      if (s.provider_.get ())
-        provider (*(s.provider_));
-      else
-        provider_.reset (0);
+        if (s.provider_.get ())
+          provider (*(s.provider_));
+        else
+          provider_.reset (0);
 
-      kind (*s.kind_);
+        kind (*s.kind_);
 
-      instance (*s.instance_);
+        instance (*s.instance_);
+      }
 
       return *this;
     }
@@ -3996,16 +4169,19 @@ namespace DAnCE
     ExternalReferenceEndpoint& ExternalReferenceEndpoint::
     operator= (ExternalReferenceEndpoint const& s)
     {
-      location (*s.location_);
+      if (&s != this)
+      {
+        location (*s.location_);
 
-      provider (*s.provider_);
+        provider (*s.provider_);
 
-      if (s.portName_.get ())
-        portName (*(s.portName_));
-      else
-        portName_.reset (0);
+        if (s.portName_.get ())
+          portName (*(s.portName_));
+        else
+          portName_.reset (0);
 
-      supportedType_ = s.supportedType_;
+        supportedType_ = s.supportedType_;
+      }
 
       return *this;
     }
@@ -4143,13 +4319,16 @@ namespace DAnCE
     ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription::
     operator= (ConnectionResourceDeploymentDescription const& s)
     {
-      targetName (*s.targetName_);
+      if (&s != this)
+      {
+        targetName (*s.targetName_);
 
-      requirementName (*s.requirementName_);
+        requirementName (*s.requirementName_);
 
-      resourceName (*s.resourceName_);
+        resourceName (*s.resourceName_);
 
-      property_ = s.property_;
+        property_ = s.property_;
+      }
 
       return *this;
     }
@@ -4268,22 +4447,25 @@ namespace DAnCE
     PlanConnectionDescription& PlanConnectionDescription::
     operator= (PlanConnectionDescription const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      if (s.source_.get ())
-        source (*(s.source_));
-      else
-        source_.reset (0);
+        if (s.source_.get ())
+          source (*(s.source_));
+        else
+          source_.reset (0);
 
-      deployRequirement_ = s.deployRequirement_;
+        deployRequirement_ = s.deployRequirement_;
 
-      externalEndpoint_ = s.externalEndpoint_;
+        externalEndpoint_ = s.externalEndpoint_;
 
-      internalEndpoint_ = s.internalEndpoint_;
+        internalEndpoint_ = s.internalEndpoint_;
 
-      externalReference_ = s.externalReference_;
+        externalReference_ = s.externalReference_;
 
-      deployedResource_ = s.deployedResource_;
+        deployedResource_ = s.deployedResource_;
+      }
 
       return *this;
     }
@@ -4548,7 +4730,10 @@ namespace DAnCE
     ImplementationDependency& ImplementationDependency::
     operator= (ImplementationDependency const& s)
     {
-      requiredType (*s.requiredType_);
+      if (&s != this)
+      {
+        requiredType (*s.requiredType_);
+      }
 
       return *this;
     }
@@ -4596,11 +4781,14 @@ namespace DAnCE
     Capability& Capability::
     operator= (Capability const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      resourceType_ = s.resourceType_;
+        resourceType_ = s.resourceType_;
 
-      property_ = s.property_;
+        property_ = s.property_;
+      }
 
       return *this;
     }
@@ -4734,26 +4922,29 @@ namespace DAnCE
     ImplementationRequirement& ImplementationRequirement::
     operator= (ImplementationRequirement const& s)
     {
-      if (s.resourceUsage_.get ())
-        resourceUsage (*(s.resourceUsage_));
-      else
-        resourceUsage_.reset (0);
+      if (&s != this)
+      {
+        if (s.resourceUsage_.get ())
+          resourceUsage (*(s.resourceUsage_));
+        else
+          resourceUsage_.reset (0);
 
-      if (s.resourcePort_.get ())
-        resourcePort (*(s.resourcePort_));
-      else
-        resourcePort_.reset (0);
+        if (s.resourcePort_.get ())
+          resourcePort (*(s.resourcePort_));
+        else
+          resourcePort_.reset (0);
 
-      if (s.componentPort_.get ())
-        componentPort (*(s.componentPort_));
-      else
-        componentPort_.reset (0);
+        if (s.componentPort_.get ())
+          componentPort (*(s.componentPort_));
+        else
+          componentPort_.reset (0);
 
-      resourceType (*s.resourceType_);
+        resourceType (*s.resourceType_);
 
-      name (*s.name_);
+        name (*s.name_);
 
-      property_ = s.property_;
+        property_ = s.property_;
+      }
 
       return *this;
     }
@@ -4943,9 +5134,12 @@ namespace DAnCE
     SubcomponentPortEndpoint& SubcomponentPortEndpoint::
     operator= (SubcomponentPortEndpoint const& s)
     {
-      portName (*s.portName_);
+      if (&s != this)
+      {
+        portName (*s.portName_);
 
-      instance (*s.instance_);
+        instance (*s.instance_);
+      }
 
       return *this;
     }
@@ -5009,15 +5203,18 @@ namespace DAnCE
     AssemblyConnectionDescription& AssemblyConnectionDescription::
     operator= (AssemblyConnectionDescription const& s)
     {
-      name (*s.name_);
+      if (&s != this)
+      {
+        name (*s.name_);
 
-      deployRequirement_ = s.deployRequirement_;
+        deployRequirement_ = s.deployRequirement_;
 
-      internalEndpoint_ = s.internalEndpoint_;
+        internalEndpoint_ = s.internalEndpoint_;
 
-      externalEndpoint_ = s.externalEndpoint_;
+        externalEndpoint_ = s.externalEndpoint_;
 
-      externalReference_ = s.externalReference_;
+        externalReference_ = s.externalReference_;
+      }
 
       return *this;
     }
@@ -5245,9 +5442,12 @@ namespace DAnCE
     PlanLocality& PlanLocality::
     operator= (PlanLocality const& s)
     {
-      constraint (*s.constraint_);
+      if (&s != this)
+      {
+        constraint (*s.constraint_);
 
-      constrainedInstance_ = s.constrainedInstance_;
+        constrainedInstance_ = s.constrainedInstance_;
+      }
 
       return *this;
     }
@@ -5535,6 +5735,12 @@ namespace DAnCE
           alias (t);
         }
 
+        else if (n == ACE_TEXT("array"))
+        {
+          ::DAnCE::Config_Handlers::ArrayType t (e);
+          array (t);
+        }
+
         else
         {
         }
@@ -5943,6 +6149,39 @@ namespace DAnCE
       }
     }
 
+    // ArrayType
+    //
+
+    ArrayType::
+    ArrayType (::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 == ACE_TEXT("length"))
+        {
+          length_ = ::std::auto_ptr< ::XMLSchema::unsignedInt > (new ::XMLSchema::unsignedInt (e));
+          length_->container (this);
+        }
+
+        else if (n == ACE_TEXT("elementType"))
+        {
+          elementType_ = ::std::auto_ptr< ::DAnCE::Config_Handlers::DataType > (new ::DAnCE::Config_Handlers::DataType (e));
+          elementType_->container (this);
+        }
+
+        else
+        {
+        }
+      }
+    }
+
     // SequenceType
     //
 
@@ -7397,6 +7636,20 @@ namespace DAnCE
 
       NamedValueTypeInfoInitializer NamedValueTypeInfoInitializer_;
 
+      struct ArrayTypeTypeInfoInitializer
+      {
+        ArrayTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (::DAnCE::Config_Handlers::ArrayType));
+          ::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));
+        }
+      };
+
+      ArrayTypeTypeInfoInitializer ArrayTypeTypeInfoInitializer_;
+
       struct SequenceTypeTypeInfoInitializer
       {
         SequenceTypeTypeInfoInitializer ()
@@ -7911,6 +8164,8 @@ namespace DAnCE
         else sequence_none (o);
         if (o.alias_p ()) alias (o);
         else alias_none (o);
+        if (o.array_p ()) array (o);
+        else array_none (o);
         if (o.id_p ()) id (o);
         else id_none (o);
         post (o);
@@ -7931,6 +8186,8 @@ namespace DAnCE
         else sequence_none (o);
         if (o.alias_p ()) alias (o);
         else alias_none (o);
+        if (o.array_p ()) array (o);
+        else array_none (o);
         if (o.id_p ()) id (o);
         else id_none (o);
         post (o);
@@ -8069,6 +8326,28 @@ namespace DAnCE
       }
 
       void DataType::
+      array (Type& o)
+      {
+        dispatch (o.array ());
+      }
+
+      void DataType::
+      array (Type const& o)
+      {
+        dispatch (o.array ());
+      }
+
+      void DataType::
+      array_none (Type&)
+      {
+      }
+
+      void DataType::
+      array_none (Type const&)
+      {
+      }
+
+      void DataType::
       id (Type& o)
       {
         dispatch (o.id ());
@@ -10190,6 +10469,72 @@ namespace DAnCE
       {
       }
 
+      // ArrayType
+      //
+      //
+
+      void ArrayType::
+      traverse (Type& o)
+      {
+        pre (o);
+        length (o);
+        elementType (o);
+        post (o);
+      }
+
+      void ArrayType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        length (o);
+        elementType (o);
+        post (o);
+      }
+
+      void ArrayType::
+      pre (Type&)
+      {
+      }
+
+      void ArrayType::
+      pre (Type const&)
+      {
+      }
+
+      void ArrayType::
+      length (Type& o)
+      {
+        dispatch (o.length ());
+      }
+
+      void ArrayType::
+      length (Type const& o)
+      {
+        dispatch (o.length ());
+      }
+
+      void ArrayType::
+      elementType (Type& o)
+      {
+        dispatch (o.elementType ());
+      }
+
+      void ArrayType::
+      elementType (Type const& o)
+      {
+        dispatch (o.elementType ());
+      }
+
+      void ArrayType::
+      post (Type&)
+      {
+      }
+
+      void ArrayType::
+      post (Type const&)
+      {
+      }
+
       // SequenceType
       //
       //
@@ -15068,7 +15413,7 @@ namespace DAnCE
       void DataType::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("kind"), top_ ()));
         Traversal::DataType::kind (o);
         pop_ ();
       }
@@ -15076,7 +15421,7 @@ namespace DAnCE
       void DataType::
       enum_ (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("enum"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("enum"), top_ ()));
         Traversal::DataType::enum_ (o);
         pop_ ();
       }
@@ -15084,7 +15429,7 @@ namespace DAnCE
       void DataType::
       struct_ (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("struct"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("struct"), top_ ()));
         Traversal::DataType::struct_ (o);
         pop_ ();
       }
@@ -15092,7 +15437,7 @@ namespace DAnCE
       void DataType::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("value"), top_ ()));
         Traversal::DataType::value (o);
         pop_ ();
       }
@@ -15100,7 +15445,7 @@ namespace DAnCE
       void DataType::
       sequence (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("sequence"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("sequence"), top_ ()));
         Traversal::DataType::sequence (o);
         pop_ ();
       }
@@ -15108,12 +15453,20 @@ namespace DAnCE
       void DataType::
       alias (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("alias"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("alias"), top_ ()));
         Traversal::DataType::alias (o);
         pop_ ();
       }
 
       void DataType::
+      array (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("array"), top_ ()));
+        Traversal::DataType::array (o);
+        pop_ ();
+      }
+
+      void DataType::
       id (Type const& o)
       {
         ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT ("http://www.omg.org/Deployment"), ACE_TEXT (""), top_ ());
@@ -15146,7 +15499,7 @@ namespace DAnCE
       void DataValue::
       short_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("short"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("short"), top_ ()));
       }
 
       void DataValue::
@@ -15165,7 +15518,7 @@ namespace DAnCE
       void DataValue::
       long_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("long"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("long"), top_ ()));
       }
 
       void DataValue::
@@ -15184,7 +15537,7 @@ namespace DAnCE
       void DataValue::
       ushort_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("ushort"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("ushort"), top_ ()));
       }
 
       void DataValue::
@@ -15203,7 +15556,7 @@ namespace DAnCE
       void DataValue::
       ulong_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("ulong"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("ulong"), top_ ()));
       }
 
       void DataValue::
@@ -15222,7 +15575,7 @@ namespace DAnCE
       void DataValue::
       float_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("float"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("float"), top_ ()));
       }
 
       void DataValue::
@@ -15241,7 +15594,7 @@ namespace DAnCE
       void DataValue::
       double_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("double"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("double"), top_ ()));
       }
 
       void DataValue::
@@ -15260,7 +15613,7 @@ namespace DAnCE
       void DataValue::
       boolean_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("boolean"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("boolean"), top_ ()));
       }
 
       void DataValue::
@@ -15279,7 +15632,7 @@ namespace DAnCE
       void DataValue::
       octet_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("octet"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("octet"), top_ ()));
       }
 
       void DataValue::
@@ -15298,7 +15651,7 @@ namespace DAnCE
       void DataValue::
       enum_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("enum"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("enum"), top_ ()));
       }
 
       void DataValue::
@@ -15317,7 +15670,7 @@ namespace DAnCE
       void DataValue::
       string_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("string"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("string"), top_ ()));
       }
 
       void DataValue::
@@ -15336,7 +15689,7 @@ namespace DAnCE
       void DataValue::
       longlong_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("longlong"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("longlong"), top_ ()));
       }
 
       void DataValue::
@@ -15355,7 +15708,7 @@ namespace DAnCE
       void DataValue::
       ulonglong_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("ulonglong"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("ulonglong"), top_ ()));
       }
 
       void DataValue::
@@ -15374,7 +15727,7 @@ namespace DAnCE
       void DataValue::
       longdouble_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("longdouble"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("longdouble"), top_ ()));
       }
 
       void DataValue::
@@ -15393,7 +15746,7 @@ namespace DAnCE
       void DataValue::
       element_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("element"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("element"), top_ ()));
       }
 
       void DataValue::
@@ -15412,7 +15765,7 @@ namespace DAnCE
       void DataValue::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("member"), top_ ()));
       }
 
       void DataValue::
@@ -15452,7 +15805,7 @@ namespace DAnCE
       void AliasType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::AliasType::name (o);
         pop_ ();
       }
@@ -15460,7 +15813,7 @@ namespace DAnCE
       void AliasType::
       typeId (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("typeId"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("typeId"), top_ ()));
         Traversal::AliasType::typeId (o);
         pop_ ();
       }
@@ -15468,7 +15821,7 @@ namespace DAnCE
       void AliasType::
       elementType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("elementType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("elementType"), top_ ()));
         Traversal::AliasType::elementType (o);
         pop_ ();
       }
@@ -15497,7 +15850,7 @@ namespace DAnCE
       void EnumType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::EnumType::name (o);
         pop_ ();
       }
@@ -15505,7 +15858,7 @@ namespace DAnCE
       void EnumType::
       typeId (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("typeId"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("typeId"), top_ ()));
         Traversal::EnumType::typeId (o);
         pop_ ();
       }
@@ -15513,7 +15866,7 @@ namespace DAnCE
       void EnumType::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("member"), top_ ()));
       }
 
       void EnumType::
@@ -15553,7 +15906,7 @@ namespace DAnCE
       void StructType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::StructType::name (o);
         pop_ ();
       }
@@ -15561,7 +15914,7 @@ namespace DAnCE
       void StructType::
       typeId (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("typeId"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("typeId"), top_ ()));
         Traversal::StructType::typeId (o);
         pop_ ();
       }
@@ -15569,7 +15922,7 @@ namespace DAnCE
       void StructType::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("member"), top_ ()));
       }
 
       void StructType::
@@ -15609,7 +15962,7 @@ namespace DAnCE
       void StructMemberType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::StructMemberType::name (o);
         pop_ ();
       }
@@ -15617,7 +15970,7 @@ namespace DAnCE
       void StructMemberType::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("type"), top_ ()));
         Traversal::StructMemberType::type (o);
         pop_ ();
       }
@@ -15646,7 +15999,7 @@ namespace DAnCE
       void ValueType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::ValueType::name (o);
         pop_ ();
       }
@@ -15654,7 +16007,7 @@ namespace DAnCE
       void ValueType::
       typeId (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("typeId"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("typeId"), top_ ()));
         Traversal::ValueType::typeId (o);
         pop_ ();
       }
@@ -15662,7 +16015,7 @@ namespace DAnCE
       void ValueType::
       modifier (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("modifier"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("modifier"), top_ ()));
         Traversal::ValueType::modifier (o);
         pop_ ();
       }
@@ -15670,7 +16023,7 @@ namespace DAnCE
       void ValueType::
       baseType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("baseType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("baseType"), top_ ()));
         Traversal::ValueType::baseType (o);
         pop_ ();
       }
@@ -15678,7 +16031,7 @@ namespace DAnCE
       void ValueType::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("member"), top_ ()));
       }
 
       void ValueType::
@@ -15718,7 +16071,7 @@ namespace DAnCE
       void ValueMemberType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::ValueMemberType::name (o);
         pop_ ();
       }
@@ -15726,7 +16079,7 @@ namespace DAnCE
       void ValueMemberType::
       visibility (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("visibility"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("visibility"), top_ ()));
         Traversal::ValueMemberType::visibility (o);
         pop_ ();
       }
@@ -15734,7 +16087,7 @@ namespace DAnCE
       void ValueMemberType::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("type"), top_ ()));
         Traversal::ValueMemberType::type (o);
         pop_ ();
       }
@@ -15763,7 +16116,7 @@ namespace DAnCE
       void NamedValue::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::NamedValue::name (o);
         pop_ ();
       }
@@ -15771,11 +16124,48 @@ namespace DAnCE
       void NamedValue::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("value"), top_ ()));
         Traversal::NamedValue::value (o);
         pop_ ();
       }
 
+      // ArrayType
+      //
+      //
+
+      ArrayType::
+      ArrayType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ArrayType::
+      ArrayType ()
+      {
+      }
+
+      void ArrayType::
+      traverse (Type const& o)
+      {
+        Traversal::ArrayType::traverse (o);
+      }
+
+      void ArrayType::
+      length (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("length"), top_ ()));
+        Traversal::ArrayType::length (o);
+        pop_ ();
+      }
+
+      void ArrayType::
+      elementType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("elementType"), top_ ()));
+        Traversal::ArrayType::elementType (o);
+        pop_ ();
+      }
+
       // SequenceType
       //
       //
@@ -15800,7 +16190,7 @@ namespace DAnCE
       void SequenceType::
       bound (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("bound"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("bound"), top_ ()));
         Traversal::SequenceType::bound (o);
         pop_ ();
       }
@@ -15808,7 +16198,7 @@ namespace DAnCE
       void SequenceType::
       elementType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("elementType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("elementType"), top_ ()));
         Traversal::SequenceType::elementType (o);
         pop_ ();
       }
@@ -15837,7 +16227,7 @@ namespace DAnCE
       void Any::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("type"), top_ ()));
         Traversal::Any::type (o);
         pop_ ();
       }
@@ -15845,7 +16235,7 @@ namespace DAnCE
       void Any::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("value"), top_ ()));
         Traversal::Any::value (o);
         pop_ ();
       }
@@ -15874,7 +16264,7 @@ namespace DAnCE
       void Property::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::Property::name (o);
         pop_ ();
       }
@@ -15882,7 +16272,7 @@ namespace DAnCE
       void Property::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("value"), top_ ()));
         Traversal::Property::value (o);
         pop_ ();
       }
@@ -15952,7 +16342,7 @@ namespace DAnCE
       void SatisfierProperty::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::SatisfierProperty::name (o);
         pop_ ();
       }
@@ -15960,7 +16350,7 @@ namespace DAnCE
       void SatisfierProperty::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("kind"), top_ ()));
         Traversal::SatisfierProperty::kind (o);
         pop_ ();
       }
@@ -15968,7 +16358,7 @@ namespace DAnCE
       void SatisfierProperty::
       dynamic (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dynamic"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("dynamic"), top_ ()));
         Traversal::SatisfierProperty::dynamic (o);
         pop_ ();
       }
@@ -15976,7 +16366,7 @@ namespace DAnCE
       void SatisfierProperty::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("value"), top_ ()));
         Traversal::SatisfierProperty::value (o);
         pop_ ();
       }
@@ -16005,7 +16395,7 @@ namespace DAnCE
       void Resource::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::Resource::name (o);
         pop_ ();
       }
@@ -16013,7 +16403,7 @@ namespace DAnCE
       void Resource::
       resourceType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceType"), top_ ()));
       }
 
       void Resource::
@@ -16032,7 +16422,7 @@ namespace DAnCE
       void Resource::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("property"), top_ ()));
       }
 
       void Resource::
@@ -16072,7 +16462,7 @@ namespace DAnCE
       void Requirement::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::Requirement::name (o);
         pop_ ();
       }
@@ -16080,7 +16470,7 @@ namespace DAnCE
       void Requirement::
       resourceType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceType"), top_ ()));
         Traversal::Requirement::resourceType (o);
         pop_ ();
       }
@@ -16088,7 +16478,7 @@ namespace DAnCE
       void Requirement::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("property"), top_ ()));
       }
 
       void Requirement::
@@ -16128,7 +16518,7 @@ namespace DAnCE
       void ResourceDeploymentDescription::
       requirementName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requirementName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("requirementName"), top_ ()));
         Traversal::ResourceDeploymentDescription::requirementName (o);
         pop_ ();
       }
@@ -16136,7 +16526,7 @@ namespace DAnCE
       void ResourceDeploymentDescription::
       resourceName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceName"), top_ ()));
         Traversal::ResourceDeploymentDescription::resourceName (o);
         pop_ ();
       }
@@ -16144,7 +16534,7 @@ namespace DAnCE
       void ResourceDeploymentDescription::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("property"), top_ ()));
       }
 
       void ResourceDeploymentDescription::
@@ -16184,7 +16574,7 @@ namespace DAnCE
       void ArtifactDeploymentDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::ArtifactDeploymentDescription::name (o);
         pop_ ();
       }
@@ -16192,7 +16582,7 @@ namespace DAnCE
       void ArtifactDeploymentDescription::
       source_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("source"), top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -16211,7 +16601,7 @@ namespace DAnCE
       void ArtifactDeploymentDescription::
       node (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("node"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("node"), top_ ()));
         Traversal::ArtifactDeploymentDescription::node (o);
         pop_ ();
       }
@@ -16219,7 +16609,7 @@ namespace DAnCE
       void ArtifactDeploymentDescription::
       location_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("location"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("location"), top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -16238,7 +16628,7 @@ namespace DAnCE
       void ArtifactDeploymentDescription::
       execParameter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("execParameter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("execParameter"), top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -16257,7 +16647,7 @@ namespace DAnCE
       void ArtifactDeploymentDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployRequirement"), top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -16276,7 +16666,7 @@ namespace DAnCE
       void ArtifactDeploymentDescription::
       deployedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployedResource"), top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -16325,7 +16715,7 @@ namespace DAnCE
       void MonolithicDeploymentDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::MonolithicDeploymentDescription::name (o);
         pop_ ();
       }
@@ -16333,7 +16723,7 @@ namespace DAnCE
       void MonolithicDeploymentDescription::
       source_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("source"), top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -16352,7 +16742,7 @@ namespace DAnCE
       void MonolithicDeploymentDescription::
       artifact_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("artifact"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("artifact"), top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -16371,7 +16761,7 @@ namespace DAnCE
       void MonolithicDeploymentDescription::
       execParameter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("execParameter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("execParameter"), top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -16390,7 +16780,7 @@ namespace DAnCE
       void MonolithicDeploymentDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployRequirement"), top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -16479,7 +16869,7 @@ namespace DAnCE
       void InstanceResourceDeploymentDescription::
       resourceUsage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceUsage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceUsage"), top_ ()));
         Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
         pop_ ();
       }
@@ -16487,7 +16877,7 @@ namespace DAnCE
       void InstanceResourceDeploymentDescription::
       requirementName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requirementName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("requirementName"), top_ ()));
         Traversal::InstanceResourceDeploymentDescription::requirementName (o);
         pop_ ();
       }
@@ -16495,7 +16885,7 @@ namespace DAnCE
       void InstanceResourceDeploymentDescription::
       resourceName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceName"), top_ ()));
         Traversal::InstanceResourceDeploymentDescription::resourceName (o);
         pop_ ();
       }
@@ -16503,7 +16893,7 @@ namespace DAnCE
       void InstanceResourceDeploymentDescription::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("property"), top_ ()));
       }
 
       void InstanceResourceDeploymentDescription::
@@ -16543,7 +16933,7 @@ namespace DAnCE
       void InstanceDeploymentDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::InstanceDeploymentDescription::name (o);
         pop_ ();
       }
@@ -16551,7 +16941,7 @@ namespace DAnCE
       void InstanceDeploymentDescription::
       node (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("node"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("node"), top_ ()));
         Traversal::InstanceDeploymentDescription::node (o);
         pop_ ();
       }
@@ -16559,7 +16949,7 @@ namespace DAnCE
       void InstanceDeploymentDescription::
       source (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("source"), top_ ()));
         Traversal::InstanceDeploymentDescription::source (o);
         pop_ ();
       }
@@ -16567,7 +16957,7 @@ namespace DAnCE
       void InstanceDeploymentDescription::
       implementation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("implementation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("implementation"), top_ ()));
         Traversal::InstanceDeploymentDescription::implementation (o);
         pop_ ();
       }
@@ -16575,7 +16965,7 @@ namespace DAnCE
       void InstanceDeploymentDescription::
       configProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("configProperty"), top_ ()));
       }
 
       void InstanceDeploymentDescription::
@@ -16594,7 +16984,7 @@ namespace DAnCE
       void InstanceDeploymentDescription::
       deployedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployedResource"), top_ ()));
       }
 
       void InstanceDeploymentDescription::
@@ -16613,7 +17003,7 @@ namespace DAnCE
       void InstanceDeploymentDescription::
       deployedSharedResource (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedSharedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployedSharedResource"), top_ ()));
         Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
         pop_ ();
       }
@@ -16694,7 +17084,7 @@ namespace DAnCE
       void ComponentPortDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::ComponentPortDescription::name (o);
         pop_ ();
       }
@@ -16702,7 +17092,7 @@ namespace DAnCE
       void ComponentPortDescription::
       specificType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("specificType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("specificType"), top_ ()));
         Traversal::ComponentPortDescription::specificType (o);
         pop_ ();
       }
@@ -16710,7 +17100,7 @@ namespace DAnCE
       void ComponentPortDescription::
       supportedType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("supportedType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("supportedType"), top_ ()));
       }
 
       void ComponentPortDescription::
@@ -16729,7 +17119,7 @@ namespace DAnCE
       void ComponentPortDescription::
       provider (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("provider"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("provider"), top_ ()));
         Traversal::ComponentPortDescription::provider (o);
         pop_ ();
       }
@@ -16737,7 +17127,7 @@ namespace DAnCE
       void ComponentPortDescription::
       exclusiveProvider (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("exclusiveProvider"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("exclusiveProvider"), top_ ()));
         Traversal::ComponentPortDescription::exclusiveProvider (o);
         pop_ ();
       }
@@ -16745,7 +17135,7 @@ namespace DAnCE
       void ComponentPortDescription::
       exclusiveUser (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("exclusiveUser"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("exclusiveUser"), top_ ()));
         Traversal::ComponentPortDescription::exclusiveUser (o);
         pop_ ();
       }
@@ -16753,7 +17143,7 @@ namespace DAnCE
       void ComponentPortDescription::
       optional (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("optional"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("optional"), top_ ()));
         Traversal::ComponentPortDescription::optional (o);
         pop_ ();
       }
@@ -16761,7 +17151,7 @@ namespace DAnCE
       void ComponentPortDescription::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("kind"), top_ ()));
         Traversal::ComponentPortDescription::kind (o);
         pop_ ();
       }
@@ -16769,7 +17159,7 @@ namespace DAnCE
       void ComponentPortDescription::
       templateParam_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("templateParam"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("templateParam"), top_ ()));
       }
 
       void ComponentPortDescription::
@@ -16809,7 +17199,7 @@ namespace DAnCE
       void ComponentPropertyDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::ComponentPropertyDescription::name (o);
         pop_ ();
       }
@@ -16817,7 +17207,7 @@ namespace DAnCE
       void ComponentPropertyDescription::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("type"), top_ ()));
         Traversal::ComponentPropertyDescription::type (o);
         pop_ ();
       }
@@ -16846,7 +17236,7 @@ namespace DAnCE
       void ComponentExternalPortEndpoint::
       portName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("portName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("portName"), top_ ()));
         Traversal::ComponentExternalPortEndpoint::portName (o);
         pop_ ();
       }
@@ -16875,7 +17265,7 @@ namespace DAnCE
       void PlanSubcomponentPortEndpoint::
       portName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("portName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("portName"), top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::portName (o);
         pop_ ();
       }
@@ -16883,7 +17273,7 @@ namespace DAnCE
       void PlanSubcomponentPortEndpoint::
       provider (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("provider"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("provider"), top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::provider (o);
         pop_ ();
       }
@@ -16891,7 +17281,7 @@ namespace DAnCE
       void PlanSubcomponentPortEndpoint::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("kind"), top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::kind (o);
         pop_ ();
       }
@@ -16899,7 +17289,7 @@ namespace DAnCE
       void PlanSubcomponentPortEndpoint::
       instance (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("instance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("instance"), top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::instance (o);
         pop_ ();
       }
@@ -16928,7 +17318,7 @@ namespace DAnCE
       void ExternalReferenceEndpoint::
       location (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("location"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("location"), top_ ()));
         Traversal::ExternalReferenceEndpoint::location (o);
         pop_ ();
       }
@@ -16936,7 +17326,7 @@ namespace DAnCE
       void ExternalReferenceEndpoint::
       provider (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("provider"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("provider"), top_ ()));
         Traversal::ExternalReferenceEndpoint::provider (o);
         pop_ ();
       }
@@ -16944,7 +17334,7 @@ namespace DAnCE
       void ExternalReferenceEndpoint::
       portName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("portName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("portName"), top_ ()));
         Traversal::ExternalReferenceEndpoint::portName (o);
         pop_ ();
       }
@@ -16952,7 +17342,7 @@ namespace DAnCE
       void ExternalReferenceEndpoint::
       supportedType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("supportedType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("supportedType"), top_ ()));
       }
 
       void ExternalReferenceEndpoint::
@@ -16992,7 +17382,7 @@ namespace DAnCE
       void ConnectionResourceDeploymentDescription::
       targetName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("targetName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("targetName"), top_ ()));
         Traversal::ConnectionResourceDeploymentDescription::targetName (o);
         pop_ ();
       }
@@ -17000,7 +17390,7 @@ namespace DAnCE
       void ConnectionResourceDeploymentDescription::
       requirementName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requirementName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("requirementName"), top_ ()));
         Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
         pop_ ();
       }
@@ -17008,7 +17398,7 @@ namespace DAnCE
       void ConnectionResourceDeploymentDescription::
       resourceName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceName"), top_ ()));
         Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
         pop_ ();
       }
@@ -17016,7 +17406,7 @@ namespace DAnCE
       void ConnectionResourceDeploymentDescription::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("property"), top_ ()));
       }
 
       void ConnectionResourceDeploymentDescription::
@@ -17056,7 +17446,7 @@ namespace DAnCE
       void PlanConnectionDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::PlanConnectionDescription::name (o);
         pop_ ();
       }
@@ -17064,7 +17454,7 @@ namespace DAnCE
       void PlanConnectionDescription::
       source (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("source"), top_ ()));
         Traversal::PlanConnectionDescription::source (o);
         pop_ ();
       }
@@ -17072,7 +17462,7 @@ namespace DAnCE
       void PlanConnectionDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployRequirement"), top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -17091,7 +17481,7 @@ namespace DAnCE
       void PlanConnectionDescription::
       externalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("externalEndpoint"), top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -17110,7 +17500,7 @@ namespace DAnCE
       void PlanConnectionDescription::
       internalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("internalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("internalEndpoint"), top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -17129,7 +17519,7 @@ namespace DAnCE
       void PlanConnectionDescription::
       externalReference_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalReference"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("externalReference"), top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -17148,7 +17538,7 @@ namespace DAnCE
       void PlanConnectionDescription::
       deployedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployedResource"), top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -17188,7 +17578,7 @@ namespace DAnCE
       void ImplementationDependency::
       requiredType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requiredType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("requiredType"), top_ ()));
         Traversal::ImplementationDependency::requiredType (o);
         pop_ ();
       }
@@ -17217,7 +17607,7 @@ namespace DAnCE
       void Capability::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::Capability::name (o);
         pop_ ();
       }
@@ -17225,7 +17615,7 @@ namespace DAnCE
       void Capability::
       resourceType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceType"), top_ ()));
       }
 
       void Capability::
@@ -17244,7 +17634,7 @@ namespace DAnCE
       void Capability::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("property"), top_ ()));
       }
 
       void Capability::
@@ -17284,7 +17674,7 @@ namespace DAnCE
       void ImplementationRequirement::
       resourceUsage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceUsage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceUsage"), top_ ()));
         Traversal::ImplementationRequirement::resourceUsage (o);
         pop_ ();
       }
@@ -17292,7 +17682,7 @@ namespace DAnCE
       void ImplementationRequirement::
       resourcePort (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourcePort"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourcePort"), top_ ()));
         Traversal::ImplementationRequirement::resourcePort (o);
         pop_ ();
       }
@@ -17300,7 +17690,7 @@ namespace DAnCE
       void ImplementationRequirement::
       componentPort (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("componentPort"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("componentPort"), top_ ()));
         Traversal::ImplementationRequirement::componentPort (o);
         pop_ ();
       }
@@ -17308,7 +17698,7 @@ namespace DAnCE
       void ImplementationRequirement::
       resourceType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("resourceType"), top_ ()));
         Traversal::ImplementationRequirement::resourceType (o);
         pop_ ();
       }
@@ -17316,7 +17706,7 @@ namespace DAnCE
       void ImplementationRequirement::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::ImplementationRequirement::name (o);
         pop_ ();
       }
@@ -17324,7 +17714,7 @@ namespace DAnCE
       void ImplementationRequirement::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("property"), top_ ()));
       }
 
       void ImplementationRequirement::
@@ -17364,7 +17754,7 @@ namespace DAnCE
       void SubcomponentPortEndpoint::
       portName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("portName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("portName"), top_ ()));
         Traversal::SubcomponentPortEndpoint::portName (o);
         pop_ ();
       }
@@ -17372,7 +17762,7 @@ namespace DAnCE
       void SubcomponentPortEndpoint::
       instance (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("instance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("instance"), top_ ()));
         Traversal::SubcomponentPortEndpoint::instance (o);
         pop_ ();
       }
@@ -17401,7 +17791,7 @@ namespace DAnCE
       void AssemblyConnectionDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("name"), top_ ()));
         Traversal::AssemblyConnectionDescription::name (o);
         pop_ ();
       }
@@ -17409,7 +17799,7 @@ namespace DAnCE
       void AssemblyConnectionDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("deployRequirement"), top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -17428,7 +17818,7 @@ namespace DAnCE
       void AssemblyConnectionDescription::
       internalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("internalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("internalEndpoint"), top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -17447,7 +17837,7 @@ namespace DAnCE
       void AssemblyConnectionDescription::
       externalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("externalEndpoint"), top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -17466,7 +17856,7 @@ namespace DAnCE
       void AssemblyConnectionDescription::
       externalReference_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalReference"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("externalReference"), top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -17544,7 +17934,7 @@ namespace DAnCE
       void PlanLocality::
       constraint (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("constraint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("constraint"), top_ ()));
         Traversal::PlanLocality::constraint (o);
         pop_ ();
       }
@@ -17552,7 +17942,7 @@ namespace DAnCE
       void PlanLocality::
       constrainedInstance_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("constrainedInstance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT("constrainedInstance"), top_ ()));
       }
 
       void PlanLocality::
diff --git a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp
index 76745eba955..415b0e4c891 100644
--- a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -8,13 +8,6 @@
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
-
-// Fix for Borland compilers, which seem to have a broken
-// <string> include.
-#ifdef __BORLANDC__
-# include <string.h>
-#endif
-
 #ifndef BASIC_DEPLOYMENT_DATA_HPP
 #define BASIC_DEPLOYMENT_DATA_HPP
 
@@ -36,6 +29,7 @@ namespace DAnCE
     class ValueType;
     class ValueMemberType;
     class NamedValue;
+    class ArrayType;
     class SequenceType;
     class Any;
     class Property;
@@ -89,7 +83,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < IdRef, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::IdRef, ACE_Null_Mutex > _ptr;
 
       // href
       //
@@ -111,7 +105,6 @@ namespace DAnCE
       void idref (::XMLSchema::IDREF< ACE_TCHAR > const& );
       ::XSCRT::Type* idref_ptr ();
 
-
       protected:
       ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > idref_;
 
@@ -204,7 +197,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < DataType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::DataType, ACE_Null_Mutex > _ptr;
 
       // kind
       //
@@ -265,6 +258,16 @@ namespace DAnCE
       protected:
       ::std::auto_ptr< ::DAnCE::Config_Handlers::AliasType > alias_;
 
+      // array
+      //
+      public:
+      bool array_p () const;
+      ::DAnCE::Config_Handlers::ArrayType const& array () const;
+      void array (::DAnCE::Config_Handlers::ArrayType const& );
+
+      protected:
+      ::std::auto_ptr< ::DAnCE::Config_Handlers::ArrayType > array_;
+
       // id
       //
       public:
@@ -295,7 +298,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < DataValue, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::DataValue, ACE_Null_Mutex > _ptr;
 
       // short
       //
@@ -307,7 +310,8 @@ namespace DAnCE
       short_const_iterator begin_short () const;
       short_const_iterator end_short () const;
       void add_short ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::short_, ACE_Null_Mutex > const& );
-      XSCRT::Type* short_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_short_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_short_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_short (void) const;
 
       protected:
@@ -323,7 +327,8 @@ namespace DAnCE
       long_const_iterator begin_long () const;
       long_const_iterator end_long () const;
       void add_long ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::int_, ACE_Null_Mutex > const& );
-      XSCRT::Type* long_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_long_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_long_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_long (void) const;
 
       protected:
@@ -339,7 +344,8 @@ namespace DAnCE
       ushort_const_iterator begin_ushort () const;
       ushort_const_iterator end_ushort () const;
       void add_ushort ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedShort, ACE_Null_Mutex > const& );
-      XSCRT::Type* ushort_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_ushort_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_ushort_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_ushort (void) const;
 
       protected:
@@ -355,7 +361,8 @@ namespace DAnCE
       ulong_const_iterator begin_ulong () const;
       ulong_const_iterator end_ulong () const;
       void add_ulong ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedInt, ACE_Null_Mutex > const& );
-      XSCRT::Type* ulong_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_ulong_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_ulong_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_ulong (void) const;
 
       protected:
@@ -371,7 +378,8 @@ namespace DAnCE
       float_const_iterator begin_float () const;
       float_const_iterator end_float () const;
       void add_float ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::float_, ACE_Null_Mutex > const& );
-      XSCRT::Type* float_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_float_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_float_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_float (void) const;
 
       protected:
@@ -387,7 +395,8 @@ namespace DAnCE
       double_const_iterator begin_double () const;
       double_const_iterator end_double () const;
       void add_double ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::double_, ACE_Null_Mutex > const& );
-      XSCRT::Type* double_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_double_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_double_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_double (void) const;
 
       protected:
@@ -403,7 +412,8 @@ namespace DAnCE
       boolean_const_iterator begin_boolean () const;
       boolean_const_iterator end_boolean () const;
       void add_boolean ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::boolean, ACE_Null_Mutex > const& );
-      XSCRT::Type* boolean_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_boolean_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_boolean_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_boolean (void) const;
 
       protected:
@@ -419,7 +429,8 @@ namespace DAnCE
       octet_const_iterator begin_octet () const;
       octet_const_iterator end_octet () const;
       void add_octet ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedByte, ACE_Null_Mutex > const& );
-      XSCRT::Type* octet_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_octet_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_octet_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_octet (void) const;
 
       protected:
@@ -435,7 +446,8 @@ namespace DAnCE
       enum_const_iterator begin_enum () const;
       enum_const_iterator end_enum () const;
       void add_enum ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* enum_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_enum_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_enum_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_enum (void) const;
 
       protected:
@@ -451,7 +463,8 @@ namespace DAnCE
       string_const_iterator begin_string () const;
       string_const_iterator end_string () const;
       void add_string ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* string_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_string_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_string_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_string (void) const;
 
       protected:
@@ -467,7 +480,8 @@ namespace DAnCE
       longlong_const_iterator begin_longlong () const;
       longlong_const_iterator end_longlong () const;
       void add_longlong ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::long_, ACE_Null_Mutex > const& );
-      XSCRT::Type* longlong_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_longlong_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_longlong_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_longlong (void) const;
 
       protected:
@@ -483,7 +497,8 @@ namespace DAnCE
       ulonglong_const_iterator begin_ulonglong () const;
       ulonglong_const_iterator end_ulonglong () const;
       void add_ulonglong ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedLong, ACE_Null_Mutex > const& );
-      XSCRT::Type* ulonglong_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_ulonglong_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_ulonglong_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_ulonglong (void) const;
 
       protected:
@@ -499,7 +514,8 @@ namespace DAnCE
       longdouble_const_iterator begin_longdouble () const;
       longdouble_const_iterator end_longdouble () const;
       void add_longdouble ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::double_, ACE_Null_Mutex > const& );
-      XSCRT::Type* longdouble_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_longdouble_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_longdouble_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_longdouble (void) const;
 
       protected:
@@ -515,7 +531,8 @@ namespace DAnCE
       element_const_iterator begin_element () const;
       element_const_iterator end_element () const;
       void add_element ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::DataValue, ACE_Null_Mutex > const& );
-      XSCRT::Type* element_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_element_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_element_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_element (void) const;
 
       protected:
@@ -531,7 +548,8 @@ namespace DAnCE
       member_const_iterator begin_member () const;
       member_const_iterator end_member () const;
       void add_member ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::NamedValue, ACE_Null_Mutex > const& );
-      XSCRT::Type* member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_member_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_member (void) const;
 
       protected:
@@ -556,7 +574,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < AliasType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::AliasType, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -606,7 +624,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < EnumType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::EnumType, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -636,7 +654,8 @@ namespace DAnCE
       member_const_iterator begin_member () const;
       member_const_iterator end_member () const;
       void add_member ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_member_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_member (void) const;
 
       protected:
@@ -663,7 +682,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < StructType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::StructType, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -693,7 +712,8 @@ namespace DAnCE
       member_const_iterator begin_member () const;
       member_const_iterator end_member () const;
       void add_member ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::StructMemberType, ACE_Null_Mutex > const& );
-      XSCRT::Type* member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_member_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_member (void) const;
 
       protected:
@@ -719,7 +739,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < StructMemberType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::StructMemberType, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -759,7 +779,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ValueType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ValueType, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -807,7 +827,8 @@ namespace DAnCE
       member_const_iterator begin_member () const;
       member_const_iterator end_member () const;
       void add_member ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ValueMemberType, ACE_Null_Mutex > const& );
-      XSCRT::Type* member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_member_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_member_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_member (void) const;
 
       protected:
@@ -835,7 +856,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ValueMemberType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ValueMemberType, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -885,7 +906,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < NamedValue, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::NamedValue, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -920,12 +941,52 @@ namespace DAnCE
     };
 
 
+    class XSC_XML_Handlers_Export ArrayType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      public:
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ArrayType, ACE_Null_Mutex > _ptr;
+
+      // length
+      //
+      public:
+      ::XMLSchema::unsignedInt const& length () const;
+      void length (::XMLSchema::unsignedInt const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::unsignedInt > length_;
+
+      // elementType
+      //
+      public:
+      ::DAnCE::Config_Handlers::DataType const& elementType () const;
+      void elementType (::DAnCE::Config_Handlers::DataType const& );
+
+      protected:
+      ::std::auto_ptr< ::DAnCE::Config_Handlers::DataType > elementType_;
+
+      public:
+      ArrayType (::XMLSchema::unsignedInt const& length__,
+                 ::DAnCE::Config_Handlers::DataType const& elementType__);
+
+      ArrayType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ArrayType (ArrayType const& s);
+
+      ArrayType&
+      operator= (ArrayType const& s);
+
+      private:
+      char regulator__;
+    };
+
+
     class XSC_XML_Handlers_Export SequenceType : public ::XSCRT::Type
     {
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < SequenceType, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::SequenceType, ACE_Null_Mutex > _ptr;
 
       // bound
       //
@@ -965,7 +1026,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < Any, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Any, ACE_Null_Mutex > _ptr;
 
       // type
       //
@@ -1005,7 +1066,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < Property, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1084,7 +1145,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < SatisfierProperty, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::SatisfierProperty, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1144,7 +1205,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < Resource, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Resource, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1165,7 +1226,8 @@ namespace DAnCE
       resourceType_const_iterator begin_resourceType () const;
       resourceType_const_iterator end_resourceType () const;
       void add_resourceType ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* resourceType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_resourceType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_resourceType_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_resourceType (void) const;
 
       protected:
@@ -1181,7 +1243,8 @@ namespace DAnCE
       property_const_iterator begin_property () const;
       property_const_iterator end_property () const;
       void add_property ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::SatisfierProperty, ACE_Null_Mutex > const& );
-      XSCRT::Type* property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_property_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_property (void) const;
 
       protected:
@@ -1207,7 +1270,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < Requirement, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Requirement, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1237,7 +1300,8 @@ namespace DAnCE
       property_const_iterator begin_property () const;
       property_const_iterator end_property () const;
       void add_property ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_property_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_property (void) const;
 
       protected:
@@ -1263,7 +1327,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ResourceDeploymentDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ResourceDeploymentDescription, ACE_Null_Mutex > _ptr;
 
       // requirementName
       //
@@ -1293,7 +1357,8 @@ namespace DAnCE
       property_const_iterator begin_property () const;
       property_const_iterator end_property () const;
       void add_property ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_property_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_property (void) const;
 
       protected:
@@ -1319,7 +1384,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ArtifactDeploymentDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ArtifactDeploymentDescription, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1340,7 +1405,8 @@ namespace DAnCE
       source_const_iterator begin_source () const;
       source_const_iterator end_source () const;
       void add_source ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* source_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_source_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_source_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_source (void) const;
 
       protected:
@@ -1365,7 +1431,8 @@ namespace DAnCE
       location_const_iterator begin_location () const;
       location_const_iterator end_location () const;
       void add_location ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* location_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_location_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_location_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_location (void) const;
 
       protected:
@@ -1381,7 +1448,8 @@ namespace DAnCE
       execParameter_const_iterator begin_execParameter () const;
       execParameter_const_iterator end_execParameter () const;
       void add_execParameter ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* execParameter_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_execParameter_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_execParameter_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_execParameter (void) const;
 
       protected:
@@ -1397,7 +1465,8 @@ namespace DAnCE
       deployRequirement_const_iterator begin_deployRequirement () const;
       deployRequirement_const_iterator end_deployRequirement () const;
       void add_deployRequirement ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Requirement, ACE_Null_Mutex > const& );
-      XSCRT::Type* deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_deployRequirement_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_deployRequirement (void) const;
 
       protected:
@@ -1413,7 +1482,8 @@ namespace DAnCE
       deployedResource_const_iterator begin_deployedResource () const;
       deployedResource_const_iterator end_deployedResource () const;
       void add_deployedResource ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ResourceDeploymentDescription, ACE_Null_Mutex > const& );
-      XSCRT::Type* deployedResource_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_deployedResource_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_deployedResource_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_deployedResource (void) const;
 
       protected:
@@ -1450,7 +1520,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < MonolithicDeploymentDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::MonolithicDeploymentDescription, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1471,7 +1541,8 @@ namespace DAnCE
       source_const_iterator begin_source () const;
       source_const_iterator end_source () const;
       void add_source ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* source_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_source_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_source_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_source (void) const;
 
       protected:
@@ -1487,7 +1558,8 @@ namespace DAnCE
       artifact_const_iterator begin_artifact () const;
       artifact_const_iterator end_artifact () const;
       void add_artifact ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::IdRef, ACE_Null_Mutex > const& );
-      XSCRT::Type* artifact_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_artifact_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_artifact_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_artifact (void) const;
 
       protected:
@@ -1503,7 +1575,8 @@ namespace DAnCE
       execParameter_const_iterator begin_execParameter () const;
       execParameter_const_iterator end_execParameter () const;
       void add_execParameter ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* execParameter_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_execParameter_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_execParameter_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_execParameter (void) const;
 
       protected:
@@ -1519,7 +1592,8 @@ namespace DAnCE
       deployRequirement_const_iterator begin_deployRequirement () const;
       deployRequirement_const_iterator end_deployRequirement () const;
       void add_deployRequirement ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Requirement, ACE_Null_Mutex > const& );
-      XSCRT::Type* deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_deployRequirement_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_deployRequirement (void) const;
 
       protected:
@@ -1593,7 +1667,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < InstanceResourceDeploymentDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::InstanceResourceDeploymentDescription, ACE_Null_Mutex > _ptr;
 
       // resourceUsage
       //
@@ -1632,7 +1706,8 @@ namespace DAnCE
       property_const_iterator begin_property () const;
       property_const_iterator end_property () const;
       void add_property ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_property_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_property (void) const;
 
       protected:
@@ -1659,7 +1734,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < InstanceDeploymentDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::InstanceDeploymentDescription, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1707,7 +1782,8 @@ namespace DAnCE
       configProperty_const_iterator begin_configProperty () const;
       configProperty_const_iterator end_configProperty () const;
       void add_configProperty ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* configProperty_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_configProperty_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_configProperty_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_configProperty (void) const;
 
       protected:
@@ -1723,7 +1799,8 @@ namespace DAnCE
       deployedResource_const_iterator begin_deployedResource () const;
       deployedResource_const_iterator end_deployedResource () const;
       void add_deployedResource ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::InstanceResourceDeploymentDescription, ACE_Null_Mutex > const& );
-      XSCRT::Type* deployedResource_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_deployedResource_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_deployedResource_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_deployedResource (void) const;
 
       protected:
@@ -1813,7 +1890,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ComponentPortDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ComponentPortDescription, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1844,7 +1921,8 @@ namespace DAnCE
       supportedType_const_iterator begin_supportedType () const;
       supportedType_const_iterator end_supportedType () const;
       void add_supportedType ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* supportedType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_supportedType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_supportedType_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_supportedType (void) const;
 
       protected:
@@ -1905,7 +1983,8 @@ namespace DAnCE
       templateParam_const_iterator begin_templateParam () const;
       templateParam_const_iterator end_templateParam () const;
       void add_templateParam ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* templateParam_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_templateParam_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_templateParam_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_templateParam (void) const;
 
       protected:
@@ -1935,7 +2014,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ComponentPropertyDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ComponentPropertyDescription, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -1975,7 +2054,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ComponentExternalPortEndpoint, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ComponentExternalPortEndpoint, ACE_Null_Mutex > _ptr;
 
       // portName
       //
@@ -2005,7 +2084,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < PlanSubcomponentPortEndpoint, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::PlanSubcomponentPortEndpoint, ACE_Null_Mutex > _ptr;
 
       // portName
       //
@@ -2065,7 +2144,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ExternalReferenceEndpoint, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ExternalReferenceEndpoint, ACE_Null_Mutex > _ptr;
 
       // location
       //
@@ -2105,7 +2184,8 @@ namespace DAnCE
       supportedType_const_iterator begin_supportedType () const;
       supportedType_const_iterator end_supportedType () const;
       void add_supportedType ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* supportedType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_supportedType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_supportedType_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_supportedType (void) const;
 
       protected:
@@ -2131,7 +2211,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ConnectionResourceDeploymentDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ConnectionResourceDeploymentDescription, ACE_Null_Mutex > _ptr;
 
       // targetName
       //
@@ -2170,7 +2250,8 @@ namespace DAnCE
       property_const_iterator begin_property () const;
       property_const_iterator end_property () const;
       void add_property ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_property_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_property (void) const;
 
       protected:
@@ -2197,7 +2278,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < PlanConnectionDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::PlanConnectionDescription, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -2228,7 +2309,8 @@ namespace DAnCE
       deployRequirement_const_iterator begin_deployRequirement () const;
       deployRequirement_const_iterator end_deployRequirement () const;
       void add_deployRequirement ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Requirement, ACE_Null_Mutex > const& );
-      XSCRT::Type* deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_deployRequirement_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_deployRequirement (void) const;
 
       protected:
@@ -2244,7 +2326,8 @@ namespace DAnCE
       externalEndpoint_const_iterator begin_externalEndpoint () const;
       externalEndpoint_const_iterator end_externalEndpoint () const;
       void add_externalEndpoint ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ComponentExternalPortEndpoint, ACE_Null_Mutex > const& );
-      XSCRT::Type* externalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_externalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_externalEndpoint_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_externalEndpoint (void) const;
 
       protected:
@@ -2260,7 +2343,8 @@ namespace DAnCE
       internalEndpoint_const_iterator begin_internalEndpoint () const;
       internalEndpoint_const_iterator end_internalEndpoint () const;
       void add_internalEndpoint ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::PlanSubcomponentPortEndpoint, ACE_Null_Mutex > const& );
-      XSCRT::Type* internalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_internalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_internalEndpoint_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_internalEndpoint (void) const;
 
       protected:
@@ -2276,7 +2360,8 @@ namespace DAnCE
       externalReference_const_iterator begin_externalReference () const;
       externalReference_const_iterator end_externalReference () const;
       void add_externalReference ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ExternalReferenceEndpoint, ACE_Null_Mutex > const& );
-      XSCRT::Type* externalReference_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_externalReference_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_externalReference_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_externalReference (void) const;
 
       protected:
@@ -2292,7 +2377,8 @@ namespace DAnCE
       deployedResource_const_iterator begin_deployedResource () const;
       deployedResource_const_iterator end_deployedResource () const;
       void add_deployedResource ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ConnectionResourceDeploymentDescription, ACE_Null_Mutex > const& );
-      XSCRT::Type* deployedResource_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_deployedResource_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_deployedResource_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_deployedResource (void) const;
 
       protected:
@@ -2317,7 +2403,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ImplementationDependency, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ImplementationDependency, ACE_Null_Mutex > _ptr;
 
       // requiredType
       //
@@ -2347,7 +2433,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < Capability, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Capability, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -2368,7 +2454,8 @@ namespace DAnCE
       resourceType_const_iterator begin_resourceType () const;
       resourceType_const_iterator end_resourceType () const;
       void add_resourceType ( ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& );
-      XSCRT::Type* resourceType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_resourceType_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_resourceType_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_resourceType (void) const;
 
       protected:
@@ -2384,7 +2471,8 @@ namespace DAnCE
       property_const_iterator begin_property () const;
       property_const_iterator end_property () const;
       void add_property ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::SatisfierProperty, ACE_Null_Mutex > const& );
-      XSCRT::Type* property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_property_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_property (void) const;
 
       protected:
@@ -2409,7 +2497,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < ImplementationRequirement, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ImplementationRequirement, ACE_Null_Mutex > _ptr;
 
       // resourceUsage
       //
@@ -2469,7 +2557,8 @@ namespace DAnCE
       property_const_iterator begin_property () const;
       property_const_iterator end_property () const;
       void add_property ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Property, ACE_Null_Mutex > const& );
-      XSCRT::Type* property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_property_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_property_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_property (void) const;
 
       protected:
@@ -2495,7 +2584,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < SubcomponentPortEndpoint, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::SubcomponentPortEndpoint, ACE_Null_Mutex > _ptr;
 
       // portName
       //
@@ -2535,7 +2624,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < AssemblyConnectionDescription, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::AssemblyConnectionDescription, ACE_Null_Mutex > _ptr;
 
       // name
       //
@@ -2556,7 +2645,8 @@ namespace DAnCE
       deployRequirement_const_iterator begin_deployRequirement () const;
       deployRequirement_const_iterator end_deployRequirement () const;
       void add_deployRequirement ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::Requirement, ACE_Null_Mutex > const& );
-      XSCRT::Type* deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_deployRequirement_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_deployRequirement_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_deployRequirement (void) const;
 
       protected:
@@ -2572,7 +2662,8 @@ namespace DAnCE
       internalEndpoint_const_iterator begin_internalEndpoint () const;
       internalEndpoint_const_iterator end_internalEndpoint () const;
       void add_internalEndpoint ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::SubcomponentPortEndpoint, ACE_Null_Mutex > const& );
-      XSCRT::Type* internalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_internalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_internalEndpoint_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_internalEndpoint (void) const;
 
       protected:
@@ -2588,7 +2679,8 @@ namespace DAnCE
       externalEndpoint_const_iterator begin_externalEndpoint () const;
       externalEndpoint_const_iterator end_externalEndpoint () const;
       void add_externalEndpoint ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ComponentExternalPortEndpoint, ACE_Null_Mutex > const& );
-      XSCRT::Type* externalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_externalEndpoint_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_externalEndpoint_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_externalEndpoint (void) const;
 
       protected:
@@ -2604,7 +2696,8 @@ namespace DAnCE
       externalReference_const_iterator begin_externalReference () const;
       externalReference_const_iterator end_externalReference () const;
       void add_externalReference ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::ExternalReferenceEndpoint, ACE_Null_Mutex > const& );
-      XSCRT::Type* externalReference_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_externalReference_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_externalReference_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_externalReference (void) const;
 
       protected:
@@ -2665,7 +2758,7 @@ namespace DAnCE
       typedef ::XSCRT::Type Base;
 
       public:
-      typedef ACE_Refcounted_Auto_Ptr < PlanLocality, ACE_Null_Mutex > _ptr;
+      typedef ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::PlanLocality, ACE_Null_Mutex > _ptr;
 
       // constraint
       //
@@ -2686,7 +2779,8 @@ namespace DAnCE
       constrainedInstance_const_iterator begin_constrainedInstance () const;
       constrainedInstance_const_iterator end_constrainedInstance () const;
       void add_constrainedInstance ( ACE_Refcounted_Auto_Ptr < ::DAnCE::Config_Handlers::IdRef, ACE_Null_Mutex > const& );
-      XSCRT::Type* constrainedInstance_ptr ( std::basic_string<ACE_TCHAR> idref );
+      XSCRT::Type* get_constrainedInstance_ptr ( std::basic_string<ACE_TCHAR> idref );
+      void set_constrainedInstance_ptr (std::basic_string<ACE_TCHAR> idref );
       size_t count_constrainedInstance (void) const;
 
       protected:
@@ -2853,6 +2947,18 @@ namespace DAnCE
         alias_none (Type const&);
 
         virtual void
+        array (Type&);
+
+        virtual void
+        array (Type const&);
+
+        virtual void
+        array_none (Type&);
+
+        virtual void
+        array_none (Type const&);
+
+        virtual void
         id (Type&);
 
         virtual void
@@ -3681,6 +3787,39 @@ namespace DAnCE
         post (Type const&);
       };
 
+      struct XSC_XML_Handlers_Export ArrayType : ::XMLSchema::Traversal::Traverser< ::DAnCE::Config_Handlers::ArrayType >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        length (Type&);
+
+        virtual void
+        length (Type const&);
+
+        virtual void
+        elementType (Type&);
+
+        virtual void
+        elementType (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
       struct XSC_XML_Handlers_Export SequenceType : ::XMLSchema::Traversal::Traverser< ::DAnCE::Config_Handlers::SequenceType >
       {
         virtual void
@@ -5759,6 +5898,15 @@ namespace DAnCE
         alias (Type const&);
 
         virtual void
+        array (Type &o)
+        {
+          this->array (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        array (Type const&);
+
+        virtual void
         id (Type &o)
         {
           this->id (const_cast <Type const &> (o));
@@ -6571,6 +6719,43 @@ namespace DAnCE
         NamedValue ();
       };
 
+      struct ArrayType : Traversal::ArrayType,
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::DAnCE::Config_Handlers::ArrayType Type;
+        ArrayType (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        length (Type &o)
+        {
+          this->length (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        length (Type const&);
+
+        virtual void
+        elementType (Type &o)
+        {
+          this->elementType (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        elementType (Type const&);
+
+        protected:
+        ArrayType ();
+      };
+
       struct SequenceType : Traversal::SequenceType,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
index 4774af7f8a6..8d21150145f 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
@@ -32,126 +32,9 @@ namespace DAnCE
           else
             tc = DynAlias_Handler::create_typecode (type);
 
-          // Make the actual DynAlias
-          //          DynamicAny::DynAny_var retval =
-          //DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
-          //          DynamicAny::DynAlias_var retval =
-          //            DynamicAny::DynAlias::_narrow (temp.in ());
-
           DynamicAny::DynAny_var alias = DYNANY_HANDLER->extract_into_dynany (
             type.alias ().elementType (), value, tc);
           return alias._retn ();
-          /*
-          switch (type.kind ().integral ())
-            {
-              // ========== BASIC TYPES
-            case TCKind::tk_null_l:
-            case TCKind::tk_void_l:
-              DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR,
-                (LM_WARNING, "I don't know how to handle null or
-              void types\n"));
-
-            case TCKind::tk_short_l:
-              retval->insert_short (CORBA::Short (static_cast <
-                ::XMLSchema::short_ const & > (*value.begin_short ())));
-              break;
-
-            case TCKind::tk_long_l:
-              retval->insert_long (CORBA::Long (static_cast <
-                ::XMLSchema::int_ const& > (*value.begin_long ())));
-              break;
-
-            case TCKind::tk_ushort_l:
-              retval->insert_ushort (CORBA::UShort (static_cast<
-                ::XMLSchema::unsignedShort const & > (*value.begin_ushort ())));
-              break;
-
-            case TCKind::tk_ulong_l:
-              retval->insert_ulong (CORBA::ULong (static_cast <
-                ::XMLSchema::unsignedInt const& > (*value.begin_ulong ())));
-              break;
-
-            case TCKind::tk_float_l:
-              retval->insert_float (CORBA::Float (*value.begin_float ()));
-              break;
-
-            case TCKind::tk_double_l:
-              retval->insert_double (CORBA::Double (*value.begin_double ()));
-              break;
-
-            case TCKind::tk_boolean_l:
-              retval->insert_boolean (static_cast <
-                ::XMLSchema::boolean const& > (*value.begin_boolean ()));
-              break;
-
-            case TCKind::tk_char_l:
-              retval->insert_char (CORBA::Char (
-                *value.begin_string ()->c_str ()));
-              break;
-
-            case TCKind::tk_octet_l:
-              retval->insert_octet (static_cast <
-                const unsigned char &> (*value.begin_octet ()));
-              break;
-
-            case TCKind::tk_string_l:
-              retval->insert_string (value.begin_string ()->c_str ());
-              break;
-
-            case TCKind::tk_longlong_l:
-              retval->insert_longlong (CORBA::LongLong (static_cast <
-                ::XMLSchema::long_ const& > (*value.begin_longlong ())));
-              break;
-
-            case TCKind::tk_ulonglong_l:
-              retval->insert_ulonglong (CORBA::ULongLong (static_cast <
-                ::XMLSchema::unsignedLong const& > (
-                  *value.begin_ulonglong ())));
-              break;
-
-            case TCKind::tk_wchar_l:
-              retval->insert_wchar (CORBA::WChar (
-                *value.begin_string ()->c_str ()));
-              break;
-
-        case TCKind::tk_enum_l:
-          return DynEnum_Handler::extract_into_dynany (type, value);
-
-        case TCKind::tk_sequence_l:
-          return DynSequence_Handler::extract_into_dynany (type, value);
-
-        case TCKind::tk_struct_l:
-          return DynStruct_Handler::extract_into_dynany (type, value);
-
-        case TCKind::tk_alias_l:
-          return DynAlias_Handler::extract_into_dynany (type, value);
-
-        case TCKind::tk_longdouble_l:
-        case TCKind::tk_wstring_l:
-        case TCKind::tk_wfixed_l:
-        case TCKind::tk_any_l:
-        case TCKind::tk_TypeCode_l:
-        case TCKind::tk_Principal_l:
-        case TCKind::tk_objref_l:
-        case TCKind::tk_union_l:
-        case TCKind::tk_array_l:
-        case TCKind::tk_except_l:
-        case TCKind::tk_value_l:
-        case TCKind::tk_value_box_l:
-        case TCKind::tk_native_l:
-        case TCKind::tk_abstract_interface_l:
-        case TCKind::tk_local_interface_l:
-        case TCKind::tk_component_l:
-        case TCKind::tk_home_l:
-        case TCKind::tk_event_l:
-          DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR,
-          (LM_ERROR, "Type not supported\n"));
-          throw Config_Error ("", "Type not supported");
-        }
-          */
-          //          retval->assign (alias);
-
-          //          return retval._retn ();
         }
       catch (const DynamicAny::DynAny::InvalidValue&)
         {
@@ -219,4 +102,3 @@ namespace DAnCE
   }
 }
 
-
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index d2e63ec489d..85e472ded06 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
@@ -8,6 +8,7 @@
 #include "DynSequence_Handler.h"
 #include "DynStruct_Handler.h"
 #include "DynAlias_Handler.h"
+#include "DynArray_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "Common.h"
 
@@ -178,7 +179,7 @@ namespace DAnCE
               ACE_TEXT ("Wrong value type for tk_octet data type"));
           if (!req_tc)
             retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_octet);
-          retval->insert_octet (static_cast <const unsigned char &> (
+          retval->insert_octet (CORBA::Octet (
             *(*(value.begin_octet ()))));
           break;
 
@@ -240,7 +241,14 @@ namespace DAnCE
         case TCKind::tk_alias_l:
           return DynAlias_Handler::extract_into_dynany (type, value, req_tc);
 
+        case TCKind::tk_array_l:
+          return DynArray_Handler::extract_into_dynany (type, value, req_tc);
+
         case TCKind::tk_longdouble_l:
+          // Not supported since a longdouble is defined in the xsd as double.
+          // We are then creating a long double initialized with a regular
+          // double. This is a very tricky conversion and doesn't work in
+          // combination with certain (versions of) compilers.
         case TCKind::tk_wstring_l:
         case TCKind::tk_fixed_l:
         case TCKind::tk_any_l:
@@ -248,7 +256,6 @@ namespace DAnCE
         case TCKind::tk_Principal_l:
         case TCKind::tk_objref_l:
         case TCKind::tk_union_l:
-        case TCKind::tk_array_l:
         case TCKind::tk_except_l:
         case TCKind::tk_value_l:
         case TCKind::tk_value_box_l:
@@ -259,7 +266,7 @@ namespace DAnCE
         case TCKind::tk_home_l:
         case TCKind::tk_event_l:
           DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR,
-            ACE_TEXT ("Type not supported\n")));
+            DLINFO ACE_TEXT ("DynAny_Handler::extract_into_dynany - Type not supported\n")));
           throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Type not supported"));
         }
 
@@ -416,6 +423,10 @@ namespace DAnCE
           break;
 
         case TCKind::tk_longdouble_l:
+          // Disabled since a longdouble is defined in the xsd as double.
+          // We are then creating a long double initialized from a regular
+          // double. This is a very tricky conversion and doesn't work in
+          // combination with certain (versions of) compilers.
           break;
 
         case TCKind::tk_wchar_l:
@@ -437,13 +448,15 @@ namespace DAnCE
         case TCKind::tk_alias_l:
           return DynAlias_Handler::create_typecode (type);
 
+        case TCKind::tk_array_l:
+          return DynArray_Handler::create_typecode (type);
+
         case TCKind::tk_fixed_l:
         case TCKind::tk_any_l:
         case TCKind::tk_TypeCode_l:
         case TCKind::tk_Principal_l:
         case TCKind::tk_objref_l:
         case TCKind::tk_union_l:
-        case TCKind::tk_array_l:
         case TCKind::tk_except_l:
         case TCKind::tk_value_l:
         case TCKind::tk_value_box_l:
@@ -454,7 +467,7 @@ namespace DAnCE
         case TCKind::tk_home_l:
         case TCKind::tk_event_l:
           DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR,
-            (LM_ERROR, ACE_TEXT ("Type not supported\n")));
+            (LM_ERROR, DLINFO ACE_TEXT ("DynAny_Handler::create_typecode - Type not supported\n")));
           throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Type not supported"));
         }
 
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
index ddcfad20900..853a7d78122 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
@@ -11,6 +11,7 @@ project (XSC_DynAny_Handler) : install, xerces, dynamicany, typecodefactory, dan
   Source_Files {
     DynAny_Handler.cpp
     DynEnum_Handler.cpp
+    DynArray_Handler.cpp
     DynSequence_Handler.cpp
     DynStruct_Handler.cpp
     DynAlias_Handler.cpp
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp
new file mode 100644
index 00000000000..e5b01c6af81
--- /dev/null
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.cpp
@@ -0,0 +1,161 @@
+// $Id$
+
+#include "DynArray_Handler.h"
+#include "DynAny_Handler.h"
+#include "dance/Logger/Log_Macros.h"
+#include "Basic_Deployment_Data.hpp"
+#include "Common.h"
+
+#include "ace/Null_Mutex.h"
+
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
+
+namespace DAnCE
+{
+  namespace Config_Handlers
+  {
+    DynamicAny::DynAny_ptr
+    DynArray_Handler::extract_into_dynany (const DataType &type,
+                                           const DataValue &value,
+                                           CORBA::TypeCode_ptr req_tc)
+    {
+      DANCE_TRACE("DynArray_Handler::extract_into_dynany");
+
+      CORBA::TypeCode_var tc;
+      if (req_tc)
+        tc = req_tc;
+      else
+        tc = DynArray_Handler::create_typecode (type);
+
+      // Make the actual DynArray
+      DynamicAny::DynAny_var temp =
+        DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
+      DynamicAny::DynArray_var retval =
+        DynamicAny::DynArray::_narrow (temp.in ());
+
+      DynamicAny::DynAnySeq dynseq;
+      CORBA::ULong pos = 0;
+
+      switch (type.array ().elementType ().kind ().integral ())
+        {
+          // ========== BASIC TYPES
+        case TCKind::tk_null_l:
+        case TCKind::tk_void_l:
+        case TCKind::tk_objref_l:
+        case TCKind::tk_fixed_l:
+        case TCKind::tk_component_l:
+        case TCKind::tk_home_l:
+
+          DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR,
+            (LM_WARNING, "I don't know how to handle null or void types\n"));
+          throw 1;
+
+        case TCKind::tk_short_l:
+        case TCKind::tk_long_l:
+        case TCKind::tk_ushort_l:
+        case TCKind::tk_ulong_l:
+        case TCKind::tk_float_l:
+        case TCKind::tk_double_l:
+        case TCKind::tk_boolean_l:
+        case TCKind::tk_octet_l:
+        case TCKind::tk_string_l:
+        case TCKind::tk_longlong_l:
+        case TCKind::tk_ulonglong_l:
+        case TCKind::tk_longdouble_l:
+        case TCKind::tk_wstring_l:
+        case TCKind::tk_enum_l:
+        case TCKind::tk_struct_l:
+        case TCKind::tk_sequence_l:
+        case TCKind::tk_array_l:
+          try
+            {
+              dynseq.length (value.count_element ());
+
+              for (DataValue::element_const_iterator i = value.begin_element ();
+                   i != value.end_element ();
+                   ++i)
+                {
+                  DynamicAny::DynAny_var dynany
+                    (DYNANY_HANDLER->extract_into_dynany (type.array ().elementType (),
+                                                          **i));
+                  dynseq[pos++] = dynany->copy ();
+                }
+
+              retval->set_elements_as_dyn_any (dynseq);
+              return retval._retn ();
+            }
+          catch (DynamicAny::DynAny::InvalidValue)
+            {
+              DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, ACE_TEXT ("Invalid value provided in XML when trying to ")
+                          ACE_TEXT ("populate %ith element of an array\n"),
+                          pos));
+              throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Invalid value whilst populating the array."));
+            }
+
+        case TCKind::tk_char_l:
+        case TCKind::tk_wchar_l:
+          // special case where value iterator multiplicity should be one, and should
+          // represent a string, each character of which becomes a element of the sequence.
+
+        case TCKind::tk_any_l:
+        case TCKind::tk_TypeCode_l:
+        case TCKind::tk_Principal_l:
+        case TCKind::tk_union_l:
+        case TCKind::tk_alias_l:
+        case TCKind::tk_except_l:
+        case TCKind::tk_value_l:
+        case TCKind::tk_value_box_l:
+        case TCKind::tk_native_l:
+        case TCKind::tk_abstract_interface_l:
+        case TCKind::tk_local_interface_l:
+        case TCKind::tk_event_l:
+          // Special case where element association in datavalue contains another datavalue.
+          DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("DynArray_Handler::extract_into_dynany - Type not supported\n")));
+          throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Type not supported"));
+        }
+
+      return retval._retn ();
+    }
+
+    void
+    DynArray_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr)
+    {
+      DANCE_TRACE("DynArray_Handler::extract_out_of_dynany");
+
+      DANCE_DEBUG (DANCE_LOG_NONFATAL_ERROR,
+        (LM_ERROR, ACE_TEXT ("Extracting Array not yet supported\n")));
+    }
+
+    CORBA::TypeCode_ptr
+    DynArray_Handler::create_typecode (const DataType &type)
+    {
+      DANCE_TRACE("DynArray_Handler::create_typecode");
+
+      if (!type.array_p ())
+        {
+          DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR,
+            (LM_ERROR, ACE_TEXT (
+              "ERROR: Array type description required")));
+          throw Config_Error (ACE_TEXT (""),
+            ACE_TEXT ("Expected <array> element, incorrect tc_kind."));
+        }
+
+      CORBA::TypeCode_var etc =
+        DYNANY_HANDLER->create_typecode (type.array ().elementType ());
+
+      CORBA::ULong const length =  type.array ().length ();
+
+      CORBA::TypeCode_var tc =
+        DYNANY_HANDLER->orb ()->create_array_tc (length, etc);
+
+      return tc._retn ();
+    }
+  }
+}
+
+
+
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h
new file mode 100644
index 00000000000..ecf5efbe2d0
--- /dev/null
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynArray_Handler.h
@@ -0,0 +1,52 @@
+/**
+ * $Id$
+ *
+ * @file DynArray_Handler.h
+ * @author Johnny Willemsen <jwillemsen@remedy.nl>
+ */
+
+#ifndef CIAO_CONFIG_HANDLERS_DYNARRAY_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_DYNARRAY_HANDLER_H
+#include /**/ "ace/pre.h"
+
+#include "DynAny_Handler_Export.h"
+
+#include "tao/ORB.h"
+#include "tao/DynamicAny/DynamicAny.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace DAnCE
+{
+  namespace Config_Handlers
+  {
+    class Any;
+    class DataType;
+    class DataValue;
+
+    /**
+     * @class DynArray_Handler
+     * @brief Translates sequences specified in deployment plans into Dynamic Anys
+     *
+     */
+    class DynArray_Handler
+    {
+    public:
+      static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
+                                                         const DataValue &value,
+                                                         CORBA::TypeCode_ptr = 0);
+
+      static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn);
+
+      static CORBA::TypeCode_ptr create_typecode (const DataType &type);
+    };
+
+  }
+}
+
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_DYNARRAY_HANDLER_H*/
+
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
index 6f388dfb37e..ef18ab43ea2 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
@@ -69,6 +69,8 @@ namespace DAnCE
         case TCKind::tk_wstring_l:
         case TCKind::tk_enum_l:
         case TCKind::tk_struct_l:
+        case TCKind::tk_sequence_l:
+        case TCKind::tk_array_l:
           try
             {
               dynseq.length (value.count_element ());
@@ -100,10 +102,6 @@ namespace DAnCE
           // special case where value iterator multiplicity should be one, and should
           // represent a string, each character of which becomes a element of the sequence.
 
-        case TCKind::tk_sequence_l:
-        case TCKind::tk_array_l:
-          // Several special cases here.
-
         case TCKind::tk_any_l:
         case TCKind::tk_TypeCode_l:
         case TCKind::tk_Principal_l:
@@ -118,7 +116,7 @@ namespace DAnCE
         case TCKind::tk_event_l:
           // Special case where element association in datavalue contains another datavalue.
 
-          DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, ACE_TEXT ("Type not supported\n")));
+          DANCE_DEBUG (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("DynSequence_Handler::extract_into_dynany - Type not supported\n")));
           throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Type not supported"));
         }
author	msmit <msmit@remedy.nl>	2013-08-01 11:57:33 +0000
committer	msmit <msmit@remedy.nl>	2013-08-01 11:57:33 +0000
commit	91824e74eabe751612022e2167be04423c80e1d0 (patch)
tree	fd6dc66bc5676afe943772cf445bad71e988428f /DAnCE/tools
parent	eeec8b87019d19583882831c18a278c681bdaac3 (diff)
download	ATCD-91824e74eabe751612022e2167be04423c80e1d0.tar.gz