ChangeLogTag: Tue Mar 15 22:15:32 2005 J.T. Conklin <jtc@acorntoolworks.com>

9 files changed, 504 insertions, 433 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 13543ceb667..f739e405907 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Tue Mar 15 22:15:32 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/orbsvcs/Makefile.am:
+
+	  Regenerate.
+
+	* orbsvcs/orbsvcs/AVStreams.idl:
+	* orbsvcs/orbsvcs/AV/AVStreams_i.h:
+	* orbsvcs/tests/Property/main.cpp:
+
+	  Update to use CosProperty.idl, etc.
+
+	* orbsvcs/orbsvcs/CosProperty.mpc:
+	* orbsvcs/orbsvcs/CosProperty.idl:
+	* orbsvcs/orbsvcs/CosPropertyService.idl:
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+
+	  Current OMG specs refer to Property Service via CosProperty.idl
+	  instead of CosPropertyService.idl.  Rename *.idl file, but keep
+	  a wrapper version for backwards compatibility.
+
 Tue Mar 15 16:20:12 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* tao/Makefile.am:
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 4c223b52763..c0e4c25b14b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -29,7 +29,7 @@
 #include "ace/SOCK_Acceptor.h"
 
 #include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/CosPropertyS.h"
 #include "orbsvcs/AVStreamsS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
index 34a9abd88f2..1e40c191651 100644
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl
@@ -14,7 +14,7 @@
 #ifndef TAO_AV_STREAMS_IDL
 #define TAO_AV_STREAMS_IDL
 
-#include "CosPropertyService.idl"
+#include "CosProperty.idl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.idl b/TAO/orbsvcs/orbsvcs/CosProperty.idl
new file mode 100644
index 00000000000..1bba55334e7
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.idl
@@ -0,0 +1,413 @@
+// -*-c++-*-
+
+// $Id$
+
+// ================================================================
+//
+// = LIBRARY
+//     cos
+//
+// = FILENAME
+//     CosPropertyService.idl
+//
+// = DESCRITION
+//     The property service, downloaded from
+//     ftp://ftp.omg.org/pub/docs/1995/95-06-01.ps 
+//
+// = AUTHOR
+//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ================================================================
+
+#ifndef TAO_PROPERTY_IDL
+#define TAO_PROPERTY_IDL
+
+#include <orb.idl>
+
+#pragma prefix "omg.org"
+
+module CosPropertyService
+{
+  // = TITLE
+  //     CosPropertyService : To support properties (that are typed
+  //     named values dynamically associated with an object, outside
+  //     of the type system.
+  //
+  // = DESCRIPTION
+  //     The data types and interfaces to deal with property names,
+  //     property values, property modes etc.
+
+  // = Data Types.
+
+  typedef string PropertyName;
+
+  struct Property
+  {
+    PropertyName property_name;
+    any property_value;
+  };
+
+  enum PropertyModeType
+  {
+    normal,
+    read_only,
+    fixed_normal,
+    fixed_readonly,
+    undefined
+  };
+
+  struct PropertyDef
+  {
+    PropertyName property_name;
+    any property_value;
+    PropertyModeType property_mode;
+  };
+
+  struct PropertyMode
+  {
+    PropertyName property_name;
+    PropertyModeType property_mode;
+  };
+
+  typedef sequence<PropertyName> PropertyNames;
+  typedef sequence<Property> Properties;
+  typedef sequence<PropertyDef> PropertyDefs;
+  typedef sequence<PropertyMode> PropertyModes;
+  typedef sequence<CORBA::TypeCode> PropertyTypes;
+
+  interface PropertyNamesIterator;
+  interface PropertiesIterator;
+  interface PropertySetFactory;
+  interface PropertySetDef;
+  interface PropertySet;
+
+  // = Exceptions
+
+  exception ConstraintNotSupported {};
+  exception InvalidPropertyName {};
+  exception ConflictingProperty {};
+  exception PropertyNotFound {};
+  exception UnsupportedTypeCode {};
+  exception UnsupportedProperty {};
+  exception UnsupportedMode {};
+  exception FixedProperty {};
+  exception ReadOnlyProperty {};
+
+  enum ExceptionReason
+  {
+    invalid_property_name,
+    conflicting_property,
+    property_not_found,
+    unsupported_type_code,
+    unsupported_property,
+    unsupported_mode,
+    fixed_property,
+    read_only_property
+  };
+
+  struct PropertyException
+  {
+      ExceptionReason reason;
+      PropertyName failing_property_name;
+  };
+  
+  typedef sequence<PropertyException> PropertyExceptions;
+
+  exception MultipleExceptions
+    {
+      PropertyExceptions exceptions;
+    };
+
+  // = Interface Definitions.
+
+  interface PropertySetFactory
+    {
+      // = TITLE
+      //     Factory class for PropertySet interface.
+      // = DESCRIPTION
+      //     Support for creating PropertySets with initial
+      //     constraints and properties.
+
+      PropertySet create_propertyset ();
+      // The create_propertyset operation returns a new
+      // PropertySet. It is considered an implementation issue as to
+      // whether the PropertySet contains any initial properties or
+      // has constraints.
+
+      PropertySet create_constrained_propertyset (in PropertyTypes allowed_property_types,
+                                                 in Properties allowed_properties)
+        raises (ConstraintNotSupported);
+      // The create_constrained_propertyset operation allows a client
+      // to create a new PropertySet with specific constraints.
+
+      PropertySet create_initial_propertyset (in Properties initial_properties)
+        raises (MultipleExceptions);
+      // The create_initial_propertyset operation allows a client to
+      // create a new PropertySet with specific initial properties.
+    };
+
+  interface PropertySetDefFactory
+    {
+      // = TITLE
+      //     Factory class for PropertySetDef interface.
+      // = DESCRIPTION
+      //     Support for creating Propsetdefs with initial constraints
+      //     and properties.
+
+      PropertySetDef create_propertysetdef ();
+      //  The create_propertysetdef operation returns a new
+      //  PropertySetDef.
+
+      PropertySetDef create_constrained_propertysetdef (in PropertyTypes allowed_property_types,
+                                                        in PropertyDefs  allowed_property_defs)
+        raises (ConstraintNotSupported);
+      // The create_constrained_propertysetdef operation allows a
+      // client to create a new PropertySetDef with specific
+      // constraints, including property modes.
+
+      PropertySetDef create_initial_propertysetdef (in PropertyDefs initial_property_defs)
+        raises (MultipleExceptions);
+      // The create_initial_propertysetdef operation allows a client
+      // to create a new PropertySetDef with specific initial
+      // properties, including property modes.
+    };
+
+  interface PropertySet
+    {
+      // = TITLE
+      //     The PropertySet interface provides operations to define
+      //     and modify properties, list and get properties, and
+      //     delete properties.
+      //
+      // = DESCRIPTION
+      //     Provides support for defining and modifying properties,
+      //     getting properties and their names and deleting properties.
+
+      // = Support for defining and modifying properties.
+
+      void define_property (in PropertyName property_name,
+                            in any property_value)
+        raises (InvalidPropertyName,
+                ConflictingProperty,
+                UnsupportedTypeCode,
+                UnsupportedProperty,
+                ReadOnlyProperty);
+      // Will modify or add a property to the PropertySet. If the
+      // property already exists, then the property type is checked
+      // before the value is overwritten. If the property does not
+      // exist, then the property is added to the PropertySet.
+
+      void define_properties (in Properties nproperties)
+        raises (MultipleExceptions);
+      // Will modify or add each of the properties in Properties
+      // parameter to the PropertySet. For each property in the list,
+      // if the property already exists, then the property type is
+      // checked before overwriting the value. If the property does
+      // not exist, then the property is added to the PropertySet.
+
+      // = Support for Getting Properties and their Names.
+
+      unsigned long get_number_of_properties ();
+      // Returns the current number of properties associated with this
+      // PropertySet.
+
+      void get_all_property_names (in unsigned long how_many,
+                                   out PropertyNames property_names,
+                                   out PropertyNamesIterator rest);
+      // Returns all of the property names currently defined in the
+      // PropertySet. If the PropertySet contains more than how_many
+      // property names, then the remaining property names are put
+      // into the PropertyNamesIterator.
+
+      any  get_property_value (in  PropertyName property_name)
+        raises (PropertyNotFound,
+                InvalidPropertyName);
+      // Returns the value of a property in the PropertySet.
+
+      boolean get_properties (in PropertyNames property_names,
+                              out Properties nproperties);
+      // Returns the values of the properties listed in
+      // property_names.
+
+      void get_all_properties (in unsigned long how_many,
+                               out Properties nproperties,
+                               out PropertiesIterator rest);
+      // Returns all of the property names currently defined in the
+      // PropertySet. If the PropertySet contains more than how_many
+      // property names, then the remaining property names are put
+      // into the PropertyNamesIterator.
+
+      // = Support for Deleting Properties.
+
+      void delete_property (in PropertyName property_name)
+        raises (PropertyNotFound,
+                InvalidPropertyName,
+                FixedProperty);
+      // Deletes the specified property if it exists from a
+      // PropertySet.
+
+
+      void delete_properties (in PropertyNames property_names)
+        raises (MultipleExceptions);
+      // Deletes the properties defined in the property_names
+      // parameter. This is a batch operation that returns the
+      // MultipleExceptions exception if any delete failed.
+
+      boolean delete_all_properties ();
+      // Variation of delete_properties. Applies to all properties.
+
+      // = Support for Existence Check.
+
+      boolean is_property_defined (in PropertyName property_name)
+        raises (InvalidPropertyName);
+      // The is_property_defined operation returns true if the
+      // property is defined in the PropertySet, and returns false
+      // otherwise.
+    };
+
+  interface PropertySetDef:PropertySet
+    {
+      // = TITLE
+      //     Interface to deal with the Property Modes.
+      //
+      // = DESCRIPTION
+      //     The PropertySetDef interface is a specialization
+      //     (subclass) of the PropertySet interface. The
+      //     PropertySetDef interface provides operations to retrieve
+      //     PropertySet constraints, define and modify properties
+      //     with modes, and to get or set property modes.
+
+      void get_allowed_property_types (out PropertyTypes property_types);
+      // Indicates which types of properties are supported by this
+      // PropertySet. If the output sequence is empty, then there is
+      // no restrictions on the any TypeCode portion of the
+      // property_value field of a Property in this PropertySet,
+      // unless the get_allowed_properties output sequence is not empty.
+
+      void get_allowed_properties (out PropertyDefs property_defs);
+      // Indicates which properties are supported by this
+      // PropertySet. If the output sequence is empty, then there is
+      // no restrictions on the properties that can be in this
+      // PropertySet, unless the get_allowed_property_types output
+      // sequence is not empty.
+
+      void define_property_with_mode (in PropertyName property_name,
+                                      in any property_value,
+                                      in PropertyModeType property_mode)
+        raises (InvalidPropertyName,
+                ConflictingProperty,
+                UnsupportedTypeCode,
+                UnsupportedProperty,
+                UnsupportedMode,
+                ReadOnlyProperty);
+      // This operation will modify or add a property to the
+      // PropertySet. If the property already exists, then the
+      // property type is checked before the value is overwritten. The
+      // property mode is also checked to be sure a new value may be
+      // written. If the property does not exist, then the property is
+      // added to the PropertySet. To change the any TypeCode portion
+      // of the property_value of a property, a client must first
+      // delete_property, then invoke the define_property_with_mode.
+
+      void define_properties_with_modes (in PropertyDefs property_defs)
+        raises (MultipleExceptions);
+      // This operation will modify or add each of the properties in
+      // the Properties parameter to the PropertySet. For each
+      // property in the list, if the property already exists, then
+      // the property type is checked before overwriting the
+      // value. The property mode is also checked to be sure a new
+      // value may be written. If the property does not exist, then
+      // the property is added to the PropertySet. This is a batch
+      // operation that returns the MultipleExceptions exception if
+      // any define operation failed.
+
+      // = Support for Getting and Setting Property Modes.
+
+      PropertyModeType get_property_mode (in  PropertyName property_name)
+        raises (PropertyNotFound,
+                InvalidPropertyName);
+      // Support for Getting and Setting Property Modes.
+
+      boolean get_property_modes (in PropertyNames property_names,
+                                 out PropertyModes property_modes);
+      // Support for Getting and Setting Property Modes.
+
+      void set_property_mode (in PropertyName property_name,
+                             in PropertyModeType property_mode)
+        raises (InvalidPropertyName,
+                PropertyNotFound,
+                UnsupportedMode);
+      // Sets the mode of a property in the PropertySet.
+
+      void set_property_modes (in PropertyModes property_modes)
+        raises (MultipleExceptions);
+      // Sets the mode for each property in the property_modes
+      // parameter. This is a batch operation that returns the
+      // MultipleExceptions exception if any set failed.
+
+    };
+
+  interface PropertyNamesIterator
+    {
+      // = TITLE
+      //     Interface for iterating thru the Property Names.
+      //
+      // = DESCRIPTION
+      //     The PropertyNamesIterator interface allows a client to
+      //     iterate through the names using the next_one or next_n operations.
+
+      void reset ();
+      // The reset operation resets the position in an iterator to the
+      // first property, if one exists.
+
+      boolean next_one (out PropertyName property_name);
+      // The next_one operation returns true if an item exists at the
+      // current position in the iterator with an output parameter of
+      // a property name. A return of false signifies no more items in
+      // the iterator.
+
+      boolean next_n (in unsigned long how_many,
+                      out PropertyNames property_names);
+      // The next_n operation returns true if an item exists at the
+      // current position in the iterator and the how_many parameter
+      // was set greater than zero. The output is a PropertyNames
+      // sequence with at most the how_many number of names. A return
+      // of false signifies no more items in the iterator.
+
+      void destroy ();
+      // The destroy operation destroys the iterator.
+    };
+
+  interface PropertiesIterator
+    {
+      // = TITLE
+      //     Interface for iterating thru the Properties.
+      //
+      // = DESCRIPTION
+      //     allows a client to through the name-value pairs using the
+      //     next_one or next_n operations.
+
+      void reset ();
+      // The reset operation resets the position in an iterator to the
+      // first property, if one exists.
+
+      boolean next_one (out Property aproperty);
+      // The next_one operation returns true if an item exists at the
+      // current position in the iterator with an output parameter of
+      // a property. A return of false signifies no more items in the
+      // iterator.
+
+      boolean next_n (in unsigned long how_many,
+                      out Properties nproperties);
+      // The next_n operation returns true if an item exists at the
+      // current position in the iterator and the how_many parameter
+      // was set greater than zero. The output is a properties
+      // sequence with at most the how_many number of properties. A
+      // return of false signifies no more items in the iterator.
+
+      void destroy ();
+      // The destroy operation destroys the iterator.
+    };
+};
+
+#endif /* TAO_PROPERTY_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index 2fa121db12d..c45a5b20548 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -10,15 +10,20 @@ project(CosProperty) : orbsvcslib, core, portableserver {
   pch_source   =
 
   IDL_Files {
+    CosProperty.idl
+
+    // This is a wrappper for backwards compatibility
     CosPropertyService.idl
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    Property {
-      CosPropertyServiceC.cpp
-      CosPropertyServiceS.cpp
-      Property
-    }
+  Source_Files {
+    CosPropertyC.cpp
+    CosPropertyS.cpp
+    Property
+  }
+
+  Header_Files {
+    Property
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
index 1bba55334e7..90246368491 100644
--- a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
+++ b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
@@ -1,413 +1,16 @@
-// -*-c++-*-
-
+// 
 // $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//     cos
-//
-// = FILENAME
-//     CosPropertyService.idl
-//
-// = DESCRITION
-//     The property service, downloaded from
-//     ftp://ftp.omg.org/pub/docs/1995/95-06-01.ps 
 //
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ================================================================
-
-#ifndef TAO_PROPERTY_IDL
-#define TAO_PROPERTY_IDL
 
-#include <orb.idl>
+#ifndef TAO_PROPERTYSERVICE_IDL
+#define TAO_PROPERTYSERVICE_IDL
 
+// Force the IDL compiler to include this file [it does not include
+// empty files]
 #pragma prefix "omg.org"
+ 
+#include "CosProperty.idl"
+ 
+#pragma prefix ""
 
-module CosPropertyService
-{
-  // = TITLE
-  //     CosPropertyService : To support properties (that are typed
-  //     named values dynamically associated with an object, outside
-  //     of the type system.
-  //
-  // = DESCRIPTION
-  //     The data types and interfaces to deal with property names,
-  //     property values, property modes etc.
-
-  // = Data Types.
-
-  typedef string PropertyName;
-
-  struct Property
-  {
-    PropertyName property_name;
-    any property_value;
-  };
-
-  enum PropertyModeType
-  {
-    normal,
-    read_only,
-    fixed_normal,
-    fixed_readonly,
-    undefined
-  };
-
-  struct PropertyDef
-  {
-    PropertyName property_name;
-    any property_value;
-    PropertyModeType property_mode;
-  };
-
-  struct PropertyMode
-  {
-    PropertyName property_name;
-    PropertyModeType property_mode;
-  };
-
-  typedef sequence<PropertyName> PropertyNames;
-  typedef sequence<Property> Properties;
-  typedef sequence<PropertyDef> PropertyDefs;
-  typedef sequence<PropertyMode> PropertyModes;
-  typedef sequence<CORBA::TypeCode> PropertyTypes;
-
-  interface PropertyNamesIterator;
-  interface PropertiesIterator;
-  interface PropertySetFactory;
-  interface PropertySetDef;
-  interface PropertySet;
-
-  // = Exceptions
-
-  exception ConstraintNotSupported {};
-  exception InvalidPropertyName {};
-  exception ConflictingProperty {};
-  exception PropertyNotFound {};
-  exception UnsupportedTypeCode {};
-  exception UnsupportedProperty {};
-  exception UnsupportedMode {};
-  exception FixedProperty {};
-  exception ReadOnlyProperty {};
-
-  enum ExceptionReason
-  {
-    invalid_property_name,
-    conflicting_property,
-    property_not_found,
-    unsupported_type_code,
-    unsupported_property,
-    unsupported_mode,
-    fixed_property,
-    read_only_property
-  };
-
-  struct PropertyException
-  {
-      ExceptionReason reason;
-      PropertyName failing_property_name;
-  };
-  
-  typedef sequence<PropertyException> PropertyExceptions;
-
-  exception MultipleExceptions
-    {
-      PropertyExceptions exceptions;
-    };
-
-  // = Interface Definitions.
-
-  interface PropertySetFactory
-    {
-      // = TITLE
-      //     Factory class for PropertySet interface.
-      // = DESCRIPTION
-      //     Support for creating PropertySets with initial
-      //     constraints and properties.
-
-      PropertySet create_propertyset ();
-      // The create_propertyset operation returns a new
-      // PropertySet. It is considered an implementation issue as to
-      // whether the PropertySet contains any initial properties or
-      // has constraints.
-
-      PropertySet create_constrained_propertyset (in PropertyTypes allowed_property_types,
-                                                 in Properties allowed_properties)
-        raises (ConstraintNotSupported);
-      // The create_constrained_propertyset operation allows a client
-      // to create a new PropertySet with specific constraints.
-
-      PropertySet create_initial_propertyset (in Properties initial_properties)
-        raises (MultipleExceptions);
-      // The create_initial_propertyset operation allows a client to
-      // create a new PropertySet with specific initial properties.
-    };
-
-  interface PropertySetDefFactory
-    {
-      // = TITLE
-      //     Factory class for PropertySetDef interface.
-      // = DESCRIPTION
-      //     Support for creating Propsetdefs with initial constraints
-      //     and properties.
-
-      PropertySetDef create_propertysetdef ();
-      //  The create_propertysetdef operation returns a new
-      //  PropertySetDef.
-
-      PropertySetDef create_constrained_propertysetdef (in PropertyTypes allowed_property_types,
-                                                        in PropertyDefs  allowed_property_defs)
-        raises (ConstraintNotSupported);
-      // The create_constrained_propertysetdef operation allows a
-      // client to create a new PropertySetDef with specific
-      // constraints, including property modes.
-
-      PropertySetDef create_initial_propertysetdef (in PropertyDefs initial_property_defs)
-        raises (MultipleExceptions);
-      // The create_initial_propertysetdef operation allows a client
-      // to create a new PropertySetDef with specific initial
-      // properties, including property modes.
-    };
-
-  interface PropertySet
-    {
-      // = TITLE
-      //     The PropertySet interface provides operations to define
-      //     and modify properties, list and get properties, and
-      //     delete properties.
-      //
-      // = DESCRIPTION
-      //     Provides support for defining and modifying properties,
-      //     getting properties and their names and deleting properties.
-
-      // = Support for defining and modifying properties.
-
-      void define_property (in PropertyName property_name,
-                            in any property_value)
-        raises (InvalidPropertyName,
-                ConflictingProperty,
-                UnsupportedTypeCode,
-                UnsupportedProperty,
-                ReadOnlyProperty);
-      // Will modify or add a property to the PropertySet. If the
-      // property already exists, then the property type is checked
-      // before the value is overwritten. If the property does not
-      // exist, then the property is added to the PropertySet.
-
-      void define_properties (in Properties nproperties)
-        raises (MultipleExceptions);
-      // Will modify or add each of the properties in Properties
-      // parameter to the PropertySet. For each property in the list,
-      // if the property already exists, then the property type is
-      // checked before overwriting the value. If the property does
-      // not exist, then the property is added to the PropertySet.
-
-      // = Support for Getting Properties and their Names.
-
-      unsigned long get_number_of_properties ();
-      // Returns the current number of properties associated with this
-      // PropertySet.
-
-      void get_all_property_names (in unsigned long how_many,
-                                   out PropertyNames property_names,
-                                   out PropertyNamesIterator rest);
-      // Returns all of the property names currently defined in the
-      // PropertySet. If the PropertySet contains more than how_many
-      // property names, then the remaining property names are put
-      // into the PropertyNamesIterator.
-
-      any  get_property_value (in  PropertyName property_name)
-        raises (PropertyNotFound,
-                InvalidPropertyName);
-      // Returns the value of a property in the PropertySet.
-
-      boolean get_properties (in PropertyNames property_names,
-                              out Properties nproperties);
-      // Returns the values of the properties listed in
-      // property_names.
-
-      void get_all_properties (in unsigned long how_many,
-                               out Properties nproperties,
-                               out PropertiesIterator rest);
-      // Returns all of the property names currently defined in the
-      // PropertySet. If the PropertySet contains more than how_many
-      // property names, then the remaining property names are put
-      // into the PropertyNamesIterator.
-
-      // = Support for Deleting Properties.
-
-      void delete_property (in PropertyName property_name)
-        raises (PropertyNotFound,
-                InvalidPropertyName,
-                FixedProperty);
-      // Deletes the specified property if it exists from a
-      // PropertySet.
-
-
-      void delete_properties (in PropertyNames property_names)
-        raises (MultipleExceptions);
-      // Deletes the properties defined in the property_names
-      // parameter. This is a batch operation that returns the
-      // MultipleExceptions exception if any delete failed.
-
-      boolean delete_all_properties ();
-      // Variation of delete_properties. Applies to all properties.
-
-      // = Support for Existence Check.
-
-      boolean is_property_defined (in PropertyName property_name)
-        raises (InvalidPropertyName);
-      // The is_property_defined operation returns true if the
-      // property is defined in the PropertySet, and returns false
-      // otherwise.
-    };
-
-  interface PropertySetDef:PropertySet
-    {
-      // = TITLE
-      //     Interface to deal with the Property Modes.
-      //
-      // = DESCRIPTION
-      //     The PropertySetDef interface is a specialization
-      //     (subclass) of the PropertySet interface. The
-      //     PropertySetDef interface provides operations to retrieve
-      //     PropertySet constraints, define and modify properties
-      //     with modes, and to get or set property modes.
-
-      void get_allowed_property_types (out PropertyTypes property_types);
-      // Indicates which types of properties are supported by this
-      // PropertySet. If the output sequence is empty, then there is
-      // no restrictions on the any TypeCode portion of the
-      // property_value field of a Property in this PropertySet,
-      // unless the get_allowed_properties output sequence is not empty.
-
-      void get_allowed_properties (out PropertyDefs property_defs);
-      // Indicates which properties are supported by this
-      // PropertySet. If the output sequence is empty, then there is
-      // no restrictions on the properties that can be in this
-      // PropertySet, unless the get_allowed_property_types output
-      // sequence is not empty.
-
-      void define_property_with_mode (in PropertyName property_name,
-                                      in any property_value,
-                                      in PropertyModeType property_mode)
-        raises (InvalidPropertyName,
-                ConflictingProperty,
-                UnsupportedTypeCode,
-                UnsupportedProperty,
-                UnsupportedMode,
-                ReadOnlyProperty);
-      // This operation will modify or add a property to the
-      // PropertySet. If the property already exists, then the
-      // property type is checked before the value is overwritten. The
-      // property mode is also checked to be sure a new value may be
-      // written. If the property does not exist, then the property is
-      // added to the PropertySet. To change the any TypeCode portion
-      // of the property_value of a property, a client must first
-      // delete_property, then invoke the define_property_with_mode.
-
-      void define_properties_with_modes (in PropertyDefs property_defs)
-        raises (MultipleExceptions);
-      // This operation will modify or add each of the properties in
-      // the Properties parameter to the PropertySet. For each
-      // property in the list, if the property already exists, then
-      // the property type is checked before overwriting the
-      // value. The property mode is also checked to be sure a new
-      // value may be written. If the property does not exist, then
-      // the property is added to the PropertySet. This is a batch
-      // operation that returns the MultipleExceptions exception if
-      // any define operation failed.
-
-      // = Support for Getting and Setting Property Modes.
-
-      PropertyModeType get_property_mode (in  PropertyName property_name)
-        raises (PropertyNotFound,
-                InvalidPropertyName);
-      // Support for Getting and Setting Property Modes.
-
-      boolean get_property_modes (in PropertyNames property_names,
-                                 out PropertyModes property_modes);
-      // Support for Getting and Setting Property Modes.
-
-      void set_property_mode (in PropertyName property_name,
-                             in PropertyModeType property_mode)
-        raises (InvalidPropertyName,
-                PropertyNotFound,
-                UnsupportedMode);
-      // Sets the mode of a property in the PropertySet.
-
-      void set_property_modes (in PropertyModes property_modes)
-        raises (MultipleExceptions);
-      // Sets the mode for each property in the property_modes
-      // parameter. This is a batch operation that returns the
-      // MultipleExceptions exception if any set failed.
-
-    };
-
-  interface PropertyNamesIterator
-    {
-      // = TITLE
-      //     Interface for iterating thru the Property Names.
-      //
-      // = DESCRIPTION
-      //     The PropertyNamesIterator interface allows a client to
-      //     iterate through the names using the next_one or next_n operations.
-
-      void reset ();
-      // The reset operation resets the position in an iterator to the
-      // first property, if one exists.
-
-      boolean next_one (out PropertyName property_name);
-      // The next_one operation returns true if an item exists at the
-      // current position in the iterator with an output parameter of
-      // a property name. A return of false signifies no more items in
-      // the iterator.
-
-      boolean next_n (in unsigned long how_many,
-                      out PropertyNames property_names);
-      // The next_n operation returns true if an item exists at the
-      // current position in the iterator and the how_many parameter
-      // was set greater than zero. The output is a PropertyNames
-      // sequence with at most the how_many number of names. A return
-      // of false signifies no more items in the iterator.
-
-      void destroy ();
-      // The destroy operation destroys the iterator.
-    };
-
-  interface PropertiesIterator
-    {
-      // = TITLE
-      //     Interface for iterating thru the Properties.
-      //
-      // = DESCRIPTION
-      //     allows a client to through the name-value pairs using the
-      //     next_one or next_n operations.
-
-      void reset ();
-      // The reset operation resets the position in an iterator to the
-      // first property, if one exists.
-
-      boolean next_one (out Property aproperty);
-      // The next_one operation returns true if an item exists at the
-      // current position in the iterator with an output parameter of
-      // a property. A return of false signifies no more items in the
-      // iterator.
-
-      boolean next_n (in unsigned long how_many,
-                      out Properties nproperties);
-      // The next_n operation returns true if an item exists at the
-      // current position in the iterator and the how_many parameter
-      // was set greater than zero. The output is a properties
-      // sequence with at most the how_many number of properties. A
-      // return of false signifies no more items in the iterator.
-
-      void destroy ();
-      // The destroy operation destroys the iterator.
-    };
-};
-
-#endif /* TAO_PROPERTY_IDL */
+#endif /* TAO_PROPERTYSERVICE_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 8b948ed00b0..582a65aefcb 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -14,7 +14,6 @@ TAO_ROOT = $(top_srcdir)
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 
-noinst_LTLIBRARIES =
 pkgconfig_DATA =
 lib_LTLIBRARIES =
 CLEANFILES =
@@ -95,12 +94,38 @@ EXTRA_DIST = \
 ## Makefile.CosProperty.am
 
 BUILT_SOURCES += \
+  CosPropertyC.inl \
+  CosPropertyS.inl \
+  CosPropertyS_T.inl \
+  CosPropertyC.h \
+  CosPropertyS.h \
+  CosPropertyC.cpp \
+  CosPropertyS.cpp \
+  CosPropertyS_T.cpp
+
+CLEANFILES += \
+  CosProperty-stamp \
+  CosPropertyC.inl \
+  CosPropertyS.inl \
+  CosPropertyS_T.inl \
+  CosPropertyC.h \
+  CosPropertyS.h \
+  CosPropertyC.cpp \
+  CosPropertyS.cpp \
+  CosPropertyS_T.cpp
+
+CosPropertyC.inl CosPropertyS.inl CosPropertyS_T.inl CosPropertyC.h CosPropertyS.h CosPropertyC.cpp CosPropertyS.cpp CosPropertyS_T.cpp: CosProperty-stamp
+
+CosProperty-stamp: $(srcdir)/CosProperty.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosProperty.idl
+	@touch $@
+
+BUILT_SOURCES += \
   CosPropertyServiceC.inl \
   CosPropertyServiceS.inl \
   CosPropertyServiceS_T.inl \
   CosPropertyServiceC.h \
   CosPropertyServiceS.h \
-  CosPropertyServiceS_T.h \
   CosPropertyServiceC.cpp \
   CosPropertyServiceS.cpp \
   CosPropertyServiceS_T.cpp
@@ -112,22 +137,16 @@ CLEANFILES += \
   CosPropertyServiceS_T.inl \
   CosPropertyServiceC.h \
   CosPropertyServiceS.h \
-  CosPropertyServiceS_T.h \
   CosPropertyServiceC.cpp \
   CosPropertyServiceS.cpp \
   CosPropertyServiceS_T.cpp
 
-CosPropertyServiceC.inl CosPropertyServiceS.inl CosPropertyServiceS_T.inl CosPropertyServiceC.h CosPropertyServiceS.h CosPropertyServiceS_T.h CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceS_T.cpp: CosPropertyService-stamp
+CosPropertyServiceC.inl CosPropertyServiceS.inl CosPropertyServiceS_T.inl CosPropertyServiceC.h CosPropertyServiceS.h CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceS_T.cpp: CosPropertyService-stamp
 
 CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl
 	@touch $@
 
-Property = \
-  CosPropertyServiceC.cpp \
-  CosPropertyServiceS.cpp \
-  Property/CosPropertyService_i.cpp
-
 lib_LTLIBRARIES += libTAO_CosProperty.la
 
 libTAO_CosProperty_la_CPPFLAGS = \
@@ -140,7 +159,11 @@ libTAO_CosProperty_la_CPPFLAGS = \
   -DTAO_PROPERTY_BUILD_DLL
 
 libTAO_CosProperty_la_SOURCES = \
-  $(Property)
+  CosPropertyC.cpp \
+  CosPropertyS.cpp \
+  CosPropertyServiceC.cpp \
+  CosPropertyServiceS.cpp \
+  Property/CosPropertyService_i.cpp
 
 libTAO_CosProperty_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
@@ -151,15 +174,22 @@ libTAO_CosProperty_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
+  CosProperty.idl \
+  CosPropertyC.h \
+  CosPropertyC.inl \
+  CosPropertyS.h \
+  CosPropertyS.inl \
+  CosPropertyS_T.cpp \
+  CosPropertyS_T.inl \
   CosPropertyService.idl \
   CosPropertyServiceC.h \
   CosPropertyServiceC.inl \
   CosPropertyServiceS.h \
   CosPropertyServiceS.inl \
   CosPropertyServiceS_T.cpp \
-  CosPropertyServiceS_T.h \
   CosPropertyServiceS_T.inl \
-  Property/CosPropertyService_i.h
+  Property/CosPropertyService_i.h \
+  Property/property_export.h
 
 pkgconfig_DATA += TAO_CosProperty.pc
 
@@ -726,7 +756,6 @@ libTAO_CosEvent_Skel_la_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_EVENT_SKEL_BUILD_DLL
 
 libTAO_CosEvent_Skel_la_SOURCES = \
@@ -821,7 +850,6 @@ libTAO_CosEvent_Serv_la_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL \
-  -DTAO_HAS_TYPED_EVENT_CHANNEL \
   -DTAO_EVENT_SERV_BUILD_DLL
 
 libTAO_CosEvent_Serv_la_SOURCES = \
@@ -2194,7 +2222,7 @@ EXTRA_DIST += \
 if BUILD_ACEXML
 if !BUILD_MINIMUM_CORBA
 
-noinst_LTLIBRARIES += libTAO_CosNotification_Persist.la
+lib_LTLIBRARIES += libTAO_CosNotification_Persist.la
 
 libTAO_CosNotification_Persist_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -2230,7 +2258,7 @@ libTAO_CosNotification_Persist_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-noinst_HEADERS = \
+nobase_include_HEADERS += \
   Channel_Clients_T.i \
   Event_Utilities.i \
   Notify/XML_Loader.h \
@@ -2952,6 +2980,7 @@ libTAO_DsEventLogAdmin_Serv_la_LDFLAGS = \
 
 libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
   libTAO_CosEvent_Serv.la \
+  libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index f84ae64649f..ff9f3961736 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/CosPropertyS.h"
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 9ab18f5bcdc..d9e9a9f2a3e 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -15,7 +15,7 @@
 //
 // ========================================================================
 
-#include "orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/CosPropertyS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 
 ACE_RCSID(CosPropertyService, main, "$Id$")