Fix 3306 - Plugin -> Plug-in

12 files changed, 27 insertions, 27 deletions

diff --git a/java/CHANGES b/java/CHANGES
index 88989eece0c..28e43ac5801 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -53,8 +53,8 @@ Changes since version 3.2.0
                encapsulation) in 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
@@ -277,7 +277,7 @@ Changes since version 3.0.1
 - Added identityToString and stringToIdentity to the Communicator
   interface.
 
-- Added an SSL plugin for Java5 that supports the thread pool
+- Added an SSL plug-in for Java5 that supports the thread pool
   concurrency model.
 
 - Added support for specifying an alternate abstract type in
diff --git a/java/INSTALL b/java/INSTALL
index b6edfa9e1b5..3a78294a206 100644
--- a/java/INSTALL
+++ b/java/INSTALL
@@ -39,7 +39,7 @@ You can download Java5 and Java6 for Solaris, Windows, and Linux from:
 
 Make sure to add javac and java to your PATH.
 
-When using the Ice for Java SSL plugin (IceSSL), you may experience
+When using the Ice for Java SSL plug-in (IceSSL), you may experience
 occasional hangs. The most likely reason is that your system's entropy
 pool is empty. If you have sufficient system privileges, you can solve
 this issue by editing the following file
diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java
index f76789f4a21..0eb405f7638 100644
--- a/java/src/Ice/PluginManagerI.java
+++ b/java/src/Ice/PluginManagerI.java
@@ -19,12 +19,12 @@ public final class PluginManagerI implements PluginManager
         if(_initialized)
         {
             InitializationException ex = new InitializationException();
-            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.
         //
         java.util.List<Plugin> initializedPlugins = new java.util.ArrayList<Plugin>();
         try
@@ -40,7 +40,7 @@ public final class PluginManagerI implements PluginManager
         catch(RuntimeException ex)
         {
             //
-            // Destroy the plugins that have been successfully initialized, in the
+            // Destroy the plug-ins that have been successfully initialized, in the
             // reverse order.
             //
             java.util.ListIterator<Plugin> i = initializedPlugins.listIterator(initializedPlugins.size());
@@ -135,8 +135,8 @@ public final class PluginManagerI implements PluginManager
         // 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.
         //
         final String prefix = "Ice.Plugin.";
         Properties properties = _communicator.getProperties();
@@ -148,7 +148,7 @@ public final class PluginManagerI implements PluginManager
             if(_plugins.containsKey(loadOrder[i]))
             {
                 PluginInitializationException ex = new PluginInitializationException();
-                ex.reason = "plugin `" + loadOrder[i] + "' already loaded";
+                ex.reason = "plug-in `" + loadOrder[i] + "' already loaded";
                 throw ex;
             }
 
@@ -173,13 +173,13 @@ public final class PluginManagerI implements PluginManager
             else
             {
                 PluginInitializationException ex = new PluginInitializationException();
-                ex.reason = "plugin `" + loadOrder[i] + "' not defined";
+                ex.reason = "plug-in `" + loadOrder[i] + "' 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.isEmpty())
         {
@@ -240,7 +240,7 @@ public final class PluginManagerI implements PluginManager
         //
         // 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/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index d327c4bfa9a..87fb274fac1 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -981,7 +981,7 @@ public class ServiceManagerI extends _ServiceManagerDisp
 
         //
         // 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).
         //
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = properties;
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index e494bb9c4d7..bf5b9831311 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -556,7 +556,7 @@ public final class Instance
     setLogger(Ice.Logger 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/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java
index d07846bcc15..4ce1e5f70bf 100644
--- a/java/src/IceSSL/AcceptorI.java
+++ b/java/src/IceSSL/AcceptorI.java
@@ -47,12 +47,12 @@ final class AcceptorI implements IceInternal.Acceptor
     accept()
     {
         //
-        // The plugin may not be fully initialized.
+        // The plug-in may not be fully initialized.
         //
         if(!_instance.initialized())
         {
             Ice.PluginInitializationException ex = new Ice.PluginInitializationException();
-            ex.reason = "IceSSL: plugin is not initialized";
+            ex.reason = "IceSSL: plug-in is not initialized";
             throw ex;
         }
 
diff --git a/java/src/IceSSL/ConnectorI.java b/java/src/IceSSL/ConnectorI.java
index 51f490975eb..0da713515fd 100644
--- a/java/src/IceSSL/ConnectorI.java
+++ b/java/src/IceSSL/ConnectorI.java
@@ -15,12 +15,12 @@ final class ConnectorI implements IceInternal.Connector, java.lang.Comparable
     connect()
     {
         //
-        // The plugin may not be fully initialized.
+        // The plug-in may not be fully initialized.
         //
         if(!_instance.initialized())
         {
             Ice.PluginInitializationException ex = new Ice.PluginInitializationException();
-            ex.reason = "IceSSL: plugin is not initialized";
+            ex.reason = "IceSSL: plug-in is not initialized";
             throw ex;
         }
 
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java
index 9a53f10e9a9..9c950bae453 100644
--- a/java/src/IceSSL/Instance.java
+++ b/java/src/IceSSL/Instance.java
@@ -22,7 +22,7 @@ class Instance
         // 
         // 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));
     }
@@ -463,7 +463,7 @@ class Instance
         if(_initialized)
         {
             Ice.PluginInitializationException ex = new Ice.PluginInitializationException();
-            ex.reason = "IceSSL: plugin is already initialized";
+            ex.reason = "IceSSL: plug-in is already initialized";
             throw ex;
         }
 
diff --git a/java/src/IceSSL/PasswordCallback.java b/java/src/IceSSL/PasswordCallback.java
index 5a7cbb3db83..be1e9dff4cd 100644
--- a/java/src/IceSSL/PasswordCallback.java
+++ b/java/src/IceSSL/PasswordCallback.java
@@ -10,7 +10,7 @@
 package IceSSL;
 
 //
-// A password callback is an alternate way of supplying the plugin with
+// A password callback is an alternate way of supplying the plug-in with
 // passwords that avoids using plaintext configuration properties.
 //
 public interface PasswordCallback
diff --git a/java/src/IceSSL/Plugin.java b/java/src/IceSSL/Plugin.java
index c192b8d0953..86ef11d74f8 100644
--- a/java/src/IceSSL/Plugin.java
+++ b/java/src/IceSSL/Plugin.java
@@ -13,12 +13,12 @@ public interface Plugin extends Ice.Plugin
 {
     //
     // Establish the SSL 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 SSL context, the
-    // plugin skips its normal property-based configuration.
+    // plug-in skips its normal property-based configuration.
     // 
     void setContext(javax.net.ssl.SSLContext context);
 
@@ -42,7 +42,7 @@ public interface Plugin extends Ice.Plugin
 
     //
     // Establish the password callback object. This should be
-    // done before the plugin is initialized.
+    // done before the plug-in is initialized.
     //
     void setPasswordCallback(PasswordCallback callback);
 
diff --git a/java/test/Ice/background/Client.java b/java/test/Ice/background/Client.java
index 7631b086a2c..91a4be7dbe8 100644
--- a/java/test/Ice/background/Client.java
+++ b/java/test/Ice/background/Client.java
@@ -40,7 +40,7 @@ public class Client
             initData.properties.setProperty("Ice.Warn.Connections", "0");
 
             //
-            // Setup the test transport plugin.
+            // Setup the test transport plug-in.
             //
             initData.properties.setProperty("Ice.Plugin.Test", "PluginFactory");
             String defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java
index f444015c944..7e5cdb7d513 100644
--- a/java/test/Ice/background/Server.java
+++ b/java/test/Ice/background/Server.java
@@ -133,7 +133,7 @@ public class Server
             initData.properties.setProperty("Ice.Warn.Connections", "0");
 
             //
-            // Setup the test transport plugin.
+            // Setup the test transport plug-in.
             //
             initData.properties.setProperty("Ice.Plugin.Test", "PluginFactory");
             String defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");