Tests now use the JAD file task and will read proxy references from

    configuration if so provided, otherwise they will use defaults.

14 files changed, 62 insertions, 54 deletions

diff --git a/javae/test/IceE/adapterDeactivation/build.xml b/javae/test/IceE/adapterDeactivation/build.xml
index 63a463c8baf..e1e55c06ccc 100644
--- a/javae/test/IceE/adapterDeactivation/build.xml
+++ b/javae/test/IceE/adapterDeactivation/build.xml
@@ -64,7 +64,7 @@
     <!-- Write the descriptor files -->
     <target name="server-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="server.jad">
+	<jadfile file="server.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -77,12 +77,12 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="client-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="client.jad">
+	<jadfile file="client.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -95,12 +95,12 @@
 	    <attribute name="runserver" value="false"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="colloc-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="colloc.jad">
+	<jadfile file="colloc.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -109,9 +109,8 @@
 	    <attribute name="MIDlet-1" value="TestApplication, , TestApplication"/>
 	    <attribute name="MIDlet-Jar-Size" value="${jarfile-length}"/>
 	    <attribute name="MIDlet-Name" value="TestServer"/>
-	    <attribute name="MIDlet-Permissions" 
-		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+	    <attribute name="MIDlet-Permissions" value="javax.microedition.io.Connector.socket"/>
+        </jadfile>
     </target>
 
     <target name="midlets" depends="midlet-jar, server-midlet, client-midlet, colloc-midlet"/>
diff --git a/javae/test/IceE/common/TestApplication.java b/javae/test/IceE/common/TestApplication.java
index 1c6e596a4bf..2231ac92586 100644
--- a/javae/test/IceE/common/TestApplication.java
+++ b/javae/test/IceE/common/TestApplication.java
@@ -229,18 +229,22 @@ public class TestApplication
 	}
 	catch(Exception ex)
 	{
-	    ex.printStackTrace();
+	    javax.microedition.lcdui.Alert a = 
+		new javax.microedition.lcdui.Alert("startApp alert", ex.getMessage(),
+			null, javax.microedition.lcdui.AlertType.ERROR);
+	    a.setTimeout(javax.microedition.lcdui.Alert.FOREVER);
+	    _display.setCurrent(a);
 	    throw new javax.microedition.midlet.MIDletStateChangeException(ex.getMessage());
 	}
 
 	if(_colloc != null)
 	{
-	    _display.setCurrent(_outList);
+	    message("Starting up colloc");
 	    new Thread(_colloc).start();
+	    message("Colloc started");
 	}
 	else if(_server != null)
 	{
-	    _display.setCurrent(_outList);
 	    new Thread(_server).start();
 	}
     }
diff --git a/javae/test/IceE/exceptions/AllTests.java b/javae/test/IceE/exceptions/AllTests.java
index 557bad3e2b9..3b5769c516a 100644
--- a/javae/test/IceE/exceptions/AllTests.java
+++ b/javae/test/IceE/exceptions/AllTests.java
@@ -94,7 +94,8 @@ public class AllTests
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "thrower:default -p 12345 -t 10000";
+        String ref = communicator.getProperties().getPropertyWithDefault("Test.Proxy", 
+		"thrower:default -p 12345 -t 10000");
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/javae/test/IceE/exceptions/build.xml b/javae/test/IceE/exceptions/build.xml
index adae90d03ca..5c902651002 100644
--- a/javae/test/IceE/exceptions/build.xml
+++ b/javae/test/IceE/exceptions/build.xml
@@ -64,7 +64,7 @@
     <!-- Write the descriptor files -->
     <target name="server-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="server.jad">
+	<jadfile file="server.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -77,12 +77,12 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="client-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="client.jad">
+	<jadfile file="client.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -95,12 +95,12 @@
 	    <attribute name="runserver" value="false"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="colloc-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="colloc.jad">
+	<jadfile file="colloc.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -111,7 +111,7 @@
 	    <attribute name="MIDlet-Name" value="TestServer"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="midlets" depends="midlet-jar, server-midlet, client-midlet, colloc-midlet"/>
diff --git a/javae/test/IceE/facets/AllTests.java b/javae/test/IceE/facets/AllTests.java
index 68b1ef7ba92..63ebf721723 100644
--- a/javae/test/IceE/facets/AllTests.java
+++ b/javae/test/IceE/facets/AllTests.java
@@ -79,7 +79,7 @@ public class AllTests
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "d:default -p 12345 -t 10000";
+        String ref = communicator.getProperties().getPropertyWithDefault("Test.Proxy", "d:default -p 12345 -t 10000");
         Ice.ObjectPrx db = communicator.stringToProxy(ref);
         test(db != null);
         out.println("ok");
diff --git a/javae/test/IceE/facets/build.xml b/javae/test/IceE/facets/build.xml
index 04fe0897cc9..4ff6bb0dad0 100644
--- a/javae/test/IceE/facets/build.xml
+++ b/javae/test/IceE/facets/build.xml
@@ -64,7 +64,7 @@
     <!-- Write the descriptor files -->
     <target name="server-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="server.jad">
+	<jadfile file="server.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -77,12 +77,12 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="client-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="client.jad">
+	<jadfile file="client.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -95,12 +95,12 @@
 	    <attribute name="runserver" value="false"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="colloc-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="colloc.jad">
+	<jadfile file="colloc.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -111,7 +111,7 @@
 	    <attribute name="MIDlet-Name" value="TestServer"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="midlets" depends="midlet-jar, server-midlet, client-midlet, colloc-midlet"/>
diff --git a/javae/test/IceE/inheritance/AllTests.java b/javae/test/IceE/inheritance/AllTests.java
index ac7194c5b85..4ee8d3092e3 100644
--- a/javae/test/IceE/inheritance/AllTests.java
+++ b/javae/test/IceE/inheritance/AllTests.java
@@ -23,7 +23,8 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:default -p 12345 -t 10000";
+        String ref = communicator.getProperties().getPropertyWithDefault("Test.Proxy", 
+		"initial:default -p 12345 -t 10000");
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/javae/test/IceE/inheritance/build.xml b/javae/test/IceE/inheritance/build.xml
index 2a8078af2e3..2f5be87c262 100644
--- a/javae/test/IceE/inheritance/build.xml
+++ b/javae/test/IceE/inheritance/build.xml
@@ -64,7 +64,7 @@
     <!-- Write the descriptor files -->
     <target name="server-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="server.jad">
+	<jadfile file="server.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -77,12 +77,12 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="client-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="client.jad">
+	<jadfile file="client.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -95,12 +95,12 @@
 	    <attribute name="runserver" value="false"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="colloc-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="colloc.jad">
+	<jadfile file="colloc.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -111,7 +111,7 @@
 	    <attribute name="MIDlet-Name" value="TestServer"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="midlets" depends="midlet-jar, server-midlet, client-midlet, colloc-midlet"/>
diff --git a/javae/test/IceE/location/AllTests.java b/javae/test/IceE/location/AllTests.java
index e5b989288fc..a3b510284e2 100644
--- a/javae/test/IceE/location/AllTests.java
+++ b/javae/test/IceE/location/AllTests.java
@@ -23,8 +23,9 @@ public class AllTests
     public static void
     allTests(Ice.Communicator communicator, java.io.PrintStream out)
     {
-	ServerManagerPrx manager = ServerManagerPrxHelper.checkedCast(
-	    communicator.stringToProxy("ServerManager :default -t 10000 -p 12345"));
+	String serverManagerRef = communicator.getProperties().getPropertyWithDefault("Test.ServerManager", 
+	    "ServerManager :default -t 10000 -p 12345");
+	ServerManagerPrx manager = ServerManagerPrxHelper.checkedCast(communicator.stringToProxy(serverManagerRef));
 	test(manager != null);
 
 	out.print("testing stringToProxy... ");
diff --git a/javae/test/IceE/location/build.xml b/javae/test/IceE/location/build.xml
index 6b8c6a0331d..9a70e348678 100644
--- a/javae/test/IceE/location/build.xml
+++ b/javae/test/IceE/location/build.xml
@@ -65,7 +65,7 @@
     <!-- Write the descriptor files -->
     <target name="server-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="server.jad">
+	<jadfile file="server.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -78,12 +78,12 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="client-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="client.jad">
+	<jadfile file="client.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -96,12 +96,12 @@
 	    <attribute name="runserver" value="false"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="colloc-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="colloc.jad">
+	<jadfile file="colloc.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -114,7 +114,7 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="midlets" depends="midlet-jar, server-midlet, client-midlet, colloc-midlet"/>
diff --git a/javae/test/IceE/operations/AllTests.java b/javae/test/IceE/operations/AllTests.java
index 07267d5dd9f..76a45c69788 100644
--- a/javae/test/IceE/operations/AllTests.java
+++ b/javae/test/IceE/operations/AllTests.java
@@ -23,7 +23,8 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:default -p 12345 -t 10000";
+        String ref = communicator.getProperties().getPropertyWithDefault("Test.Proxy", 
+		"test:default -p 12345 -t 10000");
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/javae/test/IceE/operations/build.xml b/javae/test/IceE/operations/build.xml
index 236e8c79e19..a91c4b7bfa6 100644
--- a/javae/test/IceE/operations/build.xml
+++ b/javae/test/IceE/operations/build.xml
@@ -68,7 +68,7 @@
     <!-- Write the descriptor files -->
     <target name="server-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="server.jad">
+	<jadfile file="server.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -81,12 +81,12 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="client-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="client.jad">
+	<jadfile file="client.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -99,12 +99,12 @@
 	    <attribute name="runserver" value="false"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="colloc-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="colloc.jad">
+	<jadfile file="colloc.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -115,7 +115,7 @@
 	    <attribute name="MIDlet-Name" value="TestServer"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="midlets" depends="midlet-jar, server-midlet, client-midlet, colloc-midlet"/>
diff --git a/javae/test/IceE/package/AllTests.java b/javae/test/IceE/package/AllTests.java
index 851fb78ccce..8e71ab18de3 100644
--- a/javae/test/IceE/package/AllTests.java
+++ b/javae/test/IceE/package/AllTests.java
@@ -23,7 +23,8 @@ public class AllTests
     {
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:default -p 12345 -t 10000";
+        String ref = communicator.getProperties().getPropertyWithDefault("Test.Proxy", 
+		"initial:default -p 12345 -t 10000");
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff --git a/javae/test/IceE/package/build.xml b/javae/test/IceE/package/build.xml
index 1fa2cbd4c23..56d6fc9fb01 100644
--- a/javae/test/IceE/package/build.xml
+++ b/javae/test/IceE/package/build.xml
@@ -67,7 +67,7 @@
     <!-- Write the descriptor files -->
     <target name="server-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="server.jad">
+	<jadfile file="server.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -80,12 +80,12 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="client-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="client.jad">
+	<jadfile file="client.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -98,12 +98,12 @@
 	    <attribute name="runserver" value="false"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="colloc-midlet" if="midp">
 	<length property="jarfile-length" file="./TestMIDlet.jar"/>
-	<manifest file="colloc.jad">
+	<jadfile file="colloc.jad">
 	    <attribute name="MIDlet-Version" value="1.0"/>
             <attribute name="MIDlet-Vendor" value="ZeroC"/>
 	    <attribute name="MIDlet-Jar-URL" value="TestMIDlet.jar"/>
@@ -116,7 +116,7 @@
 	    <attribute name="runserver" value="true"/>
 	    <attribute name="MIDlet-Permissions" 
 		value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
-        </manifest>
+        </jadfile>
     </target>
 
     <target name="midlets" depends="midlet-jar, server-midlet, client-midlet, colloc-midlet"/>