summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-10-11 22:59:58 +0000
committermk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-10-11 22:59:58 +0000
commitc2f00616256b3996aed666df95a3ccbc117a56ee (patch)
tree66fa0bfe638c076681853ebf90f160d4de8a0579
parent2fe1fcdeeb8c5563f1581e39fa056ca2adb19317 (diff)
downloadATCD-c2f00616256b3996aed666df95a3ccbc117a56ee.tar.gz
ChangeLog: Wed Oct 11 17:58:35 2000 Michael Kircher <Michael.Kircher@mchp.siemens.de>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a10
-rw-r--r--TAO/examples/Simple/time-date/svc.conf6
2 files changed, 16 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 10797caa5e1..90b4c8e9970 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Wed Oct 11 17:58:35 2000 Michael Kircher <Michael.Kircher@mchp.siemens.de>
+
+ * examples/Simple/time-date/svc.conf: Added the CORBA LOC
+ and CORBA NAME parsers to be loaded explicitly before
+ the ORB is loaded dynamically. This is necessary to avoid
+ having the ORB call process_directive () on the Service
+ Configurator and prohibiting further processing of the
+ svc.conf during startup.
+
Wed Oct 11 16:14:35 2000 Nanbor Wang <nanbor@cs.wustl.edu>
* orbsvcs/orbsvcs/Fault_Tolerance.dsp:
@@ -141,6 +150,7 @@ Tue Oct 10 16:59:18 2000 Nanbor Wang <nanbor@cs.wustl.edu>
files. Many of these static project configurations were
completely broken.
+>>>>>>> 1.1678
Tue Oct 10 14:52:16 2000 Jeff Parsons <parsons@cs.wustl.edu>
* tao/Any.h:
diff --git a/TAO/examples/Simple/time-date/svc.conf b/TAO/examples/Simple/time-date/svc.conf
index e786f1e9730..72a699177e2 100644
--- a/TAO/examples/Simple/time-date/svc.conf
+++ b/TAO/examples/Simple/time-date/svc.conf
@@ -13,6 +13,12 @@ dynamic TAO_IORTable Service_Object * TAO_IORTable:_make_TAO_Table_Adapter_Facto
dynamic DLL_Parser Service_Object * TAO:_make_TAO_DLL_Parser()
dynamic FILE_Parser Service_Object * TAO:_make_TAO_FILE_Parser()
+# Dynamically configure the CORBA LOC parser
+dynamic CORBALOC_Parser Service_Object * TAO:_make_TAO_CORBALOC_Parser() ""
+
+# Dynamically configure the CORBA NAME parser
+dynamic CORBANAME_Parser Service_Object * TAO:_make_TAO_CORBANAME_Parser() ""
+
# Dynamically configure the ORB into the application process.
dynamic ORB Service_Object * ./Time_Date:_make_DLL_ORB() "dummy -ORBSkipServiceConfigOpen"