Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 26 insertions, 6 deletions

diff --git a/java/src/IceSSL/Plugin.java b/java/src/IceSSL/Plugin.java
index ecb1475bc1d..7e7aabf5651 100644
--- a/java/src/IceSSL/Plugin.java
+++ b/java/src/IceSSL/Plugin.java
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -13,13 +13,13 @@ 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);
 
     //
@@ -28,7 +28,7 @@ public interface Plugin extends Ice.Plugin
     //
     javax.net.ssl.SSLContext getContext();
 
-    // 
+    //
     // Establish the certificate verifier object. This should be
     // done before any connections are established.
     //
@@ -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);
 
@@ -51,4 +51,24 @@ public interface Plugin extends Ice.Plugin
     // callback is set.
     //
     PasswordCallback getPasswordCallback();
+
+    //
+    // Supplies an input stream for the keystore. Calling this method
+    // causes IceSSL to ignore the IceSSL.Keystore property.
+    //
+    void setKeystoreStream(java.io.InputStream stream);
+
+    //
+    // Supplies an input stream for the truststore. Calling this method
+    // causes IceSSL to ignore the IceSSL.Truststore property. It is
+    // legal to supply the same input stream as setKeystoreStream, in
+    // which case IceSSL uses the certificates contained in the keystore.
+    //
+    void setTruststoreStream(java.io.InputStream stream);
+
+    //
+    // Add an input stream for the random number seed. You may call
+    // this method multiple times if necessary.
+    //
+    void addSeedStream(java.io.InputStream stream);
 }