Bug 803 - Changed communicator initialzation

6 files changed, 94 insertions, 138 deletions

diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index bb087ef372f..19b8f86a150 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -12,12 +12,6 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-	//
-	// For this test, we need a dummy logger, otherwise the
-	// assertion test will print an error message.
-	//
-	communicator.setLogger(new DummyLogger());
-
         Ice.Properties properties = communicator.getProperties();
 	// We don't need to disable warnings, because we have a dummy logger.
         //properties.setProperty("Ice.Warn.Dispatch", "0");
@@ -38,7 +32,14 @@ public class Server
 
         try
         {
-            communicator = Ice.Util.initialize(args);
+	    //
+	    // For this test, we need a dummy logger, otherwise the
+	    // assertion test will print an error message.
+	    //
+            Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.logger = new DummyLogger();
+
+            communicator = Ice.Util.initialize(args, initData);
             status = run(args, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java
index bb087ef372f..be5e6b6f7df 100644
--- a/java/test/Ice/exceptionsAMD/Server.java
+++ b/java/test/Ice/exceptionsAMD/Server.java
@@ -12,12 +12,6 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-	//
-	// For this test, we need a dummy logger, otherwise the
-	// assertion test will print an error message.
-	//
-	communicator.setLogger(new DummyLogger());
-
         Ice.Properties properties = communicator.getProperties();
 	// We don't need to disable warnings, because we have a dummy logger.
         //properties.setProperty("Ice.Warn.Dispatch", "0");
@@ -38,7 +32,14 @@ public class Server
 
         try
         {
-            communicator = Ice.Util.initialize(args);
+	    //
+	    // For this test, we need a dummy logger, otherwise the
+	    // assertion test will print an error message.
+	    //
+	    Ice.InitializationData initData = new Ice.InitializationData();
+	    initData.logger = new DummyLogger();
+
+            communicator = Ice.Util.initialize(args, initData);
             status = run(args, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index d02746e7f7d..7a6967afc54 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/Ice/location/Client.java
@@ -24,9 +24,10 @@ public class Client
 
         try
         {
-            Ice.Properties properties = Ice.Util.createProperties(args);
-	    properties.setProperty("Ice.Default.Locator", "locator:default -p 12010");
-            communicator = Ice.Util.initializeWithProperties(args, properties);
+	    Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = Ice.Util.createProperties(args);
+	    initData.properties.setProperty("Ice.Default.Locator", "locator:default -p 12010");
+            communicator = Ice.Util.initialize(args, initData);
             status = run(args, communicator);
         }
         catch (Ice.LocalException ex)
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index 56ef358b7eb..c39aa334315 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -17,6 +17,7 @@ public class Collocated
         Ice.Identity id = Ice.Util.stringToIdentity("test");
         adapter.add(new MyDerivedClassI(adapter, id), id);
         adapter.add(new TestCheckedCastI(), Ice.Util.stringToIdentity("context"));
+	adapter.activate();
 
         AllTests.allTests(communicator, true);
 
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index f46aedab62e..b8e62ca877d 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -598,69 +598,56 @@ class Twoways
         }
 
 	{
-	    java.util.HashMap ctx = new java.util.HashMap();
-	    ctx.put("one", "ONE");
-	    ctx.put("two", "TWO");
-	    ctx.put("three", "THREE");
 	    {
-		test(p.ice_getContext().isEmpty());
-		java.util.Map r = p.opContext();
-		test(!r.equals(ctx));
-	    }
-	    {
-		java.util.Map r = p.opContext(ctx);
-		test(p.ice_getContext().isEmpty());
-		test(r.equals(ctx));
-	    }
-	    {
-		Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-		test(p2.ice_getContext().equals(ctx));
-		java.util.Map r = p2.opContext();
-		test(r.equals(ctx));
-		r = p2.opContext(ctx);
-		test(r.equals(ctx));
+	        java.util.HashMap ctx = new java.util.HashMap();
+	        ctx.put("one", "ONE");
+	        ctx.put("two", "TWO");
+	        ctx.put("three", "THREE");
+	        {
+		    test(p.ice_getContext().isEmpty());
+		    java.util.Map r = p.opContext();
+		    test(!r.equals(ctx));
+	        }
+	        {
+		    java.util.Map r = p.opContext(ctx);
+		    test(p.ice_getContext().isEmpty());
+		    test(r.equals(ctx));
+	        }
+	        {
+		    Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+		    test(p2.ice_getContext().equals(ctx));
+		    java.util.Map r = p2.opContext();
+		    test(r.equals(ctx));
+		    r = p2.opContext(ctx);
+		    test(r.equals(ctx));
+	        }
 	    }
 	    {
 		//
 		// Test that default context is obtained correctly from communicator.
 		//
-		java.util.HashMap dflt = new java.util.HashMap();
-		dflt.put("a", "b");
-		communicator.setDefaultContext(dflt);
-		test(!p.opContext().equals(dflt));
-
-		Test.MyClassPrx p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
-		test(p2.opContext().isEmpty());
+		Ice.InitializationData initData = new Ice.InitializationData();
+		initData.defaultContext = new java.util.HashMap();
+		initData.defaultContext.put("a", "b");
+		Ice.Communicator communicator2 = Ice.Util.initialize(new String[0], initData);
 
-		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
-		test(p2.opContext().equals(dflt));
-
-		communicator.setDefaultContext(new java.util.HashMap());
-		test(!p2.opContext().isEmpty());
-
-		communicator.setDefaultContext(dflt);
 		Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast(
-					communicator.stringToProxy("test:default -p 12010 -t 10000"));
-		test(c.opContext().equals(dflt));
+					communicator2.stringToProxy("test:default -p 12010 -t 10000"));
+		test(c.opContext().equals(initData.defaultContext));
 
-		dflt.put("a", "c");
-		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
+		java.util.Map ctx = new java.util.HashMap();
+		ctx.put("a", "c");
+		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(ctx));
 		test(c2.opContext().get("a").equals("c"));
 
-		dflt.clear();
-		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
+		ctx.clear();
+		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(ctx));
 		test(c3.opContext().get("a") == null);
 
 		Test.MyClassPrx c4 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_defaultContext());
 		test(c4.opContext().get("a").equals("b"));
 
-		dflt.put("a", "d");
-		communicator.setDefaultContext(dflt);
-
-		Test.MyClassPrx c5 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_defaultContext());
-		test(c5.opContext().get("a").equals("d"));
-
-		communicator.setDefaultContext(new java.util.HashMap());
+		communicator2.destroy();
 	    }
 	}
 
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index 71db5081182..746b9513bd0 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -1407,72 +1407,48 @@ class TwowaysAMI
 	}
 
 	{
-	    java.util.Map ctx = new java.util.HashMap();
-	    ctx.put("one", "ONE");
-	    ctx.put("two", "TWO");
-	    ctx.put("three", "THREE");
 	    {
-		test(p.ice_getContext().isEmpty());
-		AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(ctx);
-		p.opContext_async(cb);
-		test(cb.check());
-	    }
-	    {
-		test(p.ice_getContext().isEmpty());
-		AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		p.opContext_async(cb, ctx);
-		test(cb.check());
-	    }
-	    Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-	    test(p2.ice_getContext().equals(ctx));
-	    {
-		AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		p2.opContext_async(cb);
-		test(cb.check());
-	    }
-	    {
-		AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		p2.opContext_async(cb, ctx);
-		test(cb.check());
-	    }
-
-	    {
-		//
-		// Test that default context is obtained correctly from communicator.
-		//
-		java.util.HashMap dflt = new java.util.HashMap();
-		dflt.put("a", "b");
-		communicator.setDefaultContext(dflt);
-		{
-		    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(dflt);
+	        java.util.Map ctx = new java.util.HashMap();
+	        ctx.put("one", "ONE");
+	        ctx.put("two", "TWO");
+	        ctx.put("three", "THREE");
+	        {
+		    test(p.ice_getContext().isEmpty());
+		    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(ctx);
 		    p.opContext_async(cb);
 		    test(cb.check());
-		}
-
-		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(new java.util.HashMap());
-		    p2.opContext_async(cb);
+	        }
+	        {
+		    test(p.ice_getContext().isEmpty());
+		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
+		    p.opContext_async(cb, ctx);
 		    test(cb.check());
-		}
-
-		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(dflt);
+	        }
+	        Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+	        test(p2.ice_getContext().equals(ctx));
+	        {
+		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
 		    p2.opContext_async(cb);
 		    test(cb.check());
-		}
-
-		communicator.setDefaultContext(new java.util.HashMap());
-		{
-		    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(new java.util.HashMap());
-		    p2.opContext_async(cb);
+	        }
+	        {
+		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
+		    p2.opContext_async(cb, ctx);
 		    test(cb.check());
-		}
+	        }
+	    }
+
+	    {
+		//
+		// Test that default context is obtained correctly from communicator.
+		//
+                Ice.InitializationData initData = new Ice.InitializationData();
+                initData.defaultContext = new java.util.HashMap();
+                initData.defaultContext.put("a", "b");
+                Ice.Communicator communicator2 = Ice.Util.initialize(new String[0], initData);
 
-		communicator.setDefaultContext(dflt);
 		Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast(
-						communicator.stringToProxy("test:default -p 12010 -t 10000"));
+						communicator2.stringToProxy("test:default -p 12010 -t 10000"));
 		{
 		    java.util.HashMap tmp = new java.util.HashMap();
 		    tmp.put("a", "b");
@@ -1481,8 +1457,9 @@ class TwowaysAMI
 		    test(cb.check());
 		}
 
-		dflt.put("a", "c");
-		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
+		java.util.HashMap ctx = new java.util.HashMap();
+		ctx.put("a", "c");
+		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(ctx));
 		{
 		    java.util.HashMap tmp = new java.util.HashMap();
 		    tmp.put("a", "c");
@@ -1491,8 +1468,8 @@ class TwowaysAMI
 		    test(cb.check());
 		}
 
-		dflt.clear();
-		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
+		ctx.clear();
+		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(ctx));
 		{
 		    java.util.HashMap tmp = new java.util.HashMap();
 		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
@@ -1509,19 +1486,7 @@ class TwowaysAMI
 		    test(cb.check());
 		}
 
-		dflt.put("a", "d");
-		communicator.setDefaultContext(dflt);
-
-		Test.MyClassPrx c5 = Test.MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
-		{
-		    java.util.HashMap tmp = new java.util.HashMap();
-		    tmp.put("a", "d");
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-		    c5.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		communicator.setDefaultContext(new java.util.HashMap());
+	        communicator2.destroy();
 	    }
 	}