diff options
author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-07-24 16:26:55 +0000 |
---|---|---|
committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-07-24 16:26:55 +0000 |
commit | 87448e1c4d4d728bd98c431e1573b9ca9a7e7c6a (patch) | |
tree | 6aa54c5edbafb49111877ba9865fb27d95e1b19f /CIAO | |
parent | b75219e93c8202e34dd32daf843158e8cd14cfb1 (diff) | |
download | ATCD-87448e1c4d4d728bd98c431e1573b9ca9a7e7c6a.tar.gz |
ChangeLogTag: Tue Jul 24 16:24:58 UTC 2007 Krishnakumar B <kitty@nospam.invalid.domain>
Diffstat (limited to 'CIAO')
-rw-r--r-- | CIAO/ChangeLog | 17 | ||||
-rw-r--r-- | CIAO/examples/Hello/descriptors/DeploymentPlan.cdp | 30 | ||||
-rw-r--r-- | CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp | 30 |
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> |