summaryrefslogtreecommitdiff
path: root/TAO/tests/POA
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/POA')
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc2
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/Makefile.am78
-rw-r--r--TAO/tests/POA/Current/.cvsignore1
-rw-r--r--TAO/tests/POA/Current/Makefile.am46
-rw-r--r--TAO/tests/POA/Deactivate_Object/Makefile.am80
-rw-r--r--TAO/tests/POA/Default_Servant/.cvsignore1
-rw-r--r--TAO/tests/POA/Default_Servant/Default_Servant.mpc2
-rw-r--r--TAO/tests/POA/Default_Servant/Makefile.am78
-rw-r--r--TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc24
-rw-r--r--TAO/tests/POA/EndpointPolicy/Makefile.am108
-rw-r--r--TAO/tests/POA/Etherealization/.cvsignore1
-rw-r--r--TAO/tests/POA/Etherealization/Etherealization.mpc2
-rw-r--r--TAO/tests/POA/Etherealization/Makefile.am78
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore1
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc2
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am78
-rw-r--r--TAO/tests/POA/Identity/.cvsignore1
-rw-r--r--TAO/tests/POA/Identity/Identity.mpc2
-rw-r--r--TAO/tests/POA/Identity/Makefile.am78
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/.cvsignore1
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc2
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/Makefile.am78
-rw-r--r--TAO/tests/POA/Makefile.am31
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore1
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am78
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc2
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/.cvsignore1
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/Makefile.am78
-rw-r--r--TAO/tests/POA/Object_Reactivation/.cvsignore1
-rw-r--r--TAO/tests/POA/Object_Reactivation/Makefile.am78
-rw-r--r--TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc2
-rw-r--r--TAO/tests/POA/POAManagerFactory/Makefile.am49
-rw-r--r--TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc2
-rw-r--r--TAO/tests/POA/POA_Destruction/.cvsignore1
-rw-r--r--TAO/tests/POA/POA_Destruction/Makefile.am78
-rw-r--r--TAO/tests/POA/Persistent_ID/.cvsignore2
-rw-r--r--TAO/tests/POA/Persistent_ID/Makefile.am104
-rw-r--r--TAO/tests/POA/Persistent_ID/Persistent_ID.mpc22
-rw-r--r--TAO/tests/POA/Policies/.cvsignore1
-rw-r--r--TAO/tests/POA/Policies/Makefile.am49
-rw-r--r--TAO/tests/POA/Policies/Policies.cpp4
-rw-r--r--TAO/tests/POA/Policies/Policies.mpc2
-rw-r--r--TAO/tests/POA/Reference_Counting/Makefile.am78
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/.cvsignore1
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/Makefile.am78
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc2
-rw-r--r--TAO/tests/POA/wait_for_completion/.cvsignore1
-rw-r--r--TAO/tests/POA/wait_for_completion/Makefile.am78
48 files changed, 32 insertions, 1536 deletions
diff --git a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
index 91146f271ff..8bd676130d6 100644
--- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
+++ b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, minimum_corba {
}
diff --git a/TAO/tests/POA/Bug_2511_Regression/Makefile.am b/TAO/tests/POA/Bug_2511_Regression/Makefile.am
deleted file mode 100644
index 06398d5da19..00000000000
--- a/TAO/tests/POA/Bug_2511_Regression/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Bug_2511_Regression.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
- server.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-server_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Current/.cvsignore b/TAO/tests/POA/Current/.cvsignore
new file mode 100644
index 00000000000..d8a2b853f2c
--- /dev/null
+++ b/TAO/tests/POA/Current/.cvsignore
@@ -0,0 +1 @@
+Current
diff --git a/TAO/tests/POA/Current/Makefile.am b/TAO/tests/POA/Current/Makefile.am
deleted file mode 100644
index ed1e544b1a9..00000000000
--- a/TAO/tests/POA/Current/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Current.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Current
-
-Current_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Current_SOURCES = \
- Current.cpp
-
-Current_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Deactivate_Object/Makefile.am b/TAO/tests/POA/Deactivate_Object/Makefile.am
deleted file mode 100644
index dcde647032c..00000000000
--- a/TAO/tests/POA/Deactivate_Object/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Deactivate_Object_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- TestC.cpp \
- TestC.h \
- TestC.inl \
- TestS.cpp \
- TestS.h \
- TestS.inl
-
-CLEANFILES = \
- Test-stamp \
- TestC.cpp \
- TestC.h \
- TestC.inl \
- TestS.cpp \
- TestS.h \
- TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
- @touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
- Hello.cpp \
- TestC.cpp \
- TestS.cpp \
- server.cpp \
- Hello.h \
- TestC.h \
- TestC.inl \
- TestS.h \
- TestS.inl
-
-server_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Default_Servant/.cvsignore b/TAO/tests/POA/Default_Servant/.cvsignore
new file mode 100644
index 00000000000..1a4929b3b80
--- /dev/null
+++ b/TAO/tests/POA/Default_Servant/.cvsignore
@@ -0,0 +1 @@
+Default_Servant
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
index 582c1f14733..c96018f073f 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
@@ -1,6 +1,6 @@
// -*- MPC -*-
// $Id$
-project(POA Default Servant): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA Default Servant): taoserver, minimum_corba {
exename = Default_Servant
}
diff --git a/TAO/tests/POA/Default_Servant/Makefile.am b/TAO/tests/POA/Default_Servant/Makefile.am
deleted file mode 100644
index f55f9ec8940..00000000000
--- a/TAO/tests/POA/Default_Servant/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Default_Servant.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Default_Servant
-
-Default_Servant_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Default_Servant_SOURCES = \
- Default_Servant.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Default_Servant_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index a3db1635f9c..5411e0e656f 100644
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -1,37 +1,19 @@
// -*- MPC -*-
// $Id$
-project(*idl): taoidldefaults {
+project(*Server): taoserver, endpointpolicy, pi_server, minimum_corba {
idlflags += -Sa -St
- IDL_Files {
- Test.idl
- }
- custom_only = 1
-}
-
-project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
- after += *idl
Source_Files {
Hello.cpp
server.cpp
}
- Source_Files {
- TestC.cpp
- TestS.cpp
- }
- IDL_Files {
- }
}
project(*Client): taoclient {
- after += *idl
after += *Server
Source_Files {
- client.cpp
- }
- Source_Files {
TestC.cpp
- }
- IDL_Files {
+ client.cpp
}
}
+
diff --git a/TAO/tests/POA/EndpointPolicy/Makefile.am b/TAO/tests/POA/EndpointPolicy/Makefile.am
deleted file mode 100644
index c59078cc840..00000000000
--- a/TAO/tests/POA/EndpointPolicy/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.EndpointPolicy_Idl.am
-
-BUILT_SOURCES = \
- TestC.cpp \
- TestC.h \
- TestC.inl \
- TestS.cpp \
- TestS.h \
- TestS.inl
-
-CLEANFILES = \
- Test-stamp \
- TestC.cpp \
- TestC.h \
- TestC.inl \
- TestS.cpp \
- TestS.h \
- TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl
- @touch $@
-
-noinst_HEADERS = \
- Test.idl
-
-## Makefile.EndpointPolicy_Server.am
-
-if BUILD_EXCEPTIONS
-
-bin_PROGRAMS = server
-
-server_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
- Hello.cpp \
- TestC.cpp \
- TestS.cpp \
- server.cpp \
- Hello.h
-
-server_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
- $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \
- $(TAO_BUILDDIR)/tao/libTAO_PI.la \
- $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.EndpointPolicy_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
- TestC.cpp \
- client.cpp \
- Hello.h
-
-client_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Etherealization/.cvsignore b/TAO/tests/POA/Etherealization/.cvsignore
new file mode 100644
index 00000000000..3e143a96f1d
--- /dev/null
+++ b/TAO/tests/POA/Etherealization/.cvsignore
@@ -0,0 +1 @@
+Etherealization
diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc
index 3aa46e5d4cf..5400bf85c9b 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.mpc
+++ b/TAO/tests/POA/Etherealization/Etherealization.mpc
@@ -1,6 +1,6 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, minimum_corba {
exename = Etherealization
}
diff --git a/TAO/tests/POA/Etherealization/Makefile.am b/TAO/tests/POA/Etherealization/Makefile.am
deleted file mode 100644
index 7e48dfb8170..00000000000
--- a/TAO/tests/POA/Etherealization/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Etherealization.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Etherealization
-
-Etherealization_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Etherealization_SOURCES = \
- Etherealization.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Etherealization_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore b/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore
new file mode 100644
index 00000000000..2733a260597
--- /dev/null
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore
@@ -0,0 +1 @@
+Excessive_Object_Deactivations
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
index 6136555334d..8b143029fd2 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoexe, portableserver, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am b/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am
deleted file mode 100644
index 81a0191efed..00000000000
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Excessive_Object_Deactivations.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Excessive_Object_Deactivations
-
-Excessive_Object_Deactivations_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Excessive_Object_Deactivations_SOURCES = \
- Excessive_Object_Deactivations.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Excessive_Object_Deactivations_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Identity/.cvsignore b/TAO/tests/POA/Identity/.cvsignore
new file mode 100644
index 00000000000..58cf73e05e2
--- /dev/null
+++ b/TAO/tests/POA/Identity/.cvsignore
@@ -0,0 +1 @@
+Identity
diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc
index be9b7edff28..8e2c99d1610 100644
--- a/TAO/tests/POA/Identity/Identity.mpc
+++ b/TAO/tests/POA/Identity/Identity.mpc
@@ -1,6 +1,6 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoserver, avoids_corba_e_micro {
+project(POA*): taoserver {
exename = Identity
}
diff --git a/TAO/tests/POA/Identity/Makefile.am b/TAO/tests/POA/Identity/Makefile.am
deleted file mode 100644
index 0233b450a07..00000000000
--- a/TAO/tests/POA/Identity/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Identity.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Identity
-
-Identity_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Identity_SOURCES = \
- Identity.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Identity_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/MT_Servant_Locator/.cvsignore b/TAO/tests/POA/MT_Servant_Locator/.cvsignore
new file mode 100644
index 00000000000..3a06a6508b0
--- /dev/null
+++ b/TAO/tests/POA/MT_Servant_Locator/.cvsignore
@@ -0,0 +1 @@
+MT_Servant_Locator
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
index a2ddf365db4..6443ce82a36 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, minimum_corba {
}
diff --git a/TAO/tests/POA/MT_Servant_Locator/Makefile.am b/TAO/tests/POA/MT_Servant_Locator/Makefile.am
deleted file mode 100644
index 5d7183bdbe1..00000000000
--- a/TAO/tests/POA/MT_Servant_Locator/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_MT_Servant_Locator.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = MT_Servant_Locator
-
-MT_Servant_Locator_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-MT_Servant_Locator_SOURCES = \
- MT_Servant_Locator.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-MT_Servant_Locator_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Makefile.am b/TAO/tests/POA/Makefile.am
deleted file mode 100644
index baa8f3833d1..00000000000
--- a/TAO/tests/POA/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
- Bug_2511_Regression \
- Current \
- Deactivate_Object \
- Default_Servant \
- EndpointPolicy \
- Etherealization \
- Excessive_Object_Deactivations \
- Identity \
- MT_Servant_Locator \
- Nested_Non_Servant_Upcalls \
- Non_Servant_Upcalls \
- Object_Reactivation \
- POAManagerFactory \
- POA_Destruction \
- Persistent_ID \
- Policies \
- Reference_Counting \
- Single_Threaded_POA \
- wait_for_completion
-
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore
new file mode 100644
index 00000000000..482d2468c35
--- /dev/null
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore
@@ -0,0 +1 @@
+Nested_Non_Servant_Upcalls
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
deleted file mode 100644
index 09eb04269e5..00000000000
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Nested_Non_Servant_Upcalls.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Nested_Non_Servant_Upcalls
-
-Nested_Non_Servant_Upcalls_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Nested_Non_Servant_Upcalls_SOURCES = \
- Nested_Non_Servant_Upcalls.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Nested_Non_Servant_Upcalls_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
index a2ddf365db4..6443ce82a36 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, minimum_corba {
}
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore b/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore
new file mode 100644
index 00000000000..37d45be2816
--- /dev/null
+++ b/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore
@@ -0,0 +1 @@
+Non_Servant_Upcalls
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am
deleted file mode 100644
index 7e0bc5f933a..00000000000
--- a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Non_Servant_Upcalls.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Non_Servant_Upcalls
-
-Non_Servant_Upcalls_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Non_Servant_Upcalls_SOURCES = \
- Non_Servant_Upcalls.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Non_Servant_Upcalls_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Object_Reactivation/.cvsignore b/TAO/tests/POA/Object_Reactivation/.cvsignore
new file mode 100644
index 00000000000..ccf778224c8
--- /dev/null
+++ b/TAO/tests/POA/Object_Reactivation/.cvsignore
@@ -0,0 +1 @@
+Object_Reactivation
diff --git a/TAO/tests/POA/Object_Reactivation/Makefile.am b/TAO/tests/POA/Object_Reactivation/Makefile.am
deleted file mode 100644
index 57ad776232c..00000000000
--- a/TAO/tests/POA/Object_Reactivation/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Object_Reactivation.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Object_Reactivation
-
-Object_Reactivation_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Object_Reactivation_SOURCES = \
- Object_Reactivation.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Object_Reactivation_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
index 6136555334d..8b143029fd2 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoexe, portableserver, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/POAManagerFactory/Makefile.am b/TAO/tests/POA/POAManagerFactory/Makefile.am
deleted file mode 100644
index c2a1826f118..00000000000
--- a/TAO/tests/POA/POAManagerFactory/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_POAManagerFactory.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = POAManagerFactory
-
-POAManagerFactory_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-POAManagerFactory_SOURCES = \
- POAManagerFactory.cpp
-
-POAManagerFactory_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
- $(TAO_BUILDDIR)/tao/libTAO_PI.la \
- $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
index 10139dc0d5e..b6c6400e52f 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoexe, portableserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, pi_server, minimum_corba {
}
diff --git a/TAO/tests/POA/POA_Destruction/.cvsignore b/TAO/tests/POA/POA_Destruction/.cvsignore
new file mode 100644
index 00000000000..0b6ca378266
--- /dev/null
+++ b/TAO/tests/POA/POA_Destruction/.cvsignore
@@ -0,0 +1 @@
+POA_Destruction
diff --git a/TAO/tests/POA/POA_Destruction/Makefile.am b/TAO/tests/POA/POA_Destruction/Makefile.am
deleted file mode 100644
index 9a3da85c363..00000000000
--- a/TAO/tests/POA/POA_Destruction/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_POA_Destruction.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = POA_Destruction
-
-POA_Destruction_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-POA_Destruction_SOURCES = \
- POA_Destruction.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-POA_Destruction_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Persistent_ID/.cvsignore b/TAO/tests/POA/Persistent_ID/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/POA/Persistent_ID/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/POA/Persistent_ID/Makefile.am b/TAO/tests/POA/Persistent_ID/Makefile.am
deleted file mode 100644
index d1ac453cd0c..00000000000
--- a/TAO/tests/POA/Persistent_ID/Makefile.am
+++ /dev/null
@@ -1,104 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.POA_IDL_Persistent_ID.am
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
- @touch $@
-
-noinst_HEADERS = \
- test.idl
-
-## Makefile.POA_Server_Persistent_ID.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
- server.cpp \
- testC.cpp \
- testS.cpp
-
-server_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.POA_Client_Persistent_ID.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
- client.cpp \
- testC.cpp
-
-client_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
index da50f0ec27f..de531ab3649 100644
--- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -1,36 +1,16 @@
// -*- MPC -*-
// $Id$
-project(POA_IDL*): taoidldefaults {
- IDL_Files {
- test.idl
- }
- custom_only = 1
-}
-
-project(POA_server*): taoserver, avoids_corba_e_micro {
- after += POA_IDL*
+project(POA_server*): taoserver {
Source_Files {
server.cpp
}
- Source_Files {
- testC.cpp
- testS.cpp
- }
- IDL_Files {
- }
}
project(POA_client*): taoserver {
exename = client
- after += POA_IDL*
after += POA_server*
Source_Files {
client.cpp
}
- Source_Files {
- testC.cpp
- }
- IDL_Files {
- }
}
diff --git a/TAO/tests/POA/Policies/.cvsignore b/TAO/tests/POA/Policies/.cvsignore
new file mode 100644
index 00000000000..a5bf361f073
--- /dev/null
+++ b/TAO/tests/POA/Policies/.cvsignore
@@ -0,0 +1 @@
+Policies
diff --git a/TAO/tests/POA/Policies/Makefile.am b/TAO/tests/POA/Policies/Makefile.am
deleted file mode 100644
index 716682b4339..00000000000
--- a/TAO/tests/POA/Policies/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Policies.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS = Policies
-
-Policies_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Policies_SOURCES = \
- Policies.cpp
-
-Policies_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
- $(TAO_BUILDDIR)/tao/libTAO_PI.la \
- $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index 59db0b1e922..095c1dca356 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -60,7 +60,7 @@ main (int argc, char **argv)
poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
{
PortableServer::ThreadPolicy_var policy1 =
@@ -156,7 +156,7 @@ main (int argc, char **argv)
ACE_ASSERT (policy1->value () == policy2->value ());
}
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
{
PortableServer::ImplicitActivationPolicy_var policy1 =
diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc
index 2ff338b723d..49fcc0fc6a3 100644
--- a/TAO/tests/POA/Policies/Policies.mpc
+++ b/TAO/tests/POA/Policies/Policies.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoexe, portableserver, pi_server, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, pi_server {
}
diff --git a/TAO/tests/POA/Reference_Counting/Makefile.am b/TAO/tests/POA/Reference_Counting/Makefile.am
deleted file mode 100644
index 7d254b6c7e2..00000000000
--- a/TAO/tests/POA/Reference_Counting/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Reference_Counting_Server.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- HelloC.cpp \
- HelloC.h \
- HelloC.inl \
- HelloS.cpp \
- HelloS.h \
- HelloS.inl
-
-CLEANFILES = \
- Hello-stamp \
- HelloC.cpp \
- HelloC.h \
- HelloC.inl \
- HelloS.cpp \
- HelloS.h \
- HelloS.inl
-
-HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp
-
-Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl
- @touch $@
-
-noinst_PROGRAMS = server
-
-server_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
- HelloC.cpp \
- HelloS.cpp \
- test.cpp \
- HelloC.h \
- HelloC.inl \
- HelloS.h \
- HelloS.inl
-
-server_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Single_Threaded_POA/.cvsignore b/TAO/tests/POA/Single_Threaded_POA/.cvsignore
new file mode 100644
index 00000000000..e376b320c12
--- /dev/null
+++ b/TAO/tests/POA/Single_Threaded_POA/.cvsignore
@@ -0,0 +1 @@
+Single_Threaded_POA
diff --git a/TAO/tests/POA/Single_Threaded_POA/Makefile.am b/TAO/tests/POA/Single_Threaded_POA/Makefile.am
deleted file mode 100644
index d9745f895e2..00000000000
--- a/TAO/tests/POA/Single_Threaded_POA/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Single_Threaded_POA.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = Single_Threaded_POA
-
-Single_Threaded_POA_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-Single_Threaded_POA_SOURCES = \
- Single_Threaded_POA.cpp \
- testC.cpp \
- testS.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-Single_Threaded_POA_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
index a2ddf365db4..6443ce82a36 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
// $Id$
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoexe, portableserver, minimum_corba {
}
diff --git a/TAO/tests/POA/wait_for_completion/.cvsignore b/TAO/tests/POA/wait_for_completion/.cvsignore
new file mode 100644
index 00000000000..8386b39bdc5
--- /dev/null
+++ b/TAO/tests/POA/wait_for_completion/.cvsignore
@@ -0,0 +1 @@
+wait_for_completion
diff --git a/TAO/tests/POA/wait_for_completion/Makefile.am b/TAO/tests/POA/wait_for_completion/Makefile.am
deleted file mode 100644
index 6aebb6f3cfa..00000000000
--- a/TAO/tests/POA/wait_for_completion/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.POA_Wait_For_Completion.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
- @touch $@
-
-noinst_PROGRAMS = wait_for_completion
-
-wait_for_completion_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-wait_for_completion_SOURCES = \
- testC.cpp \
- testS.cpp \
- wait_for_completion.cpp \
- testC.h \
- testC.inl \
- testS.h \
- testS.inl
-
-wait_for_completion_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB