(1) include/makeinclude/wrapper_macros.GNU ------ checked in done --------- Add include $(ACE_ROOT)/include/makeinclude/2kAceRules.GNU We no longer needs to include 2kAceRules.GNU in the Makefile (2) include/makeinclude/2kAceRules.GNU Add TAO_ORBSVCS to shrink the size of liborbsvcs.so (Only Naming/Property/Trader will be created.) ace/config.h ------ Do not check in -------- Replace with new version of "config-sunos5.7.h" ace/ACE_COMPONENTS.list ------ Do not check in -------- It is generated by the compilation ace/Acceptor.h ------ Do not check in -------- Add #if defined(twoK) around adding friend class Dynamic_Service_Config Line: 249 No concurrent strategy Line 320 Line 322: comment out CONCURRENCY_STRATEGY defifnition in the private section. Multiple declaration for CONCURRENCY_STRATEGY ace/Acceptor.i ------ Do not check in -------- No conflict ? It's strange. ace/CORBA_macros.h ------ Do not check in -------- ace/Makefile ------ Do not check in -------- Do not Add include $(ACE_ROOT)/include/makeinclude/2kAceRules.GNU ace/Object_Manager.cpp ------ Do not check in -------- The Dynamic_Service_Config:;close() will be called since Dynamic_Service_Config is registered by ACE_Object_Manager::at_exit() while instanciating its class. Include "Dynamic_Service_Config.h" Add Dynamic_Service_Config::close() in ACE_Object_Manager::fini() class Dynamic_Service_Config make the use of singleton to avoid the order problem of initialization ACE_Object_Manager::fini() Change Dynamic_Service_Config::close() --> Dynamic_Service_Config::instance()->close() (3) ace/Service_Config.h ------ checked in done --------- Add friend class Dynamic_Service_Config Line: 302 ======================================================================= TAO/tao/Connect.cpp ------ Do not check in -------- This file is no longer used. (4) TAO/tao/GIOP.cpp ------ checked in done --------- Moved from "Connect.cpp" add includes In TAO_GIOP::process_server_request() Server_Security_Strategy hook Performance_Monitor hook performance monitoring strategy analyze() method add new parameter TAO_ORB_Core *orb_core in order to dispatch from the analyze(). See Monitoring_Strategy.cpp I cannot get peer information here now. Remove peer argument from the security. I will pass dummy peer for the performance monitor. We have another dispatch_servant() call in TAO_GIOP::process_server_locate(). Which is for forwarding request. We have to check if we are going to apply the same security strategy or not. No definition of CORBA_NO_PERMISSION. Replaced CORBA_NO_PERMISSION with CORBA::NO_PERMISSION. New macro for throwing system exception. class Dynamic_Service_Config make the use of singleton to avoid the order problem of initialization TAO_GIOP::process_server_request() Change Dynamic_Service_Config::domainConfigurator() --> Dynamic_Service_Config::instance()->domainConfigurator() (Change two places in this function) (5) TAO/tao/IIOP_Transport.cpp ------ checked in done --------- Moved from "Invocation.cpp" add includes In TAO_IIOP_Client_Transport::start_request() Client_security_strategy hook class Dynamic_Service_Config make the use of singleton to avoid the order problem of initialization TAO_IIOP_Client_Transport::start_request() Change Dynamic_Service_Config::domainConfigurator() --> Dynamic_Service_Config::instance()->domainConfigurator() (*) We had better modify TAO_GIOP::write_request_header() instead of this function to minimize the point of modification. Think about it later. TAO/tao/Invocation.cpp We no longer does not modify this file because of the structual change of TAO in ver1.0 (6) TAO/tao/Makefile ------ checked in done --------- Add LIBS += -lACE2k Do not Add include $(ACE_ROOT)/include/makeinclude/2kAceRules.GNU insert includes. There is an dependency libTAO.so => libDynamicConfigurator.so and libACE2k.so So adding -lDynamicConfigurator -lACE2k to LIBS macro. Now the linker can detect the dependency of libTAO.so We no longer have to explicitly link -lACE2k -libTAO2k -lSimpleConfigurator -lDynamicConfigurator to compile application programs. (7) TAO/tao/ORB.cpp ------ checked in done --------- Adding resolve_dynconf() entry Adding call of resolve_dynconf() to CORBA_ORB::resolve_initial_references () Adding CORBA::Environment argument to dynconf() (8) TAO/tao/ORB.h ------ checked in done --------- Adding resolve_dynconf() entry Adding CORBA::Environment argument to resolve_dynconf() (9) TAO/tao/ORB_Core.cpp ------ checked in done --------- Adding includes Adding initialization of TAO_ORB_Core: dynconf_ dynconf(DynamicCOnfigurator_i *) create_and_set_dynconf(CORBA::Environment&) We may have multiple ORB in the same process now. So we have one DynamicConfigurator per ORB Adding initialization of TAO_ORB_Table: dynconf_ In create_and_set_dynconf(CORBA::Environment&) // // Default collocation strategy for TAO 1.0 is THRU_POA. // So if we call dynamicConfigurator call before activating // POA Manager (usually through run() method of servant), // it will raise TRANSIENT exception. // To prevent this problem, we are going to activate POA manager // here. (through root_poa) // (10) TAO/tao/ORB_Core.h ------ checked in done --------- Adding members of TAO_ORB_Core dynconf_ create_and_set_dynconf(CORBA::Environment&) dynconf(DynamicConfigurator_i*) dynconf(CORBA::Environment&) Adding dynconf_ as a member of TAO_ORB_Table (which is a singleton) (11) TAO/tao/ORB_Core.i ------ checked in done --------- Adding dynconf(CORBA::Environment&) We no longer have TAO_OC_RETRIEVE() macro. Use just (this->dynconf_) instead. (12) TAO/tao/Principal.h ------ checked in done --------- Make destructor of CORBA_Principal public for principal security strategy CC -mt -g -features=castop -DACE_LACKS_RTTI -noex -DtwoK -I. -I/projects/2k/personal/yamane/src.new/aw -I/projects/2k/personal/yamane/src.new/aw/TAO -DtwoK -I/usr/java/include -I/usr/java/include/solaris -DTAO_USES_DEPRECATED_TAO_TRY_MACROS -c -PIC -o .obj/principal_security_strategy.o principal_security_strategy.cpp "principal_security_strategy.h", line 20: Error: CORBA_Principal::~CORBA_Principal() is not accessible from Principal_Security_Strategy::~Principal_Security_Strategy(). "principal_security_strategy.h", line 20: Error: CORBA_Principal::~CORBA_Principal() is not accessible from Principal_Security_Strategy::~Principal_Security_Strategy(). (13) TAO/tao/Resource_Factory.cpp ------ checked in done --------- add includes "dynamicConfigurator_i_.h" adding get_dynconf(void); adding set_dynconf(DynamicConfigurator_i *dc) We use TAO_ORB_Table singleton to get dynconf_ instead of GLOBAL_APP_ALLOCATED (14) TAO/tao/Resource_Factory.h ------ checked in done --------- class TAO_Resource_Factory is moved to here adding get_dynconf(void); adding set_dynconf(DynamicConfigurator_i *dc) (15) TAO/tao/Server_Strategy_Factory.cpp ------ checked in done --------- Add activate_server_connections(int) function to class Server_Strategy_Factory (16) TAO/tao/Server_Strategy_Factory.h ------ checked in done --------- Add activate_server_connections(int) function to class Server_Strategy_Factory (17) TAO/tao/TAO_Internal.cpp ------ checked in done --------- Add includes "Dynamic_Service_Config.h" TAO_Internal::open_services() Replace ACE_Service_Config::open() with Dynamic_Service_Config::instance()->open() class Dynamic_Service_Config make the use of singleton to avoid the order problem of initialization TAO_Internal::open_services() Change Dynamic_Service_Config::open() --> Dynamic_Service_Config::instance()->open() (18) TAO/tao/UIOP_Transport.cpp ------ checked in done --------- Moved from "Invocation.cpp" add includes In TAO_IIOP_Client_Transport::start_request() Client_security_strategy hook class Dynamic_Service_Config make the use of singleton to avoid the order problem of initialization TAO_UIOP_Client_Transport::start_request() Change Dynamic_Service_Config::domainConfigurator() --> Dynamic_Service_Config::instance()->domainConfigurator() (*) We had better modify TAO_GIOP::write_request_header() instead of this function to minimize the point of modification. Think about it later. (19) TAO/tao/default_server.cpp ------ checked in done --------- Add activate_server_connections(int) function to class TAO_Default_Server_Strategy_Factory A lot of changes. No strategy at all. Need investigation. concurrency_strategy will be defined and used in IIOP_Acceptor.cpp and UIOP_Acceptor.cpp (20) TAO/tao/default_server.h ------ checked in done --------- Add activate_server_connections(int) function to class TAO_Default_Server_Strategy_Factory Do I only need to port concurrency strategy? how about creation_strategy_ reactive_strategy_, threaded_strategy_ default_creation_strategy_ Add thread_per_connnection_use_timeout_(0) to the default constructor TAO/dynamicConfiguratorC.cpp TAO/dynamicConfiguratorC.h TAO/dynamicConfiguratorC.i TAO/dynamicConfiguratorS.cpp TAO/dynamicConfiguratorS.h TAO/dynamicConfiguratorS.i TAO/dynamicConfiguratorS_T.cpp TAO/dynamicConfiguratorS_T.h TAO/dynamicConfiguratorS_T.i These files are not used. (21) TAO/tao/orbconf.h ------ checked in done --------- Add #define TAO_OBJID_DYNCONF "DynamicConfigurator" TAO/orbsvcs/orbsvcs/Naming/* ------ checked in done --------- We had a preliminary version of persistent name server. Override by the new one. TAO/orbsvcs/Naming_Service/* ------ checked in done --------- We had a preliminary version of persistent name server. Override by the new one. ------------------------------------------------------------------