- Update to 5.4.0

- Use %%TAO_VERSION%% in pkg-plist
- Fix CONFLICTS

PR:                 61437
Submitted by:       Sergey Matveychuk <sem@ciam.ru> (maintainer)
Approved by:        erwin (mentor) (implicitly)

6 files changed, 169 insertions, 126 deletions

diff --git a/devel/ace+tao/Makefile b/devel/ace+tao/Makefile
index 6366389060b0..af17d3e29929 100644
--- a/devel/ace+tao/Makefile
+++ b/devel/ace+tao/Makefile
@@ -8,17 +8,18 @@
 PORTNAME?=	ace+tao
 PORTVERSION?=	${ACE_VERSION}+${TAO_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	http://deuce.doc.wustl.edu/old_distribution/ \
+MASTER_SITES=	ftp://deuce.doc.wustl.edu/pub/previous_versions/ \
+		http://deuce.doc.wustl.edu/old_distribution/ \
 		http://www.navicon.dk/mirrors/ace/deuce.doc.wustl.edu/old_distribution/
-DISTNAME=	ACE-${ACE_VERSION}+TAO-${TAO_VERSION}
+DISTNAME=	ACE-${ACE_VERSION:C/\.0$//}+TAO-${TAO_VERSION:C/\.0$//}
 
 MAINTAINER=	sem@ciam.ru
 COMMENT?=	The Adaptive Communication Environment (ACE) with The ACE ORB (TAO)
 
 CONFLICTS?=	ace-*
 
-ACE_VERSION=	5.3.6
-TAO_VERSION=	1.3.6
+ACE_VERSION=	5.4.0
+TAO_VERSION=	1.4.0
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -37,7 +38,8 @@ WRKSRC=		${WRKDIR}/ACE_wrappers
 ACE_ROOT=	${WRKSRC}
 TAO_ROOT=	${ACE_ROOT}/TAO
 
-PLIST_SUB+=	TAO=${TAO} TESTS=${TESTS}
+PLIST_SUB+=	TAO=${TAO} TESTS=${TESTS} \
+		ACE_VERSION=${ACE_VERSION} TAO_VERSION=${TAO_VERSION}
 
 .if defined(WITHOUT_TAO)
 TAO=	"@comment "
@@ -55,16 +57,12 @@ post-patch:
 	${CP} ${FILESDIR}/config.h ${ACE_ROOT}/ace; \
 	cd ${TAO_ROOT}/orbsvcs; \
 	${CHMOD} a-x default.bld; \
-	${CHMOD} a-x FTRT_Event_Service/Event_Service/*; \
-	${CHMOD} a-x FTRT_Event_Service/Factory_Service/*; \
-	${CHMOD} a-x FTRT_Event_Service/Gateway_Service/*; \
 	${CHMOD} a-x Logging_Service/Event_Logging_Service/*; \
 	${CHMOD} a-x Logging_Service/Notify_Logging_Service/*; \
 	${CHMOD} a-x Logging_Service/RTEvent_Logging_Service/*; \
-	${CHMOD} a-x orbsvcs/*.idl orbsvcs/*.mpc orbsvcs/*.mpb; \
-	${CHMOD} a-x orbsvcs/FaultTolerance/* orbsvcs/FtRtEvent/ClientORB/*; \
-	${CHMOD} a-x orbsvcs/FtRtEvent/EventChannel/*; \
-	${CHMOD} a-x orbsvcs/FtRtEvent/Utils/*
+	${CHMOD} a-x orbsvcs/*.mpb; \
+	${CHMOD} a-x orbsvcs/FaultTolerance/*; \
+	${CHMOD} a-x FT_ReplicationManager/*
 .if !defined(WITH_TESTS)
 	@${REINPLACE_CMD} -e "21d" ${ACE_ROOT}/Makefile
 	@${REINPLACE_CMD} -e "24d" ${TAO_ROOT}/Makefile
diff --git a/devel/ace+tao/distinfo b/devel/ace+tao/distinfo
index d8885c0d380a..a752a9aacf6e 100644
--- a/devel/ace+tao/distinfo
+++ b/devel/ace+tao/distinfo
@@ -1 +1 @@
-MD5 (ACE-5.3.6+TAO-1.3.6.tar.bz2) = d57ccf34fb5185f25518bea531dace08
+MD5 (ACE-5.4+TAO-1.4.tar.bz2) = 2b3bc642ae44be1c35ad43b68f68230b
diff --git a/devel/ace+tao/files/patch-Concurrency_Service b/devel/ace+tao/files/patch-Concurrency_Service
deleted file mode 100644
index ebd9af8e5630..000000000000
--- a/devel/ace+tao/files/patch-Concurrency_Service
+++ /dev/null
@@ -1,19 +0,0 @@
---- TAO/orbsvcs/Concurrency_Service/Makefile.orig	Thu Nov 20 05:16:49 2003
-+++ TAO/orbsvcs/Concurrency_Service/Makefile	Wed Dec 24 20:46:35 2003
-@@ -17,6 +17,8 @@
- 
- BIN2 = Concurrency_Service
- 
-+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-+
- #### If the TAO orbsvcs library wasn't built with sufficient components,
- #### don't try to build here.
- TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-@@ -30,7 +32,6 @@
- #       Include macros and targets
- #----------------------------------------------------------------------------
- 
--include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
- include $(ACE_ROOT)/include/makeinclude/macros.GNU
- include $(TAO_ROOT)/rules.tao.GNU
- include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/devel/ace+tao/files/patch-ab b/devel/ace+tao/files/patch-ab
index c11b7b3bc4bf..1593e20fcff2 100644
--- a/devel/ace+tao/files/patch-ab
+++ b/devel/ace+tao/files/patch-ab
@@ -1,13 +1,14 @@
---- TAO/Makefile.orig	Fri Jun 13 22:12:42 2003
-+++ TAO/Makefile	Fri Dec  5 10:34:27 2003
-@@ -23,10 +23,7 @@
+--- TAO/Makefile.orig	Mon Jan  5 10:18:45 1970
++++ TAO/Makefile	Fri Jan 16 02:08:11 2004
+@@ -23,11 +23,7 @@
            TAO_IDL \
            tests \
            orbsvcs \
 -          examples \
 -          performance-tests \
 -          utils \
--	  docs/tutorials/Quoter
+-	  docs/tutorials/Quoter \
+-          CIAO
 +          utils
  
  CLONE   = Makefile \
diff --git a/devel/ace+tao/files/patch-ac b/devel/ace+tao/files/patch-ac
index 7e01bb9f1967..195e4cb84cce 100644
--- a/devel/ace+tao/files/patch-ac
+++ b/devel/ace+tao/files/patch-ac
@@ -1,5 +1,5 @@
---- TAO/orbsvcs/Makefile.orig	Sat Dec  6 10:13:59 2003
-+++ TAO/orbsvcs/Makefile	Sat Dec  6 10:14:28 2003
+--- TAO/orbsvcs/Makefile.orig	Thu Jan 15 22:51:35 2004
++++ TAO/orbsvcs/Makefile	Thu Jan 15 22:52:27 2004
 @@ -43,10 +43,9 @@
  	Trading_Service \
  	LoadBalancer \
diff --git a/devel/ace+tao/pkg-plist b/devel/ace+tao/pkg-plist
index a4bc32ca1671..2a78012b02c2 100644
--- a/devel/ace+tao/pkg-plist
+++ b/devel/ace+tao/pkg-plist
@@ -1721,6 +1721,7 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/DynSched.i
 %%TAO%%include/orbsvcs/Dynamic_Bitset.cpp
 %%TAO%%include/orbsvcs/Dynamic_Bitset.h
+%%TAO%%include/orbsvcs/Dynamic_Bitset.inl
 %%TAO%%include/orbsvcs/ECG_Adapters.cpp
 %%TAO%%include/orbsvcs/ECG_Adapters.h
 %%TAO%%include/orbsvcs/ECG_Address_Server_Base.cpp
@@ -2171,17 +2172,30 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/FT_ClientService_Activate.h
 %%TAO%%include/orbsvcs/FT_Endpoint_Selector_Factory.cpp
 %%TAO%%include/orbsvcs/FT_Endpoint_Selector_Factory.h
+%%TAO%%include/orbsvcs/FT_FaultDetectorFactory.idl
 %%TAO%%include/orbsvcs/FT_IOGR_Property.cpp
 %%TAO%%include/orbsvcs/FT_IOGR_Property.h
+%%TAO%%include/orbsvcs/FT_IOGR_Property.i
 %%TAO%%include/orbsvcs/FT_IOGR_Property.inl
 %%TAO%%include/orbsvcs/FT_Invocation_Endpoint_Selectors.cpp
 %%TAO%%include/orbsvcs/FT_Invocation_Endpoint_Selectors.h
 %%TAO%%include/orbsvcs/FT_Invocation_Endpoint_Selectors.inl
+%%TAO%%include/orbsvcs/FT_Notifier.idl
+%%TAO%%include/orbsvcs/FT_ORBInitializer.cpp
+%%TAO%%include/orbsvcs/FT_ORBInitializer.h
 %%TAO%%include/orbsvcs/FT_ORB_Utils_export.h
+%%TAO%%include/orbsvcs/FT_PolicyFactory.cpp
+%%TAO%%include/orbsvcs/FT_PolicyFactory.h
+%%TAO%%include/orbsvcs/FT_Policy_i.cpp
+%%TAO%%include/orbsvcs/FT_Policy_i.h
+%%TAO%%include/orbsvcs/FT_Policy_i.i
+%%TAO%%include/orbsvcs/FT_Policy_i.inl
 %%TAO%%include/orbsvcs/FT_ProxyAdmin_Base.cpp
 %%TAO%%include/orbsvcs/FT_ProxyAdmin_Base.h
 %%TAO%%include/orbsvcs/FT_ProxyAdmin_T.cpp
 %%TAO%%include/orbsvcs/FT_ProxyAdmin_T.h
+%%TAO%%include/orbsvcs/FT_Replica.idl
+%%TAO%%include/orbsvcs/FT_ReplicationManager.idl
 %%TAO%%include/orbsvcs/FT_ServerORBInitializer.cpp
 %%TAO%%include/orbsvcs/FT_ServerORBInitializer.h
 %%TAO%%include/orbsvcs/FT_ServerORB_export.h
@@ -2194,9 +2208,11 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/FT_ServerRequest_Interceptor.h
 %%TAO%%include/orbsvcs/FT_ServerService_Activate.cpp
 %%TAO%%include/orbsvcs/FT_ServerService_Activate.h
+%%TAO%%include/orbsvcs/FT_Service_Activate.cpp
 %%TAO%%include/orbsvcs/FT_Service_Activate.h
 %%TAO%%include/orbsvcs/FT_Service_Callbacks.cpp
 %%TAO%%include/orbsvcs/FT_Service_Callbacks.h
+%%TAO%%include/orbsvcs/FT_Service_Callbacks.i
 %%TAO%%include/orbsvcs/FT_Service_Callbacks.inl
 %%TAO%%include/orbsvcs/Factory.h
 %%TAO%%include/orbsvcs/FactoryDef_i.cpp
@@ -2534,12 +2550,16 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/Options.h
 %%TAO%%include/orbsvcs/PG_Default_Property_Validator.cpp
 %%TAO%%include/orbsvcs/PG_Default_Property_Validator.h
+%%TAO%%include/orbsvcs/PG_FactoryRegistry.cpp
+%%TAO%%include/orbsvcs/PG_FactoryRegistry.h
 %%TAO%%include/orbsvcs/PG_Factory_Map.cpp
 %%TAO%%include/orbsvcs/PG_Factory_Map.h
 %%TAO%%include/orbsvcs/PG_Factory_Set.cpp
 %%TAO%%include/orbsvcs/PG_Factory_Set.h
 %%TAO%%include/orbsvcs/PG_GenericFactory.cpp
 %%TAO%%include/orbsvcs/PG_GenericFactory.h
+%%TAO%%include/orbsvcs/PG_Group_Factory.cpp
+%%TAO%%include/orbsvcs/PG_Group_Factory.h
 %%TAO%%include/orbsvcs/PG_Group_Guard.cpp
 %%TAO%%include/orbsvcs/PG_Group_Guard.h
 %%TAO%%include/orbsvcs/PG_Location_Equal_To.cpp
@@ -2558,12 +2578,25 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/PG_ObjectGroupManager.h
 %%TAO%%include/orbsvcs/PG_ObjectGroup_Map.cpp
 %%TAO%%include/orbsvcs/PG_ObjectGroup_Map.h
+%%TAO%%include/orbsvcs/PG_Object_Group.cpp
+%%TAO%%include/orbsvcs/PG_Object_Group.h
+%%TAO%%include/orbsvcs/PG_Object_Group_Manipulator.cpp
+%%TAO%%include/orbsvcs/PG_Object_Group_Manipulator.h
 %%TAO%%include/orbsvcs/PG_Operators.cpp
 %%TAO%%include/orbsvcs/PG_Operators.h
+%%TAO%%include/orbsvcs/PG_Properties_Encoder.cpp
+%%TAO%%include/orbsvcs/PG_Properties_Encoder.h
+%%TAO%%include/orbsvcs/PG_Properties_Support.cpp
+%%TAO%%include/orbsvcs/PG_Properties_Support.h
 %%TAO%%include/orbsvcs/PG_PropertyManager.cpp
 %%TAO%%include/orbsvcs/PG_PropertyManager.h
+%%TAO%%include/orbsvcs/PG_Property_Set.cpp
+%%TAO%%include/orbsvcs/PG_Property_Set.h
+%%TAO%%include/orbsvcs/PG_Property_Set_Find.h
 %%TAO%%include/orbsvcs/PG_Property_Utils.cpp
 %%TAO%%include/orbsvcs/PG_Property_Utils.h
+%%TAO%%include/orbsvcs/PG_Utils.cpp
+%%TAO%%include/orbsvcs/PG_Utils.h
 %%TAO%%include/orbsvcs/PG_conf.h
 %%TAO%%include/orbsvcs/POA_Helper.cpp
 %%TAO%%include/orbsvcs/POA_Helper.h
@@ -2602,6 +2635,16 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/PortableGroup_ORBInitializer.h
 %%TAO%%include/orbsvcs/PortableGroup_Request_Dispatcher.cpp
 %%TAO%%include/orbsvcs/PortableGroup_Request_Dispatcher.h
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DS.idl
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSC.cpp
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSC.h
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSC.i
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSS.cpp
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSS.h
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSS.i
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSS_T.cpp
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSS_T.h
+%%TAO%%include/orbsvcs/PortableGroup_Simple_DSS_T.i
 %%TAO%%include/orbsvcs/Portable_Group_Map.cpp
 %%TAO%%include/orbsvcs/Portable_Group_Map.h
 %%TAO%%include/orbsvcs/PrimitiveDef_i.cpp
@@ -3103,6 +3146,8 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/UIPMC_Endpoint.i
 %%TAO%%include/orbsvcs/UIPMC_Factory.cpp
 %%TAO%%include/orbsvcs/UIPMC_Factory.h
+%%TAO%%include/orbsvcs/UIPMC_Message_Block_Data_Iterator.cpp
+%%TAO%%include/orbsvcs/UIPMC_Message_Block_Data_Iterator.h
 %%TAO%%include/orbsvcs/UIPMC_Profile.cpp
 %%TAO%%include/orbsvcs/UIPMC_Profile.h
 %%TAO%%include/orbsvcs/UIPMC_Profile.i
@@ -3154,10 +3199,10 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/lifecycle_export.h
 %%TAO%%include/orbsvcs/log_export.h
 %%TAO%%include/orbsvcs/md5.h
+%%TAO%%include/orbsvcs/md5c.cpp
 %%TAO%%include/orbsvcs/media_timer.cpp
 %%TAO%%include/orbsvcs/media_timer.h
 %%TAO%%include/orbsvcs/metrics_export.h
-%%TAO%%include/orbsvcs/mgm.idl
 %%TAO%%include/orbsvcs/miop.idl
 %%TAO%%include/orbsvcs/miopC.cpp
 %%TAO%%include/orbsvcs/miopC.h
@@ -3208,8 +3253,6 @@ include/ace/svc_export.h
 %%TAO%%include/orbsvcs/trading_export.h
 %%TAO%%include/tao/AMH_Response_Handler.cpp
 %%TAO%%include/tao/AMH_Response_Handler.h
-%%TAO%%include/tao/AMI_ClientRequestInfo_i.cpp
-%%TAO%%include/tao/AMI_ClientRequestInfo_i.h
 %%TAO%%include/tao/AbstractBase.cpp
 %%TAO%%include/tao/AbstractBase.h
 %%TAO%%include/tao/AbstractBase.inl
@@ -3329,6 +3372,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Blocked_Connect_Strategy.cpp
 %%TAO%%include/tao/Blocked_Connect_Strategy.h
 %%TAO%%include/tao/Bounds.pidl
+%%TAO%%include/tao/BoundsA.cpp
+%%TAO%%include/tao/BoundsA.h
 %%TAO%%include/tao/BoundsC.cpp
 %%TAO%%include/tao/BoundsC.h
 %%TAO%%include/tao/BoundsC.i
@@ -3341,6 +3386,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/CDR_Encaps_Codec.cpp
 %%TAO%%include/tao/CDR_Encaps_Codec.h
 %%TAO%%include/tao/CONV_FRAME.pidl
+%%TAO%%include/tao/CONV_FRAMEA.cpp
+%%TAO%%include/tao/CONV_FRAMEA.h
 %%TAO%%include/tao/CONV_FRAMEC.cpp
 %%TAO%%include/tao/CONV_FRAMEC.h
 %%TAO%%include/tao/CONV_FRAMEC.i
@@ -3425,14 +3472,14 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Current.cpp
 %%TAO%%include/tao/Current.h
 %%TAO%%include/tao/Current.pidl
+%%TAO%%include/tao/CurrentA.cpp
+%%TAO%%include/tao/CurrentA.h
 %%TAO%%include/tao/CurrentC.cpp
 %%TAO%%include/tao/CurrentC.h
 %%TAO%%include/tao/CurrentC.i
 %%TAO%%include/tao/DII_Arguments.cpp
 %%TAO%%include/tao/DII_Arguments.h
 %%TAO%%include/tao/DII_Arguments.inl
-%%TAO%%include/tao/DII_ClientRequestInfo.cpp
-%%TAO%%include/tao/DII_ClientRequestInfo.h
 %%TAO%%include/tao/DII_Invocation.cpp
 %%TAO%%include/tao/DII_Invocation.h
 %%TAO%%include/tao/DII_Invocation.inl
@@ -3496,6 +3543,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Distributable_Thread.cpp
 %%TAO%%include/tao/Distributable_Thread.h
 %%TAO%%include/tao/Domain.pidl
+%%TAO%%include/tao/DomainA.cpp
+%%TAO%%include/tao/DomainA.h
 %%TAO%%include/tao/DomainC.cpp
 %%TAO%%include/tao/DomainC.h
 %%TAO%%include/tao/DomainC.i
@@ -3540,8 +3589,11 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Dynamic_Implementation.cpp
 %%TAO%%include/tao/Dynamic_Implementation.h
 %%TAO%%include/tao/Dynamic_Parameter.pidl
+%%TAO%%include/tao/Dynamic_ParameterA.cpp
+%%TAO%%include/tao/Dynamic_ParameterA.h
 %%TAO%%include/tao/Dynamic_ParameterC.cpp
 %%TAO%%include/tao/Dynamic_ParameterC.h
+%%TAO%%include/tao/Dynamic_ParameterC.i
 %%TAO%%include/tao/Dynamic_ParameterC.inl
 %%TAO%%include/tao/Encodable.cpp
 %%TAO%%include/tao/Encodable.h
@@ -3585,6 +3637,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Flushing_Strategy.cpp
 %%TAO%%include/tao/Flushing_Strategy.h
 %%TAO%%include/tao/GIOP.pidl
+%%TAO%%include/tao/GIOPA.cpp
+%%TAO%%include/tao/GIOPA.h
 %%TAO%%include/tao/GIOPC.cpp
 %%TAO%%include/tao/GIOPC.h
 %%TAO%%include/tao/GIOPC.i
@@ -3649,6 +3703,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/IFR_ExtendedC.h
 %%TAO%%include/tao/IFR_ExtendedC.i
 %%TAO%%include/tao/IIOP.pidl
+%%TAO%%include/tao/IIOPA.cpp
+%%TAO%%include/tao/IIOPA.h
 %%TAO%%include/tao/IIOPC.cpp
 %%TAO%%include/tao/IIOPC.h
 %%TAO%%include/tao/IIOPC.i
@@ -3664,8 +3720,11 @@ include/ace/svc_export.h
 %%TAO%%include/tao/IIOP_Endpoint.h
 %%TAO%%include/tao/IIOP_Endpoint.i
 %%TAO%%include/tao/IIOP_Endpoints.pidl
+%%TAO%%include/tao/IIOP_EndpointsA.cpp
+%%TAO%%include/tao/IIOP_EndpointsA.h
 %%TAO%%include/tao/IIOP_EndpointsC.cpp
 %%TAO%%include/tao/IIOP_EndpointsC.h
+%%TAO%%include/tao/IIOP_EndpointsC.i
 %%TAO%%include/tao/IIOP_EndpointsC.inl
 %%TAO%%include/tao/IIOP_Factory.cpp
 %%TAO%%include/tao/IIOP_Factory.h
@@ -3761,7 +3820,6 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Interceptor_List.cpp
 %%TAO%%include/tao/Interceptor_List.h
 %%TAO%%include/tao/Interceptor_List.inl
-%%TAO%%include/tao/Interface.pidl
 %%TAO%%include/tao/InterfaceDef.pidl
 %%TAO%%include/tao/InvalidName.pidl
 %%TAO%%include/tao/Invocation_Adapter.cpp
@@ -3929,7 +3987,6 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Object.cpp
 %%TAO%%include/tao/Object.h
 %%TAO%%include/tao/Object.i
-%%TAO%%include/tao/Object.pidl
 %%TAO%%include/tao/ObjectIdList.pidl
 %%TAO%%include/tao/ObjectIdListC.cpp
 %%TAO%%include/tao/ObjectIdListC.h
@@ -4120,6 +4177,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/RTPortableServer.cpp
 %%TAO%%include/tao/RTPortableServer.h
 %%TAO%%include/tao/RTPortableServer.pidl
+%%TAO%%include/tao/RTPortableServerA.cpp
+%%TAO%%include/tao/RTPortableServerA.h
 %%TAO%%include/tao/RTPortableServerC.cpp
 %%TAO%%include/tao/RTPortableServerC.h
 %%TAO%%include/tao/RTPortableServerC.i
@@ -4290,6 +4349,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/ServerRequestInfo.cpp
 %%TAO%%include/tao/ServerRequestInfo.h
 %%TAO%%include/tao/ServerRequestInfo.inl
+%%TAO%%include/tao/Server_Main.cpp
+%%TAO%%include/tao/Server_Main.h
 %%TAO%%include/tao/Server_Request.cpp
 %%TAO%%include/tao/Server_Request.h
 %%TAO%%include/tao/Server_Request.inl
@@ -4328,8 +4389,6 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Special_Basic_SArgument_T.inl
 %%TAO%%include/tao/Special_Basic_SArguments.cpp
 %%TAO%%include/tao/Special_Basic_SArguments.h
-%%TAO%%include/tao/Strategized_Object_Proxy_Broker.cpp
-%%TAO%%include/tao/Strategized_Object_Proxy_Broker.h
 %%TAO%%include/tao/StringSeq.pidl
 %%TAO%%include/tao/StringSeqA.cpp
 %%TAO%%include/tao/StringSeqA.h
@@ -4355,6 +4414,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Synch_Reply_Dispatcher.cpp
 %%TAO%%include/tao/Synch_Reply_Dispatcher.h
 %%TAO%%include/tao/TAO.pidl
+%%TAO%%include/tao/TAOA.cpp
+%%TAO%%include/tao/TAOA.h
 %%TAO%%include/tao/TAOC.cpp
 %%TAO%%include/tao/TAOC.h
 %%TAO%%include/tao/TAOC.i
@@ -4406,6 +4467,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/ThruPOA_Object_Proxy_Impl.cpp
 %%TAO%%include/tao/ThruPOA_Object_Proxy_Impl.h
 %%TAO%%include/tao/TimeBase.pidl
+%%TAO%%include/tao/TimeBaseA.cpp
+%%TAO%%include/tao/TimeBaseA.h
 %%TAO%%include/tao/TimeBaseC.cpp
 %%TAO%%include/tao/TimeBaseC.h
 %%TAO%%include/tao/TimeBaseC.i
@@ -4435,9 +4498,6 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Transport_Mux_Strategy.h
 %%TAO%%include/tao/Transport_Timer.cpp
 %%TAO%%include/tao/Transport_Timer.h
-%%TAO%%include/tao/Twoway_Asynch_Invocation.cpp
-%%TAO%%include/tao/Twoway_Asynch_Invocation.h
-%%TAO%%include/tao/Twoway_Asynch_Invocation.i
 %%TAO%%include/tao/TypeCodeFactory.pidl
 %%TAO%%include/tao/TypeCodeFactoryC.cpp
 %%TAO%%include/tao/TypeCodeFactoryC.h
@@ -4485,6 +4545,7 @@ include/ace/svc_export.h
 %%TAO%%include/tao/UIOP_Transport.cpp
 %%TAO%%include/tao/UIOP_Transport.h
 %%TAO%%include/tao/UIOP_Transport.i
+%%TAO%%include/tao/UShortSeq.pidl
 %%TAO%%include/tao/Unknown_User_Exception.cpp
 %%TAO%%include/tao/Unknown_User_Exception.h
 %%TAO%%include/tao/Upcall_Wrapper.h
@@ -4530,6 +4591,8 @@ include/ace/svc_export.h
 %%TAO%%include/tao/Wait_Strategy.h
 %%TAO%%include/tao/Wait_Strategy.inl
 %%TAO%%include/tao/WrongTransaction.pidl
+%%TAO%%include/tao/WrongTransactionA.cpp
+%%TAO%%include/tao/WrongTransactionA.h
 %%TAO%%include/tao/WrongTransactionC.cpp
 %%TAO%%include/tao/WrongTransactionC.h
 %%TAO%%include/tao/WrongTransactionC.i
@@ -4604,155 +4667,155 @@ include/ace/svc_export.h
 %%TAO%%include/tao/xt_resource.h
 %%TAO%%include/tao/xt_resource.i
 lib/libACE.so
-lib/libACE.so.5.3.6
+lib/libACE.so.%%ACE_VERSION%%
 lib/libACEXML.so
-lib/libACEXML.so.5.3.6
+lib/libACEXML.so.%%ACE_VERSION%%
 lib/libACEXML_Parser.so
-lib/libACEXML_Parser.so.5.3.6
+lib/libACEXML_Parser.so.%%ACE_VERSION%%
 lib/libACEXML_XML_Svc_Conf_Parser.so
-lib/libACEXML_XML_Svc_Conf_Parser.so.5.3.6
+lib/libACEXML_XML_Svc_Conf_Parser.so.%%ACE_VERSION%%
 lib/libACE_RMCast.so
-lib/libACE_RMCast.so.5.3.6
+lib/libACE_RMCast.so.%%ACE_VERSION%%
 lib/libACE_SSL.so
-lib/libACE_SSL.so.5.3.6
+lib/libACE_SSL.so.%%ACE_VERSION%%
 %%TESTS%%lib/libDLL_Test.so
-%%TESTS%%lib/libDLL_Test.so.5.3.6
-lib/libDump_Restore.so
-lib/libDump_Restore.so.5.3.6
+%%TESTS%%lib/libDLL_Test.so.%%ACE_VERSION%%
 %%TESTS%%lib/libFramework_Component_DLL.so
-%%TESTS%%lib/libFramework_Component_DLL.so.5.3.6
+%%TESTS%%lib/libFramework_Component_DLL.so.%%ACE_VERSION%%
 lib/libGateway.so
-lib/libGateway.so.5.3.6
+lib/libGateway.so.%%ACE_VERSION%%
 lib/libKokyu.so
-lib/libKokyu.so.5.3.6
+lib/libKokyu.so.%%ACE_VERSION%%
 lib/libPeer.so
-lib/libPeer.so.5.3.6
+lib/libPeer.so.%%ACE_VERSION%%
 %%TESTS%%lib/libService_Config_DLL.so
-%%TESTS%%lib/libService_Config_DLL.so.5.3.6
+%%TESTS%%lib/libService_Config_DLL.so.%%ACE_VERSION%%
 %%TESTS%%lib/libTest_Output.so
-%%TESTS%%lib/libTest_Output.so.5.3.6
+%%TESTS%%lib/libTest_Output.so.%%ACE_VERSION%%
 lib/libnetsvcs.so
-lib/libnetsvcs.so.5.3.6
+lib/libnetsvcs.so.%%ACE_VERSION%%
 lib/libwebsvcs.so
-lib/libwebsvcs.so.5.3.6
+lib/libwebsvcs.so.%%ACE_VERSION%%
 lib/libClient_Test.so
-lib/libClient_Test.so.5.3.6
+lib/libClient_Test.so.%%ACE_VERSION%%
 %%TAO%%%%TESTS%%lib/libCollocation_Diamond.so
-%%TAO%%%%TESTS%%lib/libCollocation_Diamond.so.1.3.6
+%%TAO%%%%TESTS%%lib/libCollocation_Diamond.so.%%TAO_VERSION%%
+%%TAO%%%%TESTS%%lib/libDiamond.so
+%%TAO%%%%TESTS%%lib/libDiamond.so.1.4.0
 %%TAO%%%%TESTS%%lib/libIBM1047_ISO8859.so
-%%TAO%%%%TESTS%%lib/libIBM1047_ISO8859.so.1.3.6
+%%TAO%%%%TESTS%%lib/libIBM1047_ISO8859.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO.so
-%%TAO%%lib/libTAO.so.1.3.6
+%%TAO%%lib/libTAO.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_AV.so
-%%TAO%%lib/libTAO_AV.so.1.3.6
+%%TAO%%lib/libTAO_AV.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_BiDirGIOP.so
-%%TAO%%lib/libTAO_BiDirGIOP.so.1.3.6
+%%TAO%%lib/libTAO_BiDirGIOP.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosConcurrency.so
-%%TAO%%lib/libTAO_CosConcurrency.so.1.3.6
+%%TAO%%lib/libTAO_CosConcurrency.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosEvent.so
-%%TAO%%lib/libTAO_CosEvent.so.1.3.6
+%%TAO%%lib/libTAO_CosEvent.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosLifeCycle.so
-%%TAO%%lib/libTAO_CosLifeCycle.so.1.3.6
+%%TAO%%lib/libTAO_CosLifeCycle.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosLoadBalancing.so
-%%TAO%%lib/libTAO_CosLoadBalancing.so.1.3.6
+%%TAO%%lib/libTAO_CosLoadBalancing.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosNaming.so
-%%TAO%%lib/libTAO_CosNaming.so.1.3.6
+%%TAO%%lib/libTAO_CosNaming.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosNotification.so
-%%TAO%%lib/libTAO_CosNotification.so.1.3.6
+%%TAO%%lib/libTAO_CosNotification.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosProperty.so
-%%TAO%%lib/libTAO_CosProperty.so.1.3.6
+%%TAO%%lib/libTAO_CosProperty.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosTime.so
-%%TAO%%lib/libTAO_CosTime.so.1.3.6
+%%TAO%%lib/libTAO_CosTime.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_CosTrading.so
-%%TAO%%lib/libTAO_CosTrading.so.1.3.6
+%%TAO%%lib/libTAO_CosTrading.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_Domain.so
-%%TAO%%lib/libTAO_Domain.so.1.3.6
+%%TAO%%lib/libTAO_Domain.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_DsEventLogAdmin.so
-%%TAO%%lib/libTAO_DsEventLogAdmin.so.1.3.6
+%%TAO%%lib/libTAO_DsEventLogAdmin.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_DsLogAdmin.so
-%%TAO%%lib/libTAO_DsLogAdmin.so.1.3.6
+%%TAO%%lib/libTAO_DsLogAdmin.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_DsNotifyLogAdmin.so
-%%TAO%%lib/libTAO_DsNotifyLogAdmin.so.1.3.6
+%%TAO%%lib/libTAO_DsNotifyLogAdmin.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_DynamicAny.so
-%%TAO%%lib/libTAO_DynamicAny.so.1.3.6
+%%TAO%%lib/libTAO_DynamicAny.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_DynamicInterface.so
-%%TAO%%lib/libTAO_DynamicInterface.so.1.3.6
+%%TAO%%lib/libTAO_DynamicInterface.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_ETCL.so
-%%TAO%%lib/libTAO_ETCL.so.1.3.6
+%%TAO%%lib/libTAO_ETCL.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_FTORB.so
-%%TAO%%lib/libTAO_FTORB.so.1.3.6
+%%TAO%%lib/libTAO_FTORB.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_FaultTolerance.so
-%%TAO%%lib/libTAO_FaultTolerance.so.1.3.6
+%%TAO%%lib/libTAO_FaultTolerance.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_IDL_BE_DLL.so
-%%TAO%%lib/libTAO_IDL_BE_DLL.so.5.3.6
+%%TAO%%lib/libTAO_IDL_BE_DLL.so.%%ACE_VERSION%%
 %%TAO%%lib/libTAO_IDL_FE_DLL.so
-%%TAO%%lib/libTAO_IDL_FE_DLL.so.5.3.6
+%%TAO%%lib/libTAO_IDL_FE_DLL.so.%%ACE_VERSION%%
 %%TAO%%lib/libTAO_IFRService.so
-%%TAO%%lib/libTAO_IFRService.so.1.3.6
+%%TAO%%lib/libTAO_IFRService.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_IFR_BE_DLL.so
-%%TAO%%lib/libTAO_IFR_BE_DLL.so.1.3.6
+%%TAO%%lib/libTAO_IFR_BE_DLL.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_IFR_Client.so
-%%TAO%%lib/libTAO_IFR_Client.so.1.3.6
+%%TAO%%lib/libTAO_IFR_Client.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_IORInterceptor.so
-%%TAO%%lib/libTAO_IORInterceptor.so.1.3.6
+%%TAO%%lib/libTAO_IORInterceptor.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_IORManip.so
-%%TAO%%lib/libTAO_IORManip.so.1.3.6
+%%TAO%%lib/libTAO_IORManip.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_IORTable.so
-%%TAO%%lib/libTAO_IORTable.so.1.3.6
+%%TAO%%lib/libTAO_IORTable.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_Messaging.so
-%%TAO%%lib/libTAO_Messaging.so.1.3.6
+%%TAO%%lib/libTAO_Messaging.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_ObjRefTemplate.so
-%%TAO%%lib/libTAO_ObjRefTemplate.so.1.3.6
+%%TAO%%lib/libTAO_ObjRefTemplate.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_PSDL.so
-%%TAO%%lib/libTAO_PSDL.so.1.3.6
+%%TAO%%lib/libTAO_PSDL.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_PSDL_DataStore.so
-%%TAO%%lib/libTAO_PSDL_DataStore.so.1.3.6
+%%TAO%%lib/libTAO_PSDL_DataStore.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_PortableGroup.so
-%%TAO%%lib/libTAO_PortableGroup.so.1.3.6
+%%TAO%%lib/libTAO_PortableGroup.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_PortableServer.so
-%%TAO%%lib/libTAO_PortableServer.so.1.3.6
+%%TAO%%lib/libTAO_PortableServer.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTCORBA.so
-%%TAO%%lib/libTAO_RTCORBA.so.1.3.6
+%%TAO%%lib/libTAO_RTCORBA.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTCORBAEvent.so
-%%TAO%%lib/libTAO_RTCORBAEvent.so.1.3.6
+%%TAO%%lib/libTAO_RTCORBAEvent.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTCosScheduling.so
-%%TAO%%lib/libTAO_RTCosScheduling.so.1.3.6
+%%TAO%%lib/libTAO_RTCosScheduling.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTEvent.so
-%%TAO%%lib/libTAO_RTEvent.so.1.3.6
+%%TAO%%lib/libTAO_RTEvent.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTEventLogAdmin.so
-%%TAO%%lib/libTAO_RTEventLogAdmin.so.1.3.6
+%%TAO%%lib/libTAO_RTEventLogAdmin.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTKokyuEvent.so
-%%TAO%%lib/libTAO_RTKokyuEvent.so.1.3.6
+%%TAO%%lib/libTAO_RTKokyuEvent.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTOLDEvent.so
-%%TAO%%lib/libTAO_RTOLDEvent.so.1.3.6
+%%TAO%%lib/libTAO_RTOLDEvent.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTPortableServer.so
-%%TAO%%lib/libTAO_RTPortableServer.so.1.3.6
+%%TAO%%lib/libTAO_RTPortableServer.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTSched.so
-%%TAO%%lib/libTAO_RTSched.so.1.3.6
+%%TAO%%lib/libTAO_RTSched.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTSchedEvent.so
-%%TAO%%lib/libTAO_RTSchedEvent.so.1.3.6
+%%TAO%%lib/libTAO_RTSchedEvent.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RTScheduler.so
-%%TAO%%lib/libTAO_RTScheduler.so.1.3.6
+%%TAO%%lib/libTAO_RTScheduler.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_RT_Notification.so
-%%TAO%%lib/libTAO_RT_Notification.so.1.3.6
+%%TAO%%lib/libTAO_RT_Notification.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_SSLIOP.so
-%%TAO%%lib/libTAO_SSLIOP.so.1.3.6
+%%TAO%%lib/libTAO_SSLIOP.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_Security.so
-%%TAO%%lib/libTAO_Security.so.1.3.6
+%%TAO%%lib/libTAO_Security.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_SmartProxies.so
-%%TAO%%lib/libTAO_SmartProxies.so.1.3.6
+%%TAO%%lib/libTAO_SmartProxies.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_Strategies.so
-%%TAO%%lib/libTAO_Strategies.so.1.3.6
+%%TAO%%lib/libTAO_Strategies.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_Svc_Utils.so
-%%TAO%%lib/libTAO_Svc_Utils.so.1.3.6
+%%TAO%%lib/libTAO_Svc_Utils.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_TypeCodeFactory.so
-%%TAO%%lib/libTAO_TypeCodeFactory.so.1.3.6
+%%TAO%%lib/libTAO_TypeCodeFactory.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_Utils.so
-%%TAO%%lib/libTAO_Utils.so.1.3.6
+%%TAO%%lib/libTAO_Utils.so.%%TAO_VERSION%%
 %%TAO%%lib/libTAO_Valuetype.so
-%%TAO%%lib/libTAO_Valuetype.so.1.3.6
+%%TAO%%lib/libTAO_Valuetype.so.%%TAO_VERSION%%
 %%TAO%%%%TESTS%%lib/libUCS4_UTF16.so
-%%TAO%%%%TESTS%%lib/libUCS4_UTF16.so.1.3.6
+%%TAO%%%%TESTS%%lib/libUCS4_UTF16.so.%%TAO_VERSION%%
 %%PORTDOCS%%%%DOCSDIR%%/ACE/tutorials/001/00SetEnv
 %%PORTDOCS%%%%DOCSDIR%%/ACE/tutorials/001/001.dsp
 %%PORTDOCS%%%%DOCSDIR%%/ACE/tutorials/001/Makefile