ChangeLogTag: Fri Aug 20 12:36:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 46 insertions, 33 deletions

diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl
index 3e6d5b7208d..c20532343dd 100644
--- a/TAO/tao/IORInterceptor/IORInfo.pidl
+++ b/TAO/tao/IORInterceptor/IORInfo.pidl
@@ -40,12 +40,6 @@ module PortableInterceptor
 {
   typeprefix PortableInterceptor "omg.org";
 
-  const AdapterState    HOLDING         = 0;
-  const AdapterState    ACTIVE          = 1;
-  const AdapterState    DISCARDING      = 2;
-  const AdapterState    INACTIVE        = 3;
-  const AdapterState    NON_EXISTENT    = 4;
-
   local interface IORInfo
   {
     CORBA::Policy get_effective_policy (in CORBA::PolicyType type);
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
index 4ee3a13241e..f749cd107d8 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ b/TAO/tao/IORInterceptor/IORInfoC.h
@@ -90,31 +90,6 @@ namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState HOLDING = 0;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState ACTIVE = 1;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState DISCARDING = 2;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState INACTIVE = 3;
-  
-  // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-  
-  // TAO_IDL - Generated from
   // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_)
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 61dbfdcba82..9a7d5978800 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -49,6 +49,12 @@ module PortableInterceptor {
 
   typeprefix PortableInterceptor "omg.org";
 
+  const AdapterState    HOLDING         = 0;
+  const AdapterState    ACTIVE          = 1;
+  const AdapterState    DISCARDING      = 2;
+  const AdapterState    INACTIVE        = 3;
+  const AdapterState    NON_EXISTENT    = 4;
+
   local interface Interceptor
   {
     readonly attribute string name;
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 677abef7e62..590aa228e06 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -98,6 +98,31 @@ namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
+  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState HOLDING = 0;
+  
+  // TAO_IDL - Generated from
+  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState ACTIVE = 1;
+  
+  // TAO_IDL - Generated from
+  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState DISCARDING = 2;
+  
+  // TAO_IDL - Generated from
+  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState INACTIVE = 3;
+  
+  // TAO_IDL - Generated from
+  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const PortableInterceptor::AdapterState NON_EXISTENT = 4;
+  
+  // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
diff --git a/TAO/tao/PortableServer/ORTRework.txt b/TAO/tao/PortableServer/ORTRework.txt
index e08216493f3..258cbb4c0a3 100644
--- a/TAO/tao/PortableServer/ORTRework.txt
+++ b/TAO/tao/PortableServer/ORTRework.txt
@@ -1,3 +1,18 @@
+Fri Aug 20 12:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableInterceptor.pidl:
+        * tao/IORInterceptor/IORInfo.pidl:
+          Moved AdapterState constants from IORInfo to PortableInterceptor
+          file
+
+        * tao/PortableInterceptorC.h:
+        * tao/IORInterceptor/IORInfoC.{h,cpp,inl}:
+          Updated these files with changes above
+
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/POAManager.cpp:
+          No need anymore to include IORInfoC.h to get AdapterState constants
+
 Fri Aug 20 12:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/PortableServer/POA.{h,cpp}:
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 4585204ddaf..8b6ec3a65df 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -14,7 +14,6 @@ ACE_RCSID (PortableServer,
 
 #include "tao/StringSeqC.h"
 
-#include "tao/IORInterceptor/IORInfoC.h"
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
 #include "tao/PortableServer/ObjectReferenceTemplate_Adapter.h"
 #include "tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h"
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 3bcbffa0d0f..d1a69a12c5a 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -3,7 +3,6 @@
 #include "POAManager.h"
 #include "POA.h"
 #include "poa_macros.h"
-#include "tao/IORInterceptor/IORInfoC.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/IORInterceptor_Adapter.h"