diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-02-06 11:43:41 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-02-06 11:43:41 +0100 |
| commit | e591999d8782430e68c5917552ae50aa9bcf1e9d (patch) | |
| tree | 287d1d317c8d60cbbe76e63bcbed20e75e12cee6 | |
| parent | Minor fix to Ice discovery hello server configuration (diff) | |
| download | ice-e591999d8782430e68c5917552ae50aa9bcf1e9d.tar.bz2 ice-e591999d8782430e68c5917552ae50aa9bcf1e9d.tar.xz ice-e591999d8782430e68c5917552ae50aa9bcf1e9d.zip | |
Added C++ plugins for endpoint factories, cleaned up registration of WS factories
27 files changed, 823 insertions, 352 deletions
diff --git a/cpp/include/IceGrid/.headers b/cpp/include/IceGrid/.headers index a10f5bdac20..9a7b96a4cbf 100644 --- a/cpp/include/IceGrid/.headers +++ b/cpp/include/IceGrid/.headers @@ -2,7 +2,6 @@ SDK_HEADERS = \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Admin.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Config.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Descriptor.h \ - $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Discovery.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Exception.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FileParser.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceGrid.h \ diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp index 75e2e5cf661..7d5e93eb5c5 100644 --- a/cpp/src/Ice/EndpointFactory.cpp +++ b/cpp/src/Ice/EndpointFactory.cpp @@ -8,6 +8,8 @@ // ********************************************************************** #include <Ice/EndpointFactory.h> +#include <Ice/Instance.h> +#include <Ice/EndpointFactoryManager.h> using namespace std; using namespace Ice; @@ -23,3 +25,19 @@ IceInternal::EndpointFactory::~EndpointFactory() { } +IceInternal::EndpointFactoryPlugin::EndpointFactoryPlugin(const CommunicatorPtr& communicator, + const EndpointFactoryPtr& factory) +{ + assert(communicator); + getInstance(communicator)->endpointFactoryManager()->add(factory); +} + +void +IceInternal::EndpointFactoryPlugin::initialize() +{ +} + +void +IceInternal::EndpointFactoryPlugin::destroy() +{ +} diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h index 8c4da2bd522..79873ae5c50 100644 --- a/cpp/src/Ice/EndpointFactory.h +++ b/cpp/src/Ice/EndpointFactory.h @@ -14,6 +14,8 @@ #include <Ice/EndpointIF.h> #include <Ice/EndpointFactoryF.h> #include <Ice/ProtocolInstanceF.h> +#include <Ice/CommunicatorF.h> +#include <Ice/Plugin.h> namespace IceInternal { @@ -39,6 +41,16 @@ protected: EndpointFactory(); }; +class ICE_API EndpointFactoryPlugin : public Ice::Plugin +{ +public: + + EndpointFactoryPlugin(const Ice::CommunicatorPtr&, const EndpointFactoryPtr&); + + virtual void initialize(); + virtual void destroy(); +}; + } #endif diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 47de1ec9a20..1a0ac26f360 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <IceUtil/DisableWarnings.h> + #include <Ice/Instance.h> #include <Ice/TraceLevels.h> #include <Ice/DefaultsAndOverrides.h> @@ -26,25 +27,28 @@ #include <Ice/PropertiesI.h> #include <Ice/PropertiesAdminI.h> #include <Ice/LoggerI.h> -#include <Ice/Network.h> #include <Ice/NetworkProxy.h> #include <Ice/EndpointFactoryManager.h> +#include <Ice/IPEndpointI.h> // For EndpointHostResolver +#include <Ice/WSEndpoint.h> #include <Ice/RequestHandlerFactory.h> #include <Ice/RetryQueue.h> #include <Ice/DynamicLibrary.h> #include <Ice/PluginManagerI.h> #include <Ice/Initialize.h> #include <Ice/LoggerUtil.h> -#include <IceUtil/StringUtil.h> #include <Ice/PropertiesI.h> #include <Ice/Communicator.h> #include <Ice/InstrumentationI.h> #include <Ice/ProtocolInstance.h> #include <Ice/LoggerAdminI.h> +#include <Ice/RegisterPlugins.h> +#include <Ice/ObserverHelper.h> + +#include <IceUtil/StringUtil.h> #include <IceUtil/UUID.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> -#include <Ice/ObserverHelper.h> #include <stdio.h> #include <list> @@ -62,17 +66,6 @@ # include <grp.h> // for initgroups #endif -#include <Ice/UdpEndpointI.h> - -#ifndef ICE_OS_WINRT -# include <Ice/TcpEndpointI.h> -#else -# include <IceSSL/EndpointInfo.h> // For IceSSL::EndpointType -# include <Ice/winrt/StreamEndpointI.h> -#endif - -#include <Ice/WSEndpoint.h> - using namespace std; using namespace Ice; using namespace IceInternal; @@ -168,6 +161,11 @@ public: Init init; +// +// Static initializer to register plugins. +// +IceInternal::RegisterPluginsInit initPlugins; + } namespace IceInternal // Required because ObserverUpdaterI is a friend of Instance @@ -1343,33 +1341,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _networkProxy = IceInternal::createNetworkProxy(_initData.properties, _protocolSupport); _endpointFactoryManager = new EndpointFactoryManager(this); -#ifndef ICE_OS_WINRT - ProtocolInstancePtr tcpProtocolInstance = new ProtocolInstance(this, TCPEndpointType, "tcp", false); - EndpointFactoryPtr tcpEndpointFactory = new TcpEndpointFactory(tcpProtocolInstance); - _endpointFactoryManager->add(tcpEndpointFactory); -#else - ProtocolInstancePtr tcpProtocolInstance = new ProtocolInstance(this, TCPEndpointType, "tcp", false); - EndpointFactoryPtr tcpEndpointFactory = new StreamEndpointFactory(tcpProtocolInstance); - _endpointFactoryManager->add(tcpEndpointFactory); - - ProtocolInstancePtr sslProtocolInstance = new ProtocolInstance(this, IceSSL::EndpointType, "ssl", true); - EndpointFactoryPtr sslEndpointFactory = new StreamEndpointFactory(sslProtocolInstance); - _endpointFactoryManager->add(sslEndpointFactory); - - ProtocolInstancePtr wssProtocolInstance = new ProtocolInstance(this, WSSEndpointType, "wss", true); - EndpointFactoryPtr wssEndpointFactory = new WSEndpointFactory(wssProtocolInstance, - sslEndpointFactory->clone(wssProtocolInstance)); - _endpointFactoryManager->add(wssEndpointFactory); -#endif - ProtocolInstancePtr udpProtocolInstance = new ProtocolInstance(this, UDPEndpointType, "udp", false); - EndpointFactoryPtr udpEndpointFactory = new UdpEndpointFactory(udpProtocolInstance); - _endpointFactoryManager->add(udpEndpointFactory); - - ProtocolInstancePtr wsProtocolInstance = new ProtocolInstance(this, WSEndpointType, "ws", false); - EndpointFactoryPtr wsEndpointFactory = new WSEndpointFactory(wsProtocolInstance, - tcpEndpointFactory->clone(wsProtocolInstance)); - - _endpointFactoryManager->add(wsEndpointFactory); _dynamicLibraryList = new DynamicLibraryList; @@ -1460,6 +1431,22 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica pluginManagerImpl->loadPlugins(argc, argv); // + // Add WS and WSS endpoint factories if TCP/SSL factories are installed. + // + EndpointFactoryPtr tcpFactory = _endpointFactoryManager->get(TCPEndpointType); + if(tcpFactory) + { + ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSEndpointType, "ws", false); + _endpointFactoryManager->add(new WSEndpointFactory(instance, tcpFactory->clone(instance))); + } + EndpointFactoryPtr sslFactory = _endpointFactoryManager->get(SSLEndpointType); + if(sslFactory) + { + ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSSEndpointType, "wss", true); + _endpointFactoryManager->add(new WSEndpointFactory(instance, sslFactory->clone(instance))); + } + + // // Reset _stringConverter and _wstringConverter, in case a plugin changed them // _stringConverter = IceUtil::getProcessStringConverter(); diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 2f87cf2123c..94f87cc8d2e 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -116,6 +116,7 @@ OBJS = Acceptor.o \ ProxyFactory.o \ Reference.o \ ReferenceFactory.o \ + RegisterPlugins.o \ RequestHandler.o \ RequestHandlerFactory.o \ ResponseHandler.o \ diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 7587aaeada4..c32c98f573a 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -118,6 +118,7 @@ OBJS = .\Acceptor.obj \ .\ProxyFactory.obj \ .\Reference.obj \ .\ReferenceFactory.obj \ + .\RegisterPlugins.obj \ .\RequestHandler.obj \ .\RequestHandlerFactory.obj \ .\ResponseHandler.obj \ diff --git a/cpp/src/Ice/RegisterPlugins.cpp b/cpp/src/Ice/RegisterPlugins.cpp new file mode 100644 index 00000000000..7d3cb2af4fa --- /dev/null +++ b/cpp/src/Ice/RegisterPlugins.cpp @@ -0,0 +1,26 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include <Ice/RegisterPlugins.h> +#include <Ice/CommunicatorF.h> +#include <Ice/Initialize.h> + +extern "C" +{ + +Ice::Plugin* createIceUDP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&); +Ice::Plugin* createIceTCP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&); + +}; + +IceInternal::RegisterPluginsInit::RegisterPluginsInit() +{ + Ice::registerPluginFactory("IceUDP", createIceUDP, true); + Ice::registerPluginFactory("IceTCP", createIceTCP, true); +} diff --git a/cpp/src/Ice/RegisterPlugins.h b/cpp/src/Ice/RegisterPlugins.h new file mode 100644 index 00000000000..8e1005368f2 --- /dev/null +++ b/cpp/src/Ice/RegisterPlugins.h @@ -0,0 +1,25 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_REGISTER_PLUGINS_H +#define ICE_REGISTER_PLUGINS_H + +namespace IceInternal +{ + +class RegisterPluginsInit +{ +public: + + RegisterPluginsInit(); +}; + +} + +#endif diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index 169a1aa5d94..606a442e94a 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -23,6 +23,17 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(TcpEndpointI* p) { return p; } +extern "C" +{ + +Plugin* +createIceTCP(const CommunicatorPtr& c, const string&, const StringSeq&) +{ + return new EndpointFactoryPlugin(c, new TcpEndpointFactory(new ProtocolInstance(c, TCPEndpointType, "tcp", false))); +} + +} + IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, const string& host, Int port, const Address& sourceAddr, Int timeout, const string& connectionId, bool compress) : diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index b5dfaf1c901..2525d940168 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -69,6 +69,7 @@ class TcpEndpointFactory : public EndpointFactory { public: + TcpEndpointFactory(const ProtocolInstancePtr&); virtual ~TcpEndpointFactory(); virtual Ice::Short type() const; @@ -81,9 +82,6 @@ public: private: - TcpEndpointFactory(const ProtocolInstancePtr&); - friend class Instance; - ProtocolInstancePtr _instance; }; diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp index 66e0f7269e3..6b0584fb2ba 100644 --- a/cpp/src/Ice/UdpEndpointI.cpp +++ b/cpp/src/Ice/UdpEndpointI.cpp @@ -24,6 +24,17 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(UdpEndpointI* p) { return p; } +extern "C" +{ + +Plugin* +createIceUDP(const CommunicatorPtr& c, const string&, const StringSeq&) +{ + return new EndpointFactoryPlugin(c, new UdpEndpointFactory(new ProtocolInstance(c, UDPEndpointType, "udp", false))); +} + +} + IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, const string& host, Int port, const Address& sourceAddr, const string& mcastInterface, Int mttl, bool conn, const string& conId, bool co) : diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index c4d2fabcb24..30ab27fb51e 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -71,6 +71,7 @@ class UdpEndpointFactory : public EndpointFactory { public: + UdpEndpointFactory(const ProtocolInstancePtr&); virtual ~UdpEndpointFactory(); virtual Ice::Short type() const; @@ -83,9 +84,6 @@ public: private: - UdpEndpointFactory(const ProtocolInstancePtr&); - friend class Instance; - ProtocolInstancePtr _instance; }; diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp index 31c57823238..54acdef77c4 100644 --- a/cpp/src/Ice/WSEndpoint.cpp +++ b/cpp/src/Ice/WSEndpoint.cpp @@ -14,6 +14,7 @@ #include <Ice/LocalException.h> #include <Ice/IPEndpointI.h> #include <Ice/HashUtil.h> +#include <Ice/EndpointFactoryManager.h> using namespace std; using namespace Ice; @@ -26,8 +27,8 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E { } -IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, vector<string>& args) : - _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del)) +IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const EndpointIPtr& del, vector<string>& args) : + _instance(inst), _delegate(IPEndpointIPtr::dynamicCast(del)) { initWithOptions(args); diff --git a/cpp/src/Ice/winrt/.depend.mak b/cpp/src/Ice/winrt/.depend.mak index 7767a2191e3..6d73ba98c1d 100755 --- a/cpp/src/Ice/winrt/.depend.mak +++ b/cpp/src/Ice/winrt/.depend.mak @@ -1,4 +1,214 @@ +..\BuiltinSequences.h: \ + "$(slicedir)\Ice\BuiltinSequences.ice" + +..\CommunicatorF.h: \ + "$(slicedir)\Ice\CommunicatorF.ice" + +..\Communicator.h: \ + "$(slicedir)\Ice\Communicator.ice" \ + "$(slicedir)/Ice/LoggerF.ice" \ + "$(slicedir)/Ice/InstrumentationF.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ObjectFactoryF.ice" \ + "$(slicedir)/Ice/RouterF.ice" \ + "$(slicedir)/Ice/LocatorF.ice" \ + "$(slicedir)/Ice/PluginF.ice" \ + "$(slicedir)/Ice/ImplicitContextF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/FacetMap.ice" + +..\ConnectionF.h: \ + "$(slicedir)\Ice\ConnectionF.ice" + +..\Connection.h: \ + "$(slicedir)\Ice\Connection.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +..\Current.h: \ + "$(slicedir)\Ice\Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" + +..\Endpoint.h: \ + "$(slicedir)\Ice\Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +..\EndpointF.h: \ + "$(slicedir)\Ice\EndpointF.ice" + +..\EndpointTypes.h: \ + "$(slicedir)\Ice\EndpointTypes.ice" + +..\FacetMap.h: \ + "$(slicedir)\Ice\FacetMap.ice" + +..\Identity.h: \ + "$(slicedir)\Ice\Identity.ice" + +..\ImplicitContextF.h: \ + "$(slicedir)\Ice\ImplicitContextF.ice" + +..\ImplicitContext.h: \ + "$(slicedir)\Ice\ImplicitContext.ice" \ + "$(slicedir)/Ice/LocalException.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" + +..\LocalException.h: \ + "$(slicedir)\Ice\LocalException.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +..\LocatorF.h: \ + "$(slicedir)\Ice\LocatorF.ice" + +..\Locator.h: \ + "$(slicedir)\Ice\Locator.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/ProcessF.ice" + +..\LoggerF.h: \ + "$(slicedir)\Ice\LoggerF.ice" + +..\Logger.h: \ + "$(slicedir)\Ice\Logger.ice" + +..\ObjectAdapterF.h: \ + "$(slicedir)\Ice\ObjectAdapterF.ice" + +..\ObjectAdapter.h: \ + "$(slicedir)\Ice\ObjectAdapter.ice" \ + "$(slicedir)/Ice/CommunicatorF.ice" \ + "$(slicedir)/Ice/ServantLocatorF.ice" \ + "$(slicedir)/Ice/LocatorF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/FacetMap.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +..\ObjectFactoryF.h: \ + "$(slicedir)\Ice\ObjectFactoryF.ice" + +..\ObjectFactory.h: \ + "$(slicedir)\Ice\ObjectFactory.ice" + +..\PluginF.h: \ + "$(slicedir)\Ice\PluginF.ice" + +..\Plugin.h: \ + "$(slicedir)\Ice\Plugin.ice" \ + "$(slicedir)/Ice/LoggerF.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +..\ProcessF.h: \ + "$(slicedir)\Ice\ProcessF.ice" + +..\Process.h: \ + "$(slicedir)\Ice\Process.ice" + +..\PropertiesF.h: \ + "$(slicedir)\Ice\PropertiesF.ice" + +..\Properties.h: \ + "$(slicedir)\Ice\Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +..\PropertiesAdmin.h: \ + "$(slicedir)\Ice\PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +..\RemoteLogger.h: \ + "$(slicedir)\Ice\RemoteLogger.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +..\Router.h: \ + "$(slicedir)\Ice\Router.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +..\RouterF.h: \ + "$(slicedir)\Ice\RouterF.ice" + +..\ServantLocatorF.h: \ + "$(slicedir)\Ice\ServantLocatorF.ice" + +..\ServantLocator.h: \ + "$(slicedir)\Ice\ServantLocator.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" + +..\SliceChecksumDict.h: \ + "$(slicedir)\Ice\SliceChecksumDict.ice" + +..\Version.h: \ + "$(slicedir)\Ice\Version.ice" + +..\Metrics.h: \ + "$(slicedir)\Ice\Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +..\Instrumentation.h: \ + "$(slicedir)\Ice\Instrumentation.ice" \ + "$(slicedir)/Ice/EndpointF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" + +EndpointInfo.h: \ + "$(slicedir)\IceSSL\EndpointInfo.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +ConnectionInfo.h: \ + "$(slicedir)\IceSSL\ConnectionInfo.ice" \ + "$(slicedir)/Ice/Connection.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +..\IceDiscovery.h: \ + "$(slicedir)\IceDiscovery\IceDiscovery.ice" \ + "$(slicedir)/Ice/Identity.ice" + +..\IceLocatorDiscovery.h: \ + "$(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice" \ + "$(slicedir)/Ice/Locator.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/ProcessF.ice" + $(ARCH)\$(CONFIG)\Acceptor.obj: \ ..\Acceptor.cpp \ "..\..\..\src\Ice\Acceptor.h" \ @@ -1037,6 +1247,7 @@ $(ARCH)\$(CONFIG)\ConnectionFactory.obj: \ "..\..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -1047,7 +1258,6 @@ $(ARCH)\$(CONFIG)\ConnectionFactory.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1160,6 +1370,7 @@ $(ARCH)\$(CONFIG)\ConnectionI.obj: \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1188,7 +1399,6 @@ $(ARCH)\$(CONFIG)\ConnectionI.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1720,6 +1930,9 @@ $(ARCH)\$(CONFIG)\EndpointFactoryManager.obj: \ "..\..\..\src\Ice\AcceptorF.h" \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ @@ -1742,7 +1955,6 @@ $(ARCH)\$(CONFIG)\EndpointFactoryManager.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "..\..\..\src\Ice\TraceLevelsF.h" \ "..\..\..\src\Ice\DefaultsAndOverridesF.h" \ @@ -1765,7 +1977,6 @@ $(ARCH)\$(CONFIG)\EndpointFactoryManager.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\..\src\Ice\IPEndpointIF.h" \ "..\..\..\src\Ice\RetryQueueF.h" \ @@ -1775,7 +1986,6 @@ $(ARCH)\$(CONFIG)\EndpointFactoryManager.obj: \ "..\..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -1806,6 +2016,100 @@ $(ARCH)\$(CONFIG)\EndpointFactory.obj: \ "$(includedir)\Ice\Config.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "..\..\..\src\Ice\Instance.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "..\..\..\src\Ice\TraceLevelsF.h" \ + "..\..\..\src\Ice\DefaultsAndOverridesF.h" \ + "..\..\..\src\Ice\RouterInfoF.h" \ + "..\..\..\src\Ice\LocatorInfoF.h" \ + "..\..\..\src\Ice\ReferenceFactoryF.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "..\..\..\src\Ice\ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "..\..\..\src\Ice\EndpointFactoryManagerF.h" \ + "..\..\..\src\Ice\IPEndpointIF.h" \ + "..\..\..\src\Ice\RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "..\..\..\src\Ice\NetworkF.h" \ + "..\..\..\src\Ice\NetworkProxyF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "..\..\..\src\Ice\ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "..\..\..\src\Ice\EndpointFactoryManager.h" \ $(ARCH)\$(CONFIG)\Endpoint.obj: \ ..\Endpoint.cpp \ @@ -2480,6 +2784,7 @@ $(ARCH)\$(CONFIG)\IncomingAsync.obj: \ "..\..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Proxy.h" \ @@ -2488,7 +2793,6 @@ $(ARCH)\$(CONFIG)\IncomingAsync.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -2784,6 +3088,7 @@ $(ARCH)\$(CONFIG)\Initialize.obj: \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Process.h" \ + "..\..\..\src\Ice\PluginManagerI.h" \ $(ARCH)\$(CONFIG)\Instance.obj: \ ..\Instance.cpp \ @@ -2938,6 +3243,10 @@ $(ARCH)\$(CONFIG)\Instance.obj: \ "..\..\..\src\Ice\NetworkProxy.h" \ "..\..\..\src\Ice\EndpointFactoryManager.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ + "..\..\..\src\Ice\IPEndpointI.h" \ + "..\..\..\src\Ice\WSEndpoint.h" \ + "..\..\..\src\Ice\EndpointFactory.h" \ + "..\..\..\src\Ice\ProtocolInstance.h" \ "..\..\..\src\Ice\RequestHandlerFactory.h" \ "..\..\..\src\Ice\RetryQueue.h" \ "$(includedir)\Ice\DynamicLibrary.h" \ @@ -2950,16 +3259,9 @@ $(ARCH)\$(CONFIG)\Instance.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ - "..\..\..\src\Ice\ProtocolInstance.h" \ "..\..\..\src\Ice\LoggerAdminI.h" \ + "..\..\..\src\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\UUID.h" \ - "..\..\..\src\Ice\UdpEndpointI.h" \ - "..\..\..\src\Ice\IPEndpointI.h" \ - "..\..\..\src\Ice\EndpointFactory.h" \ - "$(includedir)\IceSSL\EndpointInfo.h" \ - "StreamEndpointI.h" \ - "StreamF.h" \ - "..\..\..\src\Ice\WSEndpoint.h" \ $(ARCH)\$(CONFIG)\IPEndpointI.obj: \ ..\IPEndpointI.cpp \ @@ -4859,6 +5161,9 @@ $(ARCH)\$(CONFIG)\OpaqueEndpointI.obj: \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -4892,14 +5197,12 @@ $(ARCH)\$(CONFIG)\OpaqueEndpointI.obj: \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "..\..\..\src\Ice\Network.h" \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\NetworkProxyF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "..\..\..\src\Ice\Base64.h" \ "..\..\..\src\Ice\HashUtil.h" \ @@ -5247,12 +5550,9 @@ $(ARCH)\$(CONFIG)\PluginManagerI.obj: \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\Initialize.h" \ + "..\..\..\src\Ice\Instance.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "..\..\..\src\Ice\Instance.h" \ "..\..\..\src\Ice\TraceLevelsF.h" \ "..\..\..\src\Ice\DefaultsAndOverridesF.h" \ "..\..\..\src\Ice\RouterInfoF.h" \ @@ -5264,12 +5564,15 @@ $(ARCH)\$(CONFIG)\PluginManagerI.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\..\src\Ice\EndpointFactoryManagerF.h" \ "..\..\..\src\Ice\IPEndpointIF.h" \ "..\..\..\src\Ice\RetryQueueF.h" \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\NetworkProxyF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8243,6 +8546,7 @@ $(ARCH)\$(CONFIG)\UdpEndpointI.obj: \ "..\..\..\src\Ice\EventHandlerF.h" \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\UdpConnector.h" \ "..\..\..\src\Ice\Connector.h" \ "..\..\..\src\Ice\UdpTransceiver.h" \ @@ -8270,7 +8574,6 @@ $(ARCH)\$(CONFIG)\UdpEndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -8366,6 +8669,7 @@ $(ARCH)\$(CONFIG)\UdpTransceiver.obj: \ "..\..\..\src\Ice\AcceptorF.h" \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\Connection.h" \ "..\..\..\src\Ice\ProtocolInstance.h" \ "..\..\..\src\Ice\Instance.h" \ @@ -8388,7 +8692,6 @@ $(ARCH)\$(CONFIG)\UdpTransceiver.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8730,9 +9033,11 @@ $(ARCH)\$(CONFIG)\WSEndpoint.obj: \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstanceF.h" \ "..\..\..\src\Ice\ProtocolInstance.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -8766,7 +9071,6 @@ $(ARCH)\$(CONFIG)\WSEndpoint.obj: \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -8791,7 +9095,6 @@ $(ARCH)\$(CONFIG)\WSEndpoint.obj: \ "..\..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8811,6 +9114,7 @@ $(ARCH)\$(CONFIG)\WSEndpoint.obj: \ "..\..\..\src\Ice\Connector.h" \ "..\..\..\src\Ice\IPEndpointI.h" \ "..\..\..\src\Ice\HashUtil.h" \ + "..\..\..\src\Ice\EndpointFactoryManager.h" \ $(ARCH)\$(CONFIG)\WSTransceiver.obj: \ ..\WSTransceiver.cpp \ @@ -8989,6 +9293,153 @@ $(ARCH)\$(CONFIG)\HttpParser.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\DisableWarnings.h" \ +$(ARCH)\$(CONFIG)\IceDiscovery.obj: \ + IceDiscovery.cpp \ + "..\..\..\src\IceDiscovery\IceDiscovery.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\Outgoing.h" \ + "$(includedir)\Ice\OutgoingAsync.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + +$(ARCH)\$(CONFIG)\RegisterPlugins.obj: \ + RegisterPlugins.cpp \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Plugin.h" \ + "..\..\..\src\Ice\RegisterPlugins.h" \ + $(ARCH)\$(CONFIG)\StreamAcceptor.obj: \ StreamAcceptor.cpp \ "StreamAcceptor.h" \ @@ -9074,6 +9525,7 @@ $(ARCH)\$(CONFIG)\StreamAcceptor.obj: \ "..\..\..\src\Ice\ConnectorF.h" \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ProtocolInstance.h" \ "..\..\..\src\Ice\Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -9096,7 +9548,6 @@ $(ARCH)\$(CONFIG)\StreamAcceptor.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -9199,6 +9650,7 @@ $(ARCH)\$(CONFIG)\StreamConnector.obj: \ "..\..\..\src\Ice\AcceptorF.h" \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "StreamF.h" \ "..\..\..\src\Ice\ProtocolInstance.h" \ "..\..\..\src\Ice\Instance.h" \ @@ -9222,7 +9674,6 @@ $(ARCH)\$(CONFIG)\StreamConnector.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -9317,6 +9768,7 @@ $(ARCH)\$(CONFIG)\StreamEndpointI.obj: \ "..\..\..\src\Ice\EventHandlerF.h" \ "..\..\..\src\Ice\EndpointFactory.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ + "$(includedir)\Ice\Plugin.h" \ "StreamF.h" \ "StreamAcceptor.h" \ "..\..\..\src\Ice\Acceptor.h" \ @@ -9347,7 +9799,6 @@ $(ARCH)\$(CONFIG)\StreamEndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ "..\..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -10072,203 +10523,3 @@ $(ARCH)\$(CONFIG)\ServantLocatorF.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - -..\BuiltinSequences.h: \ - "$(slicedir)\Ice\BuiltinSequences.ice" - -..\CommunicatorF.h: \ - "$(slicedir)\Ice\CommunicatorF.ice" - -..\Communicator.h: \ - "$(slicedir)\Ice\Communicator.ice" \ - "$(slicedir)/Ice/LoggerF.ice" \ - "$(slicedir)/Ice/InstrumentationF.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ObjectFactoryF.ice" \ - "$(slicedir)/Ice/RouterF.ice" \ - "$(slicedir)/Ice/LocatorF.ice" \ - "$(slicedir)/Ice/PluginF.ice" \ - "$(slicedir)/Ice/ImplicitContextF.ice" \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/Properties.ice" \ - "$(slicedir)/Ice/PropertiesAdmin.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/FacetMap.ice" - -..\ConnectionF.h: \ - "$(slicedir)\Ice\ConnectionF.ice" - -..\Connection.h: \ - "$(slicedir)\Ice\Connection.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Endpoint.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/EndpointF.ice" - -..\Current.h: \ - "$(slicedir)\Ice\Current.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" - -..\Endpoint.h: \ - "$(slicedir)\Ice\Endpoint.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/EndpointF.ice" - -..\EndpointF.h: \ - "$(slicedir)\Ice\EndpointF.ice" - -..\EndpointTypes.h: \ - "$(slicedir)\Ice\EndpointTypes.ice" - -..\FacetMap.h: \ - "$(slicedir)\Ice\FacetMap.ice" - -..\Identity.h: \ - "$(slicedir)\Ice\Identity.ice" - -..\ImplicitContextF.h: \ - "$(slicedir)\Ice\ImplicitContextF.ice" - -..\ImplicitContext.h: \ - "$(slicedir)\Ice\ImplicitContext.ice" \ - "$(slicedir)/Ice/LocalException.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" - -..\LocalException.h: \ - "$(slicedir)\Ice\LocalException.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -..\LocatorF.h: \ - "$(slicedir)\Ice\LocatorF.ice" - -..\Locator.h: \ - "$(slicedir)\Ice\Locator.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/ProcessF.ice" - -..\LoggerF.h: \ - "$(slicedir)\Ice\LoggerF.ice" - -..\Logger.h: \ - "$(slicedir)\Ice\Logger.ice" - -..\ObjectAdapterF.h: \ - "$(slicedir)\Ice\ObjectAdapterF.ice" - -..\ObjectAdapter.h: \ - "$(slicedir)\Ice\ObjectAdapter.ice" \ - "$(slicedir)/Ice/CommunicatorF.ice" \ - "$(slicedir)/Ice/ServantLocatorF.ice" \ - "$(slicedir)/Ice/LocatorF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/FacetMap.ice" \ - "$(slicedir)/Ice/Endpoint.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/EndpointF.ice" - -..\ObjectFactoryF.h: \ - "$(slicedir)\Ice\ObjectFactoryF.ice" - -..\ObjectFactory.h: \ - "$(slicedir)\Ice\ObjectFactory.ice" - -..\PluginF.h: \ - "$(slicedir)\Ice\PluginF.ice" - -..\Plugin.h: \ - "$(slicedir)\Ice\Plugin.ice" \ - "$(slicedir)/Ice/LoggerF.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -..\ProcessF.h: \ - "$(slicedir)\Ice\ProcessF.ice" - -..\Process.h: \ - "$(slicedir)\Ice\Process.ice" - -..\PropertiesF.h: \ - "$(slicedir)\Ice\PropertiesF.ice" - -..\Properties.h: \ - "$(slicedir)\Ice\Properties.ice" \ - "$(slicedir)/Ice/PropertiesAdmin.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -..\PropertiesAdmin.h: \ - "$(slicedir)\Ice\PropertiesAdmin.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -..\RemoteLogger.h: \ - "$(slicedir)\Ice\RemoteLogger.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -..\Router.h: \ - "$(slicedir)\Ice\Router.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -..\RouterF.h: \ - "$(slicedir)\Ice\RouterF.ice" - -..\ServantLocatorF.h: \ - "$(slicedir)\Ice\ServantLocatorF.ice" - -..\ServantLocator.h: \ - "$(slicedir)\Ice\ServantLocator.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" - -..\SliceChecksumDict.h: \ - "$(slicedir)\Ice\SliceChecksumDict.ice" - -..\Version.h: \ - "$(slicedir)\Ice\Version.ice" - -..\Metrics.h: \ - "$(slicedir)\Ice\Metrics.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -..\Instrumentation.h: \ - "$(slicedir)\Ice\Instrumentation.ice" \ - "$(slicedir)/Ice/EndpointF.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" - -EndpointInfo.h: \ - "$(slicedir)\IceSSL\EndpointInfo.ice" \ - "$(slicedir)/Ice/Endpoint.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/EndpointF.ice" - -ConnectionInfo.h: \ - "$(slicedir)\IceSSL\ConnectionInfo.ice" \ - "$(slicedir)/Ice/Connection.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Endpoint.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/EndpointF.ice" diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak index 2c38e13cc28..2a8a242b0bf 100644 --- a/cpp/src/Ice/winrt/Makefile.mak +++ b/cpp/src/Ice/winrt/Makefile.mak @@ -119,16 +119,23 @@ OBJS = $(ARCH)\$(CONFIG)\Acceptor.obj \ $(ARCH)\$(CONFIG)\WSConnector.obj \ $(ARCH)\$(CONFIG)\WSEndpoint.obj \ $(ARCH)\$(CONFIG)\WSTransceiver.obj \ - $(ARCH)\$(CONFIG)\HttpParser.obj + $(ARCH)\$(CONFIG)\HttpParser.obj \ + $(ARCH)\$(CONFIG)\IceDiscovery\IceDiscovery.obj \ + $(ARCH)\$(CONFIG)\IceDiscovery\LookupI.obj \ + $(ARCH)\$(CONFIG)\IceDiscovery\LocatorI.obj \ + $(ARCH)\$(CONFIG)\IceDiscovery\PluginI.obj \ + $(ARCH)\$(CONFIG)\IceLocatorDiscovery\IceLocatorDiscovery.obj \ + $(ARCH)\$(CONFIG)\IceLocatorDiscovery\PluginI.obj -LOCAL_OBJS = $(ARCH)\$(CONFIG)\StreamAcceptor.obj \ +LOCAL_OBJS = $(ARCH)\$(CONFIG)\RegisterPlugins.obj \ + $(ARCH)\$(CONFIG)\StreamAcceptor.obj \ $(ARCH)\$(CONFIG)\StreamConnector.obj \ $(ARCH)\$(CONFIG)\StreamEndpointI.obj \ $(ARCH)\$(CONFIG)\StreamTransceiver.obj \ $(ARCH)\$(CONFIG)\EndpointInfo.obj \ $(ARCH)\$(CONFIG)\ConnectionInfo.obj \ -SLICE_CORE_SRCS = Ice\BuiltinSequences.ice \ +SLICE_SRCS = Ice\BuiltinSequences.ice \ Ice\CommunicatorF.ice \ Ice\Communicator.ice \ Ice\ConnectionF.ice \ @@ -165,13 +172,11 @@ SLICE_CORE_SRCS = Ice\BuiltinSequences.ice \ Ice\SliceChecksumDict.ice \ Ice\Version.ice \ Ice\Metrics.ice \ - Ice\Instrumentation.ice - - - -SLICE_SSL_SRCS = IceSSL\EndpointInfo.ice \ - IceSSL\ConnectionInfo.ice - + Ice\Instrumentation.ice \ + IceSSL\EndpointInfo.ice \ + IceSSL\ConnectionInfo.ice \ + IceDiscovery\IceDiscovery.ice \ + IceLocatorDiscovery\IceLocatorDiscovery.ice SRCS = $(OBJS:.obj=.cpp) SRCS = $(SRCS:x86\=) @@ -207,9 +212,10 @@ HDIR = $(headerdir)\Ice SDIR = $(slicedir)\Ice PDBNAME = $(LIBNAME:.lib=.pdb) -CPPFLAGS = /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN -CORE_SLICE2CPPFLAGS = --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) -SSL_SLICE2CPPFLAGS = --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) +CPPFLAGS = /Fd$(PDBNAME) -I. -I..\.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN +SLICE2CPPFLAGS = --ice $(SLICE2CPPFLAGS) +CORE_SLICE2CPPFLAGS = --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) +SSL_SLICE2CPPFLAGS = --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) !include $(top_srcdir)\config\Make.rules.mak @@ -223,7 +229,7 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks .cpp.d: @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) @echo Generating dependencies for $< - $(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>$(*F).d && \ + @$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>$(*F).d && \ cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $(*F).cpp $(top_srcdir) @del /q $(*F).d $(*F).i @@ -231,6 +237,34 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) $(CXX) /c /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) $< +.cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj:: + @if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" mkdir $(ARCH)\$(CONFIG)\IceDiscovery + $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< + +.cpp{$(ARCH)\$(CONFIG)\IceLocatorDiscovery\}.obj:: + @if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" mkdir $(ARCH)\$(CONFIG)\IceLocatorDiscovery + $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceLocatorDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< + +{..\..\IceDiscovery\}.cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj:: + @if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" mkdir $(ARCH)\$(CONFIG)\IceDiscovery + $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< + +{..\..\IceLocatorDiscovery\}.cpp{$(ARCH)\$(CONFIG)\IceLocatorDiscovery\}.obj:: + @if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" mkdir $(ARCH)\$(CONFIG)\IceLocatorDiscovery + $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceLocatorDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< + +.cpp{$(DEPEND_DIR)\IceDiscovery}.d: + @echo Generating dependencies for $< + @$(CXX) /E $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>$(*F).d && \ + cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $(*F).cpp $(top_srcdir) + @del /q $(*F).d $(*F).i + +.cpp{$(DEPEND_DIR)\IceLocatorDiscovery}.d: + @echo Generating dependencies for $< + @$(CXX) /E $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>$(*F).d && \ + cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $(*F).cpp $(top_srcdir) + @del /q $(*F).d $(*F).i + {$(slicedir)\Ice\}.ice{Ice\}.d: @echo Generating dependencies for $< @"$(SLICE2CPP)" $(CORE_SLICE2CPPFLAGS) --depend $< | \ @@ -263,6 +297,40 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks "$(SLICE2CPP)" $(SSL_SLICE2CPPFLAGS) $< move $(*F).h $(headerdir)\IceSSL +{$(slicedir)\IceDiscovery\}.ice{IceDiscovery\}.d: + @echo Generating dependencies for $< + @"$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) --depend $< | \ + cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice "..\" + +{$(slicedir)\IceDiscovery}.ice.cpp: + @if not exist "IceDiscovery" mkdir IceDiscovery + del /q IceDiscovery\$(*F).h $(*F).cpp + "$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) $< + move $(*F).h IceDiscovery + +{$(slicedir)\IceDiscovery}.ice{IceDiscovery}.h: + @if not exist "IceDiscovery" mkdir IceDiscovery + del /q IceDiscovery\$(*F).h $(*F).cpp + "$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) $< + move $(*F).h IceDiscovery + +{$(slicedir)\IceLocatorDiscovery\}.ice{IceLocatorDiscovery\}.d: + @echo Generating dependencies for $< + @"$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) --depend $< | \ + cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice "..\" + +{$(slicedir)\IceLocatorDiscovery}.ice.cpp: + @if not exist "IceLocatorDiscovery" mkdir IceLocatorDiscovery + del /q IceLocatorDiscovery\$(*F).h $(*F).cpp + "$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) $< + move $(*F).h IceLocatorDiscovery + +{$(slicedir)\IceLocatorDiscovery}.ice{IceLocatorDiscovery}.h: + @if not exist "IceLocatorDiscovery" mkdir IceLocatorDiscovery + del /q IceLocatorDiscovery\$(*F).h $(*F).cpp + "$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) $< + move $(*F).h IceLocatorDiscovery + clean:: -del /q $(SOURCE_DIR)\BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h -del /q $(SOURCE_DIR)\CommunicatorF.cpp $(HDIR)\CommunicatorF.h diff --git a/cpp/src/Ice/winrt/RegisterPlugins.cpp b/cpp/src/Ice/winrt/RegisterPlugins.cpp new file mode 100644 index 00000000000..17ad9123656 --- /dev/null +++ b/cpp/src/Ice/winrt/RegisterPlugins.cpp @@ -0,0 +1,35 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice Touch is licensed to you under the terms described in the +// ICE_TOUCH_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include <Ice/Initialize.h> +#include <Ice/RegisterPlugins.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +extern "C" +{ + +Plugin* createIceUDP(const CommunicatorPtr&, const string&, const StringSeq&); +Plugin* createIceTCP(const CommunicatorPtr&, const string&, const StringSeq&); +Plugin* createIceSSL(const CommunicatorPtr&, const string&, const StringSeq&); +Plugin* createIceDiscovery(const CommunicatorPtr&, const string&, const StringSeq&); +Plugin* createIceLocatorDiscovery(const CommunicatorPtr&, const string&, const StringSeq&); + +} + +RegisterPluginsInit::RegisterPluginsInit() +{ + registerPluginFactory("IceUDP", createIceUDP, true); + registerPluginFactory("IceTCP", createIceTCP, true); + registerPluginFactory("IceSSL", createIceSSL, true); + registerPluginFactory("IceDiscovery", createIceDiscovery, false); + registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, false); +} diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp index e71c0acd12b..60aca535bdd 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.cpp +++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp @@ -25,6 +25,25 @@ using namespace std; using namespace Ice; using namespace IceInternal; +extern "C" +{ + +Plugin* +createIceTCP(const CommunicatorPtr& com, const string&, const StringSeq&) +{ + ProtocolInstancePtr instance = new ProtocolInstance(com, TCPEndpointType, "tcp", false); + return new EndpointFactoryPlugin(com, new StreamEndpointFactory(instance)); +} + +Plugin* +createIceSSL(const CommunicatorPtr& com, const string&, const StringSeq&) +{ + ProtocolInstancePtr instance = new ProtocolInstance(com, SSLEndpointType, "ssl", true); + return new EndpointFactoryPlugin(com, new StreamEndpointFactory(instance)); +} + +} + namespace { diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h index f3c41915037..8e77b2d1397 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.h +++ b/cpp/src/Ice/winrt/StreamEndpointI.h @@ -72,6 +72,7 @@ class StreamEndpointFactory : public EndpointFactory { public: + StreamEndpointFactory(const ProtocolInstancePtr&); virtual ~StreamEndpointFactory(); virtual Ice::Short type() const; @@ -84,9 +85,6 @@ public: private: - StreamEndpointFactory(const ProtocolInstancePtr&); - friend class Instance; - ProtocolInstancePtr _instance; }; diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index 021f4007071..6c9183cca5c 100644 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -12,7 +12,6 @@ #include <IceSSL/SSLEngine.h> #include <IceSSL/EndpointI.h> -#include <Ice/WSEndpoint.h> #include <Ice/ProtocolPluginFacade.h> #include <Ice/ProtocolInstance.h> #include <Ice/LocalException.h> @@ -38,29 +37,23 @@ createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const // // Plugin implementation. // -IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& communicator) +IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& com) { #if defined(ICE_USE_SECURE_TRANSPORT) - _engine = new SecureTransportEngine(communicator); + _engine = new SecureTransportEngine(com); #elif defined(ICE_USE_SCHANNEL) - _engine = new SChannelEngine(communicator); + _engine = new SChannelEngine(com); #else - _engine = new OpenSSLEngine(communicator); + _engine = new OpenSSLEngine(com); #endif - IceInternal::ProtocolPluginFacadePtr facade = IceInternal::getProtocolPluginFacade(communicator); - // // Register the endpoint factory. We have to do this now, rather // than in initialize, because the communicator may need to // interpret proxies before the plug-in is fully initialized. // IceInternal::EndpointFactoryPtr sslFactory = new EndpointFactoryI(new Instance(_engine, EndpointType, "ssl")); - facade->addEndpointFactory(sslFactory); - - IceInternal::ProtocolInstancePtr wss = - new IceInternal::ProtocolInstance(communicator, WSSEndpointType, "wss", true); - facade->addEndpointFactory(new IceInternal::WSEndpointFactory(wss, sslFactory->clone(wss))); + IceInternal::getProtocolPluginFacade(com)->addEndpointFactory(sslFactory); } void diff --git a/cpp/test/WinRT/TestSuite.sln b/cpp/test/WinRT/TestSuite.sln index e5f137c1080..001c72c92dd 100644 --- a/cpp/test/WinRT/TestSuite.sln +++ b/cpp/test/WinRT/TestSuite.sln @@ -1,6 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "TestSuite\TestSuite.vcxproj", "{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}" EndProject Global diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp index 6a5137c3bbd..13def8e07e2 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp +++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp @@ -875,7 +875,7 @@ MainPage::btnStop_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEvent { _loop->IsChecked = false; _stop->IsEnabled = false; - _stop->Content = "Wainting for test to finish..."; + _stop->Content = "Waiting for test to finish..."; } Ice::CommunicatorPtr @@ -999,4 +999,4 @@ TestSuite::MainPage::printToConsoleOutput(String^ message, bool newline) _output->SelectedIndex = _messages->Size - 1; _output->ScrollIntoView(_output->SelectedItem); }, CallbackContext::Any)); -}
\ No newline at end of file +} diff --git a/cs/src/Ice/Instance.cs b/cs/src/Ice/Instance.cs index e20c479a768..882a0dcdabc 100644 --- a/cs/src/Ice/Instance.cs +++ b/cs/src/Ice/Instance.cs @@ -888,19 +888,12 @@ namespace IceInternal _networkProxy = createNetworkProxy(_initData.properties, _protocolSupport); _endpointFactoryManager = new EndpointFactoryManager(this); - ProtocolInstance tcpProtocolInstance = - new ProtocolInstance(this, Ice.TCPEndpointType.value, "tcp", false); - EndpointFactory tcpEndpointFactory = new TcpEndpointFactory(tcpProtocolInstance); - _endpointFactoryManager.add(tcpEndpointFactory); - ProtocolInstance udpProtocolInstance = - new ProtocolInstance(this, Ice.UDPEndpointType.value, "udp", false); - EndpointFactory udpEndpointFactory = new UdpEndpointFactory(udpProtocolInstance); - _endpointFactoryManager.add(udpEndpointFactory); + ProtocolInstance tcpInstance = new ProtocolInstance(this, Ice.TCPEndpointType.value, "tcp", false); + _endpointFactoryManager.add(new TcpEndpointFactory(tcpInstance)); - ProtocolInstance wsProtocolInstance = new ProtocolInstance(this, Ice.WSEndpointType.value, "ws", false); - _endpointFactoryManager.add(new WSEndpointFactory(wsProtocolInstance, - tcpEndpointFactory.clone(wsProtocolInstance))); + ProtocolInstance udpInstance = new ProtocolInstance(this, Ice.UDPEndpointType.value, "udp", false); + _endpointFactoryManager.add(new UdpEndpointFactory(udpInstance)); #if !SILVERLIGHT _pluginManager = new Ice.PluginManagerI(communicator); @@ -931,6 +924,23 @@ namespace IceInternal Ice.PluginManagerI pluginManagerImpl = (Ice.PluginManagerI)_pluginManager; pluginManagerImpl.loadPlugins(ref args); #endif + + // + // Add WS and WSS endpoint factories if TCP/SSL factories are installed. + // + EndpointFactory tcpFactory = _endpointFactoryManager.get(Ice.TCPEndpointType.value); + if(tcpFactory != null) + { + ProtocolInstance instance = new ProtocolInstance(this, Ice.WSEndpointType.value, "ws", false); + _endpointFactoryManager.add(new WSEndpointFactory(instance, tcpFactory.clone(instance))); + } + EndpointFactory sslFactory = _endpointFactoryManager.get(Ice.SSLEndpointType.value); + if(sslFactory != null) + { + ProtocolInstance instance = new ProtocolInstance(this, Ice.WSSEndpointType.value, "wss", true); + _endpointFactoryManager.add(new WSEndpointFactory(instance, sslFactory.clone(instance))); + } + // // Create Admin facets, if enabled. // @@ -1064,7 +1074,8 @@ namespace IceInternal // if(_referenceFactory.getDefaultRouter() == null) { - Ice.RouterPrx r = Ice.RouterPrxHelper.uncheckedCast(_proxyFactory.propertyToProxy("Ice.Default.Router")); + Ice.RouterPrx r = Ice.RouterPrxHelper.uncheckedCast( + _proxyFactory.propertyToProxy("Ice.Default.Router")); if(r != null) { _referenceFactory = _referenceFactory.setDefaultRouter(r); @@ -1073,7 +1084,8 @@ namespace IceInternal if(_referenceFactory.getDefaultLocator() == null) { - Ice.LocatorPrx l = Ice.LocatorPrxHelper.uncheckedCast(_proxyFactory.propertyToProxy("Ice.Default.Locator")); + Ice.LocatorPrx l = Ice.LocatorPrxHelper.uncheckedCast( + _proxyFactory.propertyToProxy("Ice.Default.Locator")); if(l != null) { _referenceFactory = _referenceFactory.setDefaultLocator(l); diff --git a/cs/src/IceSSL/PluginI.cs b/cs/src/IceSSL/PluginI.cs index 066ff59407b..cbe540123fb 100644 --- a/cs/src/IceSSL/PluginI.cs +++ b/cs/src/IceSSL/PluginI.cs @@ -45,14 +45,8 @@ namespace IceSSL // in initialize, because the communicator may need to interpret // proxies before the plug-in is fully initialized. // - IceInternal.EndpointFactory sslEndpointFactory = - new EndpointFactoryI(new Instance(_engine, IceSSL.EndpointType.value, "ssl")); - facade.addEndpointFactory(sslEndpointFactory); - - IceInternal.ProtocolInstance wssProtocolInstance = - new IceInternal.ProtocolInstance(communicator, Ice.WSSEndpointType.value, "wss", true); - facade.addEndpointFactory(new IceInternal.WSEndpointFactory(wssProtocolInstance, - sslEndpointFactory.clone(wssProtocolInstance))); + EndpointFactoryI factory = new EndpointFactoryI(new Instance(_engine, IceSSL.EndpointType.value, "ssl")); + facade.addEndpointFactory(factory); } public override void initialize() diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index 0d31033fc80..a28e914844c 100644 --- a/java/src/Ice/src/main/java/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java @@ -976,18 +976,12 @@ public final class Instance _networkProxy = createNetworkProxy(_initData.properties, _protocolSupport); _endpointFactoryManager = new EndpointFactoryManager(this); + ProtocolInstance tcpProtocolInstance = new ProtocolInstance(this, Ice.TCPEndpointType.value, "tcp", false); - EndpointFactory tcpEndpointFactory = new TcpEndpointFactory(tcpProtocolInstance); - _endpointFactoryManager.add(tcpEndpointFactory); + _endpointFactoryManager.add(new TcpEndpointFactory(tcpProtocolInstance)); ProtocolInstance udpProtocolInstance = new ProtocolInstance(this, Ice.UDPEndpointType.value, "udp", false); - EndpointFactory udpEndpointFactory = new UdpEndpointFactory(udpProtocolInstance); - _endpointFactoryManager.add(udpEndpointFactory); - - ProtocolInstance wsProtocolInstance = new ProtocolInstance(this, Ice.WSEndpointType.value, "ws", false); - EndpointFactory wsEndpointFactory = new WSEndpointFactory(wsProtocolInstance, - tcpEndpointFactory.clone(wsProtocolInstance)); - _endpointFactoryManager.add(wsEndpointFactory); + _endpointFactoryManager.add(new UdpEndpointFactory(udpProtocolInstance)); _pluginManager = new Ice.PluginManagerI(communicator, this); @@ -1070,6 +1064,22 @@ public final class Instance pluginManagerImpl.loadPlugins(args); // + // Add WS and WSS endpoint factories if TCP/SSL factories are installed. + // + final EndpointFactory tcpFactory = _endpointFactoryManager.get(Ice.TCPEndpointType.value); + if(tcpFactory != null) + { + final ProtocolInstance instance = new ProtocolInstance(this, Ice.WSEndpointType.value, "ws", false); + _endpointFactoryManager.add(new WSEndpointFactory(instance, tcpFactory.clone(instance))); + } + final EndpointFactory sslFactory = _endpointFactoryManager.get(Ice.SSLEndpointType.value); + if(sslFactory != null) + { + final ProtocolInstance instance = new ProtocolInstance(this, Ice.WSSEndpointType.value, "wss", true); + _endpointFactoryManager.add(new WSEndpointFactory(instance, sslFactory.clone(instance))); + } + + // // Create Admin facets, if enabled. // // Note that any logger-dependent admin facet must be created after we load all plugins, diff --git a/java/src/Ice/src/main/java/IceSSL/PluginI.java b/java/src/Ice/src/main/java/IceSSL/PluginI.java index d765f1fec55..dfb953a6857 100644 --- a/java/src/Ice/src/main/java/IceSSL/PluginI.java +++ b/java/src/Ice/src/main/java/IceSSL/PluginI.java @@ -13,8 +13,7 @@ class PluginI implements Plugin { public PluginI(Ice.Communicator communicator) { - IceInternal.ProtocolPluginFacade facade = IceInternal.Util.getProtocolPluginFacade(communicator); - + final IceInternal.ProtocolPluginFacade facade = IceInternal.Util.getProtocolPluginFacade(communicator); _engine = new SSLEngine(facade); // @@ -22,15 +21,8 @@ class PluginI implements Plugin // in initialize, because the communicator may need to interpret // proxies before the plug-in is fully initialized. // - IceInternal.EndpointFactory sslEndpointFactory = - new EndpointFactoryI(new Instance(_engine, IceSSL.EndpointType.value, "ssl")); - facade.addEndpointFactory(sslEndpointFactory); - - IceInternal.ProtocolInstance wssProtocolInstance = - new IceInternal.ProtocolInstance(communicator, Ice.WSSEndpointType.value, "wss", true); - IceInternal.EndpointFactory wssEndpointFactory = - new IceInternal.WSEndpointFactory(wssProtocolInstance, sslEndpointFactory.clone(wssProtocolInstance)); - facade.addEndpointFactory(wssEndpointFactory); + EndpointFactoryI factory = new EndpointFactoryI(new Instance(_engine, IceSSL.EndpointType.value, "ssl")); + facade.addEndpointFactory(factory); } @Override diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice index 4dadf20d277..3cd23807984 100644 --- a/slice/Ice/Endpoint.ice +++ b/slice/Ice/Endpoint.ice @@ -28,6 +28,13 @@ const short TCPEndpointType = 1; /** * + * Uniquely identifies SSL endpoints. + * + **/ +const short SSLEndpointType = 2; + +/** + * * Uniquely identifies UDP endpoints. * **/ diff --git a/slice/IceSSL/EndpointInfo.ice b/slice/IceSSL/EndpointInfo.ice index 091ccd09764..f11a5d54050 100644 --- a/slice/IceSSL/EndpointInfo.ice +++ b/slice/IceSSL/EndpointInfo.ice @@ -27,7 +27,9 @@ module IceSSL * Uniquely identifies SSL endpoints. * **/ -const short EndpointType = 2; +#ifndef __SLICE2OBJC__ // In Objective-C, Ice::SSLEndpointType is already mapped to ICESSLEndpointType +const short EndpointType = Ice::SSLEndpointType; +#endif /** * |