diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 15 | ||||
| -rw-r--r-- | TAO/tao/CORBALOC_Parser.cpp | 11 | ||||
| -rw-r--r-- | TAO/tao/CORBALOC_Parser.h | 1 | ||||
| -rw-r--r-- | TAO/tao/CORBANAME_Parser.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/CORBANAME_Parser.h | 1 | ||||
| -rw-r--r-- | TAO/tao/Makefile.am | 4 | ||||
| -rw-r--r-- | TAO/tao/Makefile.bor | 2 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 11 |
8 files changed, 50 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index defa7451f41..49786c3df36 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,18 @@ +Thu Oct 5 09:47:42 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/TAO_Internal.cpp: + * tao/CORBALOC_Parser.h: + * tao/CORBALOC_Parser.cpp: + * tao/CORBANAME_Parser.h: + * tao/CORBANAME_Parser.cpp: + Statically add the new CORBALOC and CORBANAME parsers into + the Service Configurator, otherwise things don't quite work for + static builds. + + * tao/Makefile.am: + * tao/Makefile.bor: + Add the new files to the Borland and automake makefiles. + Thu Oct 5 11:37:08 2000 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/orbsvcs/Makefile: Added FT library to the makefile. diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index c3b69f805e4..f4eb0339c84 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -268,7 +268,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char * // "rir" protocol. Pass the key string as an // argument to the resolve_initial_references. const char *key_string = corbaloc_name + sizeof ("rir:/") -1; - + if (ACE_OS::strcmp (key_string, "") == 0) { // If the key string is empty, assume the default @@ -279,7 +279,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char * rir_obj = this->orb_->resolve_initial_references (key_string, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - + return rir_obj; } @@ -378,6 +378,13 @@ TAO_CORBALOC_Parser::parse_string (const char *ior, return object; } +ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser, + ACE_TEXT ("CORBALOC_Parser"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_CORBALOC_Parser), + ACE_Service_Type::DELETE_THIS | + ACE_Service_Type::DELETE_OBJ, + 0) ACE_FACTORY_DEFINE (TAO, TAO_CORBALOC_Parser) diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index 39f9fcba084..41816e41d0f 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -127,6 +127,7 @@ public: # include "CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ +ACE_STATIC_SVC_DECLARE (TAO_CORBALOC_Parser) ACE_FACTORY_DECLARE (TAO, TAO_CORBALOC_Parser) #include "ace/post.h" diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index e0f038c7292..47121f9a29a 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -161,6 +161,14 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, return obj; } +ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser, + ACE_TEXT ("CORBANAME_Parser"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_CORBANAME_Parser), + ACE_Service_Type::DELETE_THIS | + ACE_Service_Type::DELETE_OBJ, + 0) + ACE_FACTORY_DEFINE (TAO, TAO_CORBANAME_Parser) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index de13716168e..2731d22a200 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -67,6 +67,7 @@ public: # include "CORBANAME_Parser.i" #endif /* __ACE_INLINE__ */ +ACE_STATIC_SVC_DECLARE (TAO_CORBANAME_Parser) ACE_FACTORY_DECLARE (TAO, TAO_CORBANAME_Parser) #include "ace/post.h" diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 9a2c08ece9f..187f6636b5d 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -84,10 +84,14 @@ ORB_CORE_FILES = \ Any.cpp \ Bind_Dispatcher_Guard.cpp \ CORBA_String.cpp \ + CORBALOC_Parser.cpp \ + CORBANAME_Parser.cpp \ CurrentC.cpp \ Exception.cpp \ WrongTransactionC.cpp \ Environment.cpp \ + DLL_Parser.cpp \ + FILE_Parser.cpp \ Object.cpp \ ObjectIDList.cpp \ ORB.cpp \ diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index 700b7d61862..f28cb3b6573 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -27,6 +27,8 @@ OBJFILES = \ $(OBJDIR)\CONV_FRAMES.obj \ $(OBJDIR)\corbafwd.obj \ $(OBJDIR)\CORBA_String.obj \ + $(OBJDIR)\CORBALOC_Parser.obj \ + $(OBJDIR)\CORBANAME_Parser.obj \ $(OBJDIR)\CurrentC.obj \ $(OBJDIR)\debug.obj \ $(OBJDIR)\default_client.obj \ diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 39e0c49f610..82f7d7d056f 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -7,11 +7,16 @@ #include "tao/default_server.h" #include "tao/default_client.h" #include "tao/default_resource.h" + #include "tao/IIOP_Factory.h" #include "tao/UIOP_Factory.h" #include "tao/SHMIOP_Factory.h" + +#include "tao/CORBANAME_Parser.h" +#include "tao/CORBALOC_Parser.h" #include "tao/FILE_Parser.h" #include "tao/DLL_Parser.h" + #include "tao/Object_Loader.h" ACE_RCSID(tao, TAO_Internal, "$Id$") @@ -57,7 +62,7 @@ TAO_Internal::open_services (int &argc, insert (&ace_svc_desc_TAO_Default_Client_Strategy_Factory); ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_Default_Server_Strategy_Factory); - + // Configure the IIOP and UIOP factories. You do *NOT* // need modify this code to add your own protocol, instead // simply add the following to your svc.conf file: @@ -79,6 +84,10 @@ TAO_Internal::open_services (int &argc, #endif /* TAO_HAS_UIOP == 1 */ // add descriptor to list of static objects. ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_CORBANAME_Parser); + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_CORBALOC_Parser); + ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_FILE_Parser); ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_DLL_Parser); |