summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-07-24 16:26:55 +0000
committerkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-07-24 16:26:55 +0000
commitd66cc78bd145d4cc47adb1120227a8a623bfe769 (patch)
tree6aa54c5edbafb49111877ba9865fb27d95e1b19f
parentb588a787608e25d12f770724e3b77cc7085e3e4a (diff)
downloadATCD-d66cc78bd145d4cc47adb1120227a8a623bfe769.tar.gz
ChangeLogTag: Tue Jul 24 16:24:58 UTC 2007 Krishnakumar B <kitty@nospam.invalid.domain>
-rw-r--r--CIAO/ChangeLog17
-rw-r--r--CIAO/examples/Hello/descriptors/DeploymentPlan.cdp30
-rw-r--r--CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp30
3 files changed, 74 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e57d197db4f..2bf3a72677a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,13 +1,24 @@
+Tue Jul 24 16:24:58 UTC 2007 Krishnakumar B <kitty@nospam.invalid.domain>
+
+ * examples/Hello/descriptors/DeploymentPlan.cdp:
+ * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp:
+
+ Initialized the attributes of the Sender. The test spits out an
+ error message if the Sender's enum attribute could not be
+ initialized. It is currently not possible to initialize enum
+ attributes in PICML. So I have modified these plans by hand for
+ now.
+
Tue Jul 24 10:09:20 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
* tools/IDL3_to_IDL2/basic_visitor.cpp(can_skip_module):
-
+
Fixed a bug in the logic, where a local or abstract interface,
or abstract eventtype, would trigger an immediate return of
'false'. This no longer happens.
-
+
* tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
+
Fixed a typo where a line was commented out inadvertently.
Mon Jul 23 16:53:45 UTC 2007 Krishnakumar B <kitty@nospam.invalid.domain>
diff --git a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
index 5252a3a2c27..d85e2aca0ec 100644
--- a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
+++ b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
@@ -75,6 +75,36 @@
</value>
</value>
</configProperty>
+ <configProperty>
+ <name>local_message</name>
+ <value>
+ <type>
+ <kind>tk_string</kind>
+ </type>
+ <value>
+ <string>hello, world!</string>
+ </value>
+ </value>
+ </configProperty>
+ <configProperty>
+ <name>color</name>
+ <value>
+ <type>
+ <kind>tk_enum</kind>
+ <enum>
+ <name>COLOR_SELECTION</name>
+ <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+ <member>empty</member>
+ <member>white</member>
+ <member>red</member>
+ <member>yellow</member>
+ </enum>
+ </type>
+ <value>
+ <enum>yellow</enum>
+ </value>
+ </value>
+ </configProperty>
</instance>
<connection>
diff --git a/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp b/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp
index 6bf323801ba..2639c455ec1 100644
--- a/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp
+++ b/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp
@@ -53,6 +53,36 @@
</value>
</value>
</configProperty>
+ <configProperty>
+ <name>local_message</name>
+ <value>
+ <type>
+ <kind>tk_string</kind>
+ </type>
+ <value>
+ <string>hello, world!</string>
+ </value>
+ </value>
+ </configProperty>
+ <configProperty>
+ <name>color</name>
+ <value>
+ <type>
+ <kind>tk_enum</kind>
+ <enum>
+ <name>COLOR_SELECTION</name>
+ <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
+ <member>empty</member>
+ <member>white</member>
+ <member>red</member>
+ <member>yellow</member>
+ </enum>
+ </type>
+ <value>
+ <enum>yellow</enum>
+ </value>
+ </value>
+ </configProperty>
</instance>
<connection>