summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-06 15:24:00 +0000
committerdengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-06 15:24:00 +0000
commit9613d218da32d8ac5a7d0fc5bbf4363d328f802a (patch)
tree473e23fce0c8c878e26b2160d7a3db1746cda3b5
parent2f1dba501c75b7177a3ac7d70e3f291023a8de56 (diff)
downloadATCD-9613d218da32d8ac5a7d0fc5bbf4363d328f802a.tar.gz
Thu Apr 6 15:22:31 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog11
-rw-r--r--TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc2
-rw-r--r--TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp2
-rw-r--r--TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp2
4 files changed, 14 insertions, 3 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index b1bd519a7d5..b60c30499ba 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Thu Apr 6 15:22:31 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu>
+
+ * ciaosvcs/Events/CIAO_Events.mpc
+
+ Fixed linking errors on WinXP_BCB6_Pro_Dynamic_Release build.
+
+ * examples/Hello/descriptors_shared_components/deploymentplan.cdp
+ * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
+
+ Modified to illustrate the shared components scenario.
+
Thu Apr 6 14:54:59 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu>
* ciaosvcs/Events/CIAO_EventService_Factory_impl.h
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index ed488fb7e35..449ab2becbe 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project (CIAO_DnC_Events) : orbsvcslib, ciao_events_dnc {
+project (CIAO_DnC_Events) : orbsvcslib, rtevent_serv, ciao_events_dnc {
after += CIAO_DnC_Events_Base CIAO_RTEvent
sharedname = CIAO_DnC_Events
diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
index c8bf5543c05..a206dc64080 100644
--- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
@@ -102,7 +102,7 @@
<instance id="Hello-Receiver-idd">
<name>Hello-Receiver-idd</name>
- <node>SenderNode</node>
+ <node>ReceiverNode</node>
<source><!-- @@ What goes here --></source>
<implementation>Hello-Receiver-mdd</implementation>
<configProperty>
diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
index 4565256398b..1acfa45c985 100644
--- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
@@ -102,7 +102,7 @@
<instance id="Hello-Receiver-idd">
<name>Hello-Receiver-idd</name>
- <node>SenderNode</node>
+ <node>ReceiverNode</node>
<source><!-- @@ What goes here --></source>
<implementation>Hello-Receiver-mdd</implementation>
<configProperty>