New initialize overloads that take a configFile instead of initData

1 files changed, 69 insertions, 1 deletions

diff --git a/java-compat/src/Ice/src/main/java/Ice/Util.java b/java-compat/src/Ice/src/main/java/Ice/Util.java
index 891f2fce97d..1ec8e1af1cb 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Util.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Util.java
@@ -117,7 +117,7 @@ public final class Util
     public static Communicator
     initialize(StringSeqHolder args)
     {
-        return initialize(args, null);
+        return initialize(args, (InitializationData)null);
     }
 
     /**
@@ -167,6 +167,32 @@ public final class Util
         return result;
     }
 
+     /**
+     * Creates a communicator.
+     *
+     * @param args A command-line argument vector. Any Ice-related options
+     * in this vector are used to intialize the communicator.
+     * This method modifies the argument vector by removing any Ice-related options.
+     *
+     * @param configFile Path to a config file that sets the new Communicator's default
+     * properties.
+     *
+     * @return The initialized communicator.
+     **/
+    public static Communicator
+    initialize(StringSeqHolder args, String configFile)
+    {
+        InitializationData initData = null;
+        if(configFile != null)
+        {
+            initData = new InitializationData();
+            initData.properties = Util.createProperties();
+            initData.properties.load(configFile);
+        }
+
+        return initialize(args, initData);
+    }
+
     /**
      * Creates a communicator.
      *
@@ -190,6 +216,26 @@ public final class Util
     /**
      * Creates a communicator.
      *
+     * @param args A command-line argument vector. Any Ice-related options
+     * in this vector are used to intialize the communicator.
+     *
+     * @param configFile Path to a config file that sets the new Communicator's default
+     * properties.
+     *
+     * @return The initialized communicator.
+     *
+     * @see InitializationData
+     **/
+    public static Communicator
+    initialize(String[] args, String configFile)
+    {
+        StringSeqHolder argsH = new StringSeqHolder(args);
+        return initialize(argsH, configFile);
+    }
+
+    /**
+     * Creates a communicator.
+     *
      * @param initData Additional intialization data.
      *
      * @return The initialized communicator.
@@ -213,6 +259,28 @@ public final class Util
         return result;
     }
 
+     /**
+     * Creates a communicator.
+     *
+     * @param configFile Path to a config file that sets the new Communicator's default
+     * properties.
+     *
+     * @return The initialized communicator.
+     **/
+    public static Communicator
+    initialize(String configFile)
+    {
+        InitializationData initData = null;
+        if(configFile != null)
+        {
+            initData = new InitializationData();
+            initData.properties = Util.createProperties();
+            initData.properties.load(configFile);
+        }
+
+        return initialize(initData);
+    }
+
     /**
      * Creates a communicator using a default configuration.
      *