ChangeLogTag:Wed Jul 10 14:25:14 2002 Nanbor Wang <nanbor@cs.wustl.edu>

3 files changed, 63 insertions, 882 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e6b7445c816..e18d962ce55 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 10 14:25:14 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tao/ccm_core/Component_Base.idl:
+	* tao/ccm_core/CosPersistentState.idl: Moved these files under the new
+
 Wed Jul 10 11:35:05 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 
 	* tests/AMH_Exceptions/server.cpp (ST_AMH_Server):
@@ -14,8 +19,8 @@ Wed Jul 10 11:35:05 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 	* examples/AMH/Sink_Server/st_server.cpp:
 
 	  Used ACE_const_cast to convert string literals to 'char
-	  *'s. Should fix the warnings for GCC-3.0.4 builds. 
-	
+	  *'s. Should fix the warnings for GCC-3.0.4 builds.
+
 Wed Jul 10 10:19:25 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 
 	* tests/AMH_Exceptions/server.cpp (test_method):
@@ -32,7 +37,7 @@ Wed Jul 10 12:19:39 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * TAO_IDL/include/utl_strlist.h:
 
           More files to which the conditional include of ace/streams.h
-          is needed for BCB. Thanks again to Johnny Willemsen 
+          is needed for BCB. Thanks again to Johnny Willemsen
           <jwillemsen@remedy.nl> for his help in maintaining the
           BCB builds.
 
@@ -89,7 +94,7 @@ Tue Jul  9 09:41:10 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * TAO_IDL/include/ast_decl.h:
 
           Added conditional include of ace/streams.h for BCB, needed
-          by class AST_Decl and all its descendants. Thanks to 
+          by class AST_Decl and all its descendants. Thanks to
           Johnny Willemsen <jwillemsen@remedy.nl> for pointing this
           out.
 
@@ -367,18 +372,18 @@ Sun Jun 30 22:22:05 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 	  - tests/RTCORBA/Makefile.bor
 	  - tests/RTCORBA/RTCORBA_tests.dsw
 	  - $ACE_ROOT/bin/auto_run_tests.lst
-	
+
 	* tests/RTCORBA/common_args.cpp: New files replaces
 	  tests/RTCORBA/Linear_Priority/readers.cpp since it had reusable
 	  code that is now also used by the Profile_And_Endpoint_Selection
 	  test.
 
-	* tests/RTCORBA/Linear_Priority/client.cpp: 
-	* tests/RTCORBA/Linear_Priority/server.cpp:  
+	* tests/RTCORBA/Linear_Priority/client.cpp:
+	* tests/RTCORBA/Linear_Priority/server.cpp:
 
 	  Updated to use the new tests/RTCORBA/common_args.cpp parsing
 	  code.
-	
+
 Mon Jul  8 16:27:22 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * TAO_IDL/TAO_IDL_FE_DLL.dsp:
@@ -442,8 +447,8 @@ Mon Jul  8 14:38:42 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
 Mon Jul 08 14:25:44 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp (get_selector): 
-	* tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp (endpoint_from_profile): 
+	* tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp (get_selector):
+	* tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp (endpoint_from_profile):
 	* tests/RTCORBA/Linear_Priority/Makefile:
 	* tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile:
 
@@ -465,7 +470,7 @@ Mon Jul  8 11:05:44 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 	  sure the IDL-compiler generation of valuetypes and
 	  AMHEceptionHolders does not result in any clashes of code when
 	  both are present simultaneously.  Updated Makefile to take the
-	  -Gv option. Cosmetic changes to run_test.pl	
+	  -Gv option. Cosmetic changes to run_test.pl
 	* tests/AMH_Exceptions/server.cpp:
 	  Was assigning const char* to a char* in the constructor of
 	  ST_AMH_Server.  "-Wwrite-strings" flagged this as a warning of
@@ -486,32 +491,32 @@ Mon Jul  8 10:59:41 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 Sun Jul  7 22:03:41 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Makefile:
-	* tao/Makefile.bor: Added the new files to the Makefiles. 
+	* tao/Makefile.bor: Added the new files to the Makefiles.
 
 Sun Jul 07 21:56:23 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Transport.h:
 	* tao/Transport.cpp:
-	* tao/Transport.inl: Did a few cosmetic changes. 
+	* tao/Transport.inl: Did a few cosmetic changes.
 
 	  - Removed the TAO_Synch_Refcountable class and moved that to a
-	    new file. 
-	
+	    new file.
+
 	  - Rearranged the methods in cpp and inl files, so that the
 	    methods specific for the input path and output path are
-	    grouped together. Just did this to improve readability. 
-	
+	    grouped together. Just did this to improve readability.
+
 	  - Added a new method by name transport_cache_manager () which
-	    returns the reference to transport cache manager from the ORB.  
+	    returns the reference to transport cache manager from the ORB.
 
 	* tao/Synch_Refcountable.{h,cpp,inl}: Added this new file which
 	  contains the class TAO_Synch_Refcountable.
-	
+
 	* tao/TAO.dsp:
 	* tao/TAO_Static.dsp: Added the new files to the project
-	  workspace. 
+	  workspace.
 
-	* tao/Incoming_Mesage_Queue.h: Fixed an erroneous comment. 
+	* tao/Incoming_Mesage_Queue.h: Fixed an erroneous comment.
 
 Sun Jul  7 18:53:54 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -532,14 +537,14 @@ Sun Jul  7 12:45:39 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
 Fri Jul  5 08:12:30 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp (init): 
+	* orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp (init):
 	  Added an "else" clause to handle the case where a user gives
  	  incorrect options.  Thanks to Bruce McIntosh
  	  <Bruce.McIntosh@Australia.Boeing.com> for reporting this.
 
 Sun Jul  7 10:24:06 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* orbsvcs/tests/Miop/McastHello/Makefile: Updated dependencies. 
+	* orbsvcs/tests/Miop/McastHello/Makefile: Updated dependencies.
 
 Sun Jul  7 09:38:36 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -548,7 +553,7 @@ Sun Jul  7 09:38:36 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Fri Jul  5 13:50:28 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 
-	* tests/AMH_Exceptions/server.cpp (start_orb_and_poa): 
+	* tests/AMH_Exceptions/server.cpp (start_orb_and_poa):
 	  Fixed Exception macros for no-exception builds.
 
 Fri Jul  5 12:07:07 2002  Carlos O'Ryan  <coryan@atdesk.com>
@@ -567,7 +572,7 @@ Thu Jul  4 16:50:53 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * tao/ValueFactory.h:
 
-	  Fixed TAO_OBV_REGISTER_FACTORY macro to use the (spec-defined) 
+	  Fixed TAO_OBV_REGISTER_FACTORY macro to use the (spec-defined)
 	  typedef of CORBA_ValueFactoryBase* in corbafwd.h.
 
 Thu Jul  4 15:25:33 2002  Jeff Parsons <parsons@cs.wustl.edu>
@@ -588,7 +593,7 @@ Thu Jul  4 15:00:06 2002  Jeff Parsons <parsons@cs.wustl.edu>
 Thu Jul  4 12:58:57 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 
 	* tests/AMH_Exceptions/Makefile:
-	  Added missing TAO_ROOT variable definition.  Thanks to Craig Rodrigues 
+	  Added missing TAO_ROOT variable definition.  Thanks to Craig Rodrigues
 	  <crodrigu@bbn.com> for reporting this.
 
 Thu Jul  4 11:50:51 2002  Jeff Parsons <parsons@cs.wustl.edu>
@@ -617,7 +622,7 @@ Thu Jul  4 11:50:51 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * TAO_IDL/be/be_tmplinst.cpp:
 
-          Added #include file. Thanks to Marvin Wolfthal <maw@weichi.com> 
+          Added #include file. Thanks to Marvin Wolfthal <maw@weichi.com>
           for pointing it out.
 
         * TAO_IDL/include/ast_native.h:
@@ -631,12 +636,12 @@ Thu Jul  4 11:50:51 2002  Jeff Parsons <parsons@cs.wustl.edu>
 Thu Jul 04 08:17:11 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Transport.h:
-	* tao/Transport.cpp (close_connection_shared): 
+	* tao/Transport.cpp (close_connection_shared):
 	* tao/Transport.inl: Fixed some comments and did some cosmetic
 	  fixes. Added a new method by name transport_cache_manager ()
 	  that returns the Transport_Cache_Manager from the ORB
-	  core. 
-	
+	  core.
+
 Wed Jul  3 19:17:52 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * TAO_IDL/fe/fe_tmplinst.cpp:
@@ -726,11 +731,11 @@ Wed Jul  3 11:48:57 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/orbconf.h: Added a check around TAO_HAS_VALUETYPE. Further,
 	  the #define is defined as 1 to be very clear.
-	
+
 	* tao/AbstractBase.h:
 	* tao/AbstractBase.cpp:
 	* tao/ORB.h:
-	* tao/ORB.cpp: 
+	* tao/ORB.cpp:
 	* tao/ValueBase.cpp:
 	* tao/ValueBase.h:
 	* tao/ValueFactory.cpp:
@@ -738,9 +743,9 @@ Wed Jul  3 11:48:57 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* tao/ValueFactory_Map.h:
 	* tao/ValueFactory_Map.cpp:
 	* tao/corbafwd.h:
-	* tao/DynamicAny/DynCommon.cpp: 
+	* tao/DynamicAny/DynCommon.cpp:
 	* tao/DynamicAny/DynCommon.h: Make a check for TAO_HAS_VALUETYPE
-	  == 1, instead of plain #if defined (..).  
+	  == 1, instead of plain #if defined (..).
 
 Wed Jul  3 11:31:25 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -768,12 +773,12 @@ Wed Jul  3 10:47:58 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * tao/IFR_TypeCodes.cpp:
 	* tao/corbafwd.cpp:
 
-	  Moved valuetype-related definitions from IFR_TypeCodes.cpp to 
+	  Moved valuetype-related definitions from IFR_TypeCodes.cpp to
 	  corbafwd.cpp, so they will be included in minimum CORBA builds.
 
 Wed Jul  3 09:53:30 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/Smart_Proxies/On_Demand:Makefile: Updated dependencies.  
+	* tests/Smart_Proxies/On_Demand:Makefile: Updated dependencies.
 
 Wed Jul  3 09:30:12 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -799,7 +804,7 @@ Wed Jul  3 09:17:50 2002  Jeff Parsons <parsons@cs.wustl.edu>
 Wed Jul  3 07:41:06 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Notify_Handler.h: Fixed a warming about an extra ; with the
-	  same compiler  
+	  same compiler
 
 Wed Jul  3 07:27:49 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -860,11 +865,11 @@ Tue Jul  2 15:46:14 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	The methodology used to solve the problem is pretty much similar
         to that described in the bug report.
-	
+
 	* tao/Connection_Handler.h: Added a pure virtual call handle_input
 	  ().
-	  
-	* tao/Transport.h: 
+
+	* tao/Transport.h:
 	* tao/Transport.cpp: Added a new pure virtual method
 	  connection_handler_i (). Trying to use an reinterpret_cast of
 	  the event_handler didnt seem to work right. Hence this method.
@@ -885,7 +890,7 @@ Tue Jul  2 15:46:14 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* tao/Strategies/SHMIOP_Transport.h:
 	* tao/Strategies/UIOP_Transport.cpp:
 	* tao/Strategies/UIOP_Transport.h: Added an implementation of
-	  connection_handler_i (). 
+	  connection_handler_i ().
 
 	* tao/ORB_Core.cpp: Delete transport_buffer and cdr_msgblock
 	  allocators during shutdown. This should prevent some leaks in
@@ -899,7 +904,7 @@ Tue Jul  2 14:57:27 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
           Fixed a bug in TAO_Marshal_Union::append where an
           implicit default case was causing an inappropriate
-          throw of CORBA::MARSHAL. Thanks to Adee Ran 
+          throw of CORBA::MARSHAL. Thanks to Adee Ran
           <adeeran@yahoo.com> for reporting the failure and
           sending in an example.
 
@@ -909,7 +914,7 @@ Tue Jul  2 14:57:27 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * tao/Any.cpp:
 
-          Added missing check for the return status of 
+          Added missing check for the return status of
           TAO_Marshal_Object::perform_append() in the
           CDR insertion operator for CORBA::Any.
 
@@ -930,7 +935,7 @@ Tue Jul  2 12:39:21 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Tue Jul  2 11:37:49 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* orbsvcs/orbsvcs/Makefile* : Updated dependencies. 
+	* orbsvcs/orbsvcs/Makefile* : Updated dependencies.
 
 Mon Jul  1 23:29:15 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -1007,7 +1012,7 @@ Mon Jul  1 14:56:27 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
 
           Backed out the changes in the previous checkin in
-          favor of a fix nearer the source, in 
+          favor of a fix nearer the source, in
           AST_PredefinedType::compute_size_type().
 
 Mon Jul  1 14:03:45 2002  Jeff Parsons <parsons@cs.wustl.edu>
@@ -1015,8 +1020,8 @@ Mon Jul  1 14:03:45 2002  Jeff Parsons <parsons@cs.wustl.edu>
         * TAO_IDL/be/be_visitor_operation/operation.cpp:
         * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
 
-          Changed code generation to be aware that if the return type 
-          of an operation is CORBA::Object, the stub and skeleton 
+          Changed code generation to be aware that if the return type
+          of an operation is CORBA::Object, the stub and skeleton
           operations' internal return value variables are _vars.
 
 Mon Jul  1 12:34:47 2002  Jeff Parsons <parsons@cs.wustl.edu>
@@ -1237,7 +1242,7 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
                   Changed the accessors and modifiers for Any members to
                   pass and return by reference instead of by value, as
                   specified in the CORBA C++ mapping, sections 1.12 and
-                  1.17.1. Thanks to Nanbor <nanbor@cs.wustl.edu> for 
+                  1.17.1. Thanks to Nanbor <nanbor@cs.wustl.edu> for
                   questioning the valuetype case.
 
         Fri Jun 28 17:06:46 2002  Jeff Parsons <parsons@cs.wustl.edu>
@@ -1327,7 +1332,7 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
 	          Added checks to valuetypes and components to check for
 	          redefinition clashes of operations or attributes between class
-	          members and parent members, class members and supported 
+	          members and parent members, class members and supported
 	          interface members, parent members and supported interface
 	          members, two parent members and two supported interface members.
 
@@ -1349,7 +1354,7 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
 	            that scope.
 
 	          - Expanding the 'potential' scope of a type declaration until
-	            a module or global containing scope is reached 
+	            a module or global containing scope is reached
 	            (CORBA 2.6 3.5.13).
 
                 * TAO_IDL/be/be_visitor_root/root_is.cpp:
@@ -1584,8 +1589,8 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
                 * TAO_IDL/include/utl_err.h:
                 * TAO_IDL/util/utl_err.cpp:
 
-	          - Made changes to error checking for abstract interface 
-	            inheritance, valuetype inheritance, and valuetype supported 
+	          - Made changes to error checking for abstract interface
+	            inheritance, valuetype inheritance, and valuetype supported
 	            interfaces.
 
 	          - Fixed value factory code generation.
@@ -1593,7 +1598,7 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
 	          - Finished code generation for abstract interfaces, add code
 	            generation for abstract valuetypes, and added code generation
 	            for valuetype interface support. The last item isn't finished
-	            yet.	
+	            yet.
 
         Fri May 24 09:04:38 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -1978,11 +1983,11 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
                 * TAO_IDL/util/utl_err.cpp:
                 * TAO_IDL/util/utl_scope.cpp:
 
-	          Changes, additions and deletions occurring as a consequence 
+	          Changes, additions and deletions occurring as a consequence
 	          of the new class files created as listed above. In particular,
 	          value types now conform to the constraints on inheritance
 	          and interface support that have been recently agreed upon by
-	          the OMG and which will soon be added officially to CORBA. 
+	          the OMG and which will soon be added officially to CORBA.
 	          Thanks to Jonathan Biggar <jon@floorboard.com> for passing
 	          along the results of this recent OMG agreement.
 
@@ -2095,7 +2100,7 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
                   to generate constants inline (always in the stub header file
                   regardless of whether the scope of the constant's declaration
                   is nested or not), which works better with some C++ compilers.
-                  Thanks to Jody Hagins <jody@atdesk.com> for sending in patches 
+                  Thanks to Jody Hagins <jody@atdesk.com> for sending in patches
                   for the inline constant generation option.
 
                 * TAO_IDL/be/be_visitor_argument/arglist.cpp:
@@ -2143,7 +2148,7 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
                 * TAO_IDL/include/ast_structure_fwd.h:
                 * TAO_IDL/include/ast_union_fwd.h:
 
-	          New files for forward declared structs and unions, along 
+	          New files for forward declared structs and unions, along
 	          with the associated visitors.
 
                 * TAO_IDL/Makefile.BE:
@@ -3074,7 +3079,7 @@ Mon Jul  1 08:31:04 2002  Jeff Parsons <parsons@cs.wustl.edu>
 	            + Expanded the use of the virtual destroy() functions.
 
 	            + Freeing memory that holds the string corresponding
-	              to the current token or identifier before the next 
+	              to the current token or identifier before the next
 	              one is read, in cases where it is either copied or
 	              not referenced.
 
diff --git a/TAO/tao/ccm_core/Component_Base.idl b/TAO/tao/ccm_core/Component_Base.idl
deleted file mode 100644
index 312471572a1..00000000000
--- a/TAO/tao/ccm_core/Component_Base.idl
+++ /dev/null
@@ -1,808 +0,0 @@
-// $Id$
-
-/**
- * @@ Compile this file with:
- *
- *     tao_idl -Gv -I W:/ACE_wrappers/TAO -I W:/ACE_wrappers/TAO/orbsvcs/orbsvcs Component_Base.idl
- *
- * @@ CosPersistentState related stuff are removed completely.
- *
- */
-
-//  import ::CORBA
-//  import ::SecurityLevel2
-//  import ::CosPersistentState
-//  import ::PortableServer
-//  import ::CosNotification
-//  import ::CosNotifyChannelAdmin
-
-#include <CORBA.pidl>
-#include <SecurityLevel2.idl>
-#include <CosPersistentState.idl>
-#include <PortableServer/PortableServer.pidl>
-#include <IFR_Client/Interface.pidl>
-#include <CosNotification.idl>
-#include <CosNotifyChannelAdmin.idl>
-
-/**
- * Temporarily fix for lacking of typePrefix keyword.
- * Search for the word "typePrefix" when tao_idl starts
- * supporting the keyword.
- */
-#pragma prefix "omg.org"
-
-module Components {
-
-  /**
-   * @@ Commented out temporarily for lack of typePrefix support.
-   */
-  //    typePrefix Components "omg.org"
-  typedef string FeatureName;
-  typedef sequence<FeatureName> NameList;
-
-  valuetype Cookie
-  {
-    private CORBA::OctetSeq cookieValue;
-  };
-
-  valuetype PortDescription
-  {
-    public FeatureName Name;
-    public CORBA::RepositoryId type_id;
-  };
-
-  valuetype FacetDescription : PortDescription
-  {
-    public Object facet_ref;
-  };
-
-  typedef sequence<FacetDescription> FacetDescriptions;
-
-  typedef unsigned long FailureReason;
-
-  exception InvalidName {};
-  exception InvalidConnection {};
-  exception ExceededConnectionLimit {};
-  exception AlreadyConnected {};
-  exception NoConnection {};
-  exception CookieRequired {};
-  exception CreateFailure {
-    FailureReason reason;
-  };
-  exception FinderFailure
-  {
-    FailureReason reason;
-  };
-  exception RemoveFailure
-  {
-    FailureReason reason;
-  };
-  exception DuplicateKeyValue {};
-  exception InvalidKey {};
-  exception UnknownKeyValue {};
-  exception NoKeyAvailable {};
-  exception BadEventType
-  {
-    CORBA::RepositoryId expected_event_type;
-  };
-  exception HomeNotFound {};
-  exception WrongComponentType {};
-
-  typedef FailureReason InvalidConfigurationReason;
-  const InvalidConfigurationReason UnknownConfigValueName = 0;
-  const InvalidConfigurationReason InvalidConfigValueType = 1;
-  const InvalidConfigurationReason ConfigValueRequired = 2;
-  const InvalidConfigurationReason ConfigValueNotExpected = 3;
-  exception InvalidConfiguration
-  {
-    InvalidConfigurationReason reason;
-    FeatureName name;
-  };
-  exception IllegalState {};
-
-  interface Navigation
-  {
-    Object provide_facet (in FeatureName name)
-      raises (InvalidName);
-    FacetDescriptions get_all_facets();
-    FacetDescriptions get_named_facets (in NameList names)
-      raises (InvalidName);
-    boolean same_component (in Object object_ref);
-  };
-
-  valuetype ConnectionDescription
-  {
-    public Cookie ck;
-    public Object objref;
-  };
-  typedef sequence<ConnectionDescription> ConnectionDescriptions;
-
-  valuetype ReceptacleDescription : PortDescription
-  {
-    public boolean is_multiple;
-    public ConnectionDescriptions connections;
-  };
-  typedef sequence<ReceptacleDescription> ReceptacleDescriptions;
-
-  interface Receptacles
-  {
-    Cookie connect (in FeatureName name, in Object connection )
-      raises (InvalidName,
-              InvalidConnection,
-              AlreadyConnected,
-              ExceededConnectionLimit);
-
-    void disconnect (in FeatureName name, in Cookie ck)
-      raises (InvalidName,
-              InvalidConnection,
-              CookieRequired,
-              NoConnection);
-
-    ConnectionDescriptions get_connections (in FeatureName name)
-      raises (InvalidName);
-
-    ReceptacleDescriptions get_all_receptacles ();
-
-    ReceptacleDescriptions get_named_receptacles (in NameList names)
-      raises (InvalidName);
-  };
-
-  abstract valuetype EventBase {};
-
-  interface EventConsumerBase
-  {
-    void push_event (in EventBase evt) raises (BadEventType);
-  };
-
-  valuetype ConsumerDescription : PortDescription
-  {
-    public EventConsumerBase consumer;
-  };
-  typedef sequence<ConsumerDescription> ConsumerDescriptions;
-
-  valuetype EmitterDescription : PortDescription
-  {
-    public EventConsumerBase consumer;
-  };
-  typedef sequence<EmitterDescription> EmitterDescriptions;
-
-  // @@ I added the parent class "PortDescription" below as it seems
-  //    to be missing from the draft.
-  valuetype SubscriberDescription : PortDescription
-  {
-    public Cookie ck;
-    public EventConsumerBase consumer;
-  };
-  typedef sequence<SubscriberDescription> SubscriberDescriptions;
-
-  valuetype PublisherDescription : PortDescription
-  {
-    public SubscriberDescriptions consumer;
-  };
-  typedef sequence<PublisherDescription> PublisherDescriptions;
-
-  interface Events
-  {
-    EventConsumerBase get_consumer (in FeatureName sink_name)
-      raises (InvalidName);
-
-    Cookie subscribe (in FeatureName publisher_name,
-                      in EventConsumerBase subscriber)
-      raises (InvalidName,
-              AlreadyConnected,
-              InvalidConnection);
-
-    void unsubscribe (in FeatureName publisher_name,
-                      in Cookie ck)
-      raises (InvalidName,
-              InvalidConnection);
-
-    void connect_consumer (in FeatureName emitter_name,
-                           in EventConsumerBase consumer)
-      raises (InvalidName,
-              AlreadyConnected,
-              InvalidConnection);
-
-    EventConsumerBase disconnect_consumer (in FeatureName source_name)
-      raises (InvalidName,
-              NoConnection);
-
-    ConsumerDescriptions get_all_consumers ();
-
-    ConsumerDescriptions get_named_consumers (in NameList names)
-      raises (InvalidName);
-
-    EmitterDescriptions get_all_emitters ();
-
-    EmitterDescriptions get_named_emitters (in NameList names)
-      raises (InvalidName);
-
-    PublisherDescriptions get_all_publishers ();
-
-    PublisherDescriptions get_named_publishers (in NameList names)
-      raises (InvalidName);
-  };
-
-  abstract valuetype PrimaryKeyBase {};
-
-  interface CCMObject; //forward reference
-
-  interface CCMHome
-  {
-    CORBA::IRObject get_component_def ();
-    CORBA::IRObject get_home_def ();
-    void remove_component ( in CCMObject comp)
-      raises (RemoveFailure);
-  };
-  typedef sequence<CCMHome> CCMHomes;
-
-  interface KeylessCCMHome
-  {
-    CCMObject create_component()
-      raises (CreateFailure);
-  };
-
-  interface HomeFinder
-  {
-    CCMHome find_home_by_component_type (in CORBA::RepositoryId comp_repid)
-      raises (HomeNotFound);
-
-    CCMHome find_home_by_home_type (in CORBA::RepositoryId home_repid)
-      raises (HomeNotFound);
-
-    CCMHome find_home_by_name (in string home_name)
-      raises (HomeNotFound);
-  };
-
-  interface Configurator
-  {
-    void configure (in CCMObject comp)
-      raises (WrongComponentType);
-  };
-
-  valuetype ConfigValue
-  {
-    public FeatureName name;
-    public any value;
-  };
-
-  typedef sequence<ConfigValue> ConfigValues;
-
-  interface StandardConfigurator : Configurator
-  {
-    void set_configuration (in ConfigValues descr);
-  };
-
-  interface HomeConfiguration : CCMHome
-  {
-    void set_configurator (in Configurator cfg);
-    void set_configuration_values (in ConfigValues config);
-    void complete_component_configuration (in boolean b);
-    void disable_home_configuration();
-  };
-
-  valuetype ComponentPortDescription
-  {
-    public FacetDescriptions facets;
-    public ReceptacleDescriptions receptacles;
-    public ConsumerDescriptions consumers;
-    public EmitterDescriptions emitters;
-    public PublisherDescriptions publishers;
-  };
-
-  interface CCMObject : Navigation, Receptacles, Events
-  {
-    CORBA::IRObject get_component_def ( );
-    CCMHome get_ccm_home( );
-    PrimaryKeyBase get_primary_key( )
-      raises (NoKeyAvailable);
-    void configuration_complete( )
-      raises (InvalidConfiguration);
-    void remove()
-      raises (RemoveFailure);
-    ComponentPortDescription get_all_ports ();
-  };
-
-
-  // @@ Enumeration and DefaultEnumeration are only for EJB to CCM
-  // mapping?  At any rate, we should be able to skip them for now.
-  abstract valuetype Enumeration
-  {
-    boolean has_more_elements();
-    CCMObject next_element();
-  };
-
-  typedef sequence<CCMObject> CCMObjectSeq;
-
-  valuetype DefaultEnumeration : Enumeration
-  {
-    private CCMObjectSeq objects;
-  };
-
-  // @@ Components::Transaction is still there.
-  module Transaction
-  {
-
-    typedef sequence<octet> TranToken;
-
-    exception NoTransaction {};
-    exception NotSupported {};
-    exception SystemError {};
-    exception RollbackError {};
-    exception HeuristicMixed {};
-    exception HeuristicRollback {};
-    exception Security {};
-    exception InvalidToken {};
-
-    enum Status
-    {
-      ACTIVE,
-      MARKED_ROLLBACK,
-      PREPARED,
-      COMMITTED,
-      ROLLED_BACK,
-      NO_TRANSACTION,
-      PREPARING,
-      COMMITTING,
-      ROLLING_BACK
-    };
-
-    local interface UserTransaction {
-      void begin ()
-        raises (NotSupported,
-                SystemError);
-
-      void commit ()
-        raises (RollbackError,
-                NoTransaction,
-                HeuristicMixed,
-                HeuristicRollback,
-                Security,
-                SystemError);
-
-      void rollback ()
-        raises (NoTransaction,
-                Security,
-                SystemError);
-
-      void set_rollback_only ()
-        raises (NoTransaction,
-                SystemError);
-
-      Status get_status()
-        raises (SystemError);
-
-      void set_timeout (in long to)
-        raises (SystemError);
-
-      TranToken suspend ()
-        raises (NoTransaction,
-                SystemError);
-
-      void resume (in TranToken txtoken)
-        raises (InvalidToken,
-                SystemError);
-    };
-  };
-
-  // @@ module Notification doesn't seem to exist anymore.
-    module Notification {
-
-        typedef CosNotification::EventHeader EventHeader;
-        /**
-         * @@ Typo with "CosNotifyChannnelAdmin::ChannelId"?
-         */
-        typedef CosNotifyChannelAdmin::ChannelID Channel;
-
-        exception ChannelUnavailable {};
-        exception InvalidSubscription {};
-        exception InvalidName {};
-        exception InvalidChannel {};
-
-        local interface LocalCookie {
-            boolean same_as (in LocalCookie cookie);
-        };
-
-        local interface Event {
-            EventConsumerBase create_channel
-                (out Channel chid)
-                raises (ChannelUnavailable);
-            LocalCookie subscribe (
-                in EventConsumerBase ecb,
-                in Channel chid)
-                raises (ChannelUnavailable);
-            void unsubscribe (in LocalCookie cookie)
-                raises (InvalidSubscription);
-            EventConsumerBase obtain_channel (
-                in string supp_name,
-                in EventHeader hdr)
-                raises (InvalidName);
-            void listen (in EventConsumerBase ecb,
-                in string csmr_name)
-                raises (InvalidName);
-            void push (in EventBase evt);
-            void destroy_channel (in Channel chid)
-                raises (InvalidChannel);
-        };
-    };
-
-  // *************** Basic Container interfaces ***************
-
-  typedef SecurityLevel2::Credentials Principal;
-
-  local interface CCMContext
-  {
-    Principal get_caller_principal();
-
-    CCMHome get_CCM_home();
-
-    boolean get_rollback_only()
-      raises (IllegalState);
-
-    Transaction::UserTransaction get_user_transaction()
-      raises (IllegalState);
-
-    boolean is_caller_in_role (in string role);
-
-    void set_rollback_only()
-      raises (IllegalState);
-  };
-
-  enum CCMExceptionReason
-  {
-    SYSTEM_ERROR,
-    CREATE_ERROR,
-    REMOVE_ERROR,
-    DUPLICATE_KEY,
-    FIND_ERROR,
-    OBJECT_NOT_FOUND,
-    NO_SUCH_ENTITY
-  };
-
-  exception CCMException
-  {
-    CCMExceptionReason reason;
-  };
-
-  local interface EnterpriseComponent {};
-
-  local interface SessionContext : CCMContext
-  {
-    Object get_CCM_object()
-      raises (IllegalState);
-  };
-
-  local interface SessionComponent : EnterpriseComponent
-  {
-    void set_session_context ( in SessionContext ctx)
-      raises (CCMException);
-
-    void ccm_activate()
-      raises (CCMException);
-
-    void ccm_passivate()
-      raises (CCMException);
-
-    void ccm_remove ()
-      raises (CCMException);
-  };
-
-  local interface SessionSynchronization
-  {
-    void after_begin ()
-      raises (CCMException);
-
-    void before_completion ()
-      raises (CCMException);
-
-    void after_completion (in boolean committed)
-      raises (CCMException);
-  };
-
-  local interface EntityContext : CCMContext
-  {
-    Object get_CCM_object ()
-      raises (IllegalState);
-
-    PrimaryKeyBase get_primary_key ()
-      raises (IllegalState);
-  };
-
-  local interface EntityComponent : EnterpriseComponent
-  {
-    void set_entity_context (in EntityContext ctx)
-      raises (CCMException);
-
-    void unset_entity_context ()
-      raises (CCMException);
-
-    void ccm_activate ()
-      raises (CCMException);
-
-    void ccm_load ()
-      raises (CCMException);
-
-    void ccm_store ()
-      raises (CCMException);
-
-    void ccm_passivate ()
-      raises (CCMException);
-
-    void ccm_remove ()
-      raises (CCMException);
-  };
-
-  // *************** Extended Container Interfaces ***************
-
-  enum BadComponentReferenceReason
-  {
-    NON_LOCAL_REFERENCE,
-    NON_COMPONENT_REFERENCE,
-    WRONG_CONTAINER
-  };
-
-  typedef CosPersistentState::CatalogBase CatalogBase;
-  typedef CosPersistentState::TypeId TypeId;
-
-  typedef short SegmentId;
-  const SegmentId COMPONENT_SEGMENT = 0;
-
-  typedef short FacetId;
-  const FacetId COMPONENT_FACET = 0;
-
-  typedef sequence<octet> IdData;
-  typedef CosPersistentState::Pid PersistentId;
-
-  typedef short StateIdType;
-  const StateIdType PERSISTENT_ID = 0;
-
-  exception BadComponentReference
-  {
-    BadComponentReferenceReason reason;
-  };
-  exception PolicyMismatch {};
-  exception PersistenceNotAvailable {};
-  exception UnknownActualHome {};
-  exception ProxyHomeNotSupported {};
-  exception InvalidStateIdData {};
-
-  local interface HomeRegistration
-  {
-    void register_home (in CCMHome home_ref,
-                        in string home_name);
-
-    void unregister_home (in CCMHome home_ref);
-  };
-
-  local interface CCM2Context : CCMContext
-  {
-    HomeRegistration get_home_registration ();
-
-    void req_passivate ()
-      raises (PolicyMismatch);
-
-    CatalogBase get_persistence (in TypeId catalog_type_id)
-      raises (PersistenceNotAvailable);
-  };
-
-  local interface ProxyHomeRegistration : HomeRegistration
-  {
-    void register_proxy_home (in CCMHome rhome,
-                              in CCMHome ahome)
-      raises (UnknownActualHome,
-              ProxyHomeNotSupported);
-  };
-
-  local interface Session2Context : SessionContext, CCM2Context
-  {
-    Object create_ref (in CORBA::RepositoryId repid);
-
-    Object create_ref_from_oid (in CORBA::OctetSeq oid,
-                                in CORBA::RepositoryId repid);
-
-    CORBA::OctetSeq get_oid_from_ref (in Object objref)
-      raises (IllegalState,
-              BadComponentReference);
-  };
-
-  abstract valuetype StateIdValue
-  {
-    StateIdType get_sid_type();
-    IdData get_sid_data();
-  };
-
-  local interface StateIdFactory
-  {
-    StateIdValue create (in IdData data)
-      raises (InvalidStateIdData);
-  };
-
-  valuetype PersistentIdValue : StateIdValue
-  {
-    private PersistentId pid;
-
-    PersistentId get_pid();
-    factory init (in PersistentId pid);
-  };
-
-  valuetype SegmentDescr
-  {
-    private StateIdValue sid;
-    private SegmentId seg;
-
-    StateIdValue get_sid();
-    SegmentId get_seg_id();
-    factory init (in StateIdValue sid,
-                  in SegmentId seg);
-  };
-
-  typedef sequence<SegmentDescr> SegmentDescrSeq;
-
-  local interface ComponentId
-  {
-    FacetId get_target_facet();
-
-    SegmentId get_target_segment();
-
-    StateIdValue get_target_state_id (in StateIdFactory sid_factory)
-      raises (InvalidStateIdData);
-
-    StateIdValue get_segment_state_id (in SegmentId seg,
-                                       in StateIdFactory sid_factory)
-      raises (InvalidStateIdData);
-
-    ComponentId create_with_new_target (in FacetId new_target_facet,
-                                        in SegmentId new_target_segment);
-
-    SegmentDescrSeq get_segment_descrs (in StateIdFactory sid_factory)
-      raises (InvalidStateIdData);
-  };
-
-  local interface Entity2Context : EntityContext, CCM2Context
-  {
-    ComponentId get_component_id ()
-      raises (IllegalState);
-
-    ComponentId create_component_id (in FacetId target_facet,
-                                     in SegmentId target_segment,
-                                     in SegmentDescrSeq seq_descrs);
-
-    ComponentId create_monolithic_component_id (in FacetId target_facet,
-                                                in StateIdValue sid);
-
-    Object create_ref_from_cid (in CORBA::RepositoryId repid,
-                                in ComponentId cid);
-
-    ComponentId get_cid_from_ref (in Object objref)
-      raises (BadComponentReference);
-  };
-
-  // *************** Packaging and Deployment ***************
-
-  module Deployment
-  {
-    typedef string UUID;
-    typedef string Location;
-
-    enum AssemblyState
-    {
-      INACTIVE,
-      INSERVICE
-    };
-
-    exception UnknownImplId {};
-    exception InvalidLocation {};
-    exception InstallationFailure
-    {
-      FailureReason reason;
-    };
-    exception InvalidAssembly {};
-
-    interface ComponentInstallation
-    {
-      void install(in UUID implUUID,
-                   in Location component_loc)
-        raises (InvalidLocation,
-                InstallationFailure);
-
-      void replace(in UUID implUUID,
-                   in Location component_loc)
-        raises (InvalidLocation,
-                InstallationFailure);
-
-      void remove(in UUID implUUID)
-        raises (UnknownImplId,
-                RemoveFailure);
-
-      Location get_implementation (in UUID implUUID)
-        raises (UnknownImplId,
-                InstallationFailure);
-    };
-
-    interface Assembly
-    {
-      void build();
-
-      void tear_down()
-        raises (RemoveFailure);
-
-      AssemblyState get_state();
-    };
-
-    interface AssemblyFactory
-    {
-      Cookie create(in Location assembly_loc)
-        raises (InvalidLocation,
-                CreateFailure);
-
-      Assembly lookup(in Cookie c)
-        raises (InvalidAssembly);
-
-      void destroy(in Cookie c)
-        raises (InvalidAssembly,
-                RemoveFailure);
-    };
-
-    interface ComponentServer;  // Forward decl.
-    typedef sequence<ComponentServer> ComponentServers;
-
-    interface ServerActivator
-    {
-      ComponentServer create_component_server (in ConfigValues config)
-        raises (CreateFailure,
-                InvalidConfiguration);
-
-      void remove_component_server (in ComponentServer server)
-        raises (RemoveFailure);
-
-      ComponentServers get_component_servers ();
-    };
-
-    interface Container;        // Forward decl.
-    typedef sequence<Container> Containers;
-
-    interface ComponentServer
-    {
-      readonly attribute ConfigValues configuration;
-
-      ServerActivator get_server_activator ();
-      Container create_container (in ConfigValues config)
-        raises (CreateFailure,
-                InvalidConfiguration);
-
-      void remove_container (in Container cref)
-        raises (RemoveFailure);
-
-      Containers get_containers ();
-
-      void remove ()
-        raises (RemoveFailure);
-    };
-
-    exception ImplEntryPointNotFound {};
-
-    interface Container
-    {
-      readonly attribute ConfigValues configuration;
-
-      ComponentServer get_component_server ();
-
-      CCMHome install_home (in UUID id,
-                            in string entrypt,
-                            in ConfigValues config)
-        raises (UnknownImplId,
-                ImplEntryPointNotFound,
-                InstallationFailure,
-                InvalidConfiguration);
-
-      void remove_home (in CCMHome href)
-        raises (RemoveFailure);
-
-      CCMHomes get_homes ();
-      void remove ()
-        raises (RemoveFailure);
-
-    };
-
-  };
-};
diff --git a/TAO/tao/ccm_core/CosPersistentState.idl b/TAO/tao/ccm_core/CosPersistentState.idl
deleted file mode 100644
index 65813eb4ed8..00000000000
--- a/TAO/tao/ccm_core/CosPersistentState.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-/**
- * @@ This is just a temporary file.  Since TAO does not have
- *    CosPersistentState at all, we use this file to define
- *    types necessary to get ComponentBase.idl to compile.
- */
-
-module CosPersistentState {
-        local interface CatalogBase
-          {
-          };
-
-        typedef sequence<octet> TypeId;
-        typedef string Pid;
-};