Committing all. VERY FEW minor changes.

5 files changed, 643 insertions, 154 deletions

diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index 57667638ca5..42bf6623afe 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 #	$Id$
 #
-#	Top-level Makefile for the AVStreams demo of the TAO ORB
+#	Top-level Makefile for the CosPropertyService Demo.
 #
 #----------------------------------------------------------------------------
 
@@ -9,17 +9,17 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS     = -lorbsvcs -lTAO 
+LDLIBS     = -lorbsvcs -lTAO
 
-AVStreams_SERVER_OBJS = server.o
-AVStreams_CLIENT_OBJS = client.o
-
-COSPROPERTY_OBJS = main.o
+CosProperty_SERVER_OBJS = server.o
+CosProperty_CLIENT_OBJS = client.o
+SRC=server.cpp client.cpp
 
 BIN = server client
 BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
+
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -28,7 +28,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 ifndef TAO_ROOT
@@ -38,10 +37,10 @@ endif
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
-server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS))
+server:$(addprefix $(VDIR),$(CosProperty_SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
+client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
@@ -51,6 +50,497 @@ realclean: clean
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index f7955f2da52..96e640b6c45 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -18,9 +18,9 @@
 
 #include "client.h"
 
-ACE_RCSID(Property, client, "$Id$")
+ACE_RCSID(CosPropertyService, client, "$Id$")
 
-  Client::Client (void)
+Client::Client (void)
 {
 }
 
@@ -42,20 +42,25 @@ Client::init (int argc,
   // Open the ORB.
   manager_.orb ()->open ();
 
-  // Initialize the naming services
-  if (my_name_client_.init (manager_.orb (), argc, argv) != 0)
+  // Naming service.
+  CORBA::Object_var naming_obj =
+    manager_.orb ()->resolve_initial_references ("NameService");
+  if (CORBA::is_nil (naming_obj.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
+                       " (%P|%t) Unable to resolve the Name Service.\n"),
                       -1);
+  CosNaming::NamingContext_var naming_context =
+    CosNaming::NamingContext::_narrow (naming_obj.in (),
+                                       env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
   // Bind PropertySetDef Object.
 
   CosNaming::Name propsetdef_name (1);
   propsetdef_name.length (1);
   propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
-  CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name,
-							       env);
+  CORBA::Object_var propsetdef_obj = naming_context->resolve (propsetdef_name,
+                                                              env);
   TAO_CHECK_ENV_RETURN (env, 1);
 
   ACE_DEBUG ((LM_DEBUG, "Naming resolve done\n"));
@@ -125,27 +130,12 @@ Client::property_tester (CORBA::Environment &env)
   this->test_get_all_properties (env);
   TAO_CHECK_ENV_RETURN (env, -1);
 
-  // Get the modes of all the properties defined.
-  this->test_get_property_modes (env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Testing delete_all_properties.
-  this->test_delete_all_properties (env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Test the number of properties.
-  this->test_get_number_of_properties (env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Try to get all the properties.
-  this->test_get_all_properties (env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
   // = Testing PropertySetDef & Iterators.
 
   // Testing define_property_with_mode.
   this->test_define_property_with_mode (env);
   TAO_CHECK_ENV_RETURN (env, -1);
+
 }
 
 // Testing define_property.
@@ -168,8 +158,8 @@ Client::test_define_property (CORBA::Environment &env)
               "Main : Char ch = %c\n",
               ch));
   this->propsetdef_->define_property ("char_property",
-				      anyval,
-				      env);
+                                           anyval,
+                                           env);
 
   // Check if that is an user exception, if so, print it out.
   if ((env.exception () != 0) &&
@@ -189,8 +179,8 @@ Client::test_define_property (CORBA::Environment &env)
               "Main : Short s = %d\n",
               s));
   propsetdef_->define_property ("short_property",
-				anyval,
-				env);
+                                     anyval,
+                                     env);
 
   // Check if that is an user exception, if so, print it out.
   if ((env.exception () != 0) &&
@@ -210,8 +200,8 @@ Client::test_define_property (CORBA::Environment &env)
               l));
   CORBA::Any newany(anyval);
   propsetdef_->define_property ("long_property",
-				anyval,
-				env);
+                                     anyval,
+                                     env);
 
   // Check if that is an user exception, if so, print it out.
   if ((env.exception () != 0) &&
@@ -230,8 +220,8 @@ Client::test_define_property (CORBA::Environment &env)
               "Main : Float f = %f\n",
               f));
   propsetdef_->define_property ("float_property",
-				anyval,
-				env);
+                                     anyval,
+                                     env);
 
   // Check if that is an user exception, if so, print it out.
   if ((env.exception () != 0) &&
@@ -253,8 +243,8 @@ Client::test_define_property (CORBA::Environment &env)
               strvar.in (),
               newstr));
   propsetdef_->define_property ("string_property",
-				anyval,
-				env);
+                                     anyval,
+                                     env);
 
   // Check if that is an user exception, if so, print it out.
   if ((env.exception () != 0) &&
@@ -282,14 +272,27 @@ Client::test_get_all_property_names (CORBA::Environment &env)
 
   // Get half on the names and half of on the iterator.
   CORBA::ULong how_many = num_of_properties / 2;
+  
+  // The extra ptr's and out's required to avoind SunnCC's warning
+  // when foo.out () is passed to a funtion.
   CosPropertyService::PropertyNames_var names_var;
+  CosPropertyService::PropertyNames_ptr names_ptr = 0;
+  CosPropertyService::PropertyNames_out names_out (names_ptr);
+  
   CosPropertyService::PropertyNamesIterator_var iterator_var;
+  CosPropertyService::PropertyNamesIterator_ptr iterator_ptr;
+  CosPropertyService::PropertyNamesIterator_out iterator_out (iterator_ptr);
+  
   propsetdef_->get_all_property_names (how_many,
-				       names_var.out (),
-				       iterator_var.out (),
-				       env);
+                                       names_out,
+                                       iterator_out,
+                                       env);
   TAO_CHECK_ENV_RETURN (env, -1);
-
+  
+  // Get the values back to var.
+  names_var = names_out.ptr ();
+  iterator_var = iterator_out.ptr ();
+  
   // Print out the names in the names-sequence.
   if (names_var.ptr () != 0)
     {
@@ -304,12 +307,27 @@ Client::test_get_all_property_names (CORBA::Environment &env)
   // Iterate thru and print out the names in the iterator, if any.
   if (iterator_var.ptr () != 0)
     {
-      CosPropertyService::PropertyName_var name_var;
-
-      while (iterator_var->next_one (name_var.out (), env) == CORBA::B_TRUE)
+      // Helper variables to stop the SunCC warnings on on foo.out
+      // (). 
+      CosPropertyService::PropertyName  name_ptr = 0;
+      CosPropertyService::PropertyName_out name_out (name_ptr);
+      
+      // Call the function.
+      CORBA::Boolean next_one_result = iterator_var->next_one (name_out, env);
+      
+      // Get the values back on a _var variable.
+      CosPropertyService::PropertyName_var name_var = name_out.ptr ();
+      
+      while (next_one_result == CORBA::B_TRUE)
         {
           TAO_CHECK_ENV_RETURN (env, -1);
           ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
+          
+          // Call the function to iterate again.
+          next_one_result = iterator_var->next_one (name_out, env);
+          
+          // Get the values back on a _var variable.
+          name_var = name_out.ptr ();
         }
 
       TAO_CHECK_ENV_RETURN (env, -1);
@@ -341,14 +359,19 @@ Client::test_get_properties (CORBA::Environment &env)
   names [2] = CORBA::string_dup ("char_property");
   //names [2] = CORBA::string_dup ("no_property");
 
-  CosPropertyService::Properties_var properties;
+
+  CosPropertyService::Properties_ptr properties_ptr = 0;
+  CosPropertyService::Properties_out properties_out (properties_ptr);
 
   // Get the properties.
   CORBA::Boolean return_val = propsetdef_->get_properties (names.in (),
-							   properties.out (),
-							   env);
+                                                           properties_out,
+                                                           env);
   TAO_CHECK_ENV_RETURN (env, -1);
-
+  
+  // Get the value to the _var.
+  CosPropertyService::Properties_var properties = properties_out.ptr ();
+  
   if (properties.ptr () != 0)
     {
       // Go thru the properties and print them out, if they are not
@@ -421,17 +444,17 @@ Client::test_delete_properties (CORBA::Environment &env)
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties\n"));
   CosPropertyService::PropertyNames prop_names;
-  prop_names.length (3);
+  prop_names.length (4);
   prop_names [0] = CORBA::string_dup ("char_property");
   prop_names [1] = CORBA::string_dup ("short_property");
   prop_names [2] = CORBA::string_dup ("long_property");
-  //prop_names [3] = CORBA::string_dup ("no_property");
+  prop_names [3] = CORBA::string_dup ("no_property");
   ACE_DEBUG ((LM_DEBUG,
               "Length of sequence %d, Maxlength : %d\n",
               prop_names.length (),
               prop_names.maximum ()));
   this->propsetdef_->delete_properties (prop_names,
-					env);
+                                   env);
   TAO_CHECK_ENV_RETURN (env, 0);
 
   return 0;
@@ -501,14 +524,23 @@ Client::test_get_all_properties (CORBA::Environment &env)
 
   // Get half on the properties and half of on the iterator.
   CORBA::ULong how_many = 0;
-  CosPropertyService::Properties_var properties;
-  CosPropertyService::PropertiesIterator_var iterator;
+
+  // Helper variables to avoid SunCC warnings.
+  CosPropertyService::Properties_ptr properties_ptr = 0;
+  CosPropertyService::Properties_out properties_out (properties_ptr);
+  CosPropertyService::PropertiesIterator_ptr iterator_ptr = 0;
+  CosPropertyService::PropertiesIterator_out iterator_out (iterator_ptr);
+  
   propsetdef_->get_all_properties (how_many,
-				   properties.out (),
-				   iterator.out (),
-				   env);
+                                   properties_out,
+                                   iterator_out,
+                                   env);
   TAO_CHECK_ENV_RETURN (env, -1);
-
+  
+  // Get these values to the _var's.
+  CosPropertyService::Properties_var properties = properties_out.ptr ();
+  CosPropertyService::PropertiesIterator_var iterator = iterator_out.ptr ();
+  
   // Print out the properties now.
   if (properties.ptr () != 0)
     {
@@ -521,18 +553,50 @@ Client::test_get_all_properties (CORBA::Environment &env)
                       "%s : ",
                       properties [pi].property_name.in ()));
 
-          // Print the value.
-          CORBA::Any::dump (properties [pi].property_value);
+          // Print the value if type is not tk_void.
+          if (properties [pi].property_value.type () == CORBA::_tc_void)
+            ACE_DEBUG ((LM_DEBUG,"Void\n"));
+
+          if (properties [pi].property_value.type () == CORBA::_tc_float)
+            {
+              CORBA::Float f;
+              properties [pi].property_value >>= f;
+              ACE_DEBUG ((LM_DEBUG,"%f\n", f));
+            }
+
+          if (properties [pi].property_value.type () == CORBA::_tc_string)
+            {
+              CORBA::String str;
+              properties [pi].property_value >>= str;
+              ACE_DEBUG ((LM_DEBUG,"%s\n", str));
+            }
+
+          if (properties [pi].property_value.type () == CORBA::_tc_long)
+            {
+              CORBA::Long l;
+              properties [pi].property_value >>= l;
+              ACE_DEBUG ((LM_DEBUG,"%d\n", l));
+            }
         }
     }
 
   // Pass thru the iterator.
   if (iterator.ptr () != 0)
     {
-      CosPropertyService::Property_var property;
-
-      while (iterator->next_one (property.out (), env) != CORBA::B_FALSE)
+      // Helper variables to avoid warnings with .out () in SunCC.
+      CosPropertyService::Property* property_ptr = 0;
+      CosPropertyService::Property_out property_out (property_ptr);
+      
+      // Call the funtion.
+      CORBA::Boolean next_one_result = iterator->next_one (property_out,
+                                                           env); 
+      
+      // Get the value to the _var variable.
+      CosPropertyService::Property_var property = property_out.ptr ();
+
+      while (next_one_result != CORBA::B_FALSE)
         {
+          ACE_DEBUG ((LM_DEBUG, "Iteration over PropertyIterartor"));
           TAO_CHECK_ENV_RETURN (env, -1);
           ACE_DEBUG ((LM_DEBUG,
                       "%s : ",
@@ -573,6 +637,13 @@ Client::test_get_all_properties (CORBA::Environment &env)
               property->property_value >>= l;
               ACE_DEBUG ((LM_DEBUG,"%d\n", l));
             }
+          
+          // Call the function for the next iteraton.
+          next_one_result = iterator->next_one (property_out,
+                                                env); 
+      
+          // Get the value to the _var variable.
+          property = property_out.ptr ();
         }
       TAO_CHECK_ENV_RETURN (env, -1);
     }
@@ -605,7 +676,8 @@ Client::test_define_property_with_mode (CORBA::Environment &env)
   if ((env.exception () != 0) &&
       (CORBA::UserException::_narrow (env.exception ()) != 0))
     {
-      env.print_exception ("char_property");      env.clear ();
+      env.print_exception ("char_property");
+      env.clear ();
     }
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -642,9 +714,9 @@ Client::test_define_property_with_mode (CORBA::Environment &env)
               l));
   CORBA::Any newany(anyval);
   propsetdef_->define_property_with_mode ("long_property",
-					  anyval,
-					  CosPropertyService::fixed_normal,
-					  env);
+                                     anyval,
+                                     CosPropertyService::fixed_normal,
+                                     env);
   TAO_CHECK_ENV_RETURN (env, -1);
 
 
@@ -657,9 +729,9 @@ Client::test_define_property_with_mode (CORBA::Environment &env)
               "Main : Float f = %f\n",
               f));
   propsetdef_->define_property_with_mode ("float_property",
-					  anyval,
-					  CosPropertyService::fixed_readonly,
-					  env);
+                                     anyval,
+                                     CosPropertyService::fixed_readonly,
+                                     env);
   TAO_CHECK_ENV_RETURN (env, -1);
 
   // Prepare a String and "define" that in the PropertySet.
@@ -695,7 +767,7 @@ Client::test_get_property_value (CORBA::Environment &env)
       // Check whether the IOR is fine.
       CORBA::Object_var propsetdef_object;
       (*any_ptr) >>= to_object (propsetdef_object);
-
+      
       CosPropertyService::PropertySetDef_var propsetdef =
         CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in (),
                                                      TAO_TRY_ENV);
@@ -717,70 +789,6 @@ Client::test_get_property_value (CORBA::Environment &env)
 }
 
 int
-Client::test_delete_all_properties (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nTesting delete_all_properties\n"));
-
-  TAO_TRY
-    {
-      // Delete all properties.
-      this->propsetdef_->delete_all_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, 0);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("test_delete_all_properties");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-int
-Client::test_get_property_modes (CORBA::Environment &env)
-{
-  // Get all the names and then get all their modes, print'em.
-  ACE_DEBUG ((LM_DEBUG,
-              "\nTesting get_property_modes ()\n"));
-
-  // Get the size.
-  CORBA::ULong num_of_properties =
-    propsetdef_->get_number_of_properties (env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Get all the names in the sequence.
-  CORBA::ULong how_many = num_of_properties;
-  CosPropertyService::PropertyNames_var names_var;
-  CosPropertyService::PropertyNamesIterator_var iterator_var;
-  propsetdef_->get_all_property_names (how_many,
-                                       names_var.out (),
-                                       iterator_var.out (),
-                                       env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Get modes for all these names.
-  CosPropertyService::PropertyModes_var modes;
-  propsetdef_->get_property_modes (names_var.in (),
-                                   modes.out (),
-                                   env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Print the names and the modes.
-  if (modes.ptr () != 0)
-    {
-      CORBA::ULong len = modes->length ();
-
-      for (CORBA::ULong mi = 0; mi < len; mi++)
-        // Print the property_name and the mode.
-        ACE_DEBUG ((LM_DEBUG,
-                    "%s, Mode %d\n",
-                    modes [mi].property_name.in (),
-                    modes [mi].property_mode));
-    }
-}
-
-int
 main (int argc, char **argv)
 {
   TAO_TRY
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index f602d5cf7d6..c9933e868e2 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -89,18 +89,9 @@ protected:
   int test_define_property_with_mode (CORBA::Environment &env);
   // Defines properties with various modes.
 
-  int test_delete_all_properties (CORBA::Environment &env);
-  // Deleting all the properties.
-
-  int test_get_property_modes (CORBA::Environment &env);
-  // Getting the modes of some properties.
-
   TAO_ORB_Manager manager_;
   // The ORB manager, handles ORB initialization etc.
 
-  TAO_Naming_Client my_name_client_;
-  // The Name Client, simplifies NameService interaction
-
   CosPropertyService::PropertySetDef_var propsetdef_;
   // To test propertySetDef interface.
 };
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 2e42776be21..4d3ae356aa7 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-// ======================================================================
+// ========================================================================
 //
 // = FILE  
 //     Program to test the property services.
@@ -13,12 +13,12 @@
 // = AUTHOR
 //     Alexander Babu Arulanthu <alex@cs.wustl.edu>
 //
-// ====================================================================== 
+// ======================================================================== 
 
 #include "orbsvcs/CosPropertyServiceS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 
-ACE_RCSID(Property, main, "$Id$")
+ACE_RCSID(CosPropertyService, main, "$Id$")
 
 class TAO_PropertySet_Tester
 {
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index eb172bac584..c32755344b9 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -18,7 +18,7 @@
 
 #include "server.h"
 
-ACE_RCSID(Property, server, "$Id$")
+ACE_RCSID(CosPropertyService, server, "$Id$")
 
 // Main program