Fix for bugs #542 and #1015 (default properties)

20 files changed, 161 insertions, 115 deletions

diff --git a/java/CHANGES b/java/CHANGES
index d23603a1e4a..4643ee1f504 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,6 +1,25 @@
 Changes since version 3.0.1
 ---------------------------
 
+- Removed getDefaultProperties() method, and the global default
+  properties. If you need global properties, you can easily
+  create your own global variable.
+
+- Added new createProperties() methods:
+  public static Properties
+  createProperties(StringSeqHolder args, Properties defaults)
+  public static Properties
+  createProperties(String[] args, Properties defaults)
+ 
+  "defaults" represents an optional set of default properties
+  used to initialize the new Properties object. Ice properties 
+  defined on the command-line and properties defined in the Ice
+  config file may override these default properties.
+   
+- Added a new communicator-initialization method:
+  public static Communicator
+  initialize(InitializationData initData)
+
 - Generating new streaming functions for Slice struct and enum types.
   The ice_write and ice_read member functions replace their internal
   equivalents (__write and __read).
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index 5b5a1f9e403..47f02fc58ad 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -236,11 +236,17 @@ public final class PropertiesI extends LocalObjectImpl implements Properties
 
     PropertiesI()
     {
-        loadConfig();
     }
 
-    PropertiesI(StringSeqHolder args)
+    PropertiesI(StringSeqHolder args, Properties defaults)
     {
+	if(defaults != null)
+	{
+	    _properties.putAll(defaults.getPropertiesForPrefix(""));
+	}
+	
+	boolean loadConfigFiles = false;
+
         for(int i = 0; i < args.value.length; i++)
         {
             if(args.value[i].startsWith("--Ice.Config"))
@@ -251,6 +257,8 @@ public final class PropertiesI extends LocalObjectImpl implements Properties
                     line += "=1";
                 }
                 parseLine(line.substring(2));
+		loadConfigFiles = true;
+
                 String[] arr = new String[args.value.length - 1];
                 System.arraycopy(args.value, 0, arr, 0, i);
                 if(i < args.value.length - 1)
@@ -261,7 +269,10 @@ public final class PropertiesI extends LocalObjectImpl implements Properties
             }
         }
 
-        loadConfig();
+	if(loadConfigFiles)
+	{
+	    loadConfig();
+	}
 
 	args.value = parseIceCommandLineOptions(args.value);
     }
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index c0d0426d1fa..736077d5980 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -20,54 +20,34 @@ public final class Util
     public static Properties
     createProperties(StringSeqHolder args)
     {
-        return new PropertiesI(args);
+        return new PropertiesI(args, null);
     }
 
     public static Properties
-    createProperties(String[] args)
+    createProperties(StringSeqHolder args, Properties defaults)
     {
-	StringSeqHolder argsH = new StringSeqHolder(args);
-        return createProperties(argsH);
+        return new PropertiesI(args, defaults);
     }
 
     public static Properties
-    getDefaultProperties()
-    {
-	synchronized(_defaultPropertiesMutex)
-	{
-	    if(_defaultProperties == null)
-	    {
-		_defaultProperties = createProperties();
-	    }
-	    return _defaultProperties;
-	}
-    }
-
-    public static Properties
-    getDefaultProperties(StringSeqHolder args)
+    createProperties(String[] args)
     {
-	synchronized(_defaultPropertiesMutex)
-	{
-	    if(_defaultProperties == null)
-	    {
-		_defaultProperties = createProperties(args);
-	    }
-	    return _defaultProperties;
-	}
+	StringSeqHolder argsH = new StringSeqHolder(args);
+        return createProperties(argsH);
     }
 
     public static Properties
-    getDefaultProperties(String[] args)
+    createProperties(String[] args, Properties defaults)
     {
 	StringSeqHolder argsH = new StringSeqHolder(args);
-	return getDefaultProperties(argsH);
+        return createProperties(argsH, defaults);
     }
 
+
     public static Communicator
     initialize(StringSeqHolder args)
     {
-    	InitializationData initData = new InitializationData();
-	return initialize(args, initData);
+	return initialize(args, null);
     }
 
     public static Communicator
@@ -80,14 +60,17 @@ public final class Util
     public static Communicator
     initialize(StringSeqHolder args, InitializationData initData)
     {
-        InitializationData tmpData = (InitializationData)initData.clone();
-    	if(tmpData.properties == null)
+	if(initData == null)
+	{
+	    initData = new InitializationData();
+	}
+	else
 	{
-	    tmpData.properties = getDefaultProperties(args);
+	    initData = (InitializationData)initData.clone();
 	}
-	args.value = tmpData.properties.parseIceCommandLineOptions(args.value);
+	initData.properties = createProperties(args, initData.properties);
 
-        CommunicatorI result = new CommunicatorI(tmpData);
+        CommunicatorI result = new CommunicatorI(initData);
         result.finishSetup(args);
         return result;
     }
@@ -99,6 +82,13 @@ public final class Util
 	return initialize(argsH, initData);
     }
 
+    public static Communicator
+    initialize(InitializationData initData)
+    {
+	return initialize(new String[0], initData);
+    }
+
+
     /**
      * @deprecated This method has been deprecated, use initialize instead.
      **/
@@ -377,7 +367,5 @@ public final class Util
         return new OutputStreamI(communicator);
     }
 
-    private static Properties _defaultProperties = null;
-    private static java.lang.Object _defaultPropertiesMutex = new java.lang.Object();
     private static String _localAddress = null;
 }
diff --git a/java/test/Glacier2/attack/Client.java b/java/test/Glacier2/attack/Client.java
index 001490282d2..5b31054bcea 100644
--- a/java/test/Glacier2/attack/Client.java
+++ b/java/test/Glacier2/attack/Client.java
@@ -17,11 +17,12 @@ public class Client
 	// proxies, even with regular retries disabled.
 	//
 	Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-	properties.setProperty("Ice.RetryIntervals", "-1");
+	Ice.InitializationData initData = new Ice.InitializationData();
+	initData.properties = Ice.Util.createProperties(argsH);
+	initData.properties.setProperty("Ice.RetryIntervals", "-1");
 
         AttackClient app = new AttackClient();
-        int status = app.main("Client", argsH.value);
+        int status = app.main("Client", argsH.value, initData);
 	System.gc();
         System.exit(status);
     }
diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java
index e7fd31e01cd..a34ac17ca33 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/Glacier2/router/Client.java
@@ -19,11 +19,12 @@ public class Client
 	// ConnectionLostException.
 	//
 	Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-	properties.setProperty("Ice.Warn.Connections", "0");
+	Ice.InitializationData initData = new Ice.InitializationData();
+	initData.properties = Ice.Util.createProperties(argsH);
+	initData.properties.setProperty("Ice.Warn.Connections", "0");
 
         CallbackClient app = new CallbackClient();
-        int status = app.main("Client", argsH.value);
+        int status = app.main("Client", argsH.value, initData);
 	System.gc();
         System.exit(status);
     }
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index 9cdd639e1ef..9a680ca209a 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -28,10 +28,11 @@ public class Client
         try
         {
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
+	    initData.properties.setProperty("Ice.Warn.Connections", "0");
 
-            communicator = Ice.Util.initialize(argsH);
+            communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index 6d03d4d2f0e..9607d8ecb78 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -81,14 +81,15 @@ public class Client
         try
         {
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
 
 	    //
 	    // This test aborts servers, so we don't want warnings.
 	    //
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	   initData. properties.setProperty("Ice.Warn.Connections", "0");
 
-            communicator = Ice.Util.initialize(argsH);
+	   communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index 13dd5cac5d4..945a57d480f 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -77,10 +77,12 @@ public class Server
 	    // used in the test.
 	    //
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-	    properties.setProperty("Ice.ServerIdleTime", "120"); // Two minutes.
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
 
-            communicator = Ice.Util.initialize(argsH);
+	    initData.properties.setProperty("Ice.ServerIdleTime", "120"); // Two minutes.
+
+            communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index d5f29b1d6e5..7695cc73d68 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -10,7 +10,7 @@
 public class Server
 {
     private static int
-    run(String[] args, Ice.Communicator communicator)
+    run(String[] args, Ice.Communicator communicator, Ice.InitializationData initData)
     {
 	//
 	// Register the server manager. The server manager creates a new
@@ -30,7 +30,7 @@ public class Server
 	//
 	ServerLocatorRegistry registry = new ServerLocatorRegistry();
 	registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager")));
-	Ice.Object object = new ServerManagerI(adapter, registry);
+	Ice.Object object = new ServerManagerI(adapter, registry, initData);
 	adapter.add(object, communicator.stringToIdentity("ServerManager"));
 
 	Ice.LocatorRegistryPrx registryPrx = 
@@ -53,8 +53,11 @@ public class Server
 
         try
         {
-            communicator = Ice.Util.initialize(args);
-            status = run(args, communicator);
+	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
+            communicator = Ice.Util.initialize(argsH, initData);
+            status = run(argsH.value, communicator, initData);
         }
         catch(Ice.LocalException ex)
         {
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java
index 3cad936b385..459e297ae95 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/Ice/location/ServerManagerI.java
@@ -11,17 +11,23 @@ import Test.*;
 
 public class ServerManagerI extends _ServerManagerDisp
 {
-    ServerManagerI(Ice.ObjectAdapter adapter, ServerLocatorRegistry registry)
+    ServerManagerI(Ice.ObjectAdapter adapter, ServerLocatorRegistry registry, Ice.InitializationData initData)
     {
 	_adapter = adapter;
 	_registry = registry;
 	_communicators = new java.util.ArrayList();
+	_initData = initData;
+
+	_initData.properties.setProperty("TestAdapter.Endpoints", "default");
+	_initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
+	_initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+	_initData.properties.setProperty("TestAdapter2.Endpoints", "default");
+	_initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
     }
 
     public void
     startServer(Ice.Current current)
     {
-	String[] argv = new String[0];
         java.util.Iterator i = _communicators.iterator();
 	while(i.hasNext())
 	{
@@ -39,15 +45,11 @@ public class ServerManagerI extends _ServerManagerDisp
 	// its endpoints with the locator and create references containing
 	// the adapter id instead of the endpoints.
 	//
-	Ice.Communicator serverCommunicator = Ice.Util.initialize(argv);
+	Ice.Communicator serverCommunicator = Ice.Util.initialize(_initData);
 	_communicators.add(serverCommunicator);
-	serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints", "default");
-	serverCommunicator.getProperties().setProperty("TestAdapter.AdapterId", "TestAdapter");
-	serverCommunicator.getProperties().setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+
 	Ice.ObjectAdapter adapter = serverCommunicator.createObjectAdapter("TestAdapter");
 
-	serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints", "default");
-	serverCommunicator.getProperties().setProperty("TestAdapter2.AdapterId", "TestAdapter2");
 	Ice.ObjectAdapter adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2");
 
 	Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:default -p 12010 -t 30000");
@@ -76,4 +78,5 @@ public class ServerManagerI extends _ServerManagerDisp
     private Ice.ObjectAdapter _adapter;
     private ServerLocatorRegistry _registry;
     private java.util.ArrayList _communicators;
+    private Ice.InitializationData _initData;
 }
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java
index d9fa88abc15..9d06d85ad1d 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/Ice/operations/AllTests.java
@@ -19,7 +19,7 @@ public class AllTests
     }
 
     public static Test.MyClassPrx
-    allTests(Ice.Communicator communicator, boolean collocated)
+    allTests(Ice.Communicator communicator, Ice.InitializationData initData, boolean collocated)
     {
         System.out.print("testing stringToProxy... ");
         System.out.flush();
@@ -97,8 +97,8 @@ public class AllTests
 
         System.out.print("testing twoway operations... ");
         System.out.flush();
-        Twoways.twoways(communicator, cl);
-        Twoways.twoways(communicator, derived);
+        Twoways.twoways(communicator, initData, cl);
+        Twoways.twoways(communicator, initData, derived);
         derived.opDerived();
         System.out.println("ok");
 
@@ -106,8 +106,8 @@ public class AllTests
 	{
 	    System.out.print("testing twoway operations with AMI... ");
 	    System.out.flush();
-	    TwowaysAMI.twowaysAMI(communicator, cl);
-	    TwowaysAMI.twowaysAMI(communicator, derived);
+	    TwowaysAMI.twowaysAMI(communicator, initData, cl);
+	    TwowaysAMI.twowaysAMI(communicator, initData, derived);
 	    System.out.println("ok");
 
 	    System.out.print("testing batch oneway operations... ");
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 73776337263..581c66fa01e 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -10,9 +10,9 @@
 public class Client
 {
     private static int
-    run(String[] args, Ice.Communicator communicator)
+    run(String[] args, Ice.Communicator communicator, Ice.InitializationData initData)
     {
-        Test.MyClassPrx myClass = AllTests.allTests(communicator, false);
+        Test.MyClassPrx myClass = AllTests.allTests(communicator, initData, false);
 
         System.out.print("testing server shutdown... ");
         System.out.flush();
@@ -43,24 +43,25 @@ public class Client
 	    // client side thread pool for nested AMI.
 	    //
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-	    properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-	    properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
+	    initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+	    initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
 
 	    //
 	    // We must set MessageSizeMax to an explicit values,
 	    // because we run tests to check whether
 	    // Ice.MemoryLimitException is raised as expected.
 	    //
-	    properties.setProperty("Ice.MessageSizeMax", "100");
+	    initData.properties.setProperty("Ice.MessageSizeMax", "100");
 
 	    //
 	    // We don't want connection warnings because of the timeout test.
 	    //
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	    initData.properties.setProperty("Ice.Warn.Connections", "0");
 	    
-            communicator = Ice.Util.initialize(argsH);
-            status = run(argsH.value, communicator);
+            communicator = Ice.Util.initialize(argsH, initData);
+            status = run(argsH.value, communicator, initData);
         }
         catch(Ice.LocalException ex)
         {
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index b9e984dc00d..37370eaac76 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -10,7 +10,7 @@
 public class Collocated
 {
     private static int
-    run(String[] args, Ice.Communicator communicator)
+    run(String[] args, Ice.Communicator communicator, Ice.InitializationData initData)
     {
         communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
@@ -19,7 +19,7 @@ public class Collocated
         adapter.add(new TestCheckedCastI(), communicator.stringToIdentity("context"));
 	adapter.activate();
 
-        AllTests.allTests(communicator, true);
+        AllTests.allTests(communicator, initData, true);
 
         return 0;
     }
@@ -32,8 +32,11 @@ public class Collocated
 
         try
         {
-            communicator = Ice.Util.initialize(args);
-            status = run(args, communicator);
+	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
+            communicator = Ice.Util.initialize(argsH, initData);
+            status = run(args, communicator, initData);
         }
         catch(Ice.LocalException ex)
         {
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index daf4225754b..c4587b3a49e 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -32,11 +32,12 @@ public class Server
         try
         {
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
+	    initData.properties.setProperty("Ice.Warn.Connections", "0");
 
-            communicator = Ice.Util.initialize(argsH);
-            status = run(args, communicator);
+            communicator = Ice.Util.initialize(argsH, initData);
+            status = run(argsH.value, communicator);
         }
         catch(Ice.LocalException ex)
         {
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index 63ade37abd3..a3cdb5191e9 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -19,7 +19,7 @@ class Twoways
     }
 
     static void
-    twoways(Ice.Communicator communicator, Test.MyClassPrx p)
+    twoways(Ice.Communicator communicator, Ice.InitializationData initData, Test.MyClassPrx p)
     {
         {
             p.opVoid();
@@ -626,10 +626,10 @@ class Twoways
 		//
 		// Test that default context is obtained correctly from communicator.
 		//
-		Ice.InitializationData initData = new Ice.InitializationData();
+		initData =(Ice.InitializationData)initData.clone();;
 		initData.defaultContext = new java.util.HashMap();
 		initData.defaultContext.put("a", "b");
-		Ice.Communicator communicator2 = Ice.Util.initialize(new String[0], initData);
+		Ice.Communicator communicator2 = Ice.Util.initialize(initData);
 
 		Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast(
 					communicator2.stringToProxy("test:default -p 12010 -t 10000"));
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index c6ac1634f76..3e85eeed5ac 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -298,7 +298,7 @@ class TwowaysAMI
             test(c2.ice_getIdentity().equals(_communicator.stringToIdentity("noSuchIdentity")));
             test(r.ice_getIdentity().equals(_communicator.stringToIdentity("test")));
 	    // We can't do the callbacks below in thread per connection mode.
-	    if(Ice.Util.getDefaultProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
+	    if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
 	    {
 		r.opVoid();
 		c1.opVoid();
@@ -332,6 +332,11 @@ class TwowaysAMI
 
     private static class AMI_MyClass_opStructI extends Test.AMI_MyClass_opStruct
     {
+	AMI_MyClass_opStructI(Ice.Communicator communicator)
+	{
+	    _communicator = communicator;
+	}
+
 	public void
 	ice_response(Test.Structure rso, Test.Structure so)
 	{
@@ -341,7 +346,7 @@ class TwowaysAMI
             test(so.e == Test.MyEnum.enum3);
             test(so.s.s.equals("a new string"));
 	    // We can't do the callbacks below in thread per connection mode.
-	    if(Ice.Util.getDefaultProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
+	    if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
 	    {
 		so.p.opVoid();
 	    }
@@ -361,6 +366,7 @@ class TwowaysAMI
 	}
 
 	private Callback callback = new Callback();
+	private Ice.Communicator _communicator;
     }
 
     private static class AMI_MyClass_opByteSI extends Test.AMI_MyClass_opByteS
@@ -1069,7 +1075,7 @@ class TwowaysAMI
     }
 
     static void
-    twowaysAMI(Ice.Communicator communicator, Test.MyClassPrx p)
+    twowaysAMI(Ice.Communicator communicator, Ice.InitializationData initData, Test.MyClassPrx p)
     {
         {
 	    // Check that a call to a void operation raises TwowayOnlyException
@@ -1169,7 +1175,7 @@ class TwowaysAMI
             si2.s = new Test.AnotherStruct();
             si2.s.s = "def";
 	    
-	    AMI_MyClass_opStructI cb = new AMI_MyClass_opStructI();
+	    AMI_MyClass_opStructI cb = new AMI_MyClass_opStructI(communicator);
 	    p.opStruct_async(cb, si1, si2);
 	    test(cb.check());
 	}
@@ -1448,10 +1454,10 @@ class TwowaysAMI
 		//
 		// Test that default context is obtained correctly from communicator.
 		//
-                Ice.InitializationData initData = new Ice.InitializationData();
+                initData = (Ice.InitializationData)initData.clone();
                 initData.defaultContext = new java.util.HashMap();
                 initData.defaultContext.put("a", "b");
-                Ice.Communicator communicator2 = Ice.Util.initialize(new String[0], initData);
+                Ice.Communicator communicator2 = Ice.Util.initialize(initData);
 
 		Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast(
 						communicator2.stringToProxy("test:default -p 12010 -t 10000"));
diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java
index f4e1f85d398..dcfe6be3c3b 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -32,10 +32,12 @@ public class Server
         try
         {
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
 
-            communicator = Ice.Util.initialize(argsH);
+	    initData.properties.setProperty("Ice.Warn.Connections", "0");
+
+            communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/java/test/Ice/retry/Client.java b/java/test/Ice/retry/Client.java
index 4557396a93c..67b310d1925 100644
--- a/java/test/Ice/retry/Client.java
+++ b/java/test/Ice/retry/Client.java
@@ -26,19 +26,20 @@ public class Client
         try
         {
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
 
 	    //
 	    // For this test, we want to disable retries.
 	    //
-	    properties.setProperty("Ice.RetryIntervals", "-1");
-
-            communicator = Ice.Util.initialize(argsH);
+	    initData.properties.setProperty("Ice.RetryIntervals", "-1");
 
 	    //
 	    // We don't want connection warnings because of the timeout test.
 	    //
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	    initData.properties.setProperty("Ice.Warn.Connections", "0");
+
+            communicator = Ice.Util.initialize(argsH, initData);
 	    
             status = run(argsH.value, communicator, System.out);
         }
diff --git a/java/test/Ice/timeout/Client.java b/java/test/Ice/timeout/Client.java
index 0764bc8d0b3..9ab05d22cd4 100644
--- a/java/test/Ice/timeout/Client.java
+++ b/java/test/Ice/timeout/Client.java
@@ -26,24 +26,25 @@ public class Client
 	try
 	{
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
 
 	    //
 	    // For this test, we want to disable retries.
 	    //
-	    properties.setProperty("Ice.RetryIntervals", "-1");
+	    initData.properties.setProperty("Ice.RetryIntervals", "-1");
 
 	    //
 	    // This test kills connections, so we don't want warnings.
 	    //
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	    initData.properties.setProperty("Ice.Warn.Connections", "0");
 
 	    //
 	    // Check for AMI timeouts every second.
 	    //
-	    properties.setProperty("Ice.MonitorConnections", "1");
+	    initData.properties.setProperty("Ice.MonitorConnections", "1");
 
-	    communicator = Ice.Util.initialize(argsH);
+	    communicator = Ice.Util.initialize(argsH, initData);
 	    status = run(argsH.value, communicator, System.out);
 	}
 	catch(Ice.LocalException ex)
diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java
index 94d7baa75db..a6ed62b6825 100644
--- a/java/test/Ice/timeout/Server.java
+++ b/java/test/Ice/timeout/Server.java
@@ -39,14 +39,15 @@ public class Server
 	try
 	{
 	    Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-	    Ice.Properties properties = Ice.Util.getDefaultProperties(argsH);
-
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.properties = Ice.Util.createProperties(argsH);
+	
 	    //
 	    // This test kills connections, so we don't want warnings.
 	    //
-	    properties.setProperty("Ice.Warn.Connections", "0");
+	    initData.properties.setProperty("Ice.Warn.Connections", "0");
 
-	    communicator = Ice.Util.initialize(argsH);
+	    communicator = Ice.Util.initialize(argsH, initData);
 	    status = run(argsH.value, communicator, System.out);
 	}
 	catch(Ice.LocalException ex)