summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/CHANGES10
-rwxr-xr-xcpp/config/convertssl.py2
-rw-r--r--cpp/include/Ice/LoggerUtil.h2
-rw-r--r--cpp/include/Ice/StringConverter.h2
-rw-r--r--cpp/include/IceSSL/Plugin.h10
-rw-r--r--cpp/src/Ice/Exception.cpp2
-rw-r--r--cpp/src/Ice/Instance.cpp6
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp18
-rw-r--r--cpp/src/Ice/StringConverter.cpp2
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp2
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp2
-rw-r--r--cpp/src/IceSSL/AcceptorI.cpp4
-rw-r--r--cpp/src/IceSSL/ConnectorI.cpp4
-rw-r--r--cpp/src/IceSSL/Instance.cpp4
-rw-r--r--cpp/src/IceSSL/PluginI.cpp2
-rw-r--r--cpp/test/Ice/background/Client.cpp2
-rw-r--r--cpp/test/Ice/background/Server.cpp2
17 files changed, 38 insertions, 38 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 5e18635b29d..3417871babe 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -66,8 +66,8 @@ Changes since version 3.2.0
base64 encoding.
This syntax is useful if, for example, a client that has the SSL
- plugin configured sends a proxy with an SSL endpoint to a server
- without the SSL plugin. Prior to this version, the server would
+ plug-in configured sends a proxy with an SSL endpoint to a server
+ without the SSL plug-in. Prior to this version, the server would
drop the unknown SSL endpoint when it stringified the proxy.
As of this version, the server preserves the endpoint and, when the server
stringifies a proxy containing an unknown endpoint, it uses the above opaque syntax.
@@ -677,7 +677,7 @@ Changes since version 3.0.1
- Added "always" and "session" activation modes to IceGrid. See the
Ice manual for more information.
-- Changed the entry point of the IceSSL plugin to be
+- Changed the entry point of the IceSSL plug-in to be
IceSSL:createIceSSL.
- Changed the entry point of the IceStorm service to be
@@ -816,11 +816,11 @@ Changes since version 3.0.1
proxies. Upgrading your clients to 3.1 is highly recommended to avoid
large routing table sizes in Glacier2.
-- Replaced the IceSSL plugin. The new plugin no longer uses an XML
+- Replaced the IceSSL plug-in. The new plug-in no longer uses an XML
configuration file but rather relies solely on properties. A Python
script is provided in config/convertssl.py to convert old XML files
to the new properties. See the Ice manual for more information on
- the plugin.
+ the plug-in.
- Added support for new Slice metadata ("cpp:type:wstring") that
generates code to use std::wstring instead of std::string. See the
diff --git a/cpp/config/convertssl.py b/cpp/config/convertssl.py
index ddc03906e40..c03a9aa0294 100755
--- a/cpp/config/convertssl.py
+++ b/cpp/config/convertssl.py
@@ -10,7 +10,7 @@
#
# This script converts an XML configuration file for earlier versions of
-# the IceSSL plugin to the new property format in 3.1.
+# the IceSSL plug-in to the new property format in 3.1.
#
# Usage:
#
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 4c102d88ac3..dae6a523532 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -150,7 +150,7 @@ template<class Y>
ICE_API Trace& operator<<(Trace&, std::ios_base& (*)(std::ios_base&));
//
-// A special plugin that installs a logger during a communicator's initialization.
+// A special plug-in that installs a logger during a communicator's initialization.
// Both initialize and destroy are no-op. See Ice::InitializationData.
//
diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h
index 5011df19e98..4166ad7f781 100644
--- a/cpp/include/Ice/StringConverter.h
+++ b/cpp/include/Ice/StringConverter.h
@@ -107,7 +107,7 @@ private:
//
-// A special plugin that sets stringConverter and wstringConverter during
+// A special plug-in that sets stringConverter and wstringConverter during
// construction (when the provided stringConverter resp. wstringConverter
// are not null). Both initialize and destroy are no-op. See Ice::InitializationData.
//
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 4c572bb9113..6834ad7d101 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -428,10 +428,10 @@ typedef IceUtil::Handle<CertificateVerifier> CertificateVerifierPtr;
// so the application can supply an implementation of PasswordPrompt
// to take responsibility for obtaining the password.
//
-// Note that the password is needed during plugin initialization, so
+// Note that the password is needed during plug-in initialization, so
// in general you will need to delay initialization (by defining
// IceSSL.DelayInit=1), configure the PasswordPrompt, then manually
-// initialize the plugin.
+// initialize the plug-in.
//
class PasswordPrompt : public IceUtil::Shared
{
@@ -452,12 +452,12 @@ public:
//
// Establish the OpenSSL context. This must be done before the
- // plugin is initialized, therefore the application must define
+ // plug-in is initialized, therefore the application must define
// the property Ice.InitPlugins=0, set the context, and finally
// invoke initializePlugins on the PluginManager.
//
// When the application supplies its own OpenSSL context, the
- // plugin skips its normal property-based configuration.
+ // plug-in skips its normal property-based configuration.
//
virtual void setContext(SSL_CTX*) = 0;
@@ -475,7 +475,7 @@ public:
//
// Establish the password prompt object. This must be done before
- // the plugin is initialized.
+ // the plug-in is initialized.
//
virtual void setPasswordPrompt(const PasswordPromptPtr&) = 0;
};
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index dd72f15ed82..4b584274039 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -635,7 +635,7 @@ void
Ice::PluginInitializationException::ice_print(ostream& out) const
{
Exception::ice_print(out);
- out << ":\nplugin initialization failed";
+ out << ":\nplug-in initialization failed";
if(!reason.empty())
{
out << ": " << reason;
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index a41030e3065..8c7ad3ed4e8 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -757,7 +757,7 @@ void
IceInternal::Instance::setStringConverter(const Ice::StringConverterPtr& stringConverter)
{
//
- // No locking, as it can only be called during plugin loading
+ // No locking, as it can only be called during plug-in loading
//
_initData.stringConverter = stringConverter;
}
@@ -766,7 +766,7 @@ void
IceInternal::Instance::setWstringConverter(const Ice::WstringConverterPtr& wstringConverter)
{
//
- // No locking, as it can only be called during plugin loading
+ // No locking, as it can only be called during plug-in loading
//
_initData.wstringConverter = wstringConverter;
}
@@ -775,7 +775,7 @@ void
IceInternal::Instance::setLogger(const Ice::LoggerPtr& logger)
{
//
- // No locking, as it can only be called during plugin loading
+ // No locking, as it can only be called during plug-in loading
//
_initData.logger = logger;
}
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index d19e195b622..a12eff6b937 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -29,12 +29,12 @@ Ice::PluginManagerI::initializePlugins()
if(_initialized)
{
InitializationException ex(__FILE__, __LINE__);
- ex.reason = "plugins already initialized";
+ ex.reason = "plug-ins already initialized";
throw ex;
}
//
- // Invoke initialize() on the plugins, in the order they were loaded.
+ // Invoke initialize() on the plug-ins, in the order they were loaded.
//
vector<PluginPtr> initializedPlugins;
try
@@ -48,7 +48,7 @@ Ice::PluginManagerI::initializePlugins()
catch(...)
{
//
- // Destroy the plugins that have been successfully initialized, in the
+ // Destroy the plug-ins that have been successfully initialized, in the
// reverse order.
//
for(vector<PluginPtr>::reverse_iterator p = initializedPlugins.rbegin(); p != initializedPlugins.rend(); ++p)
@@ -157,8 +157,8 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
// Ice.Plugin.name[.<language>]=entry_point [args]
//
// If the Ice.PluginLoadOrder property is defined, load the
- // specified plugins in the specified order, then load any
- // remaining plugins.
+ // specified plug-ins in the specified order, then load any
+ // remaining plug-ins.
//
const string prefix = "Ice.Plugin.";
PropertiesPtr properties = _communicator->getProperties();
@@ -172,7 +172,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
if(_plugins.find(name) != _plugins.end())
{
PluginInitializationException ex(__FILE__, __LINE__);
- ex.reason = "plugin `" + name + "' already loaded";
+ ex.reason = "plug-in `" + name + "' already loaded";
throw ex;
}
@@ -194,13 +194,13 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
else
{
PluginInitializationException ex(__FILE__, __LINE__);
- ex.reason = "plugin `" + name + "' not defined";
+ ex.reason = "plug-in `" + name + "' not defined";
throw ex;
}
}
//
- // Load any remaining plugins that weren't specified in PluginLoadOrder.
+ // Load any remaining plug-ins that weren't specified in PluginLoadOrder.
//
while(!plugins.empty())
@@ -259,7 +259,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
//
// An application can set Ice.InitPlugins=0 if it wants to postpone
// initialization until after it has interacted directly with the
- // plugins.
+ // plug-ins.
//
if(properties->getPropertyAsIntWithDefault("Ice.InitPlugins", 1) > 0)
{
diff --git a/cpp/src/Ice/StringConverter.cpp b/cpp/src/Ice/StringConverter.cpp
index 6fa5382f7d6..52c9dc2ed4b 100644
--- a/cpp/src/Ice/StringConverter.cpp
+++ b/cpp/src/Ice/StringConverter.cpp
@@ -221,7 +221,7 @@ StringConverterPlugin::destroy()
}
//
-// The entry point for the "string converter" plugin built-in the Ice library
+// The entry point for the "string converter" plug-in built-in the Ice library
//
extern "C"
{
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index a3438795057..0cb8aba1c9d 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -961,7 +961,7 @@ IceBox::ServiceManagerI::createCommunicator(const string& service, Ice::StringSe
//
// Remaining command line options are passed to the communicator. This is
- // necessary for Ice plugin properties (e.g.: IceSSL).
+ // necessary for Ice plug-in properties (e.g.: IceSSL).
//
InitializationData initData;
initData.properties = properties;
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index a2d4513d735..1b55a7e2066 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -521,7 +521,7 @@ NodeService::start(int argc, char* argv[])
catch(const Ice::NotRegisteredException&)
{
//
- // Some plugin removed the Process facet, so we don't replace it.
+ // Some plug-in removed the Process facet, so we don't replace it.
// (unlikely error though)
//
}
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 1cbfccc5ee6..441e2fb8399 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -67,12 +67,12 @@ IceInternal::TransceiverPtr
IceSSL::AcceptorI::accept()
{
//
- // The plugin may not be initialized.
+ // The plug-in may not be initialized.
//
if(!_instance->context())
{
PluginInitializationException ex(__FILE__, __LINE__);
- ex.reason = "IceSSL: plugin is not initialized";
+ ex.reason = "IceSSL: plug-in is not initialized";
throw ex;
}
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 9d03d2c1a47..aa034e66a18 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -25,12 +25,12 @@ IceInternal::TransceiverPtr
IceSSL::ConnectorI::connect()
{
//
- // The plugin may not be initialized.
+ // The plug-in may not be initialized.
//
if(!_instance->context())
{
PluginInitializationException ex(__FILE__, __LINE__);
- ex.reason = "IceSSL: plugin is not initialized";
+ ex.reason = "IceSSL: plug-in is not initialized";
throw ex;
}
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index b3e0a77388f..9c4875f6267 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -233,7 +233,7 @@ IceSSL::Instance::Instance(const CommunicatorPtr& communicator) :
//
// Register the endpoint factory. We have to do this now, rather than
// in initialize, because the communicator may need to interpret
- // proxies before the plugin is fully initialized.
+ // proxies before the plug-in is fully initialized.
//
_facade->addEndpointFactory(new EndpointFactoryI(this));
@@ -662,7 +662,7 @@ IceSSL::Instance::context(SSL_CTX* context)
if(_ctx)
{
PluginInitializationException ex(__FILE__, __LINE__);
- ex.reason = "IceSSL: plugin is already initialized";
+ ex.reason = "IceSSL: plug-in is already initialized";
throw ex;
}
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index a8595334547..e06cdb2eec9 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -19,7 +19,7 @@ using namespace Ice;
using namespace IceSSL;
//
-// Plugin factory function.
+// Plug-in factory function.
//
extern "C"
{
diff --git a/cpp/test/Ice/background/Client.cpp b/cpp/test/Ice/background/Client.cpp
index 5c94441501e..d5a4512755c 100644
--- a/cpp/test/Ice/background/Client.cpp
+++ b/cpp/test/Ice/background/Client.cpp
@@ -46,7 +46,7 @@ main(int argc, char* argv[])
initData.properties->setProperty("Ice.Warn.Connections", "0");
//
- // Setup the test transport plugin.
+ // Setup the test transport plug-in.
//
initData.properties->setProperty("Ice.Plugin.Test", "TestTransport:createTestTransport");
string defaultProtocol = initData.properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp
index 97f5fefad48..76a316d2f44 100644
--- a/cpp/test/Ice/background/Server.cpp
+++ b/cpp/test/Ice/background/Server.cpp
@@ -139,7 +139,7 @@ main(int argc, char* argv[])
initData.properties->setProperty("Ice.Warn.Connections", "0");
//
- // Setup the test transport plugin.
+ // Setup the test transport plug-in.
//
initData.properties->setProperty("Ice.Plugin.Test", "TestTransport:createTestTransport");
string defaultProtocol = initData.properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:51:01 +0000