Fri Apr 8 14:30:52 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu>

4 files changed, 30 insertions, 11 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index f2300b8976a..12e79aa17b4 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Apr  8 14:30:52 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
+	
+	* DAnCE/Config_Handlers/cdp.cpp
+	* DAnCE/Config_Handlers/cdp.hpp
+
+	Regenerated handlers to reflect schema changes.
+	
+	* docs/schema/cdp.xsd
+
+	Updated schema to allow 0 on the realizes element.
+	
 Fri Apr  8 13:33:24 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * CIDLC/ServantHeaderGenerator.cpp:
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp
index 1f4536d57fa..011cfbb6442 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp
@@ -19,12 +19,10 @@ namespace CIAO
     // 
 
     DeploymentPlan::
-    DeploymentPlan (::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes__)
+    DeploymentPlan ()
     : 
-    realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (realizes__)),
     regulator__ ()
     {
-      realizes_->container (this);
     }
 
     DeploymentPlan::
@@ -33,12 +31,12 @@ namespace CIAO
     ::XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_)),
+    realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
     regulator__ ()
     {
       if (label_.get ()) label_->container (this);
       if (UUID_.get ()) UUID_->container (this);
-      realizes_->container (this);
+      if (realizes_.get ()) realizes_->container (this);
       implementation_.reserve (s.implementation_.size ());
       {
         for (implementation_const_iterator i (s.implementation_.begin ());
@@ -91,7 +89,8 @@ namespace CIAO
       if (s.UUID_.get ()) UUID (*(s.UUID_));
       else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      realizes (s.realizes ());
+      if (s.realizes_.get ()) realizes (*(s.realizes_));
+      else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
       implementation_.clear ();
       implementation_.reserve (s.implementation_.size ());
@@ -238,7 +237,16 @@ namespace CIAO
     void DeploymentPlan::
     realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
     {
-      *realizes_ = e;
+      if (realizes_.get ())
+      {
+        *realizes_ = e;
+      }
+
+      else
+      {
+        realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+        realizes_->container (this);
+      }
     }
 
     // DeploymentPlan
@@ -582,8 +590,8 @@ namespace CIAO
 
         else if (n == "realizes")
         {
-          realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-          realizes_->container (this);
+          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+          realizes (t);
         }
 
         else if (n == "implementation")
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
index 723721ecbd8..3ba47910884 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
@@ -166,7 +166,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       public:
-      DeploymentPlan (::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes__);
+      DeploymentPlan ();
 
       DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
       DeploymentPlan (DeploymentPlan const& s);
diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd
index 302b7c4c1a2..4fa69acd3fe 100644
--- a/TAO/CIAO/docs/schema/cdp.xsd
+++ b/TAO/CIAO/docs/schema/cdp.xsd
@@ -10,7 +10,7 @@
    <xsd:sequence>
 	<xsd:element name="label" type="xsd:string" minOccurs="0"/>
     <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-    <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" />     
+    <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" />     
     <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" />
     <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
     <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>