ChangeLogTag:Sun Aug 27 16:02:47 2000 Carlos O'Ryan <coryan@uci.edu>

11 files changed, 331 insertions, 204 deletions

diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile
index 9b07f182f25..6d3ead9c4fb 100644
--- a/TAO/tests/DynAny_Test/Makefile
+++ b/TAO/tests/DynAny_Test/Makefile
@@ -70,12 +70,10 @@ realclean:	clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/da_testsC.o .obj/da_testsC.so .shobj/da_testsC.o .shobj/da_testsC.so: da_testsC.cpp da_testsC.h \
+.obj/da_testsC.o .obj/da_testsC.o .obj/da_testsC.o .obj/da_testsC.o: da_testsC.cpp da_testsC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -228,8 +226,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -371,8 +367,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -389,14 +383,13 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i da_testsC.i
+ $(TAO_ROOT)/tao/MessagingS.i \
+ da_testsC.i
 
-.obj/da_testsS.o .obj/da_testsS.so .shobj/da_testsS.o .shobj/da_testsS.so: da_testsS.cpp da_testsS.h da_testsC.h \
+.obj/da_testsS.o .obj/da_testsS.o .obj/da_testsS.o .obj/da_testsS.o: da_testsS.cpp da_testsS.h da_testsC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -549,8 +542,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -692,8 +683,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -710,15 +699,13 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i da_testsC.i \
- da_testsS_T.h da_testsS_T.i da_testsS_T.cpp da_testsS.i
+ $(TAO_ROOT)/tao/MessagingS.i \
+ da_testsC.i da_testsS_T.h da_testsS_T.i da_testsS_T.cpp da_testsS.i
 
-.obj/data.o .obj/data.so .shobj/data.o .shobj/data.so: data.cpp data.h \
+.obj/data.o .obj/data.o .obj/data.o .obj/data.o: data.cpp data.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -871,8 +858,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -1014,8 +999,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1034,12 +1017,11 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/MessagingS.i
 
-.obj/driver.o .obj/driver.so .shobj/driver.o .shobj/driver.so: driver.cpp $(ACE_ROOT)/ace/Get_Opt.h \
+.obj/driver.o .obj/driver.o .obj/driver.o .obj/driver.o: driver.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -1070,7 +1052,8 @@ realclean:	clean
  $(ACE_ROOT)/ace/Thread_Control.h \
  $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i test_dynany.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ test_dynany.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1193,8 +1176,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -1336,8 +1317,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1358,12 +1337,10 @@ realclean:	clean
  test_dynarray.h test_dynenum.h test_dynsequence.h test_dynstruct.h \
  test_dynunion.h test_wrapper.h test_wrapper.cpp driver.h
 
-.obj/test_dynany.o .obj/test_dynany.so .shobj/test_dynany.o .shobj/test_dynany.so: test_dynany.cpp test_dynany.h \
+.obj/test_dynany.o .obj/test_dynany.o .obj/test_dynany.o .obj/test_dynany.o: test_dynany.cpp test_dynany.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -1516,8 +1493,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -1659,8 +1634,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1677,14 +1650,19 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i data.h
+ $(TAO_ROOT)/tao/MessagingS.i \
+ data.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \
+ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \
+ $(TAO_ROOT)/tao/Object_Loader.h \
+ $(TAO_ROOT)/tao/Object_Loader.i \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.i
 
-.obj/test_dynarray.o .obj/test_dynarray.so .shobj/test_dynarray.o .shobj/test_dynarray.so: test_dynarray.cpp test_dynarray.h \
+.obj/test_dynarray.o .obj/test_dynarray.o .obj/test_dynarray.o .obj/test_dynarray.o: test_dynarray.cpp test_dynarray.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -1837,8 +1815,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -1980,8 +1956,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1998,15 +1972,19 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i da_testsC.h \
- da_testsC.i data.h
+ $(TAO_ROOT)/tao/MessagingS.i \
+ da_testsC.h da_testsC.i data.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \
+ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \
+ $(TAO_ROOT)/tao/Object_Loader.h \
+ $(TAO_ROOT)/tao/Object_Loader.i \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.i
 
-.obj/test_dynenum.o .obj/test_dynenum.so .shobj/test_dynenum.o .shobj/test_dynenum.so: test_dynenum.cpp test_dynenum.h \
+.obj/test_dynenum.o .obj/test_dynenum.o .obj/test_dynenum.o .obj/test_dynenum.o: test_dynenum.cpp test_dynenum.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -2159,8 +2137,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -2302,8 +2278,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2320,15 +2294,19 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i da_testsC.h \
- da_testsC.i data.h
+ $(TAO_ROOT)/tao/MessagingS.i \
+ da_testsC.h da_testsC.i data.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \
+ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \
+ $(TAO_ROOT)/tao/Object_Loader.h \
+ $(TAO_ROOT)/tao/Object_Loader.i \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.i
 
-.obj/test_dynsequence.o .obj/test_dynsequence.so .shobj/test_dynsequence.o .shobj/test_dynsequence.so: test_dynsequence.cpp test_dynsequence.h \
+.obj/test_dynsequence.o .obj/test_dynsequence.o .obj/test_dynsequence.o .obj/test_dynsequence.o: test_dynsequence.cpp test_dynsequence.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -2481,8 +2459,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -2624,8 +2600,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2642,15 +2616,19 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i da_testsC.h \
- da_testsC.i data.h
+ $(TAO_ROOT)/tao/MessagingS.i \
+ da_testsC.h da_testsC.i data.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \
+ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \
+ $(TAO_ROOT)/tao/Object_Loader.h \
+ $(TAO_ROOT)/tao/Object_Loader.i \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.i
 
-.obj/test_dynstruct.o .obj/test_dynstruct.so .shobj/test_dynstruct.o .shobj/test_dynstruct.so: test_dynstruct.cpp test_dynstruct.h \
+.obj/test_dynstruct.o .obj/test_dynstruct.o .obj/test_dynstruct.o .obj/test_dynstruct.o: test_dynstruct.cpp test_dynstruct.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -2803,8 +2781,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -2946,8 +2922,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2964,15 +2938,19 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i da_testsC.h \
- da_testsC.i data.h
+ $(TAO_ROOT)/tao/MessagingS.i \
+ da_testsC.h da_testsC.i data.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \
+ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \
+ $(TAO_ROOT)/tao/Object_Loader.h \
+ $(TAO_ROOT)/tao/Object_Loader.i \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.i
 
-.obj/test_dynunion.o .obj/test_dynunion.so .shobj/test_dynunion.o .shobj/test_dynunion.so: test_dynunion.cpp test_dynunion.h \
+.obj/test_dynunion.o .obj/test_dynunion.o .obj/test_dynunion.o .obj/test_dynunion.o: test_dynunion.cpp test_dynunion.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -3125,8 +3103,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
@@ -3268,8 +3244,6 @@ realclean:	clean
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3286,14 +3260,18 @@ realclean:	clean
  $(TAO_ROOT)/tao/MessagingS_T.h \
  $(TAO_ROOT)/tao/MessagingS_T.i \
  $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i da_testsC.h \
- da_testsC.i data.h
+ $(TAO_ROOT)/tao/MessagingS.i \
+ da_testsC.h da_testsC.i data.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \
+ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \
+ $(TAO_ROOT)/tao/Object_Loader.h \
+ $(TAO_ROOT)/tao/Object_Loader.i \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.h \
+ $(TAO_ROOT)/tao/DynamicAny/DynamicAnyC.i
 
-.obj/test_wrapper.o .obj/test_wrapper.so .shobj/test_wrapper.o .shobj/test_wrapper.so: test_wrapper.cpp test_wrapper.h \
+.obj/test_wrapper.o .obj/test_wrapper.o .obj/test_wrapper.o .obj/test_wrapper.o: test_wrapper.cpp test_wrapper.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 5e0b72d346c..b1111d386a8 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -30,7 +30,7 @@
 int main (int argc, char* argv[])
 {
   Driver driver;
-  
+
   // initialize the driver
   if (driver.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -133,7 +133,7 @@ Driver::parse_args (int argc, char* argv[])
                           -1);
       }
 
-  // Indicates successful parsing of command line.        
+  // Indicates successful parsing of command line.
   return 0;
 }
 
@@ -146,7 +146,7 @@ Driver::run (void)
     {
       case TEST_DYNANY:
         {
-          Test_Wrapper<Test_DynAny>* wrapper = 
+          Test_Wrapper<Test_DynAny>* wrapper =
             new Test_Wrapper<Test_DynAny> (new Test_DynAny (this->orb_));
           retstatus = wrapper->run_test ();
           delete wrapper;
@@ -154,7 +154,7 @@ Driver::run (void)
         break;
       case TEST_DYNARRAY:
         {
-          Test_Wrapper<Test_DynArray>* wrapper = 
+          Test_Wrapper<Test_DynArray>* wrapper =
             new Test_Wrapper<Test_DynArray> (new Test_DynArray (this->orb_));
           retstatus = wrapper->run_test ();
           delete wrapper;
@@ -162,7 +162,7 @@ Driver::run (void)
         break;
       case TEST_DYNENUM:
         {
-          Test_Wrapper<Test_DynEnum>* wrapper = 
+          Test_Wrapper<Test_DynEnum>* wrapper =
             new Test_Wrapper<Test_DynEnum> (new Test_DynEnum (this->orb_));
           retstatus = wrapper->run_test ();
           delete wrapper;
@@ -170,7 +170,7 @@ Driver::run (void)
         break;
       case TEST_DYNSEQUENCE:
         {
-          Test_Wrapper<Test_DynSequence>* wrapper = 
+          Test_Wrapper<Test_DynSequence>* wrapper =
             new Test_Wrapper<Test_DynSequence> (new Test_DynSequence (this->orb_));
           retstatus = wrapper->run_test ();
           delete wrapper;
@@ -178,7 +178,7 @@ Driver::run (void)
         break;
       case TEST_DYNSTRUCT:
         {
-          Test_Wrapper<Test_DynStruct>* wrapper = 
+          Test_Wrapper<Test_DynStruct>* wrapper =
             new Test_Wrapper<Test_DynStruct> (new Test_DynStruct (this->orb_));
           retstatus = wrapper->run_test ();
           delete wrapper;
@@ -186,7 +186,7 @@ Driver::run (void)
         break;
       case TEST_DYNUNION:
         {
-          Test_Wrapper<Test_DynUnion>* wrapper = 
+          Test_Wrapper<Test_DynUnion>* wrapper =
             new Test_Wrapper<Test_DynUnion> (new Test_DynUnion (this->orb_));
           retstatus = wrapper->run_test ();
           delete wrapper;
@@ -240,4 +240,3 @@ template class Test_Wrapper<Test_DynUnion>;
 #pragma instantiate Test_Wrapper<Test_DynStruct>
 #pragma instantiate Test_Wrapper<Test_DynUnion>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index a84b9446d2e..a09a92e5c1a 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -18,7 +18,7 @@
 
 #include "test_dynany.h"
 #include "data.h"
-
+#include "tao/DynamicAny/DynamicAny.h"
 
 Test_DynAny::Test_DynAny (CORBA::ORB_var orb)
   : orb_ (orb),
@@ -35,7 +35,7 @@ Test_DynAny::~Test_DynAny (void)
 
 const char*
 Test_DynAny::test_name (void) const
-{ 
+{
   return this->test_name_;
 }
 
@@ -53,11 +53,26 @@ Test_DynAny::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/insert/get\n"));
 
-      CORBA_Any in1 (CORBA::_tc_double);
-      CORBA_DynAny_var fa1 = this->orb_->create_dyn_any (in1,
-                                                         ACE_TRY_ENV);
+      CORBA::Object_var factory_obj =
+        this->orb_->resolve_initial_references ("DynAnyFactory",
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynAnyFactory_var dynany_factory =
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
+                                            ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      fa1->insert_double (data.m_double1, 
+      if (CORBA::is_nil (dynany_factory.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil dynamic any factory after narrow\n"),
+                          -1);
+
+      CORBA::Any in1 (CORBA::_tc_double);
+      DynamicAny::DynAny_var fa1 =
+        dynany_factory->create_dyn_any (in1, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      fa1->insert_double (data.m_double1,
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::Double d_out = fa1->get_double (ACE_TRY_ENV);
@@ -65,20 +80,20 @@ Test_DynAny::run_test (void)
       if (d_out == data.m_double1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       d_out = data.m_double2;
-      CORBA_DynAny_var ftc1 = 
-        this->orb_->create_basic_dyn_any (CORBA::_tc_double,
-                                          ACE_TRY_ENV);
+      DynamicAny::DynAny_var ftc1 =
+        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double,
+                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::Any in_any1;
       in_any1 <<= data.m_double1;
-      ftc1->from_any (in_any1, 
+      ftc1->from_any (in_any1,
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
@@ -88,7 +103,7 @@ Test_DynAny::run_test (void)
       if (d_out == data.m_double1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       fa1->destroy (ACE_TRY_ENV);
@@ -104,11 +119,11 @@ Test_DynAny::run_test (void)
                  "testing: constructor(Any)/insert/get\n"));
 
       CORBA_Any in (CORBA::_tc_TypeCode);
-      CORBA_DynAny_var fa2 = 
-        this->orb_->create_dyn_any (in,
-                                    ACE_TRY_ENV);
+      DynamicAny::DynAny_var fa2 =
+        dynany_factory->create_dyn_any (in,
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      fa2->insert_typecode (data.m_typecode1, 
+      fa2->insert_typecode (data.m_typecode1,
                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::TypeCode_var tc_out = fa2->get_typecode (ACE_TRY_ENV);
@@ -117,7 +132,7 @@ Test_DynAny::run_test (void)
                          ACE_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       ACE_TRY_CHECK;
@@ -125,13 +140,13 @@ Test_DynAny::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynAny_var ftc2 = 
-        this->orb_->create_basic_dyn_any (CORBA::_tc_TypeCode,
-                                          ACE_TRY_ENV);
+      DynamicAny::DynAny_var ftc2 =
+        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode,
+                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::Any in_any2;
       in_any2 <<= data.m_typecode1;
-      ftc2->from_any (in_any2, 
+      ftc2->from_any (in_any2,
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::Any_var out_any2 = ftc2->to_any (ACE_TRY_ENV);
@@ -143,7 +158,7 @@ Test_DynAny::run_test (void)
                         ACE_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       ACE_TRY_CHECK;
@@ -167,4 +182,3 @@ Test_DynAny::run_test (void)
 
   return 0;
 }
-
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 37ca93795a9..1e6d2b90435 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -19,6 +19,7 @@
 #include "test_dynarray.h"
 #include "da_testsC.h"
 #include "data.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 Test_DynArray::Test_DynArray (CORBA::ORB_var orb)
   : orb_ (orb),
@@ -35,7 +36,7 @@ Test_DynArray::~Test_DynArray (void)
 
 const char*
 Test_DynArray::test_name (void) const
-{ 
+{
   return this->test_name_;
 }
 
@@ -55,12 +56,27 @@ Test_DynArray::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/insert/get/seek/rewind/current_component\n"));
 
+      CORBA::Object_var factory_obj =
+        this->orb_->resolve_initial_references ("DynAnyFactory",
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynAnyFactory_var dynany_factory =
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
+                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (CORBA::is_nil (dynany_factory.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil dynamic any factory after narrow\n"),
+                          -1);
+
       CORBA::Any in_any1;
       in_any1 <<= ta;
-      CORBA_DynAny_var dp1 = this->orb_->create_dyn_any (in_any1,
-                                                         ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp1 =
+        dynany_factory->create_dyn_any (in_any1,
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynArray_var fa1 = CORBA_DynArray::_narrow (dp1.in (),
+      DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in (),
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->seek (1,
@@ -80,16 +96,27 @@ Test_DynArray::run_test (void)
       if (l_out1 == data.m_long1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynArray_var ftc1 = 
-        this->orb_->create_dyn_array (DynAnyTests::_tc_test_array,
-                                      ACE_TRY_ENV);
+      DynamicAny::DynAny_var ftc1_base =
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array,
+                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      DynamicAny::DynArray_var ftc1 =
+        DynamicAny::DynArray::_narrow (ftc1_base.in (),
+                                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (ftc1.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "DynArray::_narrow() returned nil\n"),
+                          -1);
+
       ta[1] = data.m_long1;
       CORBA::Any in_any2;
       in_any2 <<= ta;
@@ -99,18 +126,18 @@ Test_DynArray::run_test (void)
       CORBA::Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       DynAnyTests::test_array_forany ta_out;
-      out_any1.in () >>= ta_out; 
-      
+      out_any1.in () >>= ta_out;
+
       if (ta_out[(CORBA::ULong) 1] == data.m_long1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_elements/get_elements\n"));
 
-      CORBA::AnySeq as_in (2);
+      DynamicAny::AnySeq as_in (2);
       as_in.length (2);
       CORBA::Any in_any3;
       in_any3 <<= data.m_long1;
@@ -119,7 +146,7 @@ Test_DynArray::run_test (void)
       ftc1->set_elements (as_in,
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::AnySeq* as_out = ftc1->get_elements (ACE_TRY_ENV);
+      DynamicAny::AnySeq* as_out = ftc1->get_elements (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA_Any out_any2 = (*as_out)[1];
       CORBA::Long l_out2;
@@ -127,7 +154,7 @@ Test_DynArray::run_test (void)
       if (l_out2 == data.m_long1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       // Created with NEW
@@ -152,4 +179,3 @@ Test_DynArray::run_test (void)
 
   return 0;
 }
-
diff --git a/TAO/tests/DynAny_Test/test_dynarray.h b/TAO/tests/DynAny_Test/test_dynarray.h
index 428d9666443..63bab567490 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.h
+++ b/TAO/tests/DynAny_Test/test_dynarray.h
@@ -38,4 +38,3 @@ private:
 };
 
 #endif /* TEST_DYNARRAY_H */
-
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 38301c557f2..f544a2da169 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -19,6 +19,7 @@
 #include "test_dynenum.h"
 #include "da_testsC.h"
 #include "data.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 Test_DynEnum::Test_DynEnum (CORBA::ORB_var orb)
   : orb_ (orb),
@@ -35,7 +36,7 @@ Test_DynEnum::~Test_DynEnum (void)
 
 const char*
 Test_DynEnum::test_name (void) const
-{ 
+{
   return this->test_name_;
 }
 
@@ -49,47 +50,72 @@ Test_DynEnum::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/value_as_ulong\n"));
 
+      CORBA::Object_var factory_obj =
+        this->orb_->resolve_initial_references ("DynAnyFactory",
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynAnyFactory_var dynany_factory =
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
+                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (CORBA::is_nil (dynany_factory.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil dynamic any factory after narrow\n"),
+                          -1);
+
       CORBA_Any in_any1;
       in_any1 <<= te;
-      CORBA_DynAny_var dp1 = this->orb_->create_dyn_any (in_any1,
-                                                         ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp1 =
+        dynany_factory->create_dyn_any (in_any1,
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynEnum_var de1 = CORBA_DynEnum::_narrow (dp1.in (),
+      DynamicAny::DynEnum_var de1 = DynamicAny::DynEnum::_narrow (dp1.in (),
                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      de1->value_as_ulong (2,
-                           ACE_TRY_ENV);
+      de1->set_as_ulong (2, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::ULong ul_out1 = de1->value_as_ulong (ACE_TRY_ENV);
+      CORBA::ULong ul_out1 = de1->get_as_ulong (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (ul_out1 == 2)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: value_as_string\n"));
 
-      de1->value_as_string ("TE_FIRST",
-                            ACE_TRY_ENV);
+      de1->set_as_string ("TE_FIRST",
+                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::String_var s = de1->value_as_string (ACE_TRY_ENV);
+      CORBA::String_var s = de1->get_as_string (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (!ACE_OS::strcmp (s.in (), "TE_FIRST"))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynEnum_var de2 = 
-        this->orb_->create_dyn_enum (DynAnyTests::_tc_test_enum,
-                                     ACE_TRY_ENV);
+      DynamicAny::DynAny_var de2_base =
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum,
+                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      DynamicAny::DynEnum_var de2 =
+        DynamicAny::DynEnum::_narrow (de2_base.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (de2.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "DynEnum::_narrow() returned nil\n"),
+                          -1);
+
       CORBA_Any in_any2;
       in_any2 <<= DynAnyTests::TE_THIRD;
       de2->from_any (in_any2,
@@ -101,7 +127,7 @@ Test_DynEnum::run_test (void)
       if (te == DynAnyTests::TE_THIRD)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       de1->destroy (ACE_TRY_ENV);
@@ -123,4 +149,3 @@ Test_DynEnum::run_test (void)
 
   return 0;
 }
-
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 26f969a7b35..2bf09ecff96 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -19,6 +19,7 @@
 #include "test_dynsequence.h"
 #include "da_testsC.h"
 #include "data.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 Test_DynSequence::Test_DynSequence (CORBA::ORB_var orb)
   : orb_ (orb),
@@ -56,15 +57,29 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/insert/get/seek/rewind/current_component\n"));
 
+      CORBA::Object_var factory_obj =
+        this->orb_->resolve_initial_references ("DynAnyFactory",
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynAnyFactory_var dynany_factory =
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
+                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (CORBA::is_nil (dynany_factory.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil dynamic any factory after narrow\n"),
+                          -1);
+
       ts[0] = data.m_string2;
       ts[1] = data.m_string2;
       CORBA_Any in_any1;
       in_any1 <<= ts;
-      CORBA_DynAny_var dp1 =
-        this->orb_->create_dyn_any (in_any1,
-                                    ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp1 =
+        dynany_factory->create_dyn_any (in_any1,
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynSequence_var fa1 = CORBA_DynSequence::_narrow (dp1.in (),
+      DynamicAny::DynSequence_var fa1 = DynamicAny::DynSequence::_narrow (dp1.in (),
                                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->seek (1,
@@ -89,10 +104,21 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynSequence_var ftc1 =
-        this->orb_->create_dyn_sequence (DynAnyTests::_tc_test_seq,
-                                         ACE_TRY_ENV);
+      DynamicAny::DynAny_var ftc1_base =
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_seq,
+                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      DynamicAny::DynSequence_var ftc1 =
+        DynamicAny::DynSequence::_narrow (ftc1_base.in (),
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (ftc1.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "DynSequence::_narrow() returned nil\n"),
+                          -1);
+
       ts[0] = CORBA::string_dup (data.m_string1);
       CORBA_Any in_any2;
       in_any2 <<= ts;
@@ -116,14 +142,14 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: length/set_elements/get_elements\n"));
 
-      if (ftc1->length (ACE_TRY_ENV) != 2)
+      if (ftc1->get_length (ACE_TRY_ENV) != 2)
         ++this->error_count_;
       ACE_TRY_CHECK;
 
-      ftc1->length (3,
-                    ACE_TRY_ENV);
+      ftc1->set_length (3,
+                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::AnySeq as_in (3);
+      DynamicAny::AnySeq as_in (3);
       as_in.length (3);
       CORBA_Any in_any3;
       in_any3 <<= CORBA::Any::from_string (data.m_string2, 0);
@@ -134,7 +160,7 @@ Test_DynSequence::run_test (void)
       ftc1->set_elements (as_in,
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::AnySeq_var as_out = ftc1->get_elements (ACE_TRY_ENV);
+      DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::ULong index = 2;
       CORBA_Any out_any2 = as_out[index];
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 483242c9433..1d286fb4dc2 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -19,6 +19,7 @@
 #include "test_dynstruct.h"
 #include "da_testsC.h"
 #include "data.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 Test_DynStruct::Test_DynStruct (CORBA::ORB_var orb)
   : orb_ (orb),
@@ -35,7 +36,7 @@ Test_DynStruct::~Test_DynStruct (void)
 
 const char*
 Test_DynStruct::test_name (void) const
-{ 
+{
   return this->test_name_;
 }
 
@@ -55,14 +56,29 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/insert/get/next/seek/rewind/current_component\n"));
 
-      CORBA_Any in_any1;
+      CORBA::Object_var factory_obj =
+        this->orb_->resolve_initial_references ("DynAnyFactory",
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynAnyFactory_var dynany_factory =
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
+                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (CORBA::is_nil (dynany_factory.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil dynamic any factory after narrow\n"),
+                          -1);
+
+      CORBA::Any in_any1;
       in_any1 <<= ts;
-      CORBA_DynAny_var dp1 = 
-        this->orb_->create_dyn_any (in_any1,
-                                    ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp1 =
+        dynany_factory->create_dyn_any (in_any1,
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynStruct_var fa1 = CORBA_DynStruct::_narrow (dp1.in (),
-                                                          ACE_TRY_ENV);
+      DynamicAny::DynStruct_var fa1 =
+        DynamicAny::DynStruct::_narrow (dp1.in (),
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->insert_char (data.m_char1,
                         ACE_TRY_ENV);
@@ -71,7 +87,7 @@ Test_DynStruct::run_test (void)
                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      CORBA::DynAny_var cc = fa1->current_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = fa1->current_component (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       cc->insert_float (data.m_float1,
                         ACE_TRY_ENV);
@@ -115,14 +131,25 @@ Test_DynStruct::run_test (void)
       if (this->error_count_ == 0)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
- 
+
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_DynStruct_var ftc1 = 
-        this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
-                                       ACE_TRY_ENV);
+      DynamicAny::DynAny_var ftc1_base =
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct,
+                                                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynStruct_var ftc1 =
+        DynamicAny::DynStruct::_narrow (ftc1_base.in (),
+                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (ftc1.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "DynStruct::_narrow() returned nil\n"),
+                          -1);
+
       ts.c = data.m_char1;
       ts.l = data.m_long1;
       ts.es.f = data.m_float1;
@@ -139,7 +166,7 @@ Test_DynStruct::run_test (void)
       if (ts_out->es.s == data.m_short1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
-      else 
+      else
         ++this->error_count_;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -158,20 +185,31 @@ Test_DynStruct::run_test (void)
         ++this->error_count_;
       if (this->error_count_ == 0)
         ACE_DEBUG ((LM_DEBUG,
-                   "++ OK ++\n")); 
+                   "++ OK ++\n"));
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: get_members/set_members\n"));
 
-      CORBA::NameValuePairSeq_var nvps = fa1->get_members (ACE_TRY_ENV);
-      CORBA_DynStruct_var sm =
-        this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
-                                       ACE_TRY_ENV);
+      DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (ACE_TRY_ENV);
+      DynamicAny::DynAny_var sm_base =
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct,
+                                                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynStruct_var sm =
+        DynamicAny::DynStruct::_narrow (sm_base.in (),
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (sm.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "DynStruct::_narrow()[2] returned nil\n"),
+                          -1);
+
       sm->set_members (nvps.in (),
                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA::NameValuePairSeq_var gm = sm->get_members (ACE_TRY_ENV);
+      DynamicAny::NameValuePairSeq_var gm = sm->get_members (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::ULong index = 2;
       if (ACE_OS::strcmp (gm[index].id, "es"))
@@ -198,4 +236,3 @@ Test_DynStruct::run_test (void)
 
   return 0;
 }
-
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.h b/TAO/tests/DynAny_Test/test_dynstruct.h
index 199bb690dee..0e03c2d599c 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.h
+++ b/TAO/tests/DynAny_Test/test_dynstruct.h
@@ -38,4 +38,3 @@ private:
 };
 
 #endif /* TEST_DYNSTRUCT_H */
-
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 383207e9281..e7d3edcdb3d 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -19,6 +19,7 @@
 #include "test_dynunion.h"
 #include "da_testsC.h"
 #include "data.h"
+#include "tao/DynamicAny/DynamicAny.h"
 
 Test_DynUnion::Test_DynUnion (CORBA::ORB_var orb)
   : orb_ (orb),
@@ -55,16 +56,31 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/insert/get\n"));
 
+      CORBA::Object_var factory_obj =
+        this->orb_->resolve_initial_references ("DynAnyFactory",
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      DynamicAny::DynAnyFactory_var dynany_factory =
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
+                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (CORBA::is_nil (dynany_factory.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil dynamic any factory after narrow\n"),
+                          -1);
+
       tu._d(DynAnyTests::TE_SECOND);
       tu.tc (data.m_typecode2);
       CORBA_Any in_any1;
       in_any1 <<= tu;
-      CORBA_DynAny_var dp1 =
-        this->orb_->create_dyn_any (in_any1,
-                                    ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp1 =
+        dynany_factory->create_dyn_any (in_any1,
+                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynUnion_var fa1 = CORBA_DynUnion::_narrow (dp1.in (),
-                                                        ACE_TRY_ENV);
+      DynamicAny::DynUnion_var fa1 =
+        DynamicAny::DynUnion::_narrow (dp1.in (),
+                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
       fa1->insert_typecode (data.m_typecode1,
                             ACE_TRY_ENV);
@@ -82,10 +98,21 @@ Test_DynUnion::run_test (void)
 
       CORBA_Any_var out_any1 = fa1->to_any (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      CORBA_DynUnion_var ftc1 =
-        this->orb_->create_dyn_union (DynAnyTests::_tc_test_union,
-                                      ACE_TRY_ENV);
+      DynamicAny::DynAny_var ftc1_base =
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union,
+                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      DynamicAny::DynUnion_var ftc1 =
+        DynamicAny::DynUnion::_narrow (ftc1_base.in (),
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (ftc1.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "DynUnion::_narrow() returned nil\n"),
+                          -1);
+
       ftc1->from_any (out_any1.in (),
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -100,21 +127,18 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_as_default\n"));
 
-      if (!ftc1->set_as_default (ACE_TRY_ENV))
-        ACE_DEBUG ((LM_DEBUG,
-                   "++ OK ++\n"));
-      else
-        ++this->error_count_;
-
+      ftc1->set_to_default_member (ACE_TRY_ENV);
       ACE_TRY_CHECK;
+      ACE_DEBUG ((LM_DEBUG,
+                  "++ OK ++\n"));
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing:discriminator/discriminator_kind\n"));
 
-      CORBA_DynAny_var dp2 = ftc1->discriminator (ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (dp2->type (ACE_TRY_ENV)->kind ()
-            == ftc1->discriminator_kind (ACE_TRY_ENV))
+          == ftc1->discriminator_kind (ACE_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else
@@ -125,7 +149,7 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:member/member_kind/member_name\n"));
 
-      CORBA_DynAny_var dp3 = ftc1->member (ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp3 = ftc1->member (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::String_var m_nm = ftc1->member_name (ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/DynAny_Test/test_wrapper.cpp b/TAO/tests/DynAny_Test/test_wrapper.cpp
index ee804a53393..aa8c3fbe667 100644
--- a/TAO/tests/DynAny_Test/test_wrapper.cpp
+++ b/TAO/tests/DynAny_Test/test_wrapper.cpp
@@ -52,7 +52,7 @@ Test_Wrapper<T>::run_test (void)
                   "(%N:%l) test_wrapper.cpp - run_test:"
                   "run_test exception in %s",
                   test_name));
-      
+
       return -1;
     }