1 files changed, 72 insertions, 42 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
index ee673fc799c..76eed45438e 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
+++ b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
@@ -326,6 +326,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
@@ -373,7 +376,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Connector_Registry.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/IIOP_Acceptor.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \
+ SSLIOPC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -419,11 +422,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \
+ SSLIOP/SSLIOP_Export.h \
+ SecurityC.h \
+ Security/security_export.h \
+ SecurityC.i \
+ SSLIOPC.i \
  SSLIOP/SSLIOP_Connect.h \
  $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
@@ -590,6 +593,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
@@ -616,7 +622,7 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \
+ SSLIOPC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -747,11 +753,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \
+ SSLIOP/SSLIOP_Export.h \
+ SecurityC.h \
+ Security/security_export.h \
+ SecurityC.i \
+ SSLIOPC.i \
  SSLIOP/SSLIOP_Endpoint.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
@@ -884,6 +890,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
@@ -910,7 +919,7 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \
+ SSLIOPC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1041,11 +1050,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \
+ SSLIOP/SSLIOP_Export.h \
+ SecurityC.h \
+ Security/security_export.h \
+ SecurityC.i \
+ SSLIOPC.i \
  SSLIOP/SSLIOP_Endpoint.i SSLIOP/SSLIOP_Connect.h \
  $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -1335,6 +1344,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
@@ -1356,7 +1368,7 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \
+ SSLIOPC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1425,11 +1437,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \
+ SSLIOP/SSLIOP_Export.h \
+ SecurityC.h \
+ Security/security_export.h \
+ SecurityC.i \
+ SSLIOPC.i \
  SSLIOP/SSLIOP_Endpoint.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
@@ -1720,6 +1732,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
@@ -1741,7 +1756,7 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \
+ SSLIOPC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1808,11 +1823,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \
+ SSLIOP/SSLIOP_Export.h \
+ SecurityC.h \
+ Security/security_export.h \
+ SecurityC.i \
+ SSLIOPC.i \
  SSLIOP/SSLIOP_Endpoint.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Endpoint.h \
@@ -2059,6 +2074,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
@@ -2107,7 +2125,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Connector_Registry.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/IIOP_Acceptor.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \
+ SSLIOPC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -2153,11 +2171,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \
+ SSLIOP/SSLIOP_Export.h \
+ SecurityC.h \
+ Security/security_export.h \
+ SecurityC.i \
+ SSLIOPC.i \
  SSLIOP/SSLIOP_Connect.h \
  $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
@@ -2438,6 +2456,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
@@ -2579,7 +2600,7 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \
+ SSLIOPC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
@@ -2607,6 +2628,9 @@ realclean: clean
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
@@ -2761,11 +2785,11 @@ realclean: clean
  $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \
+ SSLIOP/SSLIOP_Export.h \
+ SecurityC.h \
+ Security/security_export.h \
+ SecurityC.i \
+ SSLIOPC.i \
  SSLIOP/ssl_endpoints.i
 
 .obj/SSLIOPS.o .obj/SSLIOPS.so .shobj/SSLIOPS.o .shobj/SSLIOPS.so: SSLIOPS.cpp SSLIOPS.h \
@@ -2884,6 +2908,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
@@ -3207,6 +3234,9 @@ realclean: clean
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \