summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-09-18 00:10:39 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-09-18 00:10:39 +0000
commit49b999d5cffe084cbf744f781ffe4581e3439558 (patch)
tree1bbce4f53aa167ed285db9b7f10a2b8fa2f3a2b1 /TAO
parentae0365601e6f58239bfdfdb847c2a909b61b411c (diff)
downloadATCD-49b999d5cffe084cbf744f781ffe4581e3439558.tar.gz
ChangeLogTag:Sun Sep 17 17:07:07 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a23
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp10
-rw-r--r--TAO/orbsvcs/Notify_Service/Makefile.bor2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming.bor2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNotification.bor5
-rw-r--r--TAO/tests/InterOp-Naming/server.bor2
7 files changed, 40 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 6ea10c00cc6..3d99ad52295 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,10 +1,23 @@
+Sun Sep 17 17:07:07 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * orbsvcs/ImplRepo_Service/ImplRepo.bor:
+ * orbsvcs/Notify_Service/Makefile.bor:
+ * orbsvcs/orbsvcs/CosNaming.bor:
+ * orbsvcs/orbsvcs/CosNotification.bor:
+ * tests/InterOp-Naming/server.bor:
+ Update Borland makefiles to include the IORTable builds.
+
+ * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
+ Add @@ comments for Darrell, the exceptions thrown and the
+ exception specs don't match.
+
Sun Sep 17 15:16:36 2000 Balachandran Natarajan <bala@cs.wustl.edu>
- * tao/Makefile:
- * tao/DynamicAny/Makefile:
- * tao/IORManipulation/Makefile:
- * tao/IORTable/Makefile:
- * tao/PortableServer/Makefile: Updated dependencies.
+ * tao/Makefile:
+ * tao/DynamicAny/Makefile:
+ * tao/IORManipulation/Makefile:
+ * tao/IORTable/Makefile:
+ * tao/PortableServer/Makefile: Updated dependencies.
Sun Sep 17 11:52:23 2000 Carlos O'Ryan <coryan@uci.edu>
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
index 306cd28b453..46342648635 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
@@ -14,12 +14,14 @@ CFLAGS = \
$(ACE_CFLAGS) \
$(TAO_CFLAGS) \
$(TAO_PORTABLESERVER_CFLAGS) \
+ $(TAO_IORTABLE_CFLAGS) \
$(TAO_SVC_UTILS_CFLAGS)
LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
$(TAO_PORTABLESERVER_LIB) \
+ $(TAO_IORTABLE_LIB) \
$(TAO_SVC_UTILS_LIB)
CPPDIR = .
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 189dc55d551..037f2453d3a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -274,6 +274,8 @@ ImplRepo_i::start_server_i (const char *server,
ACE_ERROR ((LM_ERROR,
"Error: Cannot find startup info for server <%s>\n",
server));
+ // @@ Darrell: this is not listed in the throw spec, it is bound
+ // to give trouble.
ACE_THROW (ImplementationRepository::Administration::NotFound ());
ACE_CHECK;
}
@@ -286,6 +288,8 @@ ImplRepo_i::start_server_i (const char *server,
ACE_ERROR ((LM_ERROR,
"Error: Cannot find startup info for server <%s>\n",
server));
+ // @@ Darrell: this is not listed in the throw spec, it is bound
+ // to give trouble.
ACE_THROW (ImplementationRepository::Administration::NotFound ());
ACE_CHECK;
}
@@ -373,6 +377,8 @@ ImplRepo_i::start_server_i (const char *server,
ACE_ERROR ((LM_ERROR,
"Error: Cannot find startup info for server <%s>\n",
server));
+ // @@ Darrell: this is not listed in the throw spec, it is bound
+ // to give trouble.
ACE_THROW (ImplementationRepository::Administration::NotFound ());
ACE_CHECK;
}
@@ -392,6 +398,8 @@ ImplRepo_i::start_server_i (const char *server,
ACE_ERROR ((LM_ERROR,
"Error: Cannot find ServerObject IOR for server <%s>\n",
server));
+ // @@ Darrell: this is not listed in the throw spec, it is bound
+ // to give trouble.
ACE_THROW (ImplementationRepository::Administration::NotFound ());
}
@@ -414,6 +422,8 @@ ImplRepo_i::start_server_i (const char *server,
ACE_ERROR ((LM_ERROR,
"Error: Invalid ServerObject IOR: <%s>\n",
server_object_ior.c_str ()));
+ // @@ Darrell: this is not listed in the throw spec, it is bound
+ // to give trouble.
ACE_THROW (ImplementationRepository::Administration::NotFound ());
}
}
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.bor b/TAO/orbsvcs/Notify_Service/Makefile.bor
index fcf419aee03..9f3e2818377 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile.bor
+++ b/TAO/orbsvcs/Notify_Service/Makefile.bor
@@ -10,6 +10,7 @@ CFLAGS = \
$(ACE_CFLAGS) \
$(TAO_CFLAGS) \
$(TAO_PORTABLESERVER_CFLAGS) \
+ $(TAO_IORTABLE_CFLAGS) \
$(TAO_SVC_UTILS_CFLAGS) \
$(TAO_NAMING_CFLAGS) \
$(TAO_NOTIFY_CFLAGS)
@@ -18,6 +19,7 @@ LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
$(TAO_PORTABLESERVER_LIB) \
+ $(TAO_IORTABLE_LIB) \
$(TAO_SVC_UTILS_LIB) \
$(TAO_NAMING_LIB) \
$(TAO_NOTIFY_LIB)
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.bor b/TAO/orbsvcs/orbsvcs/CosNaming.bor
index 77603a91405..5291e08ae9f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.bor
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.bor
@@ -31,6 +31,7 @@ CFLAGS = \
$(ACE_CFLAGS) \
$(TAO_CFLAGS) \
$(TAO_PORTABLESERVER_CFLAGS) \
+ $(TAO_IORTABLE_CFLAGS) \
$(TAO_NAMING_CFLAGS) \
-DTAO_NAMING_BUILD_DLL
@@ -45,6 +46,7 @@ LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
$(TAO_PORTABLESERVER_LIB) \
+ $(TAO_IORTABLE_LIB) \
$(TAO_SVC_UTILS_LIB)
all: idl_src_files
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.bor b/TAO/orbsvcs/orbsvcs/CosNotification.bor
index 2c8e2587df5..7d2488c682e 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.bor
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.bor
@@ -56,7 +56,10 @@ OBJFILES = \
$(OBJDIR)\Notify_StructuredProxyPushSupplier_i.obj \
$(OBJDIR)\Notify_SupplierAdmin_i.obj \
$(OBJDIR)\Notify_Update_Dispatch_Command.obj \
- $(OBJDIR)\Notify_Worker_Task.obj
+ $(OBJDIR)\Notify_Worker_Task.obj \
+ $(OBJDIR)\Notify_AdminProperties.obj \
+ $(OBJDIR)\Notify_Buffering_Strategy.obj \
+ $(OBJDIR)\Notify_MT_Worker_Task.obj
RESOURCE = $(OBJDIR)\orbsvcs.res
diff --git a/TAO/tests/InterOp-Naming/server.bor b/TAO/tests/InterOp-Naming/server.bor
index 88377e78d90..befd4506e07 100644
--- a/TAO/tests/InterOp-Naming/server.bor
+++ b/TAO/tests/InterOp-Naming/server.bor
@@ -16,12 +16,14 @@ OBJFILES = \
CFLAGS = \
$(ACE_CFLAGS) \
$(TAO_CFLAGS) \
+ $(TAO_IORTABLE_CFLAGS) \
$(TAO_PORTABLESERVER_CFLAGS) \
$(TAO_NAMING_CFLAGS)
LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
+ $(TAO_IORTABLE_LIB) \
$(TAO_PORTABLESERVER_LIB) \
$(TAO_NAMING_LIB)
View Lorry Controller Status