Thu May 26 21:09:22 2005 Gan Deng <gan.deng@vanderbilt.edu>

5 files changed, 55 insertions, 54 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 3ab57f20f71..f67d44f0fb7 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Thu May 26 21:09:22 2005  Gan Deng <gan.deng@vanderbilt.edu>
+	
+	* tools/Simple_Component_Server/Simple_Component_Server.mpc
+
+	  Put an empty IDL_Files segment in the 
+	  "Simple_Component_Server" project so the IDL
+	  file is not picked up automatically. Thanks to Will Chai
+          <willchai@126.com> for reporting this.
+
+	* NEWS
+	* DAnCE/NEWS
+
+	  Merged these two files and deleted the DAnCE/NEWS file,
+	  since these two files serve similar purposes.
+
 Thu May 26 14:46:53 CDT 2005  Will Otte <wotte@dre.vanderbilt.edu>
 	
 	* DAnCE/NodeManager/NodeDaemon_Impl.cpp
diff --git a/TAO/CIAO/DAnCE/NEWS b/TAO/CIAO/DAnCE/NEWS
deleted file mode 100644
index 9f5bc88bb06..00000000000
--- a/TAO/CIAO/DAnCE/NEWS
+++ /dev/null
@@ -1,44 +0,0 @@
-PLANNED MAJOR CHANGES TARGETED FOR DAnCE-0.4.5
-====================================================
- . Split the current NodeApplication entity into
-   ComponentServer(still bearing the name "NodeApplication" though)
-   and Container. (Gan)
-
- . Allow colocated and non-colocated decisions within the schema
-   (Gan)
-
- . Support for server-side RT policies, including extension for schema, container,
-   and NodeApplication.  Configuring client-side (receptacle) policies
-   to honor these server policies.  (Gan, Nanbor)
-
- . Convert C++ datastructures generated from XSC to IDL data types
-   defined in D+C. (Will, Jules)
-     
- . Change spec defined IDL's for adding policies (Depends on last)
-
- . Add binding to the NameService (Gan Deng)
-
- . Connections to supported interfaces. 
-
- . Have more than one NodeApplicationManager within the NodeManager (Tao)
-
- . RT Event Channel Integration (Gan Deng)
-
- . Tools for dynamic replacement of components (Jai)
-
- . Thread pools and the like. (Nanbor and Gan).
-
- . Dependencies during deployment.
-
- . Static Configuration for DAnCE (??) 
-
- . Target Manager (Jai and Gan and Kitty)
-
- . Tools and utilities for developing and debugging components and
-   applications. (Kitty)
-
- . Support adding attribute values on Component through XML and
-   DAnCE configurator. (Gan and Kitty)
-
- . Support parsing XML descriptors which describes the hierarchical
-   assembly of components model. (Ming Xiong)
\ No newline at end of file
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/Modified_Deployment.xsd b/TAO/CIAO/DAnCE/examples/Hello/descriptors/Modified_Deployment.xsd
index b73077b0980..d9d14911ce4 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/descriptors/Modified_Deployment.xsd
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/Modified_Deployment.xsd
@@ -266,7 +266,7 @@
       <xsd:element name="node" type="xsd:string"/>
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription -->
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
       <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
     </xsd:sequence>
diff --git a/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
index 6baac0dd44d..f5d61d7f4d1 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/DAnCE/examples/Hello/descriptors/flattened_deploymentplan.cdp
@@ -61,6 +61,19 @@
         </value>
       </value>
     </configProperty>
+
+    <configProperty>
+      <name>local_message</name>
+      <value>
+        <type>
+         <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>This is a test message passed in through XML.</string>
+        </value>
+      </value> 
+
+    </configProperty>
   </instance>
 
   <instance id="Hello-Receiver-idd">
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index bd45c3303fe..7c6c04e2192 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -1,7 +1,21 @@
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
-. Integrate Real-time Event Channel into CIAO and DAnCE.
+. Integrate various Pub/Sub services into CIAO and DAnCE.
+
+. Static Configuration for DAnCE.
+
+. Target Manager implementation.
+
+. Support threading models in NodeApplication, such as thread pools
+  and the like.
+
+. Have more than one NodeApplicationManager within the NodeManager
+
+. Enhance DAnCE to support adding/removing components to/from the
+  existing running assembly without shutting down the running appliation.
+  This will allow the application developers to evolve their applications
+  on the fly without server down time.
 
 PLANNED MAJOR CHANGES FOR x.4.6
 ===============================
@@ -10,12 +24,10 @@ PLANNED MAJOR CHANGES FOR x.4.6
   Deployment and Configuration (D&C) specification. Such effort
   will allow application developers to use real-time CORBA features
   within their CCM appliation through meta-programming (via XML
-  metadata)
-
-. Enhance DAnCE to support adding/removing components to/from the
-  existing running assembly without shutting down the running appliation.
-  This will allow the application developers to evolve their applications
-  on the fly without server down time.
+  metadata). Particularly, we will add support for server-side 
+  RT policies, including extension for schema, container,
+  and NodeApplication.  Configuring client-side (receptacle) policies
+  to honor these server policies.
 
 . Enhance DAnCE to support configurable output of debugging information.
   Support for debugging information will be added at the level of both the
@@ -25,8 +37,13 @@ PLANNED MAJOR CHANGES FOR x.4.6
   their component-based applications, as well as allowing customization of
   the amount of debugging information logged
 
-. Add a Quoter example for DAnCE, which has been a consistent tutorial example
-  since TAO. Add the CIAO OEP/Display example for DAnCE.
+. Add more examples for CIAO, which include a Quoter example (a consistent
+  tutorial example since TAO :)) and GUI-based example.
+  
+. Add binding to the Naming Service.
+
+. Enhance DAnCE to support deploying multiple assemblies with the same
+  set of ExecutionManager and NodeMangers.
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.4 and CIAO-0.4.5
 ======================================================