diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-08-12 10:35:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-08-12 10:35:04 +0200 |
| commit | 1e5843ba8400c617997e81735a9f84ac2e12bb0a (patch) | |
| tree | ac82b96476e9c161d5a2b91bfc14ec8224d823ec | |
| parent | ICE-6163 - Improve error handling in test scripts (diff) | |
| download | ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.tar.bz2 ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.tar.xz ice-1e5843ba8400c617997e81735a9f84ac2e12bb0a.zip | |
Fixed ICE-6671 - Added registration functions to explicitly register Ice plugins
237 files changed, 911 insertions, 1325 deletions
diff --git a/cpp/include/Ice/.headers b/cpp/include/Ice/.headers index 47a6188f281..b75f9b51670 100644 --- a/cpp/include/Ice/.headers +++ b/cpp/include/Ice/.headers @@ -84,6 +84,7 @@ SDK_HEADERS = \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProxyFactoryF.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProxyHandle.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ReferenceF.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RegisterPlugins.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RemoteLogger.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RequestHandlerF.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ResponseHandlerF.h \ diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index 18c26e9039e..2f1850f3790 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -50,6 +50,7 @@ #if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) # include <Ice/Service.h> #endif +#include <Ice/RegisterPlugins.h> #include <IceUtil/PopDisableWarnings.h> #endif diff --git a/cpp/include/Ice/RegisterPlugins.h b/cpp/include/Ice/RegisterPlugins.h new file mode 100644 index 00000000000..1f38a7fd51a --- /dev/null +++ b/cpp/include/Ice/RegisterPlugins.h @@ -0,0 +1,55 @@ +// ********************************************************************** +// +// 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 + +#include <Ice/Config.h> + +// +// Register functions for Ice plugins are declared here. +// +// These functions can be used to explicitly link with a plugin rather +// thanrelying on the loading of the plugin at runtime. The application +// must call the register function before initializing the communicator. +// + +namespace Ice +{ + +#if defined(ICE_STATIC_LIBS) +# define ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT /**/ +#else +# define ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT ICE_DECLSPEC_IMPORT +#endif + +// +// Checking for the API_EXPORTS macro is necessary to prevent +// inconsistent DLL linkage errors on Windows. +// + +#ifndef ICE_API_EXPORTS +ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceStringConverter(bool = true); +#endif + +#ifndef ICE_SSL_API_EXPORTS +ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceSSL(bool = true); +#endif + +#ifndef ICE_DISCOVERY_API_EXPORTS +ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceDiscovery(bool = true); +#endif + +#ifndef ICE_LOCATOR_DISCOVERY_API_EXPORTS +ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceLocatorDiscovery(bool = true); +#endif + +} + +#endif diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak index 372299c5308..1ee75d15f30 100755 --- a/cpp/src/Freeze/.depend.mak +++ b/cpp/src/Freeze/.depend.mak @@ -191,6 +191,7 @@ BackgroundSaveEvictorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\Freeze.h" \ "$(includedir)\Freeze\Initialize.h" \ "$(includedir)\Freeze\EvictorF.h" \ @@ -210,6 +211,8 @@ BackgroundSaveEvictorI.obj: \ "ObjectStore.h" \ "$(includedir)\Freeze\EvictorStorage.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "EvictorIteratorI.h" \ "SharedDbEnv.h" \ "..\..\src\IceUtil\FileUtil.h" \ @@ -339,6 +342,7 @@ Catalog.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -468,6 +472,7 @@ CatalogIndexList.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -597,11 +602,14 @@ ConnectionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ "$(includedir)\Freeze\DB.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "SharedDbEnv.h" \ "$(includedir)\Freeze\Map.h" \ "$(includedir)\Freeze\Exception.h" \ @@ -736,6 +744,7 @@ EvictorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\Freeze.h" \ "$(includedir)\Freeze\Initialize.h" \ "$(includedir)\Freeze\EvictorF.h" \ @@ -755,6 +764,8 @@ EvictorI.obj: \ "ObjectStore.h" \ "$(includedir)\Freeze\EvictorStorage.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "EvictorIteratorI.h" \ "SharedDbEnv.h" \ "..\..\src\IceUtil\FileUtil.h" \ @@ -882,6 +893,7 @@ EvictorIteratorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\Freeze.h" \ "$(includedir)\Freeze\Initialize.h" \ "$(includedir)\Freeze\EvictorF.h" \ @@ -901,6 +913,8 @@ EvictorIteratorI.obj: \ "ObjectStore.h" \ "$(includedir)\Freeze\EvictorStorage.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "$(includedir)\IceUtil\Cache.h" \ "$(includedir)\IceUtil\CountDownLatch.h" \ "EvictorI.h" \ @@ -1034,6 +1048,7 @@ Index.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "IndexI.h" \ "EvictorI.h" \ @@ -1061,6 +1076,8 @@ Index.obj: \ "ObjectStore.h" \ "$(includedir)\Freeze\EvictorStorage.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "EvictorIteratorI.h" \ "SharedDbEnv.h" \ "..\..\src\IceUtil\FileUtil.h" \ @@ -1186,6 +1203,7 @@ IndexI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\Index.h" \ "$(includedir)\Freeze\DB.h" \ "EvictorI.h" \ @@ -1213,6 +1231,8 @@ IndexI.obj: \ "ObjectStore.h" \ "$(includedir)\Freeze\EvictorStorage.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "EvictorIteratorI.h" \ "SharedDbEnv.h" \ "..\..\src\IceUtil\FileUtil.h" \ @@ -1222,6 +1242,8 @@ MapDb.obj: \ MapDb.cpp \ "MapDb.h" \ "$(includedir)\IceUtil\Config.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "ConnectionI.h" \ "$(includedir)\Freeze\Connection.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -1343,6 +1365,7 @@ MapDb.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -1479,6 +1502,7 @@ MapI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -1489,6 +1513,8 @@ MapI.obj: \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "SharedDbEnv.h" \ "..\..\src\IceUtil\FileUtil.h" \ "MapDb.h" \ @@ -1620,11 +1646,14 @@ ObjectStore.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\EvictorStorage.h" \ "$(includedir)\Freeze\Index.h" \ "TransactionI.h" \ "$(includedir)\Freeze\Transaction.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "$(includedir)\IceUtil\Cache.h" \ "$(includedir)\IceUtil\CountDownLatch.h" \ "EvictorI.h" \ @@ -1775,11 +1804,14 @@ SharedDbEnv.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ "$(includedir)\Freeze\Transaction.h" \ "..\..\src\IceUtil\FileUtil.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "Util.h" \ "MapDb.h" \ "ConnectionI.h" \ @@ -1932,6 +1964,7 @@ TransactionalEvictorContext.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\TransactionalEvictor.h" \ "$(includedir)\Freeze\Evictor.h" \ "$(includedir)\Freeze\Exception.h" \ @@ -1959,6 +1992,8 @@ TransactionalEvictorContext.obj: \ "$(includedir)\Freeze\CatalogData.h" \ "ObjectStore.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "EvictorIteratorI.h" \ "SharedDbEnv.h" \ "..\..\src\IceUtil\FileUtil.h" \ @@ -2095,6 +2130,7 @@ TransactionalEvictorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\Freeze.h" \ "$(includedir)\Freeze\Initialize.h" \ "$(includedir)\Freeze\EvictorF.h" \ @@ -2114,6 +2150,8 @@ TransactionalEvictorI.obj: \ "ObjectStore.h" \ "$(includedir)\Freeze\EvictorStorage.h" \ "TransactionI.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "EvictorIteratorI.h" \ "SharedDbEnv.h" \ "..\..\src\IceUtil\FileUtil.h" \ @@ -2178,6 +2216,8 @@ TransactionI.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Freeze\Transaction.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "ConnectionI.h" \ "$(includedir)\Freeze\Connection.h" \ "$(includedir)\Ice\Version.h" \ @@ -2276,6 +2316,7 @@ TransactionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -2406,7 +2447,10 @@ Util.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ "$(includedir)\Freeze\Exception.h" \ BackgroundSaveEvictor.obj: \ diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak index 71532fcdd39..f77623aef6c 100755 --- a/cpp/src/FreezeScript/.depend.mak +++ b/cpp/src/FreezeScript/.depend.mak @@ -121,6 +121,7 @@ AssignVisitor.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "Util.h" \ @@ -248,6 +249,7 @@ Data.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "Util.h" \ @@ -455,6 +457,7 @@ Functions.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "Util.h" \ @@ -590,6 +593,7 @@ Parser.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "GrammarUtil.h" \ @@ -716,6 +720,7 @@ Print.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "Util.h" \ @@ -848,6 +853,7 @@ Util.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -857,6 +863,8 @@ Util.obj: \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ "$(includedir)\Slice\Preprocessor.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ Grammar.obj: \ Grammar.cpp \ @@ -981,6 +989,7 @@ Grammar.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ @@ -1108,6 +1117,7 @@ Scanner.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "Grammar.h" \ @@ -1313,6 +1323,7 @@ TransformVisitor.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "Util.h" \ @@ -1440,6 +1451,7 @@ Transformer.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "$(includedir)\Freeze\Connection.h" \ "$(includedir)\Freeze\Transaction.h" \ @@ -1463,6 +1475,8 @@ Transformer.obj: \ "$(includedir)\Freeze\Index.h" \ "..\..\src\IceXML\Parser.h" \ "$(includedir)\IceUtil\InputUtil.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ transformdb.obj: \ transformdb.cpp \ @@ -1585,6 +1599,7 @@ transformdb.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "$(includedir)\Freeze\Connection.h" \ "$(includedir)\Freeze\Transaction.h" \ @@ -1606,6 +1621,8 @@ transformdb.obj: \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "..\..\src\IceUtil\FileUtil.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ DumpDescriptors.obj: \ DumpDescriptors.cpp \ @@ -1730,6 +1747,7 @@ DumpDescriptors.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "..\..\src\IceXML\Parser.h" \ @@ -1740,6 +1758,8 @@ DumpDescriptors.obj: \ "Util.h" \ "$(includedir)\Freeze\CatalogData.h" \ "$(includedir)\IceUtil\InputUtil.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ DumpDB.obj: \ DumpDB.cpp \ @@ -1864,6 +1884,7 @@ DumpDB.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Slice\Parser.h" \ "Error.h" \ "..\..\src\IceXML\Parser.h" \ @@ -1881,3 +1902,5 @@ DumpDB.obj: \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "..\..\src\IceUtil\FileUtil.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \ diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak index cd5f7f35adc..dbbebc99a67 100755 --- a/cpp/src/Glacier2/.depend.mak +++ b/cpp/src/Glacier2/.depend.mak @@ -130,6 +130,7 @@ Blobject.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "RequestQueue.h" \ "Instrumentation.h" \ "Instance.h" \ @@ -264,6 +265,7 @@ ClientBlobject.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "RequestQueue.h" \ "Instrumentation.h" \ "Instance.h" \ @@ -498,6 +500,7 @@ FilterManager.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Instrumentation.h" \ "ProxyVerifier.h" \ "SessionRouterI.h" \ @@ -633,6 +636,7 @@ Glacier2Router.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Instance.h" \ "RequestQueue.h" \ "Instrumentation.h" \ @@ -771,6 +775,7 @@ Instance.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifierF.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -1017,6 +1022,7 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ RequestQueue.obj: \ RequestQueue.cpp \ @@ -1139,6 +1145,7 @@ RequestQueue.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Instrumentation.h" \ "Instance.h" \ "ProxyVerifier.h" \ @@ -1274,6 +1281,7 @@ RouterI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Instrumentation.h" \ "ProxyVerifier.h" \ "SessionRouterI.h" \ @@ -1411,6 +1419,7 @@ RoutingTable.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ProxyVerifier.h" \ "Instrumentation.h" \ @@ -1536,6 +1545,7 @@ ServerBlobject.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "RequestQueue.h" \ "Instrumentation.h" \ "Instance.h" \ @@ -1669,6 +1679,7 @@ SessionRouterI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifierF.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak index 0c7c501d970..04379acb469 100755 --- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak @@ -129,6 +129,7 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\src\IceUtil\FileUtil.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\InputUtil.h" \ diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak index b5ed5f1053b..86d87da9935 100755 --- a/cpp/src/Glacier2Lib/.depend.mak +++ b/cpp/src/Glacier2Lib/.depend.mak @@ -155,6 +155,7 @@ Application.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -293,6 +294,7 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ SessionHelper.obj: \ SessionHelper.cpp \ @@ -415,6 +417,7 @@ SessionHelper.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/src/Glacier2Lib/winrt/.depend.mak b/cpp/src/Glacier2Lib/winrt/.depend.mak index c894b4371e2..9eaf8985ee2 100755 --- a/cpp/src/Glacier2Lib/winrt/.depend.mak +++ b/cpp/src/Glacier2Lib/winrt/.depend.mak @@ -488,6 +488,7 @@ $(ARCH)\$(CONFIG)\SessionHelper.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index 8da2ec3bf1f..8c3320a48f5 100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -501,6 +501,7 @@ Application.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "LoggerI.h" \ "..\..\src\IceUtil\FileUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1462,6 +1463,7 @@ ConnectionI.obj: \ "BatchRequestQueue.h" \ "SharedContext.h" \ "ProxyFactory.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\bzip2.v140\build\native\include\bzlib.h" \ ConnectionRequestHandler.obj: \ ConnectionRequestHandler.cpp \ @@ -1814,6 +1816,7 @@ DefaultsAndOverrides.obj: \ DeprecatedStringConverter.obj: \ DeprecatedStringConverter.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ @@ -3205,7 +3208,7 @@ Instance.obj: \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ "LoggerAdminI.h" \ - "RegisterPlugins.h" \ + "RegisterPluginsInit.h" \ "$(includedir)\IceUtil\UUID.h" \ InstrumentationI.obj: \ @@ -6185,9 +6188,9 @@ ReferenceFactory.obj: \ "PropertyNames.h" \ "$(includedir)\IceUtil\StringUtil.h" \ -RegisterPlugins.obj: \ - RegisterPlugins.cpp \ - "RegisterPlugins.h" \ +RegisterPluginsInit.obj: \ + RegisterPluginsInit.cpp \ + "RegisterPluginsInit.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -7049,6 +7052,7 @@ Service.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "LoggerI.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -9411,6 +9415,7 @@ DLLMain.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ BuiltinSequences.obj: \ BuiltinSequences.cpp \ diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 655a37920de..bc29df15d75 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -40,6 +40,27 @@ makePair(const vector<Byte>& v) } } +IceUtil::Mutex* globalMutex = 0; +Ice::LoggerPtr processLogger; + +class Init +{ +public: + + Init() + { + globalMutex = new IceUtil::Mutex; + } + + ~Init() + { + delete globalMutex; + globalMutex = 0; + } +}; + +Init init; + } StringSeq @@ -303,36 +324,10 @@ Ice::createOutputStream(const CommunicatorPtr& communicator, const EncodingVersi return new OutputStreamI(communicator, v); } -static IceUtil::Mutex* processLoggerMutex = 0; -static Ice::LoggerPtr processLogger; - -namespace -{ - -class Init -{ -public: - - Init() - { - processLoggerMutex = new IceUtil::Mutex; - } - - ~Init() - { - delete processLoggerMutex; - processLoggerMutex = 0; - } -}; - -Init init; - -} - LoggerPtr Ice::getProcessLogger() { - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processLoggerMutex); + IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); if(processLogger == 0) { @@ -347,13 +342,14 @@ Ice::getProcessLogger() void Ice::setProcessLogger(const LoggerPtr& logger) { - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processLoggerMutex); - processLogger = logger; + IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); + processLogger = logger; } void Ice::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool loadOnInitialize) { + IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize); } diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 72455275be9..4b3590c01de 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -40,7 +40,7 @@ #include <Ice/InstrumentationI.h> #include <Ice/ProtocolInstance.h> #include <Ice/LoggerAdminI.h> -#include <Ice/RegisterPlugins.h> +#include <Ice/RegisterPluginsInit.h> #include <Ice/ObserverHelper.h> #include <IceUtil/StringUtil.h> diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 6ba29354946..de6f29a4b6f 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -117,7 +117,7 @@ OBJS = Acceptor.o \ ProxyFactory.o \ Reference.o \ ReferenceFactory.o \ - RegisterPlugins.o \ + RegisterPluginsInit.o \ RequestHandler.o \ RequestHandlerFactory.o \ ResponseHandler.o \ diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 7be98f08be6..bdae62218d4 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -119,7 +119,7 @@ OBJS = .\Acceptor.obj \ .\ProxyFactory.obj \ .\Reference.obj \ .\ReferenceFactory.obj \ - .\RegisterPlugins.obj \ + .\RegisterPluginsInit.obj \ .\RequestHandler.obj \ .\RequestHandlerFactory.obj \ .\ResponseHandler.obj \ diff --git a/cpp/src/Ice/RegisterPlugins.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp index 155628c627b..870084b80a3 100644 --- a/cpp/src/Ice/RegisterPlugins.cpp +++ b/cpp/src/Ice/RegisterPluginsInit.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -#include <Ice/RegisterPlugins.h> +#include <Ice/RegisterPluginsInit.h> #include <Ice/CommunicatorF.h> #include <Ice/Initialize.h> diff --git a/cpp/src/Ice/RegisterPlugins.h b/cpp/src/Ice/RegisterPluginsInit.h index 8e1005368f2..62898f6bfdb 100644 --- a/cpp/src/Ice/RegisterPlugins.h +++ b/cpp/src/Ice/RegisterPluginsInit.h @@ -7,8 +7,8 @@ // // ********************************************************************** -#ifndef ICE_REGISTER_PLUGINS_H -#define ICE_REGISTER_PLUGINS_H +#ifndef ICE_REGISTER_PLUGINS_INIT_H +#define ICE_REGISTER_PLUGINS_INIT_H namespace IceInternal { diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp index 2c81e800234..84775e5ad80 100644 --- a/cpp/src/Ice/StringConverterPlugin.cpp +++ b/cpp/src/Ice/StringConverterPlugin.cpp @@ -63,7 +63,7 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c return 0; } } - + if(cp == -1) { Error out(communicator->getLogger()); @@ -100,7 +100,7 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c return 0; } } - + switch(iconvArgs.size()) { case 0: @@ -125,7 +125,7 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c } } -#endif +#endif return new StringConverterPlugin(communicator, stringConverter, wstringConverter); } @@ -142,4 +142,16 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c return 0; } } + +} + +namespace Ice +{ + +ICE_API void +registerIceStringConverter(bool loadOnInitialize) +{ + Ice::registerPluginFactory("IceStringConverter", createStringConverter, loadOnInitialize); +} + } diff --git a/cpp/src/Ice/winrt/.depend.mak b/cpp/src/Ice/winrt/.depend.mak index 0fb809c9414..6ee2f1ea6b7 100755 --- a/cpp/src/Ice/winrt/.depend.mak +++ b/cpp/src/Ice/winrt/.depend.mak @@ -1969,6 +1969,7 @@ $(ARCH)\$(CONFIG)\DefaultsAndOverrides.obj: \ $(ARCH)\$(CONFIG)\DeprecatedStringConverter.obj: \ ..\DeprecatedStringConverter.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ @@ -3554,7 +3555,7 @@ $(ARCH)\$(CONFIG)\Instance.obj: \ "$(includedir)\Ice\MetricsAdminI.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ "..\..\..\src\Ice\LoggerAdminI.h" \ - "..\..\..\src\Ice\RegisterPlugins.h" \ + "..\..\..\src\Ice\RegisterPluginsInit.h" \ "$(includedir)\IceUtil\UUID.h" \ $(ARCH)\$(CONFIG)\IPEndpointI.obj: \ @@ -10204,6 +10205,7 @@ $(ARCH)\$(CONFIG)\IceDiscovery\PluginI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\..\src\IceDiscovery\PluginI.h" \ "..\..\..\src\IceDiscovery\LookupI.h" \ "IceDiscovery\IceDiscovery.h" \ @@ -10333,11 +10335,12 @@ $(ARCH)\$(CONFIG)\IceLocatorDiscovery\PluginI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\..\src\IceLocatorDiscovery\PluginI.h" \ "IceLocatorDiscovery\IceLocatorDiscovery.h" \ -$(ARCH)\$(CONFIG)\RegisterPlugins.obj: \ - RegisterPlugins.cpp \ +$(ARCH)\$(CONFIG)\RegisterPluginsInit.obj: \ + RegisterPluginsInit.cpp \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Shared.h" \ @@ -10408,7 +10411,7 @@ $(ARCH)\$(CONFIG)\RegisterPlugins.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "..\..\..\src\Ice\RegisterPlugins.h" \ + "..\..\..\src\Ice\RegisterPluginsInit.h" \ $(ARCH)\$(CONFIG)\StreamAcceptor.obj: \ StreamAcceptor.cpp \ diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak index 2add295a880..ede42429f6e 100644 --- a/cpp/src/Ice/winrt/Makefile.mak +++ b/cpp/src/Ice/winrt/Makefile.mak @@ -128,7 +128,7 @@ OBJS = $(ARCH)\$(CONFIG)\Acceptor.obj \ $(ARCH)\$(CONFIG)\IceDiscovery\PluginI.obj \ $(ARCH)\$(CONFIG)\IceLocatorDiscovery\PluginI.obj -LOCAL_OBJS = $(ARCH)\$(CONFIG)\RegisterPlugins.obj \ +LOCAL_OBJS = $(ARCH)\$(CONFIG)\RegisterPluginsInit.obj \ $(ARCH)\$(CONFIG)\StreamAcceptor.obj \ $(ARCH)\$(CONFIG)\StreamConnector.obj \ $(ARCH)\$(CONFIG)\StreamEndpointI.obj \ diff --git a/cpp/src/Ice/winrt/RegisterPlugins.cpp b/cpp/src/Ice/winrt/RegisterPluginsInit.cpp index 12289f028c8..28fcc8b4f2b 100644 --- a/cpp/src/Ice/winrt/RegisterPlugins.cpp +++ b/cpp/src/Ice/winrt/RegisterPluginsInit.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Ice/Initialize.h> -#include <Ice/RegisterPlugins.h> +#include <Ice/RegisterPluginsInit.h> using namespace std; using namespace Ice; @@ -26,6 +26,17 @@ Plugin* createIceLocatorDiscovery(const CommunicatorPtr&, const string&, const S } +namespace Ice +{ + +void +registerIceSSL(bool) +{ + // Nothing to do, IceSSL is always registered by the static initializer. +} + +} + RegisterPluginsInit::RegisterPluginsInit() { registerPluginFactory("IceUDP", createIceUDP, true); diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak index 09119269b67..2d4c6b79cb0 100755 --- a/cpp/src/IceBox/.depend.mak +++ b/cpp/src/IceBox/.depend.mak @@ -128,6 +128,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServiceManagerI.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ @@ -256,6 +257,7 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Ice\DynamicLibrary.h" \ "$(includedir)\Ice\DynamicLibraryF.h" \ "..\..\src\Ice\Instance.h" \ @@ -399,6 +401,7 @@ Admin.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceBox\IceBox.h" \ diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak index fa86169f100..c198faca95c 100755 --- a/cpp/src/IceDiscovery/.depend.mak +++ b/cpp/src/IceDiscovery/.depend.mak @@ -324,6 +324,7 @@ PluginI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "PluginI.h" \ "LookupI.h" \ "IceDiscovery.h" \ diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp index 6873cec56b6..e0e1a7f9849 100644 --- a/cpp/src/IceDiscovery/PluginI.cpp +++ b/cpp/src/IceDiscovery/PluginI.cpp @@ -39,6 +39,17 @@ createIceDiscovery(const Ice::CommunicatorPtr& communicator, const string&, cons } +namespace Ice +{ + +ICE_DISCOVERY_API void +registerIceDiscovery(bool loadOnInitialize) +{ + Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, loadOnInitialize); +} + +} + PluginI::PluginI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator) { } diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index 8eec9192265..752acc49a81 100755 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -149,6 +149,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -388,6 +389,7 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "DescriptorHelper.h" \ "$(includedir)\IceUtil\OutputUtil.h" \ "..\..\src\IceXML\Parser.h" \ @@ -526,6 +528,7 @@ DescriptorParser.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\src\IceXML\Parser.h" \ "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ @@ -764,6 +767,7 @@ Parser.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\src\IceXML\Parser.h" \ "Parser.h" \ "$(includedir)\IceGrid\Admin.h" \ @@ -907,6 +911,7 @@ Util.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Util.h" \ "$(includedir)\IceGrid\Descriptor.h" \ "$(includedir)\IceGrid\Config.h" \ @@ -1225,6 +1230,7 @@ Grammar.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -1356,6 +1362,7 @@ Scanner.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -1488,6 +1495,7 @@ AdminRouter.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ FileCache.obj: \ FileCache.cpp \ @@ -1804,6 +1812,7 @@ SessionManager.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "SessionManager.h" \ "$(includedir)\IceGrid\Query.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -2022,6 +2031,7 @@ Activator.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Activator.h" \ "Internal.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -2184,6 +2194,7 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServerI.h" \ "$(includedir)\Freeze\EvictorF.h" \ "Activator.h" \ @@ -2310,6 +2321,7 @@ NodeI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ @@ -2462,6 +2474,7 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "NodeSessionManager.h" \ "SessionManager.h" \ "$(includedir)\IceGrid\Query.h" \ @@ -2605,6 +2618,7 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServerAdapterI.h" \ "Internal.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -2751,6 +2765,7 @@ ServerI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServerI.h" \ "$(includedir)\Freeze\EvictorF.h" \ "Activator.h" \ @@ -2929,6 +2944,7 @@ AdapterCache.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -3057,6 +3073,7 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -3186,6 +3203,7 @@ AdminI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\src\Ice\TraceUtil.h" \ "..\..\src\Ice\TraceLevelsF.h" \ "AdminI.h" \ @@ -3385,6 +3403,7 @@ AdminSessionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\UUID.h" \ "RegistryI.h" \ "$(includedir)\IceGrid\Registry.h" \ @@ -3592,6 +3611,7 @@ Allocatable.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -3739,6 +3759,7 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -3872,6 +3893,7 @@ Database.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -4129,6 +4151,7 @@ IdentityObjectInfoDict.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -4262,6 +4285,7 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "RegistryI.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -4455,6 +4479,7 @@ LocatorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "LocatorI.h" \ "Internal.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -4640,6 +4665,7 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "LocatorRegistryI.h" \ "Internal.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -4837,6 +4863,7 @@ NodeCache.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -4976,6 +5003,7 @@ NodeSessionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "NodeSessionI.h" \ "Internal.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -5174,6 +5202,7 @@ ObjectCache.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -5320,6 +5349,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -5492,6 +5522,7 @@ QueryI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -5649,6 +5680,7 @@ ReapThread.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ReapThread.h" \ RegistryAdminRouter.obj: \ @@ -5775,6 +5807,7 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -5947,6 +5980,7 @@ RegistryI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\src\Ice\Network.h" \ "..\..\src\Ice\NetworkF.h" \ "..\..\src\Ice\NetworkProxyF.h" \ @@ -6279,6 +6313,7 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ReplicaSessionI.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Exception.h" \ @@ -6455,6 +6490,7 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ReplicaSessionManager.h" \ "SessionManager.h" \ "$(includedir)\IceGrid\Query.h" \ @@ -6634,6 +6670,7 @@ SerialsDict.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -6788,6 +6825,7 @@ ServerCache.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -6918,6 +6956,7 @@ SessionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\UUID.h" \ "SessionI.h" \ "ReapThread.h" \ @@ -7109,6 +7148,7 @@ SessionServantManager.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -7242,6 +7282,7 @@ StringAdapterInfoDict.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -7377,6 +7418,7 @@ StringApplicationInfoDict.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -7509,6 +7551,7 @@ Topics.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Topics.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -7665,6 +7708,7 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -7826,6 +7870,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Activator.h" \ "Internal.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -7990,6 +8035,7 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "RegistryI.h" \ "$(includedir)\IceGrid\Registry.h" \ "$(includedir)\IceGrid\Exception.h" \ diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak index ffec3653307..f1487dcdf54 100755 --- a/cpp/src/IceLocatorDiscovery/.depend.mak +++ b/cpp/src/IceLocatorDiscovery/.depend.mak @@ -132,6 +132,7 @@ PluginI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "PluginI.h" \ "IceLocatorDiscovery.h" \ diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp index 3c3c22ca89e..bf30aa4cf8e 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.cpp +++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp @@ -38,6 +38,17 @@ createIceLocatorDiscovery(const Ice::CommunicatorPtr& communicator, const string } +namespace Ice +{ + +ICE_LOCATOR_DISCOVERY_API void +registerIceLocatorDiscovery(bool loadOnInitialize) +{ + Ice::registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, loadOnInitialize); +} + +} + namespace { diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak index 4191acf7cb0..ee0e03890d6 100755 --- a/cpp/src/IcePatch2/.depend.mak +++ b/cpp/src/IcePatch2/.depend.mak @@ -124,6 +124,7 @@ FileServerI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ "$(includedir)\IcePatch2\FileServer.h" \ @@ -253,6 +254,7 @@ Server.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "FileServerI.h" \ "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ @@ -382,6 +384,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "..\..\src\IcePatch2Lib\Util.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ @@ -513,5 +516,6 @@ Calc.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index cb6515d4520..892b2baf31a 100755 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak @@ -131,6 +131,7 @@ ClientUtil.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IcePatch2\FileServer.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ @@ -267,9 +268,11 @@ Util.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IcePatch2\FileInfo.h" \ "$(includedir)\IcePatch2\Config.h" \ "$(includedir)\IcePatch2\FileServer.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\bzip2.v140\build\native\include\bzlib.h" \ FileInfo.obj: \ FileInfo.cpp \ diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index 44b5bcecad3..41dbda52c22 100644 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -34,6 +34,17 @@ createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const } +namespace Ice +{ + +ICE_SSL_API void +registerIceSSL(bool loadOnInitialize) +{ + Ice::registerPluginFactory("IceSSL", createIceSSL, loadOnInitialize); +} + +} + // // Plugin implementation. // diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index b8083cfe1c5..731b5d71418 100755 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak @@ -236,6 +236,7 @@ Instance.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -483,6 +484,7 @@ LLUMap.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -617,6 +619,7 @@ NodeI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Election.h" \ "SubscriberRecord.h" \ "$(includedir)\IceStorm\IceStorm.h" \ @@ -750,6 +753,7 @@ Observers.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -901,6 +905,7 @@ Service.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -1078,6 +1083,7 @@ Subscriber.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Replica.h" \ "Util.h" \ "$(includedir)\Freeze\Freeze.h" \ @@ -1220,6 +1226,7 @@ SubscriberMap.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -1360,6 +1367,7 @@ TopicI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -1516,6 +1524,7 @@ TopicManagerI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Election.h" \ "SubscriberRecord.h" \ "LLURecord.h" \ @@ -1764,6 +1773,7 @@ TransientTopicI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\Freeze.h" \ "$(includedir)\Freeze\Initialize.h" \ "$(includedir)\Freeze\EvictorF.h" \ @@ -1915,6 +1925,7 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ Util.obj: \ Util.cpp \ @@ -2037,6 +2048,7 @@ Util.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\Freeze.h" \ "$(includedir)\Freeze\Initialize.h" \ "$(includedir)\Freeze\EvictorF.h" \ @@ -2179,6 +2191,7 @@ V31FormatDB.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -2316,6 +2329,7 @@ V32FormatDB.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -3114,6 +3128,7 @@ Admin.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -3240,6 +3255,7 @@ Parser.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -3369,6 +3385,7 @@ Grammar.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -3495,6 +3512,7 @@ Scanner.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ @@ -3623,6 +3641,7 @@ Migrate.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ diff --git a/cpp/src/IceXML/.depend.mak b/cpp/src/IceXML/.depend.mak index 3d66f0fd053..00495c0e3b2 100755 --- a/cpp/src/IceXML/.depend.mak +++ b/cpp/src/IceXML/.depend.mak @@ -8,3 +8,5 @@ Parser.obj: \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ "..\..\src\IceUtil\FileUtil.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\expat.v140\build\native\include\expat.h" \ + "C:\Users\benoit\ice\cpp\third-party-packages\expat.v140\build\native\include\expat_external.h" \ diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak index 30cfd1df230..13cdc98eb9c 100755 --- a/cpp/src/iceserviceinstall/.depend.mak +++ b/cpp/src/iceserviceinstall/.depend.mak @@ -120,6 +120,7 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -250,6 +251,7 @@ Install.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "ServiceInstaller.h" \ diff --git a/cpp/test/Freeze/complex/.depend.mak b/cpp/test/Freeze/complex/.depend.mak index 1ec40f0e4a9..bee3aa9b9ae 100755 --- a/cpp/test/Freeze/complex/.depend.mak +++ b/cpp/test/Freeze/complex/.depend.mak @@ -274,6 +274,7 @@ Scanner.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Parser.h" \ "Complex.h" \ "Grammar.h" \ @@ -473,6 +474,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -623,6 +625,7 @@ ComplexDict.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ diff --git a/cpp/test/Freeze/dbmap/.depend.mak b/cpp/test/Freeze/dbmap/.depend.mak index 7312782c8ef..34a36b2156c 100755 --- a/cpp/test/Freeze/dbmap/.depend.mak +++ b/cpp/test/Freeze/dbmap/.depend.mak @@ -122,6 +122,7 @@ ByteIntMap.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -250,6 +251,7 @@ IntIdentityMap.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -378,6 +380,7 @@ IntIdentityMapWithIndex.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -506,6 +509,7 @@ SortedMap.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -634,6 +638,7 @@ WstringWstringMap.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -768,6 +773,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ diff --git a/cpp/test/Freeze/evictor/.depend.mak b/cpp/test/Freeze/evictor/.depend.mak index d39d8526444..403727895f2 100755 --- a/cpp/test/Freeze/evictor/.depend.mak +++ b/cpp/test/Freeze/evictor/.depend.mak @@ -204,6 +204,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -337,6 +338,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -492,6 +494,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ diff --git a/cpp/test/Freeze/fileLock/.depend.mak b/cpp/test/Freeze/fileLock/.depend.mak index 636b1c6b0b9..eac4c2effbf 100755 --- a/cpp/test/Freeze/fileLock/.depend.mak +++ b/cpp/test/Freeze/fileLock/.depend.mak @@ -128,6 +128,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ @@ -273,6 +274,7 @@ ClientFail.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ diff --git a/cpp/test/FreezeScript/dbmap/.depend.mak b/cpp/test/FreezeScript/dbmap/.depend.mak index dcdbecd3d5d..a1e2b5f67f4 100755 --- a/cpp/test/FreezeScript/dbmap/.depend.mak +++ b/cpp/test/FreezeScript/dbmap/.depend.mak @@ -205,6 +205,7 @@ IntSMap.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\DB.h" \ "$(includedir)\Freeze\Exception.h" \ "$(includedir)\Freeze\Connection.h" \ @@ -340,6 +341,7 @@ makedb.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ diff --git a/cpp/test/FreezeScript/evictor/.depend.mak b/cpp/test/FreezeScript/evictor/.depend.mak index 1c03df20e4b..1e8235b35e9 100755 --- a/cpp/test/FreezeScript/evictor/.depend.mak +++ b/cpp/test/FreezeScript/evictor/.depend.mak @@ -204,6 +204,7 @@ makedb.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Freeze\EvictorF.h" \ "$(includedir)\Freeze\ConnectionF.h" \ "$(includedir)\Freeze\Index.h" \ diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index f6c340deb0e..e17c02e9c72 100755 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -200,6 +200,7 @@ BackendI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "BackendI.h" \ "Backend.h" \ @@ -324,6 +325,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -459,5 +461,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "BackendI.h" \ "Backend.h" \ diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp index d412b7092ff..e735ffb0edb 100644 --- a/cpp/test/Glacier2/attack/Client.cpp +++ b/cpp/test/Glacier2/attack/Client.cpp @@ -25,31 +25,22 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - + // // We want to check whether the client retries for evicted // proxies, even with regular retries disabled. // initData.properties->setProperty("Ice.RetryIntervals", "-1"); - + AttackClient app; return app.main(argc, argv, initData); } @@ -123,7 +114,7 @@ AttackClient::run(int, char**) } cout << string(msg.size(), '\b') << string(msg.size(), ' ') << string(msg.size(), '\b'); cout << "ok" << endl; - + cout << "testing server and router shutdown... " << flush; backend->shutdown(); communicator()->setDefaultRouter(0); diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp index 55544a1a919..39fab899370 100644 --- a/cpp/test/Glacier2/attack/Server.cpp +++ b/cpp/test/Glacier2/attack/Server.cpp @@ -22,7 +22,7 @@ public: _backend(new BackendI) { } - + virtual ObjectPtr locate(const Current&, LocalObjectPtr&) { return _backend; @@ -48,20 +48,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif BackendServer app; diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index ff5f46d8a53..d590f95b299 100755 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -210,6 +210,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -345,6 +346,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -474,6 +476,7 @@ SessionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "SessionI.h" \ "Test.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -601,6 +604,7 @@ BackendI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "BackendI.h" \ "Test.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -727,6 +731,7 @@ TestControllerI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestControllerI.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp index 50a3c4e5200..7b38bd7121f 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp @@ -23,34 +23,25 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif SessionControlClient app; Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - + // // We want to check whether the client retries for evicted // proxies, even with regular retries disabled. // initData.properties->setProperty("Ice.RetryIntervals", "-1"); initData.properties->setProperty("Ice.Warn.Connections", "0"); - + return app.main(argc, argv, initData); } @@ -77,7 +68,7 @@ SessionControlClient::run(int argc, char* argv[]) controller->step(0, currentState, newState); currentState = newState; cout << "ok" << endl; - + cout << "getting router... " << flush; ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); diff --git a/cpp/test/Glacier2/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp index b4907aadece..7bcd27e3412 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/Server.cpp @@ -27,8 +27,8 @@ class ServerLocatorRegistry : virtual public LocatorRegistry { public: - virtual void - setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, const string&, + virtual void + setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, const string&, const ObjectPrx&, const Current&) { cb->ice_response(); @@ -56,25 +56,25 @@ public: _backend(backend), _adapter(adapter) { - _registryPrx = LocatorRegistryPrx::uncheckedCast(adapter->add(new ServerLocatorRegistry, + _registryPrx = LocatorRegistryPrx::uncheckedCast(adapter->add(new ServerLocatorRegistry, _adapter->getCommunicator()->stringToIdentity("registry"))); } virtual void - findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, const Identity& id, const Current&) const - { + findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, const Identity& id, const Current&) const + { cb->ice_response(_adapter->createProxy(id)); - } + } virtual void - findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const + findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const { - cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); + cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); } - virtual LocatorRegistryPrx - getRegistry(const Current&) const - { + virtual LocatorRegistryPrx + getRegistry(const Current&) const + { return _registryPrx; } @@ -92,7 +92,7 @@ public: _backend(backend) { } - + virtual ObjectPtr locate(const Current&, LocalObjectPtr&) { return _backend; @@ -118,20 +118,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif SessionControlServer app; diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index 93ba8c9f302..16eec6259c0 100755 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -202,6 +202,7 @@ CallbackI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "CallbackI.h" \ "Callback.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -340,6 +341,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -469,5 +471,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "CallbackI.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp index 2658af80928..58c0cb7cbc4 100644 --- a/cpp/test/Glacier2/override/Client.cpp +++ b/cpp/test/Glacier2/override/Client.cpp @@ -27,20 +27,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif // @@ -83,7 +74,7 @@ CallbackClient::run(int, char**) Identity callbackReceiverIdent; callbackReceiverIdent.name = "callbackReceiver"; callbackReceiverIdent.category = category; - CallbackReceiverPrx twowayR = + CallbackReceiverPrx twowayR = CallbackReceiverPrx::uncheckedCast(adapter->add(callbackReceiver, callbackReceiverIdent)); CallbackReceiverPrx onewayR = twowayR->ice_oneway(); @@ -166,7 +157,7 @@ CallbackClient::run(int, char**) IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1000)); callbackReceiverImpl->activate(); test(callbackReceiverImpl->callbackWithPayloadOK(4) == 0); - + int remainingCallbacks = callbackReceiverImpl->callbackOK(1, 0); // // Occasionally, Glacier2 flushes in the middle of our 5 @@ -181,7 +172,7 @@ CallbackClient::run(int, char**) { test(callbackReceiverImpl->callbackOK(remainingCallbacks, 0) == 0); } - + ctx["_fwd"] = "O"; oneway->initiateCallbackWithPayload(twowayR); diff --git a/cpp/test/Glacier2/override/Server.cpp b/cpp/test/Glacier2/override/Server.cpp index 3910705eb94..179ef949152 100644 --- a/cpp/test/Glacier2/override/Server.cpp +++ b/cpp/test/Glacier2/override/Server.cpp @@ -21,20 +21,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif Ice::InitializationData initData; diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index ba60a826d40..44103b909cd 100755 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -204,6 +204,7 @@ CallbackI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "CallbackI.h" \ "Callback.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -343,6 +344,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -472,5 +474,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "CallbackI.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index 48251c41952..1de40ee442d 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -73,12 +73,12 @@ typedef IceUtil::Handle<AsyncCallback> AsyncCallbackPtr; class MisbehavedClient : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: - + MisbehavedClient(int id) : _id(id), _callback(false) { } - virtual + virtual void run() { CommunicatorPtr communicator = initialize(initData); @@ -103,12 +103,12 @@ public: _callbackReceiver = new CallbackReceiverI; notify(); } - + Identity ident; ident.name = "callbackReceiver"; ident.category = category; CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident)); - + ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010"); base = base->ice_oneway(); CallbackPrx callback = CallbackPrx::uncheckedCast(base); @@ -134,7 +134,7 @@ public: // Callback the client with a large payload. This should cause // the Glacier2 request queue thread to block trying to send the // callback to the client because the client is currently blocked - // in CallbackReceiverI::waitCallback() and can't process more + // in CallbackReceiverI::waitCallback() and can't process more // requests. // callback->initiateCallbackWithPayload(receiver); @@ -180,12 +180,12 @@ typedef IceUtil::Handle<MisbehavedClient> MisbehavedClientPtr; class StressClient : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: - + StressClient(int id) : _id(id), _initialized(false), _notified(false) { } - virtual + virtual void run() { CommunicatorPtr communicator = initialize(initData); @@ -199,14 +199,14 @@ public: communicator->getProperties()->setProperty("Ice.PrintAdapterReady", ""); ObjectAdapterPtr adapter = communicator->createObjectAdapterWithRouter("CallbackReceiverAdapter", _router); adapter->activate(); - + string category = _router->getCategoryForClient(); _callbackReceiver = new CallbackReceiverI; Identity ident; ident.name = "callbackReceiver"; ident.category = category; CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident)); - + ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010"); base = base->ice_oneway(); CallbackPrx callback = CallbackPrx::uncheckedCast(base); @@ -223,7 +223,7 @@ public: wait(); } } - + // // Stress the router until the connection is closed. // @@ -286,7 +286,7 @@ class PingStressClient : public StressClient { public: - PingStressClient(int id) : StressClient(id) + PingStressClient(int id) : StressClient(id) { } @@ -325,7 +325,7 @@ class CallbackStressClient : public StressClient { public: - CallbackStressClient(int id) : StressClient(id) + CallbackStressClient(int id) : StressClient(id) { } @@ -350,7 +350,7 @@ public: } catch(const Ice::ObjectNotExistException&) { - // This might be raised by the CallbackI implementation if it can't invoke on the + // This might be raised by the CallbackI implementation if it can't invoke on the // callback receiver because the session is being destroyed concurrently. } catch(const Ice::CommunicatorDestroyedException&) @@ -369,7 +369,7 @@ class CallbackWithPayloadStressClient : public StressClient { public: - CallbackWithPayloadStressClient(int id) : StressClient(id) + CallbackWithPayloadStressClient(int id) : StressClient(id) { } @@ -394,7 +394,7 @@ public: } catch(const Ice::ObjectNotExistException&) { - // This might be raised by the CallbackI implementation if it can't invoke on the + // This might be raised by the CallbackI implementation if it can't invoke on the // callback receiver because the session is being destroyed concurrently. } catch(const Ice::CommunicatorDestroyedException&) @@ -416,20 +416,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif // @@ -454,7 +445,7 @@ CallbackClient::run(int argc, char* argv[]) routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); cout << "ok" << endl; } - + Glacier2::RouterPrx router; { @@ -466,7 +457,7 @@ CallbackClient::run(int argc, char* argv[]) { cout << "testing router finder... " << flush; - Ice::RouterFinderPrx finder = + Ice::RouterFinderPrx finder = RouterFinderPrx::uncheckedCast(communicator()->stringToProxy("Ice/RouterFinder:default -p 12347")); test(finder->getRouter()->ice_getIdentity() == router->ice_getIdentity()); cout << "ok" << endl; @@ -492,7 +483,7 @@ CallbackClient::run(int argc, char* argv[]) base = communicator()->stringToProxy("c1/callback:tcp -p 12010"); cout << "ok" << endl; } - + { cout << "trying to ping server before session creation... " << flush; try @@ -598,7 +589,7 @@ CallbackClient::run(int argc, char* argv[]) ObjectPtr callbackReceiver; CallbackReceiverPrx twowayR; CallbackReceiverPrx fakeTwowayR; - + { cout << "creating and adding callback receiver object... " << flush; callbackReceiverImpl = new CallbackReceiverI; @@ -613,7 +604,7 @@ CallbackClient::run(int argc, char* argv[]) fakeTwowayR = CallbackReceiverPrx::uncheckedCast(adapter->add(callbackReceiver, fakeCallbackReceiverIdent)); cout << "ok" << endl; } - + { cout << "testing oneway callback... " << flush; CallbackPrx oneway = CallbackPrx::uncheckedCast(twoway->ice_oneway()); @@ -755,7 +746,7 @@ CallbackClient::run(int argc, char* argv[]) IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(1)); // - // Initiate few callbacks with a large payload. Because of + // Initiate few callbacks with a large payload. Because of // the buffered mode, this shouldn't block even though the // misbehaved client are not answering their callback // requests. @@ -855,7 +846,7 @@ CallbackClient::run(int argc, char* argv[]) } */ } - + { cout << "destroying session... " << flush; try @@ -897,9 +888,9 @@ CallbackClient::run(int argc, char* argv[]) processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); cout << "ok" << endl; } - + Ice::ProcessPrx process; - + { cout << "testing checked cast for process facet... " << flush; process = Ice::ProcessPrx::checkedCast(processBase); @@ -919,6 +910,6 @@ CallbackClient::run(int argc, char* argv[]) cout << "ok" << endl; } } - + return EXIT_SUCCESS; } diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp index a6b99027d15..b4c19f3ecd6 100644 --- a/cpp/test/Glacier2/router/Server.cpp +++ b/cpp/test/Glacier2/router/Server.cpp @@ -21,20 +21,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif Ice::InitializationData initData; diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index e8b2963033e..03ba1ae2b8e 100755 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -211,6 +211,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -346,6 +347,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -473,6 +475,7 @@ SessionI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "SessionI.h" \ "Session.h" \ "$(includedir)\Glacier2\Session.h" \ diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp index ba3e291ac5f..597dc0aa153 100644 --- a/cpp/test/Glacier2/sessionControl/Client.cpp +++ b/cpp/test/Glacier2/sessionControl/Client.cpp @@ -24,20 +24,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif Ice::InitializationData initData; @@ -49,7 +40,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.RetryIntervals", "-1"); initData.properties->setProperty("Ice.Warn.Connections", "0"); - + SessionControlClient app; return app.main(argc, argv, initData); } @@ -106,7 +97,7 @@ SessionControlClient::run(int, char**) catch(const Glacier2::CannotCreateSessionException&) { } - cout << "ok" << endl; + cout << "ok" << endl; cout << "testing shutdown... " << flush; session = Test::SessionPrx::uncheckedCast(router->createSession("userid", "abc123")); diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp index c147d19a04c..7198d78dd7e 100644 --- a/cpp/test/Glacier2/sessionControl/Server.cpp +++ b/cpp/test/Glacier2/sessionControl/Server.cpp @@ -22,20 +22,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif SessionControlServer app; diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index ac328edbd83..ef70b07fd07 100755 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -209,6 +209,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Glacier2.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -348,4 +349,5 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp index 54b29c28741..37dfcbaabc4 100644 --- a/cpp/test/Glacier2/sessionHelper/Client.cpp +++ b/cpp/test/Glacier2/sessionHelper/Client.cpp @@ -549,20 +549,11 @@ private: } // Anonymous namespace end -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif SessionHelperClient c; diff --git a/cpp/test/Glacier2/sessionHelper/Server.cpp b/cpp/test/Glacier2/sessionHelper/Server.cpp index 946a0346077..975757290e8 100644 --- a/cpp/test/Glacier2/sessionHelper/Server.cpp +++ b/cpp/test/Glacier2/sessionHelper/Server.cpp @@ -66,20 +66,11 @@ SessionHelperServer::run(int, char**) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif SessionHelperServer app; diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index 7b4ba2ce98f..c77036deb9a 100755 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -119,6 +119,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -253,6 +254,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp index 0825cabb397..d97f3a14c65 100644 --- a/cpp/test/Glacier2/ssl/Client.cpp +++ b/cpp/test/Glacier2/ssl/Client.cpp @@ -22,20 +22,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif // @@ -53,7 +44,7 @@ main(int argc, char* argv[]) int CallbackClient::run(int, char**) -{ +{ Glacier2::RouterPrx router = Glacier2::RouterPrx::uncheckedCast( communicator()->stringToProxy("Glacier2/router:tcp -h 127.0.0.1 -p 12347")); communicator()->setDefaultRouter(router); @@ -127,6 +118,6 @@ CallbackClient::run(int, char**) Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast( communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349")); process->shutdown(); - + return EXIT_SUCCESS; } diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp index 8d4ac814215..a5cf03fd51b 100644 --- a/cpp/test/Glacier2/ssl/Server.cpp +++ b/cpp/test/Glacier2/ssl/Server.cpp @@ -155,20 +155,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif SessionServer app; diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index eaf744788fe..f6511d78820 100755 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -200,6 +200,7 @@ BackendI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "BackendI.h" \ "Backend.h" \ @@ -323,6 +324,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -458,5 +460,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "BackendI.h" \ "Backend.h" \ diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp index a3a8990d411..0c2bd52e6e8 100644 --- a/cpp/test/Glacier2/staticFiltering/Client.cpp +++ b/cpp/test/Glacier2/staticFiltering/Client.cpp @@ -23,31 +23,22 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - + // // We want to check whether the client retries for evicted // proxies, even with regular retries disabled. // initData.properties->setProperty("Ice.RetryIntervals", "-1"); - + AttackClient app; return app.main(argc, argv, initData); } @@ -82,13 +73,13 @@ AttackClient::run(int, char**) } catch(const ConnectionLostException&) { - // + // // This is ok. // } catch(const CloseConnectionException&) { - // + // // This is also ok. // } @@ -132,7 +123,7 @@ AttackClient::run(int, char**) { cerr << p->second << endl; cerr << ex << endl; - test("Unexpected local exception" == 0); + test("Unexpected local exception" == 0); } try { diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp index ed700d7d76c..a467a4bff51 100644 --- a/cpp/test/Glacier2/staticFiltering/Server.cpp +++ b/cpp/test/Glacier2/staticFiltering/Server.cpp @@ -24,8 +24,8 @@ class ServerLocatorRegistry : virtual public LocatorRegistry { public: - virtual void - setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, const string&, + virtual void + setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, const string&, const ObjectPrx&, const Current&) { cb->ice_response(); @@ -59,20 +59,20 @@ public: } virtual void - findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, const Identity& id, const Current&) const - { + findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, const Identity& id, const Current&) const + { cb->ice_response(_adapter->createProxy(id)); - } + } virtual void - findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const + findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const { - cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); + cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); } - virtual LocatorRegistryPrx - getRegistry(const Current&) const - { + virtual LocatorRegistryPrx + getRegistry(const Current&) const + { return _registryPrx; } @@ -90,7 +90,7 @@ public: _backend(backend) { } - + virtual ObjectPtr locate(const Current&, LocalObjectPtr&) { return _backend; @@ -116,20 +116,11 @@ public: virtual int run(int, char*[]); }; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif BackendServer app; @@ -139,7 +130,7 @@ main(int argc, char* argv[]) int BackendServer::run(int, char**) { - string endpoints = communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", + string endpoints = communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", "tcp -p 12010:ssl -p 12011"); communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", endpoints); diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index 968bed3a9f8..68988959ed5 100755 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -467,6 +469,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -590,6 +593,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/acm/Client.cpp b/cpp/test/Ice/acm/Client.cpp index fd3cd855e12..701a380830a 100644 --- a/cpp/test/Ice/acm/Client.cpp +++ b/cpp/test/Ice/acm/Client.cpp @@ -24,20 +24,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/acm/Server.cpp b/cpp/test/Ice/acm/Server.cpp index 763cee61c87..a40af1f7b03 100644 --- a/cpp/test/Ice/acm/Server.cpp +++ b/cpp/test/Ice/acm/Server.cpp @@ -34,20 +34,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 757205d59b2..7c52e0f66df 100755 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -467,6 +469,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -591,6 +594,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -722,6 +726,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -852,6 +857,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp index b35f5cf6c73..d76c2bc2387 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -27,20 +27,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 6c9a5593f2d..ef093c73098 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -33,20 +33,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index 333d4709fed..2213bfdbb62 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -29,20 +29,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index eea6938f8c2..b61f5242d66 100755 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -206,6 +206,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -336,6 +337,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -469,6 +471,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ Server.obj: \ Server.cpp \ @@ -590,6 +593,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/admin/Client.cpp b/cpp/test/Ice/admin/Client.cpp index d4cde250c35..7470609ebee 100644 --- a/cpp/test/Ice/admin/Client.cpp +++ b/cpp/test/Ice/admin/Client.cpp @@ -23,20 +23,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp index 2015eb60672..a6dd71c2d1e 100644 --- a/cpp/test/Ice/admin/Server.cpp +++ b/cpp/test/Ice/admin/Server.cpp @@ -28,20 +28,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index ef86493f79f..a440098417b 100755 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -207,6 +207,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -337,6 +338,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -470,6 +472,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ Server.obj: \ Server.cpp \ @@ -591,6 +594,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -722,6 +726,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp index 33067bcde9d..6363cc168c2 100644 --- a/cpp/test/Ice/ami/Client.cpp +++ b/cpp/test/Ice/ami/Client.cpp @@ -23,20 +23,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp index 7bf10b80fdd..d1cc8f97a87 100644 --- a/cpp/test/Ice/ami/Collocated.cpp +++ b/cpp/test/Ice/ami/Collocated.cpp @@ -27,10 +27,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter"); TestIntfControllerIPtr testController = new TestIntfControllerI(adapter); - + adapter->add(new TestIntfI(), communicator->stringToIdentity("test")); //adapter->activate(); // Collocated test doesn't need to activate the OA - + adapter2->add(testController, communicator->stringToIdentity("testController")); //adapter2->activate(); // Collocated test doesn't need to activate the OA @@ -40,20 +40,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp index 7cd0de66ad3..52553ba29d8 100644 --- a/cpp/test/Ice/ami/Server.cpp +++ b/cpp/test/Ice/ami/Server.cpp @@ -26,33 +26,24 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter"); TestIntfControllerIPtr testController = new TestIntfControllerI(adapter); - + adapter->add(new TestIntfI(), communicator->stringToIdentity("test")); adapter->activate(); - + adapter2->add(testController, communicator->stringToIdentity("testController")); adapter2->activate(); - + TEST_READY communicator->waitForShutdown(); return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index dbe3b89c7e5..772b382cfef 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -897,6 +897,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1043,6 +1044,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ "PluginI.h" \ @@ -1192,6 +1194,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ Server.obj: \ Server.cpp \ @@ -1313,6 +1316,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "Configuration.h" \ diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index 36ec391d5ca..495bed31d21 100755 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -331,6 +332,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -461,6 +463,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -584,6 +587,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/binding/Client.cpp b/cpp/test/Ice/binding/Client.cpp index b9481c85dfe..b29a4c124d7 100644 --- a/cpp/test/Ice/binding/Client.cpp +++ b/cpp/test/Ice/binding/Client.cpp @@ -23,20 +23,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index 5e4fdc951ac..ab38fd6c354 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -33,20 +33,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 2025df7fd9d..23e334021df 100755 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -288,6 +288,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -418,6 +419,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/checksum/Client.cpp b/cpp/test/Ice/checksum/Client.cpp index eb2b73f3db6..e05ca421cf9 100644 --- a/cpp/test/Ice/checksum/Client.cpp +++ b/cpp/test/Ice/checksum/Client.cpp @@ -24,20 +24,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index 3348b2c6a74..a10e7c8ee42 100755 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -288,6 +288,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -411,6 +412,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/checksum/server/Server.cpp b/cpp/test/Ice/checksum/server/Server.cpp index fd347651b4b..42af203d3b0 100644 --- a/cpp/test/Ice/checksum/server/Server.cpp +++ b/cpp/test/Ice/checksum/server/Server.cpp @@ -28,20 +28,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index c117a9f34dd..1a35d8dcb0c 100755 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -136,6 +136,7 @@ Test.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Ice\Outgoing.h" \ Wstring.obj: \ @@ -338,6 +339,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -473,6 +475,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -630,6 +633,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ WstringI.obj: \ WstringI.cpp \ @@ -825,6 +829,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -968,6 +973,7 @@ TestAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Ice\Outgoing.h" \ TestAMDI.obj: \ @@ -1096,6 +1102,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ WstringAMD.obj: \ WstringAMD.cpp \ @@ -1373,6 +1380,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1511,6 +1519,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp index ec4bf9f1ea8..0783eb1bd87 100644 --- a/cpp/test/Ice/custom/Client.cpp +++ b/cpp/test/Ice/custom/Client.cpp @@ -26,20 +26,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char** argv) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; @@ -48,7 +39,7 @@ main(int argc, char** argv) { IceUtil::setProcessStringConverter(new Test::StringConverterI); IceUtil::setProcessWstringConverter(new Test::WstringConverterI); - + communicator = Ice::initialize(argc, argv); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index 8eeadc9d48d..4aa75410b6b 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -31,20 +31,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char** argv) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; @@ -53,7 +44,7 @@ main(int argc, char** argv) { IceUtil::setProcessStringConverter(new Test::StringConverterI()); IceUtil::setProcessWstringConverter(new Test::WstringConverterI()); - + Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index 3d96e849388..e854b07f514 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -32,20 +32,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char** argv) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; @@ -54,11 +45,11 @@ main(int argc, char** argv) { IceUtil::setProcessStringConverter(new Test::StringConverterI); IceUtil::setProcessWstringConverter(new Test::WstringConverterI); - + Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010"); - + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index 74fe3d08b3f..82593b21a6d 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -28,24 +28,15 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) adapter->activate(); TEST_READY communicator->waitForShutdown(); - - return EXIT_SUCCESS; -} - -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); + return EXIT_SUCCESS; } -#endif int main(int argc, char** argv) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; @@ -54,10 +45,10 @@ main(int argc, char** argv) { IceUtil::setProcessStringConverter(new Test::StringConverterI()); IceUtil::setProcessWstringConverter(new Test::WstringConverterI()); - + Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - + initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index 1629a7f2780..b3f5167248f 100755 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -200,6 +200,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -323,6 +324,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -453,6 +455,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/defaultServant/Client.cpp b/cpp/test/Ice/defaultServant/Client.cpp index e85398379d0..d93d45b5a6d 100644 --- a/cpp/test/Ice/defaultServant/Client.cpp +++ b/cpp/test/Ice/defaultServant/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index c6e4a6896e1..e49c4b044af 100755 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -202,6 +202,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -332,6 +333,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index c975a6a535b..e1d04c0796e 100755 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -205,6 +205,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -336,6 +337,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -519,6 +521,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Dispatcher.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -649,6 +652,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -781,6 +785,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp index c0b7679bb41..930fe5d4fe4 100644 --- a/cpp/test/Ice/dispatcher/Client.cpp +++ b/cpp/test/Ice/dispatcher/Client.cpp @@ -24,24 +24,15 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; - + try { Ice::InitializationData initData; diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp index 729e15dfeaa..eea3f48adcf 100644 --- a/cpp/test/Ice/dispatcher/Collocated.cpp +++ b/cpp/test/Ice/dispatcher/Collocated.cpp @@ -27,10 +27,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter"); TestIntfControllerIPtr testController = new TestIntfControllerI(adapter); - + adapter->add(new TestIntfI(), communicator->stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. - + adapter2->add(testController, communicator->stringToIdentity("testController")); //adapter2->activate(); // Don't activate OA to ensure collocation is used. @@ -39,24 +39,15 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; - + try { Ice::InitializationData initData; diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp index ceec43ec761..e5ef74693ef 100644 --- a/cpp/test/Ice/dispatcher/Server.cpp +++ b/cpp/test/Ice/dispatcher/Server.cpp @@ -27,10 +27,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter"); TestIntfControllerIPtr testController = new TestIntfControllerI(adapter); - + adapter->add(new TestIntfI(), communicator->stringToIdentity("test")); adapter->activate(); - + adapter2->add(testController, communicator->stringToIdentity("testController")); adapter2->activate(); @@ -40,20 +40,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index 21d504d1991..dd37ea2c556 100755 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -200,6 +200,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "BlobjectI.h" \ Server.obj: \ @@ -322,6 +323,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index 7dea3e8dea8..aebad322861 100755 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -460,6 +462,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -583,6 +586,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp index 5ec5efff127..f0a9a201dd6 100644 --- a/cpp/test/Ice/enums/Client.cpp +++ b/cpp/test/Ice/enums/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp index ee5d389b22b..046e9f232bb 100644 --- a/cpp/test/Ice/enums/Server.cpp +++ b/cpp/test/Ice/enums/Server.cpp @@ -30,20 +30,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index f71ad67703a..404e060d594 100755 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -281,6 +281,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -411,6 +412,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -541,6 +543,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -672,6 +675,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -884,6 +888,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -1015,6 +1020,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1146,6 +1152,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp index 3df05cd0e5b..aa287561706 100644 --- a/cpp/test/Ice/exceptions/Client.cpp +++ b/cpp/test/Ice/exceptions/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index 20850c863fd..394d21a7a8a 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -30,20 +30,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 0268c839670..40d6d640055 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -33,20 +33,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 4a1d5cfd696..0049294407f 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -33,20 +33,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index 542040ddb60..d06cc792c60 100755 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -460,6 +462,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -583,6 +586,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -714,6 +718,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp index c8869800916..e9a90ee6309 100644 --- a/cpp/test/Ice/facets/Client.cpp +++ b/cpp/test/Ice/facets/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index da1236de351..4d0b3f6b3cd 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -35,20 +35,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index 0032c52736c..0d31a3b95c7 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -34,20 +34,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index 1d91902dae2..091bee3ae5a 100755 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -460,6 +462,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -583,5 +586,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/Ice/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp index 044a8956350..7eaf999fbb3 100644 --- a/cpp/test/Ice/faultTolerance/Client.cpp +++ b/cpp/test/Ice/faultTolerance/Client.cpp @@ -56,20 +56,11 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index f9337d5ba6e..131788ba838 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -59,20 +59,11 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index dc9a6833902..dd991570c10 100755 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -203,6 +203,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp index 26717ae7609..5bb4aa0ea50 100644 --- a/cpp/test/Ice/gc/Client.cpp +++ b/cpp/test/Ice/gc/Client.cpp @@ -137,7 +137,7 @@ public: return false; } test(obj->__hasFlag(IceInternal::GCObject::CycleMember) && obj->__hasFlag(IceInternal::GCObject::Collectable)); - + obj->__setFlag(IceInternal::GCObject::Visiting); obj->__gcVisitMembers(*this); obj->__clearFlag(IceInternal::GCObject::Visiting); @@ -351,7 +351,7 @@ MyApplication::run(int argc, char* argv[]) NPtr n6 = new N; NPtr n7 = new N; NPtr n8 = new N; - + n1->left = n2; n2->left = n3; n2->right = n4; @@ -532,20 +532,11 @@ MyApplication::run(int argc, char* argv[]) return 0; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif MyApplication app; return app.main(argc, argv); diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index c6feaa56061..7812a9b3f7d 100755 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -202,6 +202,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Random.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/hash/Client.cpp b/cpp/test/Ice/hash/Client.cpp index a9f2e849b6f..9de30e4dac5 100644 --- a/cpp/test/Ice/hash/Client.cpp +++ b/cpp/test/Ice/hash/Client.cpp @@ -21,19 +21,10 @@ using namespace Test; DEFINE_TEST("client") -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char** argv) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif cout << "testing proxy hash algorithm collisions... " << flush; map<Ice::Int, Ice::ObjectPrx> seenProxy; diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index a425a1dd81b..ad6057ff0ec 100755 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -461,6 +463,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -592,6 +595,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/hold/Client.cpp b/cpp/test/Ice/hold/Client.cpp index 1d0df9a9f45..797d022d9b0 100644 --- a/cpp/test/Ice/hold/Client.cpp +++ b/cpp/test/Ice/hold/Client.cpp @@ -24,20 +24,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp index b6b8c5de3ca..99f51a830ea 100644 --- a/cpp/test/Ice/hold/Server.cpp +++ b/cpp/test/Ice/hold/Server.cpp @@ -21,17 +21,17 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) IceUtil::TimerPtr timer = new IceUtil::Timer(); communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -p 12010:udp"); - communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Size", "5"); - communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeMax", "5"); - communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); + communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Size", "5"); + communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeMax", "5"); + communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Serialize", "0"); Ice::ObjectAdapterPtr adapter1 = communicator->createObjectAdapter("TestAdapter1"); adapter1->add(new HoldI(timer, adapter1), communicator->stringToIdentity("hold")); communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -p 12011:udp"); - communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Size", "5"); - communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeMax", "5"); - communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); + communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Size", "5"); + communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeMax", "5"); + communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Serialize", "1"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); adapter2->add(new HoldI(timer, adapter2), communicator->stringToIdentity("hold")); @@ -48,20 +48,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index c90c8b09058..48c3d132a1c 100755 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -205,6 +205,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceSSL\IceSSL.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ @@ -341,6 +342,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -471,6 +473,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceSSL\IceSSL.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ @@ -607,6 +610,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/info/Client.cpp b/cpp/test/Ice/info/Client.cpp index b9481c85dfe..b29a4c124d7 100644 --- a/cpp/test/Ice/info/Client.cpp +++ b/cpp/test/Ice/info/Client.cpp @@ -23,20 +23,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp index 1421046303e..50c861627a8 100644 --- a/cpp/test/Ice/info/Server.cpp +++ b/cpp/test/Ice/info/Server.cpp @@ -27,20 +27,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index 6786cdc1d90..03566acb454 100755 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -202,6 +202,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -332,6 +333,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -462,6 +464,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -585,6 +588,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -716,6 +720,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp index 6fa25fa6cc8..c5a16298181 100644 --- a/cpp/test/Ice/inheritance/Client.cpp +++ b/cpp/test/Ice/inheritance/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index aa3065f4dc3..4948c224464 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -23,27 +23,18 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); - + InitialPrx allTests(const Ice::CommunicatorPtr&); allTests(communicator); return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index 856c15c66f6..a62a97dfa8d 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -28,20 +28,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index 4b9da29d8a0..2e6941c1834 100755 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -122,6 +122,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -256,6 +257,7 @@ InterceptorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -389,6 +391,7 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -519,6 +522,7 @@ MyObjectI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "MyObjectI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -731,4 +735,5 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Test.h" \ diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp index 4c5abcf5a70..7653c369306 100644 --- a/cpp/test/Ice/interceptor/Client.cpp +++ b/cpp/test/Ice/interceptor/Client.cpp @@ -97,20 +97,11 @@ extern "C" void testAction(int) } #endif -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif #ifndef _WIN32 diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index 8ed210691e6..a376709129a 100755 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -202,6 +202,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -332,6 +333,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -462,6 +464,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "BlobjectI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -593,6 +596,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/invoke/Client.cpp b/cpp/test/Ice/invoke/Client.cpp index c51bd4a6b12..b49228e3364 100644 --- a/cpp/test/Ice/invoke/Client.cpp +++ b/cpp/test/Ice/invoke/Client.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("client") using namespace std; int -run(int, char**, +run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&) { @@ -28,20 +28,11 @@ run(int, char**, return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/invoke/Server.cpp b/cpp/test/Ice/invoke/Server.cpp index d1b5f2a4deb..9b2a4573df8 100644 --- a/cpp/test/Ice/invoke/Server.cpp +++ b/cpp/test/Ice/invoke/Server.cpp @@ -17,7 +17,7 @@ DEFINE_TEST("server") using namespace std; class ServantLocatorI : public Ice::ServantLocator -{ +{ public: ServantLocatorI(bool array, bool async) @@ -45,7 +45,7 @@ public: } } } - + virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&) { @@ -99,20 +99,11 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index 84ccbaf7427..3c972a14767 100755 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -208,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -338,6 +339,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -468,6 +470,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "ServerLocator.h" \ @@ -592,6 +595,7 @@ ServerLocator.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -723,6 +727,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServerLocator.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp index 4a17c85858a..cb3b319980c 100644 --- a/cpp/test/Ice/location/Client.cpp +++ b/cpp/test/Ice/location/Client.cpp @@ -23,20 +23,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index 5a63f4fef26..e6889d17b04 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -41,7 +41,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, Ice::ObjectPtr object = new ServerManagerI(registry, initData); adapter->add(object, communicator->stringToIdentity("ServerManager")); - Ice::LocatorRegistryPrx registryPrx = + Ice::LocatorRegistryPrx registryPrx = Ice::LocatorRegistryPrx::uncheckedCast(adapter->add(registry, communicator->stringToIdentity("registry"))); Ice::LocatorPtr locator = new ServerLocator(registry, registryPrx); @@ -54,20 +54,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index 950a9b683de..0e32a66d573 100755 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -119,6 +119,7 @@ Client1.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -248,6 +249,7 @@ Client2.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -377,6 +379,7 @@ Client3.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -506,6 +509,7 @@ Client4.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/logger/Client1.cpp b/cpp/test/Ice/logger/Client1.cpp index 0a7da12c99e..2d3a4d21d1e 100644 --- a/cpp/test/Ice/logger/Client1.cpp +++ b/cpp/test/Ice/logger/Client1.cpp @@ -29,20 +29,11 @@ public: } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif cout << "testing logger encoding with Ice.LogFile... " << flush; @@ -51,10 +42,10 @@ main(int argc, char* argv[]) id.properties->load("config.client"); id.properties->setProperty("Ice.LogFile", "log.txt"); const string programName = id.properties->getProperty("Ice.ProgramName"); - + Client c; c.main(argc, argv, id); - + ifstream in("log.txt"); if(!in) { diff --git a/cpp/test/Ice/logger/Client2.cpp b/cpp/test/Ice/logger/Client2.cpp index edc76c756c2..197e75158c0 100644 --- a/cpp/test/Ice/logger/Client2.cpp +++ b/cpp/test/Ice/logger/Client2.cpp @@ -29,20 +29,11 @@ public: } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif #ifdef _WIN32 @@ -57,7 +48,7 @@ main(int argc, char* argv[]) #endif Ice::InitializationData id; id.properties = Ice::createProperties(); - id.properties->load("config.client"); + id.properties->load("config.client"); Client c; int status = c.main(argc, argv, id); diff --git a/cpp/test/Ice/logger/Client3.cpp b/cpp/test/Ice/logger/Client3.cpp index dee2a5bb8b3..db119308bf7 100644 --- a/cpp/test/Ice/logger/Client3.cpp +++ b/cpp/test/Ice/logger/Client3.cpp @@ -28,20 +28,11 @@ public: } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif #ifdef _WIN32 diff --git a/cpp/test/Ice/logger/Client4.cpp b/cpp/test/Ice/logger/Client4.cpp index 7ab6495fd00..1e71b3cbad2 100644 --- a/cpp/test/Ice/logger/Client4.cpp +++ b/cpp/test/Ice/logger/Client4.cpp @@ -28,20 +28,11 @@ public: } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif #ifdef _WIN32 @@ -56,7 +47,7 @@ main(int argc, char* argv[]) #endif Ice::InitializationData id; id.properties = Ice::createProperties(); - id.properties->load("config.client"); + id.properties->load("config.client"); Client c; int status = c.main(argc, argv, id); #ifdef _WIN32 diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index bb1f96f5afe..78b605beecf 100755 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -205,6 +205,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -336,6 +337,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -467,6 +469,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -590,6 +593,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -802,6 +806,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "TestAMD.h" \ @@ -925,6 +930,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1056,6 +1062,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/metrics/Client.cpp b/cpp/test/Ice/metrics/Client.cpp index ea2cf14e867..b895749d011 100644 --- a/cpp/test/Ice/metrics/Client.cpp +++ b/cpp/test/Ice/metrics/Client.cpp @@ -26,20 +26,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObs return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp index e7aab0b179d..5eb75ea0c15 100644 --- a/cpp/test/Ice/metrics/Collocated.cpp +++ b/cpp/test/Ice/metrics/Collocated.cpp @@ -37,20 +37,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObs return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/metrics/Server.cpp b/cpp/test/Ice/metrics/Server.cpp index a80cae9a6a4..54928e88007 100644 --- a/cpp/test/Ice/metrics/Server.cpp +++ b/cpp/test/Ice/metrics/Server.cpp @@ -35,20 +35,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/metrics/ServerAMD.cpp b/cpp/test/Ice/metrics/ServerAMD.cpp index 1addb5941b5..4b9ff8b4702 100644 --- a/cpp/test/Ice/metrics/ServerAMD.cpp +++ b/cpp/test/Ice/metrics/ServerAMD.cpp @@ -35,20 +35,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index 156583889f4..b0790ac6f34 100755 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -460,6 +462,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/networkProxy/Client.cpp b/cpp/test/Ice/networkProxy/Client.cpp index bfec206821a..60c566517a3 100644 --- a/cpp/test/Ice/networkProxy/Client.cpp +++ b/cpp/test/Ice/networkProxy/Client.cpp @@ -24,20 +24,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/networkProxy/Server.cpp b/cpp/test/Ice/networkProxy/Server.cpp index 870c12afa0b..7f4b8bf96bf 100644 --- a/cpp/test/Ice/networkProxy/Server.cpp +++ b/cpp/test/Ice/networkProxy/Server.cpp @@ -22,7 +22,7 @@ class TestI : public Test::TestIntf { public: - virtual void + virtual void shutdown(const Ice::Current& current) { current.adapter->getCommunicator()->shutdown(); @@ -44,20 +44,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index 883b2cc29c0..7233f599e53 100755 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -202,6 +202,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -325,6 +326,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -456,6 +458,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -586,6 +589,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -717,6 +721,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index a96843fd0cb..303d79031af 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -84,20 +84,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 3a3208a4e25..781c216a855 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -91,20 +91,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index a472cbdeffb..f1a1a197d39 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -65,20 +65,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index 7c7f7bd6913..a7bfced55fa 100755 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -215,6 +215,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -345,6 +346,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -475,6 +477,7 @@ Twoways.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -605,6 +608,7 @@ Oneways.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -735,6 +739,7 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -865,6 +870,7 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -995,6 +1001,7 @@ BatchOneways.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1125,6 +1132,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1255,6 +1263,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1386,6 +1395,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1598,6 +1608,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -1729,6 +1740,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1860,6 +1872,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp index b2002782c5d..0d97cd27f87 100644 --- a/cpp/test/Ice/operations/Client.cpp +++ b/cpp/test/Ice/operations/Client.cpp @@ -43,20 +43,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::Initializa return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index a2569714a2f..0ce4663448c 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -33,20 +33,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index e5af2cc7b5d..6d589352eb4 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -27,20 +27,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index 5ffa2c1f4c4..e42550569fa 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -27,20 +27,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index 237008401b3..b40de61d879 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -128,6 +128,7 @@ Test.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Ice\Outgoing.h" \ TestI.obj: \ @@ -250,6 +251,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "CustomMap.h" \ @@ -375,6 +377,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -508,6 +511,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -640,6 +644,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -776,6 +781,7 @@ TestAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Ice\Outgoing.h" \ TestAMDI.obj: \ @@ -898,6 +904,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "TestAMD.h" \ "CustomMap.h" \ @@ -1023,6 +1030,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/optional/Client.cpp b/cpp/test/Ice/optional/Client.cpp index 6721f6cca5f..6db3cf0cce2 100644 --- a/cpp/test/Ice/optional/Client.cpp +++ b/cpp/test/Ice/optional/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/optional/Server.cpp b/cpp/test/Ice/optional/Server.cpp index ca270150359..48d5017f48b 100644 --- a/cpp/test/Ice/optional/Server.cpp +++ b/cpp/test/Ice/optional/Server.cpp @@ -28,20 +28,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/optional/ServerAMD.cpp b/cpp/test/Ice/optional/ServerAMD.cpp index fd4550aec26..a541b269137 100644 --- a/cpp/test/Ice/optional/ServerAMD.cpp +++ b/cpp/test/Ice/optional/ServerAMD.cpp @@ -27,20 +27,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index a5dba71edf2..dbeb1d16cf3 100755 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -119,6 +119,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -248,6 +249,7 @@ Plugin.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index 3801922571a..13a65bb2e47 100755 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -119,6 +119,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/properties/Client.cpp b/cpp/test/Ice/properties/Client.cpp index baee22b041f..a562363f4e3 100644 --- a/cpp/test/Ice/properties/Client.cpp +++ b/cpp/test/Ice/properties/Client.cpp @@ -36,20 +36,11 @@ public: } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif ifstream in("./config/configPath"); @@ -57,7 +48,7 @@ main(int argc, char* argv[]) { test(false); } - + if(!getline(in, configPath)) { test(false); @@ -68,7 +59,7 @@ main(int argc, char* argv[]) Ice::PropertiesPtr properties = Ice::createProperties(); properties->load(configPath); test(properties->getProperty("Ice.Trace.Network") == "1"); - test(properties->getProperty("Ice.Trace.Protocol") == "1"); + test(properties->getProperty("Ice.Trace.Protocol") == "1"); test(properties->getProperty("Config.Path") == configPath); test(properties->getProperty("Ice.ProgramName") == "PropertiesClient"); cout << "ok" << endl; @@ -78,12 +69,12 @@ main(int argc, char* argv[]) cerr << ex << endl; return EXIT_FAILURE; } - + cout << "testing load properties from UTF-8 path using Ice::Application... " << flush; Client c; c.main(argc, argv, configPath.c_str()); cout << "ok" << endl; - + try { // @@ -138,8 +129,8 @@ main(int argc, char* argv[]) } ; for(size_t i = 0; props[i] != ""; i += 2) - { - test(properties->getProperty(props[i]) == props[i + 1]); + { + test(properties->getProperty(props[i]) == props[i + 1]); } cout << "ok" << endl; diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index 7d7a8d54ce2..2d86b798f09 100755 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -213,6 +213,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -343,6 +344,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -473,6 +475,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -604,6 +607,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -814,6 +818,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -945,6 +950,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1076,6 +1082,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp index 68f45fa9913..6eed51d0287 100644 --- a/cpp/test/Ice/proxy/Client.cpp +++ b/cpp/test/Ice/proxy/Client.cpp @@ -26,20 +26,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::Initializa return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index bf351698020..6c008378319 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -30,20 +30,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index 6522ad3fbfc..10195276471 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -27,20 +27,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index 9ba4afcab4b..f0f85af4b9f 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -27,20 +27,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index 68431641667..8b941ac7584 100755 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -331,6 +332,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -460,6 +462,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -592,6 +595,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "SystemFailure.h" \ @@ -716,6 +720,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -847,6 +852,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp index 5abf3def869..beb68825a4a 100644 --- a/cpp/test/Ice/retry/Client.cpp +++ b/cpp/test/Ice/retry/Client.cpp @@ -26,20 +26,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::Communicat return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/retry/Collocated.cpp b/cpp/test/Ice/retry/Collocated.cpp index 75060860227..ca230aedd73 100644 --- a/cpp/test/Ice/retry/Collocated.cpp +++ b/cpp/test/Ice/retry/Collocated.cpp @@ -18,7 +18,7 @@ DEFINE_TEST("collocated") using namespace std; using namespace Test; -void +void setupObjectAdapter(const Ice::CommunicatorPtr& communicator) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(""); @@ -39,20 +39,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::Communicat return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp index 80a82cbec61..92ba9d07f42 100644 --- a/cpp/test/Ice/retry/Server.cpp +++ b/cpp/test/Ice/retry/Server.cpp @@ -28,20 +28,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index 437e89bde49..0846f79ade8 100755 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -205,6 +205,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -335,6 +336,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -472,6 +474,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -596,6 +599,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -726,6 +730,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -946,6 +951,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "TestAMD.h" \ @@ -1069,6 +1075,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -1201,6 +1208,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/Ice/servantLocator/Client.cpp b/cpp/test/Ice/servantLocator/Client.cpp index 38a5e4ba73b..e5fba33d612 100644 --- a/cpp/test/Ice/servantLocator/Client.cpp +++ b/cpp/test/Ice/servantLocator/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp index 50eebb2c54f..fccba0827c7 100644 --- a/cpp/test/Ice/servantLocator/Collocated.cpp +++ b/cpp/test/Ice/servantLocator/Collocated.cpp @@ -34,7 +34,7 @@ protected: cookie = new CookieI(); return new TestI(); } - + virtual void checkCookie(const Ice::LocalObjectPtr& cookie) const { @@ -89,20 +89,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp index d93d0edc0fe..9f4a459d1e8 100644 --- a/cpp/test/Ice/servantLocator/Server.cpp +++ b/cpp/test/Ice/servantLocator/Server.cpp @@ -33,7 +33,7 @@ protected: cookie = new CookieI(); return new TestI(); } - + virtual void checkCookie(const Ice::LocalObjectPtr& cookie) const { @@ -77,7 +77,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - + adapter->addServantLocator(new ServantLocatorI(""), ""); adapter->addServantLocator(new ServantLocatorI("category"), "category"); adapter->add(new TestI, communicator->stringToIdentity("asm")); @@ -88,20 +88,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp index b6229e44896..72eab09e985 100644 --- a/cpp/test/Ice/servantLocator/ServerAMD.cpp +++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp @@ -77,7 +77,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - + adapter->addServantLocator(new ServantLocatorAMDI(""), ""); adapter->addServantLocator(new ServantLocatorAMDI("category"), "category"); adapter->add(new TestAMDI, communicator->stringToIdentity("asm")); @@ -88,20 +88,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/services/.depend.mak b/cpp/test/Ice/services/.depend.mak index 5cc06200dfd..89a16e56e7a 100755 --- a/cpp/test/Ice/services/.depend.mak +++ b/cpp/test/Ice/services/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\Glacier2.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ diff --git a/cpp/test/Ice/services/Client.cpp b/cpp/test/Ice/services/Client.cpp index cab6e9ce72d..5b54a4a3f73 100644 --- a/cpp/test/Ice/services/Client.cpp +++ b/cpp/test/Ice/services/Client.cpp @@ -24,20 +24,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::Initializa return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index 241a5320dd2..43095bfd674 100755 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -218,6 +218,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -430,6 +431,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -646,6 +648,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -775,6 +778,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "ServerPrivate.h" \ "Test.h" \ @@ -1075,6 +1079,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1204,6 +1209,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "ServerPrivateAMD.h" \ "TestAMD.h" \ diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp index 6948c47d83f..d9667684990 100644 --- a/cpp/test/Ice/slicing/exceptions/Client.cpp +++ b/cpp/test/Ice/slicing/exceptions/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index 971f3e17d3e..32aed8e0d2c 100644 --- a/cpp/test/Ice/slicing/exceptions/Server.cpp +++ b/cpp/test/Ice/slicing/exceptions/Server.cpp @@ -30,20 +30,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp index b275fc9c6e9..f494290748a 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp @@ -30,20 +30,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index 56a5cbb5397..d271076d636 100755 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -305,6 +305,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -436,6 +437,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -734,6 +736,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -863,6 +866,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "ServerPrivate.h" \ "Test.h" \ @@ -1165,6 +1169,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -1294,6 +1299,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestAMDI.h" \ "ServerPrivateAMD.h" \ "TestAMD.h" \ diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp index 5167a4c8916..b0e8aea2856 100644 --- a/cpp/test/Ice/slicing/objects/Client.cpp +++ b/cpp/test/Ice/slicing/objects/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index 971f3e17d3e..32aed8e0d2c 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -30,20 +30,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index b275fc9c6e9..f494290748a 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -30,20 +30,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak index d99f1ae2242..b1ce5bc8998 100755 --- a/cpp/test/Ice/stream/.depend.mak +++ b/cpp/test/Ice/stream/.depend.mak @@ -204,6 +204,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp index 569e10104b9..604ff0cb943 100644 --- a/cpp/test/Ice/stream/Client.cpp +++ b/cpp/test/Ice/stream/Client.cpp @@ -1121,20 +1121,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return 0; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index d76f64dff6c..be426383681 100755 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -202,6 +202,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -332,6 +333,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp index db2b72bfe3a..6ec547fc496 100644 --- a/cpp/test/Ice/stringConverter/Client.cpp +++ b/cpp/test/Ice/stringConverter/Client.cpp @@ -26,20 +26,11 @@ public: static bool useLocale = false; static bool useIconv = true; -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif Client app; @@ -47,7 +38,7 @@ main(int argc, char* argv[]) #ifndef _WIN32 // // Switch to French locale - // (we just used the codeset for as default internal code for + // (we just used the codeset for as default internal code for // stringConverter below) // @@ -73,7 +64,7 @@ main(int argc, char* argv[]) } IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("ucs4")); #else - + if(useLocale) { IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>()); @@ -106,7 +97,7 @@ main(int argc, char* argv[]) int Client::run(int, char*[]) { - Test::MyObjectPrx proxy = + Test::MyObjectPrx proxy = Test::MyObjectPrx::uncheckedCast(communicator()->stringToProxy("test:default -p 12010")); char oe = char(0xBD); // A single character in ISO Latin 9 diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp index b0851759d02..9b07edb5f8f 100644 --- a/cpp/test/Ice/stringConverter/Server.cpp +++ b/cpp/test/Ice/stringConverter/Server.cpp @@ -34,13 +34,13 @@ public: return IceUtil::stringToWstring(msg, IceUtil::getProcessStringConverter(), IceUtil::getProcessWstringConverter()); } - + virtual string narrow(const wstring& wmsg, const Ice::Current&) { return IceUtil::wstringToString(wmsg, IceUtil::getProcessStringConverter(), IceUtil::getProcessWstringConverter()); } - + virtual void shutdown(const Ice::Current& current) { current.adapter->getCommunicator()->shutdown(); @@ -54,26 +54,17 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyObjectI, communicator->stringToIdentity("test")); adapter->activate(); - + TEST_READY communicator->waitForShutdown(); return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index a9d0f13d1d7..79824121126 100755 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -460,6 +462,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -583,6 +586,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -714,6 +718,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/threadPoolPriority/Client.cpp b/cpp/test/Ice/threadPoolPriority/Client.cpp index 24744f36887..1466387c22d 100644 --- a/cpp/test/Ice/threadPoolPriority/Client.cpp +++ b/cpp/test/Ice/threadPoolPriority/Client.cpp @@ -24,20 +24,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/threadPoolPriority/Server.cpp b/cpp/test/Ice/threadPoolPriority/Server.cpp index 3d6f4102883..15bb709a99c 100644 --- a/cpp/test/Ice/threadPoolPriority/Server.cpp +++ b/cpp/test/Ice/threadPoolPriority/Server.cpp @@ -54,20 +54,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp index 13991d03a52..ffec696e300 100644 --- a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp +++ b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp @@ -58,20 +58,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index 11c6772f2ef..03b35bd640c 100755 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -202,6 +202,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ Client.obj: \ Client.cpp \ @@ -323,6 +324,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -453,6 +455,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -584,6 +587,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp index d259bcd0901..16821374682 100644 --- a/cpp/test/Ice/timeout/Client.cpp +++ b/cpp/test/Ice/timeout/Client.cpp @@ -25,20 +25,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; @@ -78,7 +69,7 @@ main(int argc, char* argv[]) // send() blocking after sending a given amount of data. // initData.properties->setProperty("Ice.TCP.SndSize", "50000"); - + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index 40a12267a84..61104b01a04 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -28,20 +28,11 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 718f37edabd..8a8d46e0bd9 100755 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -201,6 +201,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -331,6 +332,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -468,6 +470,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -591,6 +594,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Ice/udp/Client.cpp b/cpp/test/Ice/udp/Client.cpp index e5f77e5226b..ac60fdf9093 100644 --- a/cpp/test/Ice/udp/Client.cpp +++ b/cpp/test/Ice/udp/Client.cpp @@ -32,20 +32,11 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp index faf23f591e0..654f1e65dc4 100644 --- a/cpp/test/Ice/udp/Server.cpp +++ b/cpp/test/Ice/udp/Server.cpp @@ -61,20 +61,11 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, true); + Ice::registerIceSSL(); #endif int status; diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index c8fd7cf66f3..d03894dd451 100755 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -206,6 +206,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -336,6 +337,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -466,6 +468,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -589,6 +592,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index 099232e588a..9e149d7ae5a 100755 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -201,6 +201,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -331,6 +332,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -461,6 +463,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -584,6 +587,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index 968bed3a9f8..68988959ed5 100755 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -467,6 +469,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -590,6 +593,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/IceDiscovery/simple/Client.cpp b/cpp/test/IceDiscovery/simple/Client.cpp index 567fad5b853..d2b89579c2c 100644 --- a/cpp/test/IceDiscovery/simple/Client.cpp +++ b/cpp/test/IceDiscovery/simple/Client.cpp @@ -26,23 +26,16 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); -Ice::Plugin* createIceDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, false); - Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, false); + Ice::registerIceSSL(); #endif + // + // Explicitly register the IceDiscovery plugin to test registerIceDiscovery. + // + Ice::registerIceDiscovery(); int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/IceDiscovery/simple/Makefile b/cpp/test/IceDiscovery/simple/Makefile index 0040afbe7ea..3e6b2695532 100644 --- a/cpp/test/IceDiscovery/simple/Makefile +++ b/cpp/test/IceDiscovery/simple/Makefile @@ -33,7 +33,7 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(call mktest,$@,$(COBJS), $(LIBS)) + $(call mktest,$@,$(COBJS), -lIceDiscovery $(LIBS)) $(SERVER): $(SOBJS) rm -f $@ diff --git a/cpp/test/IceDiscovery/simple/Makefile.mak b/cpp/test/IceDiscovery/simple/Makefile.mak index 1137e6fc404..6a4ff516ee1 100644 --- a/cpp/test/IceDiscovery/simple/Makefile.mak +++ b/cpp/test/IceDiscovery/simple/Makefile.mak @@ -38,6 +38,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +LINKWITH = icediscovery$(LIBSUFFIX).lib $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb @@ -45,7 +46,7 @@ SPDBFLAGS = /pdb:$(SERVER).pdb !endif $(CLIENT)$(EXT): $(COBJS) - $(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) + $(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceDiscovery/simple/Server.cpp b/cpp/test/IceDiscovery/simple/Server.cpp index 24fe2992cae..8c51765f9d3 100644 --- a/cpp/test/IceDiscovery/simple/Server.cpp +++ b/cpp/test/IceDiscovery/simple/Server.cpp @@ -47,22 +47,12 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } -#ifdef ICE_STATIC_LIBS -extern "C" -{ - -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); -Ice::Plugin* createIceDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); - -} -#endif - int main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS - Ice::registerPluginFactory("IceSSL", createIceSSL, false); - Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, false); + Ice::registerIceSSL(); + Ice::registerIceDiscovery(); #endif int status; diff --git a/cpp/test/IceDiscovery/simple/run.py b/cpp/test/IceDiscovery/simple/run.py index dd96a172206..5de3fedd862 100755 --- a/cpp/test/IceDiscovery/simple/run.py +++ b/cpp/test/IceDiscovery/simple/run.py @@ -25,19 +25,20 @@ client = os.path.join(os.getcwd(), "client") num = 3 -args = " --Ice.Plugin.IceDiscovery=IceDiscovery:createIceDiscovery" -args += " --IceDiscovery.Timeout=50" +args = " --IceDiscovery.Timeout=50" args += " --IceDiscovery.RetryCount=5" if not TestUtil.ipv6: args += " --IceDiscovery.Interface=127.0.0.1" elif TestUtil.isDarwin(): args += " --IceDiscovery.Interface=\"::1\"" +# Set the plugin property only for the server, the client uses Ice::registerIceDiscovery() +serverArgs = " --Ice.Plugin.IceDiscovery=IceDiscovery:createIceDiscovery" + args serverProc = [] for i in range(0, num): sys.stdout.write("starting server #%d... " % (i + 1)) sys.stdout.flush() - serverProc.append(TestUtil.startServer(server, "%d %s" % (i, args), count = 4)) + serverProc.append(TestUtil.startServer(server, "%d %s " % (i, serverArgs), count = 4)) print("ok") sys.stdout.write("starting client... ") diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index b16249cea27..63798c9c31c 100755 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -599,5 +602,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceGrid/admin/.depend.mak b/cpp/test/IceGrid/admin/.depend.mak index b928a75050c..2daf0a33181 100755 --- a/cpp/test/IceGrid/admin/.depend.mak +++ b/cpp/test/IceGrid/admin/.depend.mak @@ -119,3 +119,4 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 21851d5fe29..a7df8c0a792 100755 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -331,6 +332,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -479,6 +481,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -602,6 +605,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -733,6 +737,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index eab7fde7d46..4984a1d9dcc 100755 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -600,6 +603,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -731,6 +735,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "$(includedir)\Freeze\Freeze.h" \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index 617bd0cfc7b..53df2de6aa4 100755 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -599,6 +602,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index 4a8534e316e..f76dd911f0e 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -599,6 +602,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -730,6 +734,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "$(includedir)\Freeze\Freeze.h" \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index 73a622597d1..251d89d58d4 100755 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -599,6 +602,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -730,6 +734,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index ff369cf8e1d..b58d8e383ed 100755 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -599,6 +602,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index 495559cd42b..addfe07c1e4 100755 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -209,6 +209,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -338,6 +339,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -486,6 +488,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -622,6 +625,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index cc93cf8c51f..c007d84ae45 100755 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -337,6 +338,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -599,5 +602,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp index ac6790af361..e2cd0bb95f9 100644 --- a/cpp/test/IceGrid/simple/AllTests.cpp +++ b/cpp/test/IceGrid/simple/AllTests.cpp @@ -94,8 +94,11 @@ allTests(const Ice::CommunicatorPtr& communicator) // // Now, ensure that the IceGrid discovery locator correctly - // handles failure to find a locator. - // + // handles failure to find a locator. Also test + // Ice::registerIceLocatorDiscovery() + // + Ice::registerIceLocatorDiscovery(); + initData.properties->setProperty("Ice.Plugin.IceLocatorDiscovery", ""); initData.properties->setProperty("IceLocatorDiscovery.InstanceName", "unknown"); initData.properties->setProperty("IceLocatorDiscovery.RetryCount", "1"); initData.properties->setProperty("IceLocatorDiscovery.Timeout", "100"); @@ -246,7 +249,7 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) catch(const Ice::NoEndpointException&) { } - + admin->enableServer("server", true); try diff --git a/cpp/test/IceGrid/simple/Makefile b/cpp/test/IceGrid/simple/Makefile index d07645f5166..781c2fdb4d3 100644 --- a/cpp/test/IceGrid/simple/Makefile +++ b/cpp/test/IceGrid/simple/Makefile @@ -33,7 +33,7 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) -lIceGrid -lGlacier2 + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) -lIceLocatorDiscovery -lIceGrid -lGlacier2 $(SERVER): $(SOBJS) rm -f $@ diff --git a/cpp/test/IceGrid/simple/Makefile.mak b/cpp/test/IceGrid/simple/Makefile.mak index c8ff99b1fbb..55ebe685f1e 100644 --- a/cpp/test/IceGrid/simple/Makefile.mak +++ b/cpp/test/IceGrid/simple/Makefile.mak @@ -30,7 +30,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) +LINKWITH = icelocatordiscovery$(LIBSUFFIX).lib $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index 617bd0cfc7b..53df2de6aa4 100755 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ @@ -330,6 +331,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -476,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ @@ -599,6 +602,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index e6215b0d742..31b970d0ba6 100755 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceSSL\IceSSL.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ @@ -326,6 +327,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ "$(includedir)\IceSSL\ConnectionInfo.h" \ @@ -459,6 +461,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -593,5 +596,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 02aaa378de8..8e2a08fb7da 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -280,7 +280,10 @@ static PropertiesPtr createClientProps(const Ice::PropertiesPtr& defaultProps, const string& defaultDir, const string& defaultHost, bool p12) { PropertiesPtr result = createProperties(); - result->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL"); + // + // Don't set the plugin property, the client registered the plugin with registerIceSSL. + // + //result->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL"); if(!defaultDir.empty()) { result->setProperty("IceSSL.DefaultDir", defaultDir); diff --git a/cpp/test/IceSSL/configuration/Client.cpp b/cpp/test/IceSSL/configuration/Client.cpp index e0d2deaa1e5..5ffeda054c0 100644 --- a/cpp/test/IceSSL/configuration/Client.cpp +++ b/cpp/test/IceSSL/configuration/Client.cpp @@ -34,6 +34,13 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) int main(int argc, char* argv[]) { + // + // Explicitly register the IceSSL plugin to test registerIceSSL. The tests + // don't set Ice.Plugin.IceSSL to ensure the plugin is registered without + // the property setting. + // + Ice::registerIceSSL(); + int status; Ice::CommunicatorPtr communicator; diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index 8e3c624eded..45305fd520a 100755 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -200,6 +200,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -325,6 +326,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index aad14db99ee..61a7e3a547b 100755 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -208,6 +208,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -333,6 +334,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index e05002604a4..5229e9772e4 100755 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -200,6 +200,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -341,6 +342,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -475,6 +477,7 @@ Sub.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index 92e286cd9f6..f644c834629 100755 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -200,6 +200,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index 4635dcd0fdb..429ada3f233 100755 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -281,6 +281,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -421,6 +422,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -548,4 +550,5 @@ Control.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "Controller.h" \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index c2b482209b1..19202f5106d 100755 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -200,6 +200,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -325,6 +326,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index 77a4372aa2f..2ea7e09fae1 100755 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -200,6 +200,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceStorm\IceStorm.h" \ @@ -327,6 +328,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index c5401f08676..99ec9336297 100755 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -204,6 +204,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index 3ea96271303..f610eb91620 100755 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -202,6 +202,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index f758246d219..123b3891b93 100755 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -269,6 +269,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ + "$(includedir)\Ice\RegisterPlugins.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ |