diff options
Diffstat (limited to 'TAO/tests/Smart_Proxies')
22 files changed, 32 insertions, 892 deletions
diff --git a/TAO/tests/Smart_Proxies/.cvsignore b/TAO/tests/Smart_Proxies/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/Benchmark/.cvsignore b/TAO/tests/Smart_Proxies/Benchmark/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/Benchmark/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am b/TAO/tests/Smart_Proxies/Benchmark/Makefile.am deleted file mode 100644 index 22d34bb9a70..00000000000 --- a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am +++ /dev/null @@ -1,111 +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.SP_Benchmark_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Benchmark_Server.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 \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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.SP_Benchmark_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/Smart_Proxies/Benchmark/SP_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc index 99fe5efed3b..ea8e6a3a0d7 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc +++ b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc @@ -1,36 +1,16 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, smart_proxies { - after += *idl +project(*Server): taoexe, portableserver, smart_proxies { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl - after += *Server +project(*Client): taoexe, portableserver, smart_proxies { Source_Files { client.cpp Smart_Proxy_Impl.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Collocation/.cvsignore b/TAO/tests/Smart_Proxies/Collocation/.cvsignore new file mode 100644 index 00000000000..ba2906d0666 --- /dev/null +++ b/TAO/tests/Smart_Proxies/Collocation/.cvsignore @@ -0,0 +1 @@ +main diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.am b/TAO/tests/Smart_Proxies/Collocation/Makefile.am deleted file mode 100644 index 18920bf27cb..00000000000 --- a/TAO/tests/Smart_Proxies/Collocation/Makefile.am +++ /dev/null @@ -1,133 +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_LTLIBRARIES = -noinst_HEADERS = - -## Makefile.SP_Collocation_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -CLEANFILES = \ - Diamond-stamp \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp - -Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl - @touch $@ - -noinst_HEADERS += \ - Diamond.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_TestStubsLib.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libColl_Test_Stubs.la - -libColl_Test_Stubs_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DMY_STUB_BUILD_DLL - -libColl_Test_Stubs_la_SOURCES = \ - DiamondC.cpp \ - Smart_Proxy_Impl.cpp - -noinst_HEADERS += \ - Smart_Proxy_Impl.h - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_DiamondLib.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libDiamond.la - -libDiamond_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDIAMOND_BUILD_DLL - -libDiamond_la_SOURCES = \ - DiamondS.cpp \ - Diamond_i.cpp - -noinst_HEADERS += \ - Diamond_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -main_SOURCES = \ - Coll_Tester.cpp \ - main.cpp \ - Coll_Tester.h - -main_LDADD = \ - libColl_Test_Stubs.la \ - libDiamond.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/Smart_Proxies/Collocation/SP_Collocation.mpc b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc index 765052118d0..f98a8de4eb9 100644 --- a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc +++ b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc @@ -1,54 +1,36 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd - - IDL_Files { - Diamond.idl - } - custom_only = 1 -} - project(*TestStubsLib): taolib_with_idl, smart_proxies { - after += *idl - sharedname = Coll_Test_Stubs dynamicflags += MY_STUB_BUILD_DLL - + idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd Source_Files { DiamondC.cpp Smart_Proxy_Impl.cpp } - IDL_Files { - } } project(*DiamondLib) : taolib_with_idl, smart_proxies, portableserver { - after += *idl - after += *TestStubsLib - sharedname = Diamond - dynamicflags += DIAMOND_BUILD_DLL - + after += *TestStubsLib libs += Coll_Test_Stubs - + dynamicflags += DIAMOND_BUILD_DLL + idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd Source_Files { Diamond_i.cpp DiamondS.cpp } - IDL_Files { - } } project(*Test): taoexe, smart_proxies, portableserver, strategies { - after += *idl after += *TestStubsLib *DiamondLib libs += Coll_Test_Stubs Diamond Source_Files { Coll_Tester.cpp main.cpp } - IDL_Files { + idl_files { } } + diff --git a/TAO/tests/Smart_Proxies/Makefile.am b/TAO/tests/Smart_Proxies/Makefile.am deleted file mode 100644 index 1a5794d6175..00000000000 --- a/TAO/tests/Smart_Proxies/Makefile.am +++ /dev/null @@ -1,119 +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) - -SUBDIRS = \ - . \ - Benchmark \ - Collocation \ - On_Demand \ - Policy \ - dtor - -noinst_PROGRAMS = - -## Makefile.Smart_Proxies_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Smart_Proxies_Server.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 \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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.Smart_Proxies_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/Smart_Proxies/On_Demand/.cvsignore b/TAO/tests/Smart_Proxies/On_Demand/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/On_Demand/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am b/TAO/tests/Smart_Proxies/On_Demand/Makefile.am deleted file mode 100644 index 5f0141abcd9..00000000000 --- a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am +++ /dev/null @@ -1,114 +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.SP_On_Demand_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_On_Demand_Server.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 \ - Smart_Proxy_Impl.h \ - Smart_Test_Factory.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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.SP_On_Demand_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - Smart_Test_Factory.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h \ - Smart_Test_Factory.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/Smart_Proxies/On_Demand/SP_On_Demand.mpc b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc index dfa4bfcc30c..d286b8421d7 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc +++ b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc @@ -1,37 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl - after += *Server +project(*Client): taoexe, portableserver, smart_proxies { Source_Files { client.cpp Smart_Proxy_Impl.cpp Smart_Test_Factory.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Policy/.cvsignore b/TAO/tests/Smart_Proxies/Policy/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/Policy/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile.am b/TAO/tests/Smart_Proxies/Policy/Makefile.am deleted file mode 100644 index 0890285a505..00000000000 --- a/TAO/tests/Smart_Proxies/Policy/Makefile.am +++ /dev/null @@ -1,111 +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.SP_Policy_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Policy_Server.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 \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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.SP_Policy_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/Smart_Proxies/Policy/SP_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc index 99fe5efed3b..907dac72774 100644 --- a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc +++ b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc @@ -1,36 +1,16 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl - after += *Server +project(*Client): taoclient, portableserver, smart_proxies { Source_Files { client.cpp Smart_Proxy_Impl.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc index bc4e7c42743..473bc9b4087 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc +++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl +project(*Client): taoclient, portableserver, smart_proxies { after += *Server Source_Files { + testC.cpp Smart_Proxy_Impl.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index b2bd94142ee..b49a86973b1 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -2,8 +2,6 @@ #include "Smart_Proxy_Impl.h" -ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior"); - Smart_Test_Factory::Smart_Test_Factory (void) { ACE_DEBUG ((LM_DEBUG, @@ -29,22 +27,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) { } -bool -Smart_Test_Proxy::can_convert_to_ior (void) const -{ - // Even though a smart proxy is local, this one can be stringified - return true; -} - -char* -Smart_Test_Proxy::convert_to_ior (bool, - const char*) const -{ - // If this implementation wasn't provided, the ORB would provide - // a stringified representation of this object. - return CORBA::string_dup (fake_ior_.c_str ()); -} - CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo ACE_ENV_ARG_DECL) @@ -71,9 +53,3 @@ Smart_Test_Proxy::method (CORBA::Short boo return retval; } - -const ACE_CString& -Smart_Test_Proxy::fake_ior (void) -{ - return fake_ior_; -} diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h index 76d38be6245..a61d96be76d 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h @@ -1,7 +1,6 @@ // $Id$ #include "testC.h" -#include "ace/SString.h" class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory { @@ -19,21 +18,12 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual bool can_convert_to_ior (void) const; - - virtual char* convert_to_ior (bool use_omg_ior_format, - const char* ior_prefix) const; - virtual CORBA::Short method (CORBA::Short boo ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); // "Smartify" the method call! - static const ACE_CString& fake_ior (void); - // Don't need to add any extra functionality into <shutdown>, hence // we don't define it. -private: - static ACE_CString fake_ior_; }; diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index 2fc36491398..74b28effab2 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -54,7 +54,6 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - int status = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = @@ -97,26 +96,6 @@ main (int argc, char *argv[]) ior), 1); - try - { - CORBA::String_var sm_ior = orb->object_to_string (server.in ()); - if (Smart_Test_Proxy::fake_ior () != sm_ior.in ()) - { - status = 1; - ACE_ERROR ((LM_ERROR, - "ERROR: The Smart Proxy IOR is:\n%s\n" - "but should have been: %s\n", - sm_ior.in (), - Smart_Test_Proxy::fake_ior ().c_str ())); - } - } - catch (const CORBA::MARSHAL& ex) - { - status = 1; - ACE_PRINT_EXCEPTION (ex, - "Unexpected MARSHAL exception:"); - } - server->method (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -136,9 +115,9 @@ main (int argc, char *argv[]) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client-side exception:"); - status = 1; + return 1; } ACE_ENDTRY; - return status; + return 0; } diff --git a/TAO/tests/Smart_Proxies/dtor/.cvsignore b/TAO/tests/Smart_Proxies/dtor/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/dtor/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/dtor/Makefile.am b/TAO/tests/Smart_Proxies/dtor/Makefile.am deleted file mode 100644 index 8db55984659..00000000000 --- a/TAO/tests/Smart_Proxies/dtor/Makefile.am +++ /dev/null @@ -1,112 +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.dtor_idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Dtor_Server.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 \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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.Dtor_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/Smart_Proxies/dtor/dtor.mpc b/TAO/tests/Smart_Proxies/dtor/dtor.mpc index 9feea5cd714..bfbcbe61031 100644 --- a/TAO/tests/Smart_Proxies/dtor/dtor.mpc +++ b/TAO/tests/Smart_Proxies/dtor/dtor.mpc @@ -1,35 +1,15 @@ //$Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode, smart_proxies { - after += *idl - after += *Server Source_Files { + testC.cpp Smart_Proxy_Impl.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl index 6cc94538d96..83d5dba52cf 100755 --- a/TAO/tests/Smart_Proxies/run_test.pl +++ b/TAO/tests/Smart_Proxies/run_test.pl @@ -34,14 +34,14 @@ if (PerlACE::waitforfile_timed ($iorfile, $client = $CL->SpawnWaitKill (60); -if ($client != 0) { +if ($client == -1) { print STDERR "ERROR: client returned $client\n"; $status = 1; } $server = $SV->WaitKill (10); -if ($server != 0) { +if ($server == -1) { print STDERR "ERROR: server returned $server\n"; $status = 1; } |