ChangeLogTag:Tue May 9 09:33:12 2000 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 54 insertions, 139 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f6456edc74c..e00a3b73bed 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,20 +1,33 @@
+Tue May  9 09:33:12 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * Makefile:
+        * tests/InterOp-Naming/Makefile:
+        * tests/InterOp-Naming/Server_i.h:
+        * tests/InterOp-Naming/INS_test_client.cpp:
+          Removed the NameService features from the INS test.  First we
+          test those features in many other places (implicitly), second a
+          test should test only one thing, not 20, and third this
+          eliminates all dependencies from orbsvcs in the tests directory,
+          which is good because now we can automatically test a smaller
+          subset of the ORB.
+
 Tue May  9 08:31:09 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* orbsvcs/IFR_Service/TypeCodeFactory_i.cpp:
-	  Filled in empty methods create_string_tc,
-	  create_wstring_tc, create_array_tc and
-	  create_sequence_tc.
+        * orbsvcs/IFR_Service/TypeCodeFactory_i.cpp:
+          Filled in empty methods create_string_tc,
+          create_wstring_tc, create_array_tc and
+          create_sequence_tc.
 
 
-	* orbsvcs/IFR_Service/TypeCodeFactory_i.h:
-	* orbsvcs/IFR_Service/TCF_Loader.cpp:
-	  Cosmetic changes.
+        * orbsvcs/IFR_Service/TypeCodeFactory_i.h:
+        * orbsvcs/IFR_Service/TCF_Loader.cpp:
+          Cosmetic changes.
 
 Tue May  9 08:23:26 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* tao/Interface.pidl:
-	  Replaced CORBA 2.3 version with components-ready version
-	  from CORBA Components volume III.
+        * tao/Interface.pidl:
+          Replaced CORBA 2.3 version with components-ready version
+          from CORBA Components volume III.
 
 Mon May 08 22:58:14 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
@@ -22,8 +35,8 @@ Mon May 08 22:58:14 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 Mon May  8 15:25:29 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* examples/Load_Balancing_persistent/Load_Balancer_i.cpp: Fixed a
-	  compile error with single threaded builds.  
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp: Fixed a
+          compile error with single threaded builds.
 
 Mon May  8 09:42:47 2000  Carlos O'Ryan  <coryan@uci.edu>
 
@@ -296,7 +309,7 @@ Tue May  2 16:38:55 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 Tue May  2 12:05:07 2000  Carlos O'Ryan  <coryan@uci.edu>
 
-        * orbsvcs/orbsvcs/Event/EC_Gatew<ay.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
           Fixed nasty bug in the event channel gateways.  The local
           consumer proxy map was not recomputed correctly, because I was
           invoking Map_Manager::close() to reset the map.  This method
diff --git a/TAO/Makefile b/TAO/Makefile
index 49814cc38bc..e065be4406a 100644
--- a/TAO/Makefile
+++ b/TAO/Makefile
@@ -21,19 +21,19 @@ INFO    = README \
 
 DIRS    = tao \
           TAO_IDL \
+          tests \
           orbsvcs \
           examples \
           performance-tests \
-          tests \
           utils
 
 CLONE   = Makefile \
           tao \
           TAO_IDL \
+          tests \
           orbsvcs \
           examples \
           performance-tests \
-          tests \
           utils
 
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index ad61102c93f..ac725df6ac7 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 
-#include "orbsvcs/CosNamingC.h"
 #include "INSC.h"
 
 int
@@ -74,48 +73,18 @@ main (int argc, char *argv[])
                                    "given name.\n"),
                                   -1);
 
-              if (ACE_OS::strcmp (argv[i], "NameService") == 0)
-                {
-                  CosNaming::NamingContext_var naming_context =
-                    CosNaming::NamingContext::_narrow (objref.in (),
-                                                       ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-              
-                  ACE_DEBUG ((LM_DEBUG,
-                              "Resolved IOR for %s : %s\n",
-                              argv[i],
-                              orb->object_to_string (naming_context.in ())));
-
-                  // Sanity check to see if the reference to Naming
-                  // Context is alright.
-                  CosNaming::Name my_name;
-                  my_name.length (1);
-                  my_name[0].id = CORBA::string_dup ("ObjName");
-
-                  naming_context->bind (my_name,
-                                        objref.in (),
-                                        ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-
-                  ACE_DEBUG ((LM_DEBUG,
-                              "\nBind successful on the "
-                              "resolved Naming Context\n")); 
-                }
-              else
-                {
-                  INS_var server = INS::_narrow (objref.in (),
+              INS_var server = INS::_narrow (objref.in (),
                                                  ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+              ACE_TRY_CHECK;
 
-                  ACE_DEBUG ((LM_DEBUG,
-                              "Resolved IOR for %s : %s\n",
-                              argv[i],
-                              orb->object_to_string (server.in ())));
+              ACE_DEBUG ((LM_DEBUG,
+                          "Resolved IOR for %s : %s\n",
+                          argv[i],
+                          orb->object_to_string (server.in ())));
 
-                  ACE_DEBUG ((LM_DEBUG,
-                              "\nResult of Remote Call : %s\n",
-                              server->test_ins (ACE_TRY_ENV)));
-                }
+              ACE_DEBUG ((LM_DEBUG,
+                          "\nResult of Remote Call : %s\n",
+                          server->test_ins (ACE_TRY_ENV)));
             }
         }
     }
diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile
index 48b010fabf6..ee816b4086d 100644
--- a/TAO/tests/InterOp-Naming/Makefile
+++ b/TAO/tests/InterOp-Naming/Makefile
@@ -17,7 +17,7 @@ IDL_SRC = \
 	INSC.cpp \
 	INSS.cpp
 
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+LDLIBS = -lTAO
 
 PROG_SRCS = \
 	INS_test_client.cpp \
@@ -39,17 +39,10 @@ SIMPLE_SERVER_OBJS = \
 		Server_i.o \
 		INS_test_server.o
 
-BIN2 = \
+BIN = \
 	INS_test_server \
         INS_test_client
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
-
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -67,11 +60,6 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
-
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-
 INS_test_server:$(addprefix $(VDIR),$(SIMPLE_SERVER_OBJS))
 		$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
@@ -91,10 +79,9 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/INS_test_client.o .obj/INS_test_client.so .shobj/INS_test_client.o .shobj/INS_test_client.so: INS_test_client.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(ACE_ROOT)/ace/pre.h \
+.obj/INS_test_client.o .obj/INS_test_client.so .shobj/INS_test_client.o .shobj/INS_test_client.so: INS_test_client.cpp INSC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
@@ -383,9 +370,7 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- INSC.h INSC.i
+ INSC.i
 
 .obj/INS_i.o .obj/INS_i.so .shobj/INS_i.o .shobj/INS_i.so: INS_i.cpp INS_i.h INSS.h INSC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -824,7 +809,11 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ INS_i.h INSS.h INSC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -973,35 +962,7 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- INS_i.h INSS.h INSC.h INSC.i INSS_T.h INSS_T.i INSS_T.cpp INSS.i
+ INSC.i INSS_T.h INSS_T.i INSS_T.cpp INSS.i
 
 .obj/INS_test_server.o .obj/INS_test_server.so .shobj/INS_test_server.o .shobj/INS_test_server.so: INS_test_server.cpp Server_i.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -1147,7 +1108,11 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ INS_i.h INSS.h INSC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -1296,35 +1261,7 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- INS_i.h INSS.h INSC.h INSC.i INSS_T.h INSS_T.i INSS_T.cpp INSS.i
+ INSC.i INSS_T.h INSS_T.i INSS_T.cpp INSS.i
 
 .obj/INSC.o .obj/INSC.so .shobj/INSC.o .shobj/INSC.so: INSC.cpp INSC.h \
  $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index cc606977c39..c9ac4fdebed 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -20,7 +20,6 @@
 #define SERVER_I_H
 
 #include "tao/TAO.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "INS_i.h"
@@ -60,9 +59,6 @@ protected:
   // The ORB manager - a helper class for accessing the POA and
   // registering objects.
 
-  TAO_Naming_Server namingServer;
-  // helper class for getting access to Naming Service.
-
   FILE *ior_output_file_;
   // File where the IOR of the server object is stored.