fix

27 files changed, 27 insertions, 27 deletions

diff --git a/java/allTests.py b/java/allTests.py
index f5d1dd060f4..1fd25537f26 100755
--- a/java/allTests.py
+++ b/java/allTests.py
@@ -40,7 +40,7 @@ def runTests(tests, num = 0):
 	print
 
 	try:
-	    execfile(os.path.join(dir, "run.py"))
+	    os.system(os.path.join(dir, "run.py"))
 	except SystemExit, (status,):
 	    if status:
 		if(num > 0):
diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java
index 5cce7ca3788..8a9a23ffc7d 100644
--- a/java/test/Glacier/starter/CallbackClient.java
+++ b/java/test/Glacier/starter/CallbackClient.java
@@ -88,7 +88,7 @@ class CallbackClient extends Ice.Application
 
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        ref = "callback:tcp -p 12345 -t 5000";
+        ref = "callback:tcp -p 12345 -t 10000";
         Ice.ObjectPrx base = communicator().stringToProxy(ref);
         System.out.println("ok");
 
diff --git a/java/test/Glacier/starter/CallbackServer.java b/java/test/Glacier/starter/CallbackServer.java
index fb664fe4b65..4d0444c508a 100644
--- a/java/test/Glacier/starter/CallbackServer.java
+++ b/java/test/Glacier/starter/CallbackServer.java
@@ -17,7 +17,7 @@ class CallbackServer extends Ice.Application
     public int
     run(String[] args)
     {
-	communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12345 -t 2000");
+	communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
         CallbackPrx self = CallbackPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("callback")));
         adapter.add(new CallbackI(communicator()), Ice.Util.stringToIdentity("callback"));
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java
index 75f4fcda901..db0ff7a6294 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/Ice/adapterDeactivation/AllTests.java
@@ -28,7 +28,7 @@ public class AllTests
     {
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        String ref = "test:default -p 12345 -t 2000";
+        String ref = "test:default -p 12345 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         System.out.println("ok");
diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java
index 150e6b85b56..f75fdd306b3 100644
--- a/java/test/Ice/adapterDeactivation/Collocated.java
+++ b/java/test/Ice/adapterDeactivation/Collocated.java
@@ -19,7 +19,7 @@ public class Collocated
         public int
         run(String[] args)
         {
-            communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+            communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
             Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
             Ice.ServantLocator locator = new ServantLocatorI();
             adapter.addServantLocator(locator, "");
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java
index 89a9fb05f69..ea4374e7d06 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/Ice/adapterDeactivation/Server.java
@@ -19,7 +19,7 @@ public class Server
         public int
         run(String[] args)
         {
-            communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+            communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
             Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
             Ice.ServantLocator locator = new ServantLocatorI();
             adapter.addServantLocator(locator, "");
diff --git a/java/test/Ice/custom/AllTests.java b/java/test/Ice/custom/AllTests.java
index 4b3a6f7765b..f5252a2e25f 100644
--- a/java/test/Ice/custom/AllTests.java
+++ b/java/test/Ice/custom/AllTests.java
@@ -28,7 +28,7 @@ public class AllTests
     {
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        String ref = "test:default -p 12345 -t 2000";
+        String ref = "test:default -p 12345 -t 10000";
         Ice.ObjectPrx obj = communicator.stringToProxy(ref);
         test(obj != null);
         System.out.println("ok");
diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java
index a14fd8df870..f61d9684c09 100644
--- a/java/test/Ice/custom/Collocated.java
+++ b/java/test/Ice/custom/Collocated.java
@@ -17,7 +17,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object test = new TestI(communicator);
         adapter.add(test, Ice.Util.stringToIdentity("test"));
diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java
index c8317847b6d..5968d2c855e 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/Ice/custom/Server.java
@@ -17,7 +17,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object test = new TestI(communicator);
         adapter.add(test, Ice.Util.stringToIdentity("test"));
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index 16938281a36..a04e6441396 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -780,7 +780,7 @@ public class AllTests
 
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        String ref = "thrower:default -p 12345 -t 2000";
+        String ref = "thrower:default -p 12345 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         System.out.println("ok");
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index 85c5113836d..4344d094c80 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -17,7 +17,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("thrower"));
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index 63941406f66..b768ecfa37a 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -19,7 +19,7 @@ public class Server
     {
         Ice.Properties properties = communicator.getProperties();
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("thrower"));
diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java
index 63941406f66..b768ecfa37a 100644
--- a/java/test/Ice/exceptionsAMD/Server.java
+++ b/java/test/Ice/exceptionsAMD/Server.java
@@ -19,7 +19,7 @@ public class Server
     {
         Ice.Properties properties = communicator.getProperties();
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("thrower"));
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index 1c367fa1fa3..0bcb8376470 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -56,7 +56,7 @@ public class AllTests
 
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        String ref = "d:default -p 12345 -t 2000";
+        String ref = "d:default -p 12345 -t 10000";
         Ice.ObjectPrx db = communicator.stringToProxy(ref);
         test(db != null);
         System.out.println("ok");
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index d8cc138405d..d0bad345fa0 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/Ice/facets/Collocated.java
@@ -17,7 +17,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object d = new DI();
         adapter.add(d, Ice.Util.stringToIdentity("d"));
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index 52339e0db29..9978c2562e0 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -17,7 +17,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object d = new DI();
         adapter.add(d, Ice.Util.stringToIdentity("d"));
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index 611d22e6e72..458eab30544 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -31,7 +31,7 @@ public class AllTests
         String ref = "test";
         for(int i = 0; i < ports.length; i++)
         {
-            ref += ":default -t 4000 -p " + ports[i];
+            ref += ":default -t 10000 -p " + ports[i];
         }
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java
index d15d4d9dda1..e35f23d6d99 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/Ice/inheritance/AllTests.java
@@ -28,7 +28,7 @@ public class AllTests
     {
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        String ref = "initial:default -p 12345 -t 2000";
+        String ref = "initial:default -p 12345 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         System.out.println("ok");
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index 4b119c900e1..328e9909e98 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/Ice/inheritance/Collocated.java
@@ -17,7 +17,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new InitialI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("initial"));
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 70782dba39b..5a9492c6fa0 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -17,7 +17,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new InitialI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("initial"));
diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java
index 7645a5e6dcc..a24e22f2ddf 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/Ice/objects/AllTests.java
@@ -28,7 +28,7 @@ public class AllTests
     {
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        String ref = "initial:default -p 12345 -t 2000";
+        String ref = "initial:default -p 12345 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         System.out.println("ok");
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index c8448330b4d..60420128eb5 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -17,7 +17,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Initial initial = new InitialI(adapter);
         adapter.add(initial, Ice.Util.stringToIdentity("initial"));
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 70782dba39b..5a9492c6fa0 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -17,7 +17,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new InitialI(adapter);
         adapter.add(object, Ice.Util.stringToIdentity("initial"));
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java
index 2e56ca5ce9c..5fd0cf03cb8 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/Ice/operations/AllTests.java
@@ -28,7 +28,7 @@ public class AllTests
     {
         System.out.print("testing stringToProxy... ");
         System.out.flush();
-        String ref = "test:default -p 12345 -t 2000";
+        String ref = "test:default -p 12345 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         System.out.println("ok");
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index 855a467dec5..baa09ed9b8b 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -17,7 +17,7 @@ public class Collocated
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new MyDerivedClassI(adapter, Ice.Util.stringToIdentity("test"));
         adapter.add(object, Ice.Util.stringToIdentity("test"));
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index 444c02e70fc..89d7270e981 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -17,7 +17,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new MyDerivedClassI(adapter, Ice.Util.stringToIdentity("test"));
         adapter.add(object, Ice.Util.stringToIdentity("test"));
diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java
index 444c02e70fc..89d7270e981 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -17,7 +17,7 @@ public class Server
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new MyDerivedClassI(adapter, Ice.Util.stringToIdentity("test"));
         adapter.add(object, Ice.Util.stringToIdentity("test"));