summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2006-04-26 13:42:42 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2006-04-26 13:42:42 +0000
commit8ff71a7a51991f38e92e3380dd9df19a4650cb80 (patch)
tree03e6a092883a5d0f70cf88d67cd853366d816bf7
parent2a4826bc06b1c3b2b43f84694d9f2e393c8aaf6a (diff)
downloadATCD-8ff71a7a51991f38e92e3380dd9df19a4650cb80.tar.gz
ChangeLog tag: Wed Apr 26 13:29:44 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r--TAO/ChangeLog45
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp68
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h2
-rw-r--r--TAO/tao/AnyTypeCode/PI_ForwardA.h5
-rw-r--r--TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp4
-rw-r--r--TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h2
-rw-r--r--TAO/tao/CSD_Framework/CSD_POA.cpp4
-rw-r--r--TAO/tao/CSD_Framework/CSD_POA.h4
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.cpp6
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.h2
-rw-r--r--TAO/tao/IORInterceptor/IORInfoC.h2
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptorC.h2
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h2
-rw-r--r--TAO/tao/IORInterceptor_Adapter.h2
-rw-r--r--TAO/tao/PI_Forward.pidl2
-rw-r--r--TAO/tao/PI_ForwardC.h5
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.cpp4
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.h4
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h2
-rw-r--r--TAO/tests/ORT/ORT_test_IORInterceptor.cpp2
-rw-r--r--TAO/tests/ORT/ORT_test_IORInterceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h2
31 files changed, 121 insertions, 72 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a4ff3c64552..a0aeebd0568 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,48 @@
+Wed Apr 26 13:29:44 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * orbsvcs/examples/ORT/Server_IORInterceptor.h:
+ * orbsvcs/examples/ORT/Server_IORInterceptor.cpp:
+
+ * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
+
+ * orbsvcs/orbsvcs/PortableGroup/GOA.h:
+ * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
+
+ * tao/AnyTypeCode/PI_ForwardA.h:
+
+ * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
+ * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+ * tao/CSD_Framework/CSD_POA.h:
+ * tao/CSD_Framework/CSD_POA.cpp:
+
+ * tao/IORInterceptor/IORInfo.h:
+ * tao/IORInterceptor/IORInfo.cpp:
+ * tao/IORInterceptor/IORInfoC.h:
+ * tao/IORInterceptor/IORInterceptorC.h:
+ * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+ * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+
+ * tao/IORInterceptor_Adapter.h:
+ * tao/PI_Forward.pidl:
+ * tao/PI_ForwardC.h:
+
+ * tao/RTPortableServer/RT_POA.h:
+ * tao/RTPortableServer/RT_POA.cpp:
+ * tao/RTPortableServer/RT_Servant_Dispatcher.h:
+ * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+
+ * tests/ORT/ORT_test_IORInterceptor.h:
+ * tests/ORT/ORT_test_IORInterceptor.cpp:
+
+ * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
+ * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
+
+ These are more changes related to the POAManagerFactory. They
+ are coupled with my 13:10:59 utc checkin.
+
Wed Apr 26 13:10:59 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
* tao/PortableServer/Acceptor_Filter_Factory.h:
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 4fc119dfc39..2cd8117b443 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -68,7 +68,7 @@ Server_IORInterceptor::components_established (
void
Server_IORInterceptor::adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId,
+ const char *,
PortableInterceptor::AdapterState
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index a77551ad136..da243325d05 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -55,7 +55,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId id,
+ const char * id,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 6af1cad1b42..3f555d17a5c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -95,7 +95,7 @@ TAO_LB_IORInterceptor::components_established (
void
TAO_LB_IORInterceptor::adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId,
+ const char *,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index ca4b6f7ea01..6b93c951912 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -92,7 +92,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId id,
+ const char * id,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 829ca0cdef9..804e235f797 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -38,8 +38,8 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- PortableServer::ObjectId_var obj_id = this->reference_to_id (obj_ref.in ()
- ACE_ENV_ARG_PARAMETER);
+ PortableServer::ObjectId_var obj_id =
+ this->reference_to_id (obj_ref.in () ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
// Associate the object reference with the group reference.
@@ -102,23 +102,23 @@ TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref,
TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
- TAO_POA_Manager &poa_manager,
- const TAO_POA_Policy_Set &policies,
- TAO_Root_POA *parent,
- ACE_Lock &lock,
- TAO_SYNCH_MUTEX &thread_lock,
- TAO_ORB_Core &orb_core,
- TAO_Object_Adapter *object_adapter
- ACE_ENV_ARG_DECL)
+ PortableServer::POAManager_ptr poa_manager,
+ const TAO_POA_Policy_Set &policies,
+ TAO_Root_POA *parent,
+ ACE_Lock &lock,
+ TAO_SYNCH_MUTEX &thread_lock,
+ TAO_ORB_Core &orb_core,
+ TAO_Object_Adapter *object_adapter
+ ACE_ENV_ARG_DECL)
: TAO_Regular_POA (name,
- poa_manager,
- policies,
- parent,
- lock,
- thread_lock,
- orb_core,
- object_adapter
- ACE_ENV_ARG_PARAMETER)
+ poa_manager,
+ policies,
+ parent,
+ lock,
+ thread_lock,
+ orb_core,
+ object_adapter
+ ACE_ENV_ARG_PARAMETER)
{
}
@@ -128,27 +128,27 @@ TAO_GOA::~TAO_GOA (void)
TAO_Root_POA *
TAO_GOA::new_POA (const String &name,
- TAO_POA_Manager &poa_manager,
- const TAO_POA_Policy_Set &policies,
- TAO_Root_POA *parent,
- ACE_Lock &lock,
- TAO_SYNCH_MUTEX &thread_lock,
- TAO_ORB_Core &orb_core,
- TAO_Object_Adapter *object_adapter
- ACE_ENV_ARG_DECL)
+ PortableServer::POAManager_ptr poa_manager,
+ const TAO_POA_Policy_Set &policies,
+ TAO_Root_POA *parent,
+ ACE_Lock &lock,
+ TAO_SYNCH_MUTEX &thread_lock,
+ TAO_ORB_Core &orb_core,
+ TAO_Object_Adapter *object_adapter
+ ACE_ENV_ARG_DECL)
{
TAO_GOA *poa = 0;
ACE_NEW_THROW_EX (poa,
TAO_GOA (name,
- poa_manager,
- policies,
- parent,
- lock,
- thread_lock,
- orb_core,
- object_adapter
- ACE_ENV_ARG_PARAMETER),
+ poa_manager,
+ policies,
+ parent,
+ lock,
+ thread_lock,
+ orb_core,
+ object_adapter
+ ACE_ENV_ARG_PARAMETER),
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index 12af8d574a5..d5bbdeb04dd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -264,7 +264,7 @@ public:
// End standard POA interface methods.
TAO_GOA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
@@ -282,7 +282,7 @@ protected:
/// Template method for creating new POA's of this type.
virtual TAO_Root_POA *new_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 1c2b3a94b21..4b3504795e2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -15,7 +15,7 @@ TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
TAO_Root_POA *
TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index c8c80d87a7f..a5718c240cc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -57,7 +57,7 @@ public:
/// Factory method for creating new POA's.
TAO_Root_POA *create_Root_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h
index f99092e4ec1..7286439cc39 100644
--- a/TAO/tao/AnyTypeCode/PI_ForwardA.h
+++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h
@@ -121,8 +121,9 @@ namespace PortableInterceptor
// TAO_IDL - Generated from
// be\be_visitor_typedef/typedef_ch.cpp:379
- typedef CORBA::Long AdapterManagerId;
- typedef CORBA::Long_out AdapterManagerId_out;
+ typedef char * AdapterManagerId;
+ typedef CORBA::String_var AdapterManagerId_var;
+ typedef CORBA::String_out AdapterManagerId_out;
// TAO_IDL - Generated from
// be\be_visitor_typecode/typecode_decl.cpp:44
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 7fa1a03f257..72b8028cd94 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -19,14 +19,14 @@ TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void)
TAO_Root_POA *
TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
TAO_ORB_Core &orb_core,
TAO_Object_Adapter *object_adapter
ACE_ENV_ARG_DECL)
-{
+ {
TAO_CSD_POA *poa = 0;
ACE_NEW_THROW_EX (poa,
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
index ed78621d075..1d041331e99 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
@@ -38,7 +38,7 @@ public:
/// Factory method for creating new CSD Root POA.
virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index cd63c5d7375..f3cc8e605f5 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Implementation skeleton constructor
TAO_CSD_POA::TAO_CSD_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
@@ -66,7 +66,7 @@ void TAO_CSD_POA::set_csd_strategy (
TAO_Root_POA *
TAO_CSD_POA::new_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index 7bf2c338e0d..bcbf2e0495f 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -40,7 +40,7 @@ class TAO_CSD_FW_Export TAO_CSD_POA
public:
//Constructor
TAO_CSD_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
@@ -80,7 +80,7 @@ public:
///Method for creating new CSD POA.
TAO_Root_POA * new_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index 8c9f231166f..de6dd91494d 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -90,14 +90,16 @@ TAO_IORInfo::add_ior_component_to_profile (
ACE_CHECK;
}
-PortableInterceptor::AdapterManagerId
+char *
TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK_RETURN (0);
+ return poa_manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
}
PortableInterceptor::AdapterState
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index d0314b30f7e..3d4803a6792 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -79,7 +79,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual PortableInterceptor::AdapterManagerId manager_id (
+ virtual char * manager_id (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
index 80b0ab75f1d..488250f84ef 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ b/TAO/tao/IORInterceptor/IORInfoC.h
@@ -160,7 +160,7 @@ namespace PortableInterceptor
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ch.cpp:46
- virtual ::PortableInterceptor::AdapterManagerId manager_id (
+ virtual char * manager_id (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index 7f78cfe946f..5b0df155836 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -235,7 +235,7 @@ namespace PortableInterceptor
// be\be_visitor_operation/operation_ch.cpp:46
virtual void adapter_manager_state_changed (
- ::PortableInterceptor::AdapterManagerId id,
+ const char * id,
::PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index b3f22718550..4b9bc703257 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -220,7 +220,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
void
TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId id,
+ const char * id,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 6257c699b9a..5dc289f77d8 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -80,7 +80,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId id,
+ const char * id,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index ea337f5c9f3..5dc955a3393 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -101,7 +101,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
virtual void adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId id,
+ const char * id,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index f704658e38c..4ace2af6e7b 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -43,7 +43,7 @@ module PortableInterceptor
typedef string ORBId;
typedef CORBA::StringSeq AdapterName;
typedef CORBA::OctetSeq ObjectId;
- typedef long AdapterManagerId;
+ typedef string AdapterManagerId;
typedef short AdapterState;
typedef unsigned long SlotId;
typedef short ReplyStatus;
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index d8672822375..898705618bc 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -100,8 +100,9 @@ namespace PortableInterceptor
// TAO_IDL - Generated from
// be\be_visitor_typedef/typedef_ch.cpp:379
- typedef CORBA::Long AdapterManagerId;
- typedef CORBA::Long_out AdapterManagerId_out;
+ typedef char * AdapterManagerId;
+ typedef CORBA::String_var AdapterManagerId_var;
+ typedef CORBA::String_out AdapterManagerId_out;
// TAO_IDL - Generated from
// be\be_visitor_typedef/typedef_ch.cpp:379
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 6d4baacc932..7cfc74d470f 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -38,7 +38,7 @@ ACE_RCSID (RTPortableServer,
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
@@ -71,7 +71,7 @@ TAO_RT_POA::~TAO_RT_POA (void)
TAO_Root_POA *
TAO_RT_POA::new_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 5ae1c845166..2e255935f4b 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -256,7 +256,7 @@ public:
ACE_ENV_ARG_DECL);
TAO_RT_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
@@ -273,7 +273,7 @@ protected:
/// Template method for creating new POA's of this type.
virtual TAO_Root_POA *new_POA (const String &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
TAO_Root_POA *parent,
ACE_Lock &lock,
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 736ffd89b61..25b735ea832 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -372,7 +372,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
TAO_Root_POA *
TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 138523ff62a..2e3af3ce333 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -63,7 +63,7 @@ public:
/// Factory method for creating new POA's.
TAO_Root_POA *create_Root_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
+ PortableServer::POAManager_ptr poa_manager,
const TAO_POA_Policy_Set &policies,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 33ecd4d3399..7a7a3a2943e 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -82,7 +82,7 @@ ORT_test_IORInterceptor::components_established (
void
ORT_test_IORInterceptor::adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId,
+ const char * id,
PortableInterceptor::AdapterState
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 65ef1bf0f4e..14e17c49529 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -66,7 +66,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId id,
+ const char * id,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index b8c44b203e0..c29013285ff 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -181,7 +181,7 @@ FOO_IORInterceptor::components_established (
void
FOO_IORInterceptor::adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId ,
+ const char *,
PortableInterceptor::AdapterState
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 699083a8fde..4fc980070d1 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -78,7 +78,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void adapter_manager_state_changed (
- PortableInterceptor::AdapterManagerId id,
+ const char * id,
PortableInterceptor::AdapterState state
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((