diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-12 22:56:17 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-12 22:56:17 +0000 |
| commit | fba96e3bfc29237ec483545f6fb0671851c823a0 (patch) | |
| tree | 11005fdff153329f90752e0610b51a87ff7aab57 | |
| parent | 3fb5963dcddc67f1258b100382824621f6a773f8 (diff) | |
| download | ATCD-fba96e3bfc29237ec483545f6fb0671851c823a0.tar.gz | |
ChangeLogTag: Tue Sep 12 15:41:48 2000 Priyanka Gontla <pgontla@ece.uci.edu>
25 files changed, 1630 insertions, 556 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 9dfa2ea3efd..e540690af41 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,6 +1,76 @@ -Thu Jul 20 19:53:37 2000 Priyanka Gontla <pgontla@ece.uci.edu> +Tue Sep 12 15:41:48 2000 Priyanka Gontla <pgontla@ece.uci.edu> - * tao/IIOP_Profile.cpp: + * tao/IIOP_Profile.cpp (parse_string): + + The default port number for IIOP is 683 and that of corbaloc is + 2809. Modified files to reflect and implement this. + + * tao/ORB_Core.cpp (init): + + Modified the place where the TAO_Parser_Registry::open () is + called. This should be called only after the + TAO_default_resource_factory::init () is called. + + * tao/Makefile: + + Modified the Makefile to reflect the move of the files listed + below. + + * tao/Object_Loader.i: + * tao/Object_Loader.h: + * tao/Object_Loader.cpp: + + * tao/FILE_Parser.i: + * tao/FILE_Parser.h: + * tao/FILE_Parser.cpp: + * tao/ior_file_export.h: + + * tao/DLL_Parser.i: + * tao/DLL_Parser.h: + * tao/DLL_Parser.cpp : + * tao/ior_dll_export.h: + + Removed these files from tao/ior_file and added them in + tao/. + Added ACE_STATIC_SVC_DEFINE and ACE_STATIC_SVC_DECLARE macros to + *_Parser.{cpp,h}. + + * tao/ior_file/Makefile: + * tao/ior_dll/Makefile : + + Removed these files as they are no longer needed. + + * tao/TAO_Internal.cpp (open_services): + + Added the FILE and DLL Parsers to the list of static objects. + + * tao/Parser_Registry.h (TAO_Parser_Registry): + * tao/Parser_Registry.cpp (open): + + * tao/default_resource.h (TAO_Default_Resource_Factory): + * tao/default_resource.cpp (get_parser_names): + + * tao/Resource_Factory.h (TAO_Resource_Factory): + * tao/Resource_Factory.cpp (get_parser_names): + + Fixed the way in which the default list of parsers are + initialized. Added new methods in default_resource.* and + Resource_Factory.* to fix this. + + Modified the signature of <open> in Parser_Registry so that a + pointer to the ORB_Core is provided. + + Added code to check for '-ORBIORParser' in + TAO_Default_Resource_Factory::init () method. + + * tao/ior_corbaloc/CORBALOC_Parser.h : + * tao/ior_corbaloc/CORBALOC_Parser.cpp : + + Modified the method of verifying the validity of the object + reference obtained by using <_is_a> instead of narrowing it + down. + +Thu Jul 20 19:53:37 2000 Priyanka Gontla <pgontla@ece.uci.edu> * tao/ior_corbaloc/CORBALOC_Parser.h: * tao/ior_corbaloc/CORBALOC_Parser.cpp: diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp new file mode 100644 index 00000000000..5b41da88805 --- /dev/null +++ b/TAO/tao/DLL_Parser.cpp @@ -0,0 +1,73 @@ +// $Id$ + +#include "DLL_Parser.h" +#include "Object_Loader.h" +#include "tao/Object.h" +#include "tao/Exception.h" +#include "tao/Environment.h" +#include "ace/Dynamic_Service.h" + +#if !defined(__ACE_INLINE__) +#include "DLL_Parser.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(tao, DLL_Parser, "$Id$") + +TAO_DLL_Parser::~TAO_DLL_Parser (void) +{ +} + +static const char dll_prefix[] = "DLL:"; + +int +TAO_DLL_Parser::match_prefix (const char *ior_string) const +{ + return (ACE_OS::strncmp (ior_string, + ::dll_prefix, + sizeof (::dll_prefix) - 1) == 0); +} + +CORBA::Object_ptr +TAO_DLL_Parser::parse_string (const char *ior, + CORBA::ORB_ptr orb, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Skip the prefix, we know it is there because this method in only + // called if <match_prefix> returns 1. + const char *name = + ior + sizeof (::dll_prefix) + 2; + + TAO_Object_Loader *loader = + ACE_Dynamic_Service<TAO_Object_Loader>::instance (name); + + if (loader == 0) + { + ACE_THROW_RETURN + (CORBA::INV_OBJREF + (CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO), + CORBA::Object::_nil ()); + } + + return loader->create_object (orb, ACE_TRY_ENV); +} + +ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser, + ACE_TEXT ("DLL_Parser"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_DLL_Parser), + ACE_Service_Type::DELETE_THIS | + ACE_Service_Type::DELETE_OBJ, + 0) + + +ACE_FACTORY_DEFINE (TAO, TAO_DLL_Parser) + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h new file mode 100644 index 00000000000..f8079e829e6 --- /dev/null +++ b/TAO/tao/DLL_Parser.h @@ -0,0 +1,63 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO +// +// = FILENAME +// DLL_Parser.h +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// ============================================================================ + +#ifndef TAO_DLL_PARSER_H +#define TAO_DLL_PARSER_H +#include "ace/pre.h" + +#include "tao/IOR_Parser.h" +#include "ior_dll_export.h" +#include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Export TAO_DLL_Parser : public TAO_IOR_Parser +{ + // = TITLE + // Defines the interface for the pluggable DLL parser components + // + // = DESCRIPTION + // The ORB is able to dynamically load the list of DLL formats it + // understands. That allow us to integrate formats such as + // corbaname:, http: or ftp: only when required. + // This class provides a uniform interface for all the DLL parsers + // +public: + TAO_DLL_Parser (void); + // Constructor + + virtual ~TAO_DLL_Parser (void); + // The destructor + + // = The IOR_Parser methods, please read the documentation in + // IOR_Parser.h + virtual int match_prefix (const char *ior_string) const; + virtual CORBA::Object_ptr parse_string (const char *ior, + CORBA::ORB_ptr orb, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); +}; + +#if defined (__ACE_INLINE__) +# include "DLL_Parser.i" +#endif /* __ACE_INLINE__ */ + +ACE_STATIC_SVC_DECLARE (TAO_DLL_Parser) +ACE_FACTORY_DECLARE (TAO, TAO_DLL_Parser) + +#include "ace/post.h" +#endif /* TAO_DLL_PARSER_H */ diff --git a/TAO/tao/DLL_Parser.i b/TAO/tao/DLL_Parser.i new file mode 100644 index 00000000000..00a66f43394 --- /dev/null +++ b/TAO/tao/DLL_Parser.i @@ -0,0 +1,6 @@ +// $Id$ + +ACE_INLINE +TAO_DLL_Parser::TAO_DLL_Parser (void) +{ +} diff --git a/TAO/tao/ior_file/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index b1182f4b81a..22578447cac 100644 --- a/TAO/tao/ior_file/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -69,7 +69,15 @@ TAO_FILE_Parser::parse_string (const char *ior, return object; } -ACE_FACTORY_DEFINE (TAO_IOR_FILE, TAO_FILE_Parser) +ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser, + ACE_TEXT ("FILE_Parser"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_FILE_Parser), + ACE_Service_Type::DELETE_THIS | + ACE_Service_Type::DELETE_OBJ, + 0) + +ACE_FACTORY_DEFINE (TAO, TAO_FILE_Parser) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ior_file/FILE_Parser.h b/TAO/tao/FILE_Parser.h index 30657cc8690..2d134d09f8e 100644 --- a/TAO/tao/ior_file/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -19,12 +19,13 @@ #include "tao/IOR_Parser.h" #include "ior_file_export.h" +#include "ace/Service_Config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_IOR_FILE_Export TAO_FILE_Parser : public TAO_IOR_Parser +class TAO_Export TAO_FILE_Parser : public TAO_IOR_Parser { // = TITLE // Implements the <file:> IOR format @@ -55,7 +56,8 @@ public: # include "FILE_Parser.i" #endif /* __ACE_INLINE__ */ -ACE_FACTORY_DECLARE (TAO_IOR_FILE, TAO_FILE_Parser) +ACE_STATIC_SVC_DECLARE (TAO_FILE_Parser) +ACE_FACTORY_DECLARE (TAO, TAO_FILE_Parser) #include "ace/post.h" #endif /* TAO_FILE_PARSER_H */ diff --git a/TAO/tao/FILE_Parser.i b/TAO/tao/FILE_Parser.i new file mode 100644 index 00000000000..c3ca97a6149 --- /dev/null +++ b/TAO/tao/FILE_Parser.i @@ -0,0 +1,6 @@ +// $Id$ + +ACE_INLINE +TAO_FILE_Parser::TAO_FILE_Parser (void) +{ +} diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 510158fb1f5..ef93f6c3f9b 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -255,7 +255,7 @@ TAO_IIOP_Profile::parse_string (const char *string, char *start = copy.inout (); char *cp_pos = ACE_OS::strchr (start, ':'); // Look for a port - + char *okd = ACE_OS::strchr (start, this->object_key_delimiter_); if (okd == 0) @@ -270,7 +270,7 @@ TAO_IIOP_Profile::parse_string (const char *string, } // The default port number. - const char def_port [] = ":2809"; + const char def_port [] = ":683"; // Length of port. CORBA::ULong length = 0; @@ -278,27 +278,27 @@ TAO_IIOP_Profile::parse_string (const char *string, // Length of host string. CORBA::ULong length_host = 0; - // Length of <char *cp> - CORBA::ULong length_cp = + // Length of <cp> + CORBA::ULong length_cp = ACE_OS::strlen ((const char *)okd) + sizeof (def_port); - + CORBA::String_var cp = CORBA::string_alloc (length_cp); - + if (cp_pos == 0) { // No host/port delimiter! Dont raise an exception. Use the - // default port No. 2809 + // default port No. 683 ACE_OS::strcpy (cp, def_port); ACE_OS::strcat (cp, okd); - - length = - ACE_OS::strlen (cp.in ()) - + + length = + ACE_OS::strlen (cp.in ()) - ACE_OS::strlen ((const char *)okd) - 1; - - length_host = - ACE_OS::strlen (start) + - sizeof (def_port) - + + length_host = + ACE_OS::strlen (start) + + sizeof (def_port) - ACE_OS::strlen (cp.in ()) -1; } else @@ -310,21 +310,21 @@ TAO_IIOP_Profile::parse_string (const char *string, } CORBA::String_var tmp = CORBA::string_alloc (length); - + ACE_OS::strncpy (tmp.inout (), cp.in () + 1, length); tmp[length] = '\0'; - + this->port_ = (CORBA::UShort) ACE_OS::atoi (tmp.in ()); - + tmp = CORBA::string_alloc (length_host); ACE_OS::strncpy (tmp.inout (), start, length_host); tmp[length_host] = '\0'; - + this->host_ = tmp._retn (); - + ACE_INET_Addr host_addr; - + if (ACE_OS::strcmp (this->host_.in (), "") == 0) { char tmp_host [MAXHOSTNAMELEN + 1]; @@ -352,7 +352,7 @@ TAO_IIOP_Profile::parse_string (const char *string, this->host_ = (const char *) tmp_host; } } - + if (this->object_addr_.set (this->port_, this->host_.in ()) == -1) { @@ -366,11 +366,11 @@ TAO_IIOP_Profile::parse_string (const char *string, } return -1; } - + start = ++okd; // increment past the object key separator - + TAO_POA::decode_string_to_sequence (this->object_key_, start); - + return 1; } diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index d0654394495..224033cb6d0 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -1,3 +1,5 @@ + + #---------------------------------------------------------------------------- # $Id$ # @@ -211,7 +213,10 @@ ORB_CORE_FILES = \ TAOC \ TAOS \ IOR_Parser \ - Parser_Registry + Parser_Registry \ + Object_Loader \ + DLL_Parser \ + FILE_Parser DYNAMIC_ANY_FILES = @@ -223,7 +228,7 @@ DEFS = $(addsuffix .h,$(PUB_HDRS)) ACE_SHLIBS = -lACE -DIRS += ior_dll ior_file ior_corbaloc +DIRS += ior_corbaloc ior_corbaname #---------------------------------------------------------------------------- # Include macros and targets @@ -372,12 +377,12 @@ all.nested: all.local # @@ Can we generalize this to something like this: # $(MANAGED_PIDL).target: -# ...... +# ...... interceptor.target: - $(TAO_ROOT)/TAO_IDL/tao_idl -Ge 1 -Wb,export_macro=TAO_Export Interceptor.pidl; \ - $(RM) -f InterceptorS.* InterceptorS_T.*; \ - patch < diffs/InterceptorC.h.diff; \ - patch < diffs/InterceptorC.cpp.diff + $(TAO_ROOT)/TAO_IDL/tao_idl -Ge 1 -Wb,export_macro=TAO_Export Interceptor.pidl; \ + $(RM) -f InterceptorS.* InterceptorS_T.*; \ + patch < diffs/InterceptorC.h.diff; \ + patch < diffs/InterceptorC.cpp.diff .PHONY interceptor.target: ifeq ($(fakesvcconf),1) @@ -388,8 +393,8 @@ ifeq ($(LYNXTARGET),ppc) #### POA.cpp raises internal compiler error with LynxOS 3.0.0 g++, but #### only when optimization is enabled. Disable it . . . .obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp - @echo NOTE: compiling POA.cpp with -O instead of -O2, see Makefile. - $(subst $(OCFLAGS) ,-O ,$(COMPILE.cc)) -o $@ $< + @echo NOTE: compiling POA.cpp with -O instead of -O2, see Makefile. + $(subst $(OCFLAGS) ,-O ,$(COMPILE.cc)) -o $@ $< endif # LYNXTARGET == ppc #RLDFLAGS := $(subst -L,-Wl\,-rpath ,$(LDFLAGS)) @@ -404,27 +409,27 @@ TAO_COMPONENTS: .PHONY: SIZES MODULES=POA_FILES \ - PLUGGABLE_PROTOCOLS_FILES \ - DEFAULT_RESOURCES_FILES \ - INTERPRETIVE_MARSHALING_FILES \ - IDL_COMPILER_FILES \ - ORB_CORE_FILES \ - DYNAMIC_ANY_FILES \ - PLUGGABLE_MESSAGING_FILES \ - INTERFACE_REPO_FILES + PLUGGABLE_PROTOCOLS_FILES \ + DEFAULT_RESOURCES_FILES \ + INTERPRETIVE_MARSHALING_FILES \ + IDL_COMPILER_FILES \ + ORB_CORE_FILES \ + DYNAMIC_ANY_FILES \ + PLUGGABLE_MESSAGING_FILES \ + INTERFACE_REPO_FILES SIZES: $(addsuffix .size, $(MODULES)) - @for i in $^; do \ - b=`cat $$i`; \ - echo $$i : $$b; \ - done + @for i in $^; do \ + b=`cat $$i`; \ + echo $$i : $$b; \ + done %.size: @size $(addsuffix .o, $(addprefix .obj/,$($*))) | \ - sort -n -k 4,4 >$@.details - @size $(addsuffix .o, $(addprefix .obj/,$($*))) | \ - grep -v ' text ' | \ - awk '{s += $$4} END {print s}' > $@ + sort -n -k 4,4 >$@.details + @size $(addsuffix .o, $(addprefix .obj/,$($*))) | \ + grep -v ' text ' | \ + awk '{s += $$4} END {print s}' > $@ realclean: @@ -636,8 +641,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ ORB_Core.h \ Policy_Manager.h \ @@ -669,6 +672,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -1036,8 +1041,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ Policy_Manager.i \ @@ -1068,6 +1071,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -1309,8 +1314,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ Policy_Manager.i \ @@ -1341,6 +1344,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -1541,8 +1546,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ Policy_Manager.i \ @@ -1573,6 +1576,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -2086,8 +2091,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -2127,6 +2130,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -2333,8 +2338,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Any.h \ Typecode.h \ @@ -2534,8 +2537,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ NVList.h \ @@ -2552,6 +2553,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -2697,8 +2700,8 @@ realclean: PolicyC.i \ POAC.i \ Servant_Base.h \ - Servant_Base.i ImplRepoS_T.h \ - ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \ + Servant_Base.i \ + ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \ Operation_Table.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -2803,8 +2806,6 @@ realclean: IORC.h \ IORC.i \ IORS.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ GIOP_Server_Request.h \ @@ -2834,6 +2835,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -3027,8 +3030,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ ORB_Core.h \ @@ -3045,6 +3046,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -3062,7 +3065,8 @@ realclean: Object_KeyC.i \ target_specification.i -.obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \ +.obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp \ + Profile.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -3283,8 +3287,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i @@ -3442,8 +3444,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -3483,6 +3483,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -3688,8 +3690,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -3702,6 +3702,8 @@ realclean: Policy_Manager.i \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -4105,8 +4107,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -4120,6 +4120,8 @@ realclean: Resource_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -4390,8 +4392,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -4405,6 +4405,8 @@ realclean: Resource_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -4609,8 +4611,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -4695,6 +4695,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -4968,8 +4970,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ IIOP_Profile.i \ Timeprobe.h \ @@ -4999,6 +4999,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -5278,8 +5280,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ IIOP_Profile.i \ debug.h \ @@ -5295,6 +5295,8 @@ realclean: Policy_Manager.i \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -5535,8 +5537,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -5551,6 +5551,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -5807,8 +5809,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -5823,6 +5823,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -6093,8 +6095,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -6108,6 +6108,8 @@ realclean: Resource_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -6380,8 +6382,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -6395,6 +6395,8 @@ realclean: Resource_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -6670,8 +6672,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ ORB_Core.h \ Policy_Manager.h \ @@ -6687,6 +6687,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -6978,8 +6980,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ ORB_Core.h \ @@ -6994,6 +6994,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -7281,8 +7283,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -7295,6 +7295,8 @@ realclean: Policy_Manager.i \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -7535,8 +7537,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -7551,6 +7551,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -7804,8 +7806,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -7820,6 +7820,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -8097,8 +8099,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -8112,6 +8112,8 @@ realclean: Resource_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -8310,8 +8312,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -8408,6 +8408,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -8685,8 +8687,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -8718,6 +8718,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -9003,8 +9005,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -9022,6 +9022,8 @@ realclean: Policy_Manager.i \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -9266,8 +9268,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -9282,6 +9282,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -9541,8 +9543,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -9557,6 +9557,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -9780,8 +9782,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ Invocation.h \ @@ -9799,6 +9799,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -10131,8 +10133,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -10296,8 +10296,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -10337,6 +10335,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -10514,8 +10514,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -10555,6 +10553,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -10747,8 +10747,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -10761,6 +10759,8 @@ realclean: Policy_Manager.i \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -11131,7 +11131,8 @@ realclean: Protocol_Factory.h \ default_resource.i -.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp Marshal.h \ +.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \ + Marshal.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -11290,13 +11291,12 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i \ debug.h -.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp Marshal.h \ +.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \ + Marshal.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -11455,12 +11455,11 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i -.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp Marshal.h \ +.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \ + Marshal.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -11619,8 +11618,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i \ debug.h @@ -11778,8 +11775,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i .obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp \ @@ -11938,8 +11933,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i .obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp Any.h \ @@ -12101,8 +12094,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i \ ORB_Core.h \ @@ -12140,6 +12131,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -12148,7 +12141,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp \ debug.h -.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp CurrentC.h \ +.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \ + CurrentC.h \ $(ACE_ROOT)/ace/pre.h \ Object.h \ corbafwd.h \ @@ -12334,8 +12328,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ Any.h \ @@ -12346,7 +12338,8 @@ realclean: DomainC.h \ DomainC.i -.obj/CurrentS.o .obj/CurrentS.so .shobj/CurrentS.o .shobj/CurrentS.so: CurrentS.cpp CurrentC.h \ +.obj/CurrentS.o .obj/CurrentS.so .shobj/CurrentS.o .shobj/CurrentS.so: CurrentS.cpp \ + CurrentC.h \ $(ACE_ROOT)/ace/pre.h \ Object.h \ corbafwd.h \ @@ -12500,7 +12493,8 @@ realclean: Object_KeyC.i \ Server_Request.i -.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp $(ACE_ROOT)/ace/streams.h \ +.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -12852,8 +12846,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -12893,6 +12885,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -12900,7 +12894,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp -.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp Object.h \ +.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \ + Object.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -13119,8 +13114,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ Request.h \ @@ -13146,6 +13139,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -13395,8 +13390,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ Request.h \ @@ -13422,6 +13415,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -13609,8 +13604,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Any.h \ Any.i @@ -13767,8 +13760,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Acceptor_Registry.h \ Pluggable.h \ @@ -13805,6 +13796,8 @@ realclean: Connector_Registry.i \ IOR_Parser.h \ IOR_Parser.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ @@ -13918,7 +13911,8 @@ realclean: Buffering_Constraint_Policy.h \ Buffering_Constraint_Policy.i -.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp corbafwd.h \ +.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \ + corbafwd.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -14007,7 +14001,8 @@ realclean: varbase.h \ corbafwd.i -.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h \ +.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \ + PolicyC.h \ $(ACE_ROOT)/ace/pre.h \ CurrentC.h \ Object.h \ @@ -14193,8 +14188,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ POA_CORBA.h \ @@ -14212,6 +14205,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -14240,7 +14235,8 @@ realclean: operation_details.i \ Invocation.i -.obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp PolicyC.h \ +.obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp \ + PolicyC.h \ $(ACE_ROOT)/ace/pre.h \ CurrentC.h \ Object.h \ @@ -14406,8 +14402,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i .obj/Encodable.o .obj/Encodable.so .shobj/Encodable.o .shobj/Encodable.so: Encodable.cpp \ @@ -14640,7 +14634,8 @@ realclean: RTCORBAS.i \ RT_Policy_i.i -.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \ +.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp \ + DomainC.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -14830,8 +14825,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ Invocation.h \ @@ -14845,6 +14838,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -14873,7 +14868,8 @@ realclean: operation_details.i \ Invocation.i -.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainC.h $(ACE_ROOT)/ace/pre.h \ +.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainC.h \ + $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -15039,8 +15035,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i .obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp \ @@ -15362,7 +15356,8 @@ realclean: CDR.h \ CDR.i -.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp Sequence.h \ +.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \ + Sequence.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -15624,8 +15619,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -15661,6 +15654,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -15670,7 +15665,8 @@ realclean: Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h -.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp MProfile.h \ +.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \ + MProfile.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -16025,8 +16021,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ NVList.h \ @@ -16046,6 +16040,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -16126,7 +16122,8 @@ realclean: $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp -.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp Typecode.h \ +.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \ + Typecode.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -16285,13 +16282,12 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i \ debug.h -.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp CDR.h \ +.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \ + CDR.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -16443,8 +16439,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ ORB_Core.h \ Policy_Manager.h \ @@ -16485,6 +16479,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -16743,11 +16739,10 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i -.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp Timeprobe.h \ +.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \ + Timeprobe.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -16902,8 +16897,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -16943,6 +16936,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -17045,7 +17040,8 @@ realclean: varbase.h \ corbafwd.i -.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp debug.h \ +.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \ + debug.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -17393,8 +17389,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -17434,6 +17428,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -17670,8 +17666,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -17711,6 +17705,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -17919,8 +17915,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -17960,6 +17954,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -18342,7 +18338,8 @@ realclean: Exception.h \ Exception.i \ Environment.h \ - Environment.i InterceptorC.i + Environment.i \ + InterceptorC.i .obj/Smart_Proxies.o .obj/Smart_Proxies.so .shobj/Smart_Proxies.o .shobj/Smart_Proxies.so: Smart_Proxies.cpp \ Smart_Proxies.h \ @@ -18438,7 +18435,8 @@ realclean: Object.i \ Smart_Proxies.i -.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \ +.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp \ + ORB_Core.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -18591,8 +18589,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -18632,6 +18628,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -18867,8 +18865,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -18908,6 +18904,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -19166,8 +19164,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -19207,6 +19203,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -19377,8 +19375,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -19418,6 +19414,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -19425,7 +19423,8 @@ realclean: Leader_Follower.i \ debug.h -.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp params.h \ +.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \ + params.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -19728,8 +19727,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -19742,6 +19739,8 @@ realclean: Policy_Manager.i \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -20040,8 +20039,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ ORB_Core.h \ @@ -20056,6 +20053,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -20228,7 +20227,17 @@ realclean: default_resource.i \ IIOP_Factory.h \ UIOP_Factory.h \ - SHMIOP_Factory.h + SHMIOP_Factory.h \ + FILE_Parser.h \ + IOR_Parser.h \ + IOR_Parser.i \ + ior_file_export.h \ + FILE_Parser.i \ + DLL_Parser.h \ + ior_dll_export.h \ + DLL_Parser.i \ + Object_Loader.h \ + Object_Loader.i .obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \ Typecode.h \ @@ -20385,8 +20394,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -20688,8 +20695,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i .obj/Wait_Strategy.o .obj/Wait_Strategy.so .shobj/Wait_Strategy.o .shobj/Wait_Strategy.so: Wait_Strategy.cpp \ @@ -21119,8 +21124,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -21135,6 +21138,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -21323,8 +21328,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -21339,6 +21342,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -22048,8 +22053,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -22089,6 +22092,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -22275,8 +22280,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -22312,6 +22315,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -22511,8 +22516,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ NVList.h \ Any.h \ @@ -22942,8 +22945,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ Invocation.h \ @@ -22954,6 +22955,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -23076,8 +23079,8 @@ realclean: Exception.h \ Exception.i \ CDR.h \ - CDR.i PollableC.i PollableS_T.h \ - PollableS_T.i PollableS_T.cpp PollableS.i + CDR.i PollableC.i \ + PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \ CONV_FRAMEC.h \ @@ -23401,7 +23404,8 @@ realclean: CONV_FRAMEC.i \ Tagged_Components.i -.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h \ +.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp \ + GIOPC.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -23515,7 +23519,8 @@ realclean: Typecode.i \ Any.i -.obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp BoundsC.h \ +.obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \ + BoundsC.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -23738,7 +23743,8 @@ realclean: TAOS_T.cpp \ TAOS.i -.obj/TAOS.o .obj/TAOS.so .shobj/TAOS.o .shobj/TAOS.so: TAOS.cpp TAOS.h corbafwd.h \ +.obj/TAOS.o .obj/TAOS.so .shobj/TAOS.o .shobj/TAOS.so: TAOS.cpp TAOS.h \ + corbafwd.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -23825,8 +23831,8 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ - corbafwd.i TAOS_T.h TAOS_T.i \ - TAOS_T.cpp TAOS.i + corbafwd.i TAOS_T.h \ + TAOS_T.i TAOS_T.cpp TAOS.i .obj/IOR_Parser.o .obj/IOR_Parser.so .shobj/IOR_Parser.o .shobj/IOR_Parser.so: IOR_Parser.cpp \ IOR_Parser.h \ @@ -24038,9 +24044,518 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - IOR_Parser.i + IOR_Parser.i \ + ORB_Core.h \ + ORB.h \ + Exception.h \ + Exception.i \ + IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Services.i \ + IORManipulation.h \ + Object.h \ + Object.i \ + IORS.h \ + IORC.h \ + Environment.h \ + Environment.i \ + CDR.h \ + CDR.i \ + IORC.i \ + Servant_Base.h \ + POAC.h \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + POAC.i \ + Servant_Base.i \ + IORS.i \ + Interceptor.h \ + InterceptorC.h \ + IOPC.h \ + IOPC.i \ + InterceptorC.i \ + Interceptor.i \ + ORB.i \ + Policy_Manager.h \ + POA_CORBA.h \ + DynAnyC.h \ + Any.h \ + Typecode.h \ + Typecode.i \ + Any.i \ + DynAnyC.i \ + DomainC.h \ + DomainC.i \ + Policy_Manager.i \ + Resource_Factory.h \ + Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + params.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + default_resource.h \ + default_resource.i -.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp Context.h \ +.obj/Object_Loader.o .obj/Object_Loader.so .shobj/Object_Loader.o .shobj/Object_Loader.so: Object_Loader.cpp Object_Loader.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + ior_dll_export.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Object_Loader.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i + +.obj/DLL_Parser.o .obj/DLL_Parser.so .shobj/DLL_Parser.o .shobj/DLL_Parser.so: DLL_Parser.cpp DLL_Parser.h \ + $(ACE_ROOT)/ace/pre.h \ + IOR_Parser.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + IOR_Parser.i \ + ior_dll_export.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + DLL_Parser.i Object_Loader.h Object_Loader.i \ + Object.h \ + Object.i \ + Exception.h \ + Exception.i \ + Environment.h \ + Environment.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i + +.obj/FILE_Parser.o .obj/FILE_Parser.so .shobj/FILE_Parser.o .shobj/FILE_Parser.so: FILE_Parser.cpp FILE_Parser.h \ + $(ACE_ROOT)/ace/pre.h \ + IOR_Parser.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + IOR_Parser.i \ + ior_file_export.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + FILE_Parser.i \ + ior_dll/Object_Loader.h \ + ior_dll/ior_dll_export.h \ + ior_dll/Object_Loader.i \ + Object.h \ + Object.i \ + ORB.h \ + Exception.h \ + Exception.i \ + IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Services.i \ + IORManipulation.h \ + IORS.h \ + IORC.h \ + Environment.h \ + Environment.i \ + CDR.h \ + CDR.i \ + IORC.i \ + Servant_Base.h \ + POAC.h \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + POAC.i \ + Servant_Base.i \ + IORS.i \ + Interceptor.h \ + InterceptorC.h \ + IOPC.h \ + IOPC.i \ + InterceptorC.i \ + Interceptor.i \ + ORB.i \ + $(ACE_ROOT)/ace/Read_Buffer.h \ + $(ACE_ROOT)/ace/Read_Buffer.i + +.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \ + Context.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -24200,11 +24715,10 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i -.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp Request.h \ +.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp \ + Request.h \ $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -24357,8 +24871,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ NVList.h \ Any.h \ @@ -24415,7 +24927,8 @@ realclean: Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i -.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp Services.h \ +.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \ + Services.h \ $(ACE_ROOT)/ace/pre.h \ Sequence.h \ corbafwd.h \ @@ -24525,7 +25038,8 @@ realclean: Typecode.i \ Any.i -.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp NVList.h \ +.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \ + NVList.h \ $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -24683,8 +25197,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ BoundsC.h \ BoundsC.i \ @@ -24905,8 +25417,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ Invocation.h \ @@ -24922,6 +25432,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -24974,8 +25486,9 @@ realclean: $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i MessagingS.h orbconf.h \ - TimeBaseS.h TimeBaseC.h \ + $(ACE_ROOT)/ace/Log_Record.i MessagingS.h \ + orbconf.h TimeBaseS.h \ + TimeBaseC.h \ Any.h \ CDR.h \ corbafwd.h \ @@ -25074,11 +25587,12 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i MessagingC.i POAC.h \ - POAC.i Servant_Base.h \ - POAC.h \ - Servant_Base.i MessagingS_T.h \ - MessagingS_T.i MessagingS_T.cpp MessagingS.i Operation_Table.h \ + PollableC.i MessagingC.i \ + POAC.h POAC.i \ + Servant_Base.h POAC.h \ + Servant_Base.i \ + MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \ + Operation_Table.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -25103,7 +25617,8 @@ realclean: $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Server_Request.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Server_Request.h \ Object_KeyC.h \ Object_KeyC.i \ Server_Request.i Stub.h \ @@ -25152,8 +25667,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i ORB_Core.h \ Policy_Manager.h \ @@ -25167,12 +25680,15 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp Object_Adapter.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + Object_Adapter.h \ Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ @@ -25361,8 +25877,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Resource_Factory.h \ Pluggable.h \ @@ -25391,6 +25905,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -26390,8 +26906,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ ORB_Core.h \ @@ -26406,6 +26920,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -26415,7 +26931,8 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i -.obj/RT_Mutex.o .obj/RT_Mutex.so .shobj/RT_Mutex.o .shobj/RT_Mutex.so: RT_Mutex.cpp RT_Mutex.h \ +.obj/RT_Mutex.o .obj/RT_Mutex.so .shobj/RT_Mutex.o .shobj/RT_Mutex.so: RT_Mutex.cpp \ + RT_Mutex.h \ $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -26688,7 +27205,8 @@ realclean: RTCORBAS.i \ RT_Policy_i.i -.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp RT_ORB.h \ +.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp \ + RT_ORB.h \ $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -26982,8 +27500,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ @@ -27035,6 +27551,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -27174,7 +27692,8 @@ realclean: TAOS_T.cpp \ TAOS.i -.obj/RTCORBAS.o .obj/RTCORBAS.so .shobj/RTCORBAS.o .shobj/RTCORBAS.so: RTCORBAS.cpp orbconf.h \ +.obj/RTCORBAS.o .obj/RTCORBAS.so .shobj/RTCORBAS.o .shobj/RTCORBAS.so: RTCORBAS.cpp \ + orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -27199,8 +27718,8 @@ realclean: $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i RTCORBAS.h orbconf.h \ - IOPS.h IOPC.h \ + $(ACE_ROOT)/ace/Log_Record.i RTCORBAS.h \ + orbconf.h IOPS.h IOPC.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -27292,15 +27811,17 @@ realclean: TimeBaseS_T.h \ TimeBaseS_T.i \ TimeBaseS_T.cpp \ - TimeBaseS.i RTCORBAC.h corbafwd.h \ - IOPC.h PolicyC.h \ + TimeBaseS.i RTCORBAC.h \ + corbafwd.h IOPC.h \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ - PolicyC.i TimeBaseC.h RTCORBAC.i \ - RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp RTCORBAS.i + PolicyC.i TimeBaseC.h \ + RTCORBAC.i RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp RTCORBAS.i -.obj/DynAnyC.o .obj/DynAnyC.so .shobj/DynAnyC.o .shobj/DynAnyC.so: DynAnyC.cpp DynAnyC.h \ +.obj/DynAnyC.o .obj/DynAnyC.so .shobj/DynAnyC.o .shobj/DynAnyC.so: DynAnyC.cpp \ + DynAnyC.h \ $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -27490,15 +28011,14 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Stub.i \ POA_CORBA.h \ DomainC.h \ DomainC.i -.obj/DynAnyS.o .obj/DynAnyS.so .shobj/DynAnyS.o .shobj/DynAnyS.so: DynAnyS.cpp DynAnyC.h \ +.obj/DynAnyS.o .obj/DynAnyS.so .shobj/DynAnyS.o .shobj/DynAnyS.so: DynAnyS.cpp \ + DynAnyC.h \ $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -27620,7 +28140,8 @@ realclean: POAC.i \ Servant_Base.i -.obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \ +.obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp \ + DynAny_i.h \ $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -27922,8 +28443,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i @@ -28221,8 +28740,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i @@ -28391,8 +28908,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.h \ Principal.h \ @@ -28569,8 +29084,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Marshal.i @@ -28728,8 +29241,6 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i .obj/InterfaceC.o .obj/InterfaceC.so .shobj/InterfaceC.o .shobj/InterfaceC.so: InterfaceC.cpp InterfaceC.h \ @@ -29591,8 +30102,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -29632,6 +30141,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -29849,8 +30360,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Principal.h \ Principal.i \ @@ -30033,8 +30542,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -30074,6 +30581,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -30453,8 +30962,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Principal.h \ Principal.i \ @@ -30512,6 +31019,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -30720,8 +31229,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -30761,6 +31268,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -30985,8 +31494,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -31026,6 +31533,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -31193,8 +31702,6 @@ realclean: InterceptorC.h \ InterceptorC.i \ Interceptor.i \ - Parser_Registry.h \ - Parser_Registry.i \ ORB.i \ Policy_Manager.h \ POA_CORBA.h \ @@ -31234,6 +31741,8 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + Parser_Registry.h \ + Parser_Registry.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index d7c946895b1..414327eef15 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -152,7 +152,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) ACE_NEW (this->transport_sync_strategy_, TAO_Transport_Sync_Strategy); - this->parser_registry_.open (); + // this->parser_registry_.open (this); } TAO_ORB_Core::~TAO_ORB_Core (void) @@ -1028,6 +1028,11 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) -1); } + // Calling the open method here so that the svc.conf file is + // opened and TAO_default_resource_factory::init () is called by the + // time this method is called. + this->parser_registry_.open (this); + // Initialize the pointers to resources in the ORB Core instance, // e.g., reactor, connector, etc. Must do this after we open // services because we'll load the factory from there. diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp new file mode 100644 index 00000000000..c6c7ea8f4be --- /dev/null +++ b/TAO/tao/Object_Loader.cpp @@ -0,0 +1,24 @@ +// $Id$ + +#include "Object_Loader.h" +#include "ace/Dynamic_Service.h" + +#if !defined(__ACE_INLINE__) +#include "Object_Loader.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(tao, Object_Loader, "$Id$") + +TAO_Object_Loader::~TAO_Object_Loader (void) +{ +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Dynamic_Service<TAO_Object_Loader>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Dynamic_Service<TAO_Object_Loader> + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h new file mode 100644 index 00000000000..ec439bc0642 --- /dev/null +++ b/TAO/tao/Object_Loader.h @@ -0,0 +1,57 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO +// +// = FILENAME +// Object_Loader.h +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// ============================================================================ + +#ifndef TAO_OBJECT_LOADER_H +#define TAO_OBJECT_LOADER_H +#include "ace/pre.h" + +#include "tao/corbafwd.h" +#include "ior_dll_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Service_Object.h" + +class TAO_Export TAO_Object_Loader : public ACE_Service_Object +{ + // = TITLE + // A class to dynamically load object implementations into an + // ORB. + // + // = DESCRIPTION + // Many services and components of the ORB can be dynamically + // loaded, this is the class used to implement .... + // @@ TODO + // +public: + virtual ~TAO_Object_Loader (void); + // The destructor + + virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, + CORBA::Environment &) + ACE_THROW_SPEC (()) = 0; + // Create and activate a new object into the orb. + // This method cannot throw any exception, but it can return a nil + // object to indicate an error condition. +}; + +#if defined (__ACE_INLINE__) +# include "Object_Loader.i" +#endif /* __ACE_INLINE__ */ + +#include "ace/post.h" +#endif /* TAO_OBJECT_LOADER_H */ diff --git a/TAO/tao/Object_Loader.i b/TAO/tao/Object_Loader.i new file mode 100644 index 00000000000..cfa1da318d3 --- /dev/null +++ b/TAO/tao/Object_Loader.i @@ -0,0 +1 @@ +// $Id$ diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp index b7751d7c5a8..8b1b140bb70 100644 --- a/TAO/tao/Parser_Registry.cpp +++ b/TAO/tao/Parser_Registry.cpp @@ -3,6 +3,8 @@ #include "tao/Parser_Registry.h" #include "tao/IOR_Parser.h" +#include "tao/ORB_Core.h" +#include "tao/default_resource.h" #include "ace/Dynamic_Service.h" #include "ace/Service_Repository.h" @@ -24,37 +26,27 @@ TAO_Parser_Registry::~TAO_Parser_Registry (void) } int -TAO_Parser_Registry::open (void) +TAO_Parser_Registry::open (TAO_ORB_Core *orb_core) { - this->size_ = 1; - ACE_NEW_RETURN (this->parsers_, TAO_IOR_Parser*[this->size_], - -1); + const char **names; + int number_of_names = 0; - this->parsers_[0] = - ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("DLL_Parser"); + orb_core->resource_factory ()->get_parser_names (names, number_of_names); - if (this->parsers_[0] == 0) - { - int r = ACE_Service_Config::process_directive ( - "dynamic DLL_Parser Service_Object * TAO_IOR_DLL:_make_TAO_DLL_Parser()" - ); - if (r == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error configuring DLL parser\n"), -1); - } - this->parsers_[0] = - ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("DLL_Parser"); + if (number_of_names == 0) + return -1; - } + this->size_ = number_of_names; + this->parsers_ = new TAO_IOR_Parser*[this->size_]; + for (int i = 0; i != this->size_; ++i) + { + this->parsers_[i] = + ACE_Dynamic_Service<TAO_IOR_Parser>::instance (names [i]); - // ACE_Service_Config::process_directive ( - // "dynamic TAO_FILE_Parser Service_Object * TAO_IOR_FILE:_make_TAO_FILE_Parser()" - // ); - // this->parsers_[1] = - // ACE_Dynamic_Service<TAO_IOR_Parser>::instance - // ("TAO_FILE_Parser"); + if (this->parsers_[i] == 0) + return -1; + } return 0; } @@ -65,13 +57,13 @@ TAO_Parser_Registry::match_parser (const char *ior_string) for (Parser_Iterator i = this->begin (); i != this->end (); ++i) { if ((*i)->match_prefix (ior_string)) - return *i; + { + return *i; + } } return 0; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index dec814494a7..1244458a251 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -7,12 +7,14 @@ // TAO // // = AUTHOR -// Fred Kuhns <fredk@cs.wustl.edu> +// Priyanka Gontla <pgontla@uci.edu> +// Carlos O'Ryan <coryan@uci.edu> // // ============================================================================ #ifndef TAO_PARSER_REGISTRY_H #define TAO_PARSER_REGISTRY_H + #include "ace/pre.h" #include "tao/corbafwd.h" @@ -21,6 +23,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// Forward declarations. +class TAO_ORB_Core; + class TAO_IOR_Parser; class TAO_Export TAO_Parser_Registry @@ -41,7 +46,7 @@ public: ~TAO_Parser_Registry (void); // Dstructor. - int open (void); + int open (TAO_ORB_Core *orb_core); // Initialize the parser registry with the list of known protocols. // Invoked by the ORB during startup. @@ -55,7 +60,7 @@ public: Parser_Iterator end (void) const; private: - // The acceptor registry should not be copied. + // The parser registry should not be copied. ACE_UNIMPLEMENTED_FUNC (TAO_Parser_Registry (const TAO_Parser_Registry&)) ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Parser_Registry&)) diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index 2d3a35b92ea..e797718dfa4 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -156,6 +156,13 @@ TAO_Resource_Factory::get_priority_mapping (void) return 0; } +int +TAO_Resource_Factory::get_parser_names (const char **&, + int &) +{ + return 0; +} + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_Resource_Factory>; diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 30691f3aa4c..818029f1e56 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -183,6 +183,9 @@ public: virtual TAO_Priority_Mapping *get_priority_mapping (void); // Configure the priority mapping for the ORB + + virtual int get_parser_names (const char **&names, + int &number_of_names); }; #include "ace/post.h" diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index b1679af2f18..39e0c49f610 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -10,6 +10,9 @@ #include "tao/IIOP_Factory.h" #include "tao/UIOP_Factory.h" #include "tao/SHMIOP_Factory.h" +#include "tao/FILE_Parser.h" +#include "tao/DLL_Parser.h" +#include "tao/Object_Loader.h" ACE_RCSID(tao, TAO_Internal, "$Id$") @@ -27,7 +30,8 @@ const char *TAO_Internal::client_strategy_args_ = 0; void TAO_Internal::default_svc_conf_entries (const char *resource_factory_args, const char *server_strategy_args, - const char *client_strategy_args) + const char + *client_strategy_args) { TAO_Internal::resource_factory_args_ = resource_factory_args; TAO_Internal::server_strategy_args_ = server_strategy_args; @@ -53,7 +57,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: @@ -74,7 +78,10 @@ TAO_Internal::open_services (int &argc, insert (&ace_svc_desc_TAO_SHMIOP_Protocol_Factory); #endif /* TAO_HAS_UIOP == 1 */ // add descriptor to list of static objects. - + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_FILE_Parser); + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_DLL_Parser); int result = 0; if (skip_service_config_open == 0) @@ -91,7 +98,6 @@ TAO_Internal::open_services (int &argc, ACE_Service_Config::process_directive (TAO_Internal::client_strategy_args_); if (TAO_Internal::server_strategy_args_ != 0) ACE_Service_Config::process_directive (TAO_Internal::server_strategy_args_); - return result; } else diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index efa19cf3ec2..ce8c65e4e24 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -64,6 +64,26 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) { ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args"); + this->parser_names_count_ = 0; + + for (int curarg = 0; curarg < argc; ++curarg) + { + // Parse thro' and find the number of Parsers to be loaded. + if (ACE_OS::strcasecmp (argv[curarg], + "-ORBIORParser") == 0) + ++this->parser_names_count_; + + ++curarg; + + if (curarg == (argc-1) && this->parser_names_count_ != 0) + { + // This is the last loop.. + this->parser_names_ = + new const char *[this->parser_names_count_]; + this->index_ = 0; + } + } + for (int curarg = 0; curarg < argc; curarg++) if (ACE_OS::strcasecmp (argv[curarg], "-ORBResources") == 0) @@ -321,6 +341,146 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) } } + else if (ACE_OS::strcasecmp (argv[curarg], + "-ORBIORParser") == 0) + { + curarg++; + + if (curarg < argc) + { + this->add_to_ior_parser_names (argv[curarg]); + } + } + return 0; +} + +int +TAO_Default_Resource_Factory::get_parser_names (const char **&names, + int &number_of_names) +{ + if (this->parser_names_count_ != 0) + { + // The user used some -ORBIORParser options, just return those. + names = this->parser_names_; + number_of_names = this->parser_names_count_; + + return 0; + } + + // OK fallback on the hardcoded ones.... + this->parser_names_count_ = 4; /*HOW MANY DO WE HAVE?*/ + + this->parser_names_ = new const char * [this->parser_names_count_]; + + // Ensure that there is enough space in the parser_names_ array */ + + // DLL_Parser + TAO_IOR_Parser *tmp = + ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("DLL_Parser"); + + if (tmp == 0) + { + int r = ACE_Service_Config::process_directive + ( + "dynamic DLL_Parser Service_Object * TAO:_make_TAO_DLL_Parser()" + ); + if (r != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Error configuring DLL parser\n"), -1); + } + } + + int index = 0; + if (tmp != 0) + { + this->parser_names_[index] = "DLL_Parser"; + index++; + } + + // FILE_Parser + tmp = + ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("FILE_Parser"); + + if (tmp == 0) + { + int r = ACE_Service_Config::process_directive + ( + "dynamic FILE_Parser Service_Object * TAO:_make_TAO_FILE_Parser()" + ); + + if (r != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Error Configuring FILE Parser\n"), -1); + } + } + if (tmp != 0) + { + this->parser_names_[index] = "FILE_Parser"; + index++; + } + + // CORBALOC_Parser + tmp = + ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("CORBALOC_Parser"); + + if (tmp == 0) + { + int r = ACE_Service_Config::process_directive + ( + "dynamic CORBALOC_Parser Service_Object * TAO_IOR_CORBALOC:_make_TAO_CORBALOC_Parser()" + ); + + if (r != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Error Configuring CORBALOC Parser\n"), -1); + } + } + + if (tmp != 0) + { + this->parser_names_[index] = "CORBALOC_Parser"; + index++; + } + + // CORBANAME_Parser + tmp = + ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("CORBANAME_Parser"); + + if (tmp == 0) + { + int r = ACE_Service_Config::process_directive + ( + "dynamic CORBANAME_Parser Service_Object * TAO_IOR_CORBANAME:_make_TAO_CORBANAME_Parser()" + ); + + if (r != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Error Configuring CORBANAME Parser\n"), -1); + } + } + + if (tmp != 0) + { + this->parser_names_[index] = "CORBANAME_Parser"; + index++; + } + names = this->parser_names_; + number_of_names = this->parser_names_count_; + + return 0; +} + +int +TAO_Default_Resource_Factory::add_to_ior_parser_names (const char *curarg) +{ + this->parser_names_[this->index_] = CORBA::string_dup (curarg); + + ++this->index_; + return 0; } @@ -351,7 +511,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) // class name by the ACE_FACTORY_DECLARE macro. The resulting // factory function "_make_PP_Protocol_Factory()" is what should // be used in the "dynamic" line in your svc.conf file. - // + // // LIB is the base name of the shared library that implements // the protocol. The directory containing your library must be // in your library search path, typically defined by the diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index c87548bbcab..3c0bf4a03d9 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -29,6 +29,7 @@ #include "ace/Service_Config.h" class TAO_Object_Adapter; +class TAO_IOR_Parser; class TAO_Export TAO_Default_Resource_Factory : public TAO_Resource_Factory { @@ -56,6 +57,8 @@ public: int parse_args (int argc, char* argv[]); // Parse svc.conf arguments + int get_parser_names (const char **&names, + int &number_of_names); // = Member Accessors enum { @@ -113,6 +116,9 @@ public: protected: virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const; // Obtain the reactor implementation + + int add_to_ior_parser_names (const char *); + // Add a Parser name to the list of Parser names. protected: int use_tss_resources_; @@ -131,6 +137,15 @@ protected: int cdr_allocator_type_; // The type of CDR allocators. + int parser_names_count_; + // The number of the different types of Parsers. + + const char **parser_names_; + // Array consisting of the names of the parsers + + int index_; + // Index of the current element in the parser_names_ array + TAO_ProtocolFactorySet protocol_factories_; // list of loaded protocol factories. diff --git a/TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp b/TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp index 19d168681b6..87cd1b4d5c0 100644 --- a/TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp +++ b/TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp @@ -8,8 +8,6 @@ #include "tao/Environment.h" #include "ace/Read_Buffer.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" - #if !defined(__ACE_INLINE__) #include "CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ @@ -33,11 +31,14 @@ TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const void TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name, CORBA::ULong &addr_list_length, - CORBA::ULong &count_addr) + CORBA::ULong + &count_addr, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean start_key_string = 1; - + for (const char *i = corbaloc_name; *i != '\0'; ++i) { if (*i == ',') @@ -55,10 +56,6 @@ TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name, } else if (*(i+1) != '/') { - // This is the last addr and will not be terminated with a - // ',' ..but need to count it too. - ++count_addr; - // Indication that the next characters are to be // assigned to key_string start_key_string = 0; @@ -74,6 +71,113 @@ TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name, } void +TAO_CORBALOC_Parser::assign_iiop_prefix_key_string (ACE_Array_Base <char *> &addr, + char * &cloc_name_ptr, + ACE_CString &key_string, + CORBA::ULong ¤t_addr, + CORBA::ULong &addr_list_length) +{ + + // If there is no port number specified, append the default port + // number i.e. 2809. + char *port_seperator = ACE_OS::strchr (cloc_name_ptr, + ':'); + + const char iiop_prefix[] = "iiop:"; + + if (port_seperator == 0) + { + // Implies that there is no seperator + // append the default port + + const char def_port [] = ":2809"; + + // Allocation of memory + addr [current_addr] = + CORBA::string_alloc (addr_list_length + + sizeof (iiop_prefix) + + sizeof (def_port) + + key_string.length ()); + + // If there is no explicit protocol specified, prepend the + // default "iiop:" + ACE_OS::strcpy (addr [current_addr], + iiop_prefix); + + ACE_OS::strcat (addr [current_addr], + cloc_name_ptr); + + // Append the def_port + ACE_OS::strcat (addr [current_addr], + def_port); + } + else + { + // If there is no explicit protocol specified, prepend the + // default "iiop:" + + // Allocation of memory + addr [current_addr] = + CORBA::string_alloc (addr_list_length + + sizeof (iiop_prefix) + + key_string.length ()); + + ACE_OS::strcpy (addr [current_addr], + iiop_prefix); + + ACE_OS::strcat (addr [current_addr], + cloc_name_ptr); + } + +} + +void +TAO_CORBALOC_Parser::assign_key_string (ACE_Array_Base <char *> &addr, + char * &cloc_name_ptr, + ACE_CString &key_string, + CORBA::ULong ¤t_addr, + CORBA::ULong &addr_list_length) +{ + + // If there is no port number specified, append the default port + // number i.e. 2809. + char *port_seperator = ACE_OS::strrchr (cloc_name_ptr, + ':'); + + if (*(port_seperator+1) == '/') + { + // Implies that there is no seperator + // append the default port + const char def_port [] = ":2809"; + + // Allocation of memory + addr [current_addr] = + CORBA::string_alloc (addr_list_length + + sizeof (def_port) + + key_string.length ()); + + ACE_OS::strcpy (addr [current_addr], + cloc_name_ptr); + + // Append the default port. + ACE_OS::strcat (addr [current_addr], + def_port); + } + else + { + // Allocation of memory + addr [current_addr] = + CORBA::string_alloc (addr_list_length + + key_string.length ()); + + // If the protocol is <iiop:> + ACE_OS::strcpy (addr [current_addr], + cloc_name_ptr); + + } +} + +void TAO_CORBALOC_Parser::parse_string_assign_helper (ACE_Array_Base <char *> &addr, CORBA::ULong &addr_list_length, ACE_CString &key_string, @@ -95,38 +199,28 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (ACE_Array_Base <char *> &addr, while (cloc_name_ptr != 0) { // Loop till we get all the endpoints. - if (ACE_OS::strncmp (cloc_name_ptr, iiop_prefix, + if (ACE_OS::strncmp (cloc_name_ptr, + iiop_prefix, sizeof (iiop_prefix)-1) != 0) { - // If there is no explicit protocol specified, prepend the - // default "iiop:" - - // Allocation of memory - addr [current_addr] = - CORBA::string_alloc (addr_list_length + - sizeof (iiop_prefix) + - key_string.length ()); - - ACE_OS::strcpy (addr [current_addr], - iiop_prefix); - - ACE_OS::strcat (addr [current_addr], - cloc_name_ptr); + assign_iiop_prefix_key_string (addr, + cloc_name_ptr, + key_string, + current_addr, + addr_list_length); } else { - // Allocation of memory - addr [current_addr] = CORBA::string_alloc (addr_list_length + - key_string.length ()); - // If the protocol is <iiop:> - ACE_OS::strcpy (addr [current_addr], - cloc_name_ptr); - + assign_key_string (addr, + cloc_name_ptr, + key_string, + current_addr, + addr_list_length); } ACE_OS::strcat (addr [current_addr], key_string.c_str ()); - + ++current_addr; // Get the next token. cloc_name_ptr = ACE_OS::strtok_r (NULL, @@ -143,21 +237,21 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (ACE_Array_Base <char *> &add CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - + // Make one MProfile for all of these endpoints TAO_MProfile mprofile; - + for (CORBA::ULong j = 0; j != count_addr; ++j) { CORBA::Object_ptr obj = CORBA::Object::_nil (); - + int retv = orb->orb_core ()->connector_registry ()->make_mprofile (addr [j], mprofile, ACE_TRY_ENV); - + ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Return nil. - + if (retv != 0) { ACE_THROW_RETURN (CORBA::INV_OBJREF ( @@ -167,31 +261,31 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (ACE_Array_Base <char *> &add CORBA::COMPLETED_NO), CORBA::Object::_nil ()); } - + // Now make the TAO_Stub. TAO_Stub *data = 0; ACE_NEW_THROW_EX (data, TAO_Stub ((char *) 0, mprofile, orb->orb_core ()), CORBA::NO_MEMORY ( - CORBA_SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_NO)); + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); TAO_Stub_Auto_Ptr safe_data (data); - + // Figure out if the servant is collocated. TAO_ServantBase *servant = 0; TAO_SERVANT_LOCATION servant_location = orb->_get_collocated_servant (safe_data.get (), servant); - + int collocated = 0; if (servant_location != TAO_SERVANT_NOT_FOUND) collocated = 1; - + // Create the CORBA level proxy. This will increase the ref_count // on data by one ACE_NEW_THROW_EX (obj, @@ -199,39 +293,21 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (ACE_Array_Base <char *> &add servant, (CORBA::Boolean) collocated), CORBA::NO_MEMORY ( - CORBA_SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_NO)); + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // All is well, so release the stub object from its auto_ptr. data = safe_data.release (); - CosNaming::NamingContextExt_var naming_context; - ACE_TRY - { - // Narrow to get the correct reference to check if this - // reference is the one needed. - naming_context = - CosNaming::NamingContextExt::_narrow (obj, ACE_TRY_ENV); - ACE_TRY_CHECK; - - } - ACE_CATCH (CORBA::SystemException, ex) - { - // Do not do anything. - } - ACE_ENDTRY; - - if (!CORBA::is_nil (naming_context.in ())) - { - // If this is the endpoint which has the NameService, return - // the reference. + // Check if this reference is a valid one, if it is a valid + // reference, return the reference. + if (obj->_is_a ("IDL:omg.org/CORBA/Object:1.0")) return obj; - } } - + return CORBA::Object::_nil (); } @@ -246,31 +322,22 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char * const char rir_prefix [] = "rir:/"; CORBA::Object_ptr rir_obj = CORBA::Object::_nil (); - ACE_TRY - { - // "rir" protocol. Pass the key string as an - // argument to the resolve_initial_references () - const char *key_string = - corbaloc_name + sizeof (rir_prefix) -1; - - if (ACE_OS::strcmp (key_string, "") == 0) - { - // If the key string is empty, assume the default - // "NameService". - key_string = "NameService"; - } - - rir_obj = orb->resolve_initial_references (key_string, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCH (CORBA::SystemException, ex) + // "rir" protocol. Pass the key string as an + // argument to the resolve_initial_references () + const char *key_string = + corbaloc_name + sizeof (rir_prefix) -1; + + if (ACE_OS::strcmp (key_string, "") == 0) { - ACE_PRINT_EXCEPTION (ex, "CORBALOC_Parser:RIR:helper"); + // If the key string is empty, assume the default + // "NameService". + key_string = "NameService"; } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + rir_obj = orb->resolve_initial_references (key_string, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + return rir_obj; } @@ -317,71 +384,62 @@ TAO_CORBALOC_Parser::parse_string (const char *ior, CORBA::Object_ptr object = CORBA::Object::_nil (); - ACE_TRY + // No of endpoints + CORBA::ULong count_addr = 1; + + // Length of obj_addr_list + CORBA::ULong addr_list_length = 0; + + // If the protocol is "iiop:", + if (this->check_prefix (corbaloc_name) == 0) { - // No of endpoints - CORBA::ULong count_addr = 0; - - // Length of obj_addr_list - CORBA::ULong addr_list_length = 0; - - // If the protocol is "iiop:", - if (this->check_prefix (corbaloc_name) == 0) - { - // Count the length of the obj_addr_list and number of - // endpoints in the obj_addr_list - this->parse_string_count_helper (corbaloc_name, - addr_list_length, - count_addr); - - // Convert corbaloc_name as a ACE_CString - ACE_CString corbaloc_name_str (corbaloc_name, 0, 1); - - // Get the key_string which is a substring of corbaloc_name_str - ACE_CString key_string = corbaloc_name_str.substring (addr_list_length, -1); - - // Array of <obj_addr> - ACE_Array_Base<char*> addr (count_addr); - - // Copy the <obj_addr_list> to cloc_name. - ACE_CString cloc_name (corbaloc_name, - addr_list_length, - 0, - 1); - - // Assign the <obj_addr> to the array elements - this->parse_string_assign_helper (addr, - addr_list_length, - key_string, - cloc_name, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Get the Ptr to the NameService - object = this->parse_string_mprofile_helper (addr, - count_addr, - orb, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - else - { - // RIR case: - object = this->parse_string_rir_helper (corbaloc_name, - orb, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - } - + // Count the length of the obj_addr_list and number of + // endpoints in the obj_addr_list + this->parse_string_count_helper (corbaloc_name, + addr_list_length, + count_addr, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + // Convert corbaloc_name as a ACE_CString + ACE_CString corbaloc_name_str (corbaloc_name, 0, 1); + + // Get the key_string which is a substring of corbaloc_name_str + ACE_CString key_string = corbaloc_name_str.substring (addr_list_length, -1); + + // Array of <obj_addr> + ACE_Array_Base<char*> addr (count_addr); + + // Copy the <obj_addr_list> to cloc_name. + ACE_CString cloc_name (corbaloc_name, + addr_list_length, + 0, + 1); + + // Assign the <obj_addr> to the array elements + this->parse_string_assign_helper (addr, + addr_list_length, + key_string, + cloc_name, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + // Get the Ptr to the NameService + object = this->parse_string_mprofile_helper (addr, + count_addr, + orb, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); } - ACE_CATCH (CORBA::SystemException, ex) + else { - ACE_PRINT_EXCEPTION (ex, "CORBALOC_Parser"); + // RIR case: + object = this->parse_string_rir_helper (corbaloc_name, + orb, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - + return object; } @@ -389,11 +447,7 @@ TAO_CORBALOC_Parser::parse_string (const char *ior, ACE_FACTORY_DEFINE (TAO_IOR_CORBALOC, TAO_CORBALOC_Parser) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Array_Base<char *>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Array_Base<char *> - +pragma instantiate ACE_Array_Base<char *> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ior_corbaloc/CORBALOC_Parser.h b/TAO/tao/ior_corbaloc/CORBALOC_Parser.h index a1c24479820..b5899339cab 100644 --- a/TAO/tao/ior_corbaloc/CORBALOC_Parser.h +++ b/TAO/tao/ior_corbaloc/CORBALOC_Parser.h @@ -93,10 +93,12 @@ public: virtual void parse_string_count_helper (const char * &corbaloc_name, CORBA::ULong &addr_list_length, - CORBA::ULong &count_addr); + CORBA::ULong &count_addr, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); // Helps count the length of the <obj_addr_list> and the number of // individual <obj_addr> in the <obj_addr_list>. - + virtual CORBA::Object_ptr parse_string_mprofile_helper (ACE_Array_Base <char *> &addr, CORBA::ULong &count_addr, CORBA::ORB_ptr orb, @@ -120,6 +122,25 @@ public: // Tokenizes the <obj_addr_list> using "," as the seperator. Assigns // individual endpoints to the elements of the ACE_Array_Base. + virtual void assign_iiop_prefix_key_string (ACE_Array_Base <char *> &addr, + char * &cloc_name_ptr, + ACE_CString &key_string, + CORBA::ULong ¤t_addr, + CORBA::ULong &addr_list_length); + // Helps parse_string_assign_helper by assigning in the case when + // the protocol name is missing and we have to append the default + // protocol <iiop:> and the key string. + + virtual void assign_key_string(ACE_Array_Base <char *> &addr, + char * &cloc_name_ptr, + ACE_CString &key_string, + CORBA::ULong ¤t_addr, + CORBA::ULong &addr_list_length); + // Helps parse_string_assign_helper by assigning in the case when + // the protocol name is present and we have to append jsut the key + // string. + + }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/ior_dll_export.h b/TAO/tao/ior_dll_export.h new file mode 100644 index 00000000000..a1c8d6e6ab6 --- /dev/null +++ b/TAO/tao/ior_dll_export.h @@ -0,0 +1,40 @@ +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by +// generate_export_file.pl +// ------------------------------ +#if !defined (TAO_IOR_DLL_EXPORT_H) +#define TAO_IOR_DLL_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (TAO_IOR_DLL_HAS_DLL) +#define TAO_IOR_DLL_HAS_DLL 1 +#endif /* ! TAO_IOR_DLL_HAS_DLL */ + +#if defined (TAO_IOR_DLL_HAS_DLL) +# if (TAO_IOR_DLL_HAS_DLL == 1) +# if defined (TAO_IOR_DLL_BUILD_DLL) +# define TAO_IOR_DLL_Export ACE_Proper_Export_Flag +# define TAO_IOR_DLL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_IOR_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else +# define TAO_IOR_DLL_Export ACE_Proper_Import_Flag +# define TAO_IOR_DLL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_IOR_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_IOR_DLL_BUILD_DLL */ +# else +# define TAO_IOR_DLL_Export +# define TAO_IOR_DLL_SINGLETON_DECLARATION(T) +# define TAO_IOR_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ! TAO_IOR_DLL_HAS_DLL == 1 */ +#else +# define TAO_IOR_DLL_Export +# define TAO_IOR_DLL_SINGLETON_DECLARATION(T) +# define TAO_IOR_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_IOR_DLL_HAS_DLL */ + +#endif /* TAO_IOR_DLL_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/tao/ior_file/Makefile b/TAO/tao/ior_file/Makefile deleted file mode 100644 index 389c36da4cd..00000000000 --- a/TAO/tao/ior_file/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -#---------------------------------------------------------------------------- - -MAKEFILE = Makefile -LIBNAME = libTAO_IOR_FILE -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -# These are headers for things which are exported and must be -# installed. (Currently not used). -PUB_HDRS = \ - FILE_Parser -FILES= \ - FILE_Parser - -LSRC = $(addsuffix .cpp,$(FILES)) - -DEFS = $(addsuffix .h,$(PUB_HDRS)) - -ACE_SHLIBS = -lACE - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -include $(TAO_ROOT)/taoconfig.mk - -#---------------------------------------------------------------------------- -# Local targets (and local hacks) -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/ior_file/ior_file_export.h b/TAO/tao/ior_file_export.h index 3121bc2aaa4..3121bc2aaa4 100644 --- a/TAO/tao/ior_file/ior_file_export.h +++ b/TAO/tao/ior_file_export.h |