diff --git a/mozilla/java/build.xml b/mozilla/java/build.xml
index 19a4e080159..58294f704c9 100644
--- a/mozilla/java/build.xml
+++ b/mozilla/java/build.xml
@@ -30,7 +30,7 @@
-
+
@@ -57,6 +57,7 @@
+
diff --git a/mozilla/java/dist/build.xml b/mozilla/java/dist/build.xml
index 56063f2ffea..dd11064318b 100644
--- a/mozilla/java/dist/build.xml
+++ b/mozilla/java/dist/build.xml
@@ -152,7 +152,9 @@
-
+
+
+
diff --git a/mozilla/java/dist/netbeans/build.xml b/mozilla/java/dist/netbeans/build.xml
index 94912cc38f2..b245bb651e1 100755
--- a/mozilla/java/dist/netbeans/build.xml
+++ b/mozilla/java/dist/netbeans/build.xml
@@ -69,6 +69,9 @@
-->
+
+
+
@@ -99,7 +102,58 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -146,4 +200,85 @@ ${so.prefix}xul.${so.extension}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mozilla/java/dist/netbeans/logging.properties b/mozilla/java/dist/netbeans/logging.properties
new file mode 100755
index 00000000000..4e922cbe93b
--- /dev/null
+++ b/mozilla/java/dist/netbeans/logging.properties
@@ -0,0 +1,12 @@
+handlers= java.util.logging.FileHandler
+
+.level=INFO
+
+
+java.util.logging.FileHandler.pattern = %h/moz-java-log.xml
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.append = true
+java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+
+org.mozilla.webclient.level=INFO
+
diff --git a/mozilla/java/dist/netbeans/webclient.properties b/mozilla/java/dist/netbeans/webclient.properties
index 49de6c33c7e..77e6c6c6215 100755
--- a/mozilla/java/dist/netbeans/webclient.properties
+++ b/mozilla/java/dist/netbeans/webclient.properties
@@ -1,3 +1,5 @@
bin.artifacts.pattern=${so.prefix}webclient.${so.extension},${so.prefix}javadomjni.${so.extension},components/${so.prefix}javadom.${so.extension}
+#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
+
browser.bin.dir=F:\\Projects\\mozilla\\MOZILLA_NIH\\FIREFOX_1_5_0_9_CVS\\mozilla\\xulrunner-win32_o.obj\\dist\\bin
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
index 1475216c70b..bc32c1af556 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
@@ -1,5 +1,5 @@
/*
- * $Id: WebclientTestCase.java,v 1.12 2007-01-30 18:26:37 edburns%acm.org Exp $
+ * $Id: WebclientTestCase.java,v 1.13 2007-02-21 01:40:44 edburns%acm.org Exp $
*/
/*
@@ -47,7 +47,7 @@ import org.mozilla.util.THTTPD;
*
* Lifetime And Scope
*
- * @version $Id: WebclientTestCase.java,v 1.12 2007-01-30 18:26:37 edburns%acm.org Exp $
+ * @version $Id: WebclientTestCase.java,v 1.13 2007-02-21 01:40:44 edburns%acm.org Exp $
*
* @see Blah
* @see Bloo
@@ -113,14 +113,21 @@ public void setUp()
{
verifyPreconditions();
+ // Set the OUTPUT_FILE_ROOT
String mozSrcValue = null;
+ File outputRoot = null;
- assertTrue(null != (mozSrcValue =
- System.getProperty("MOZ_SRC")));
- OUTPUT_FILE_ROOT = mozSrcValue + File.separator +
- "mozilla" + File.separator + "java" + File.separator +
- "webclient" + File.separator + OUTPUT_FILE_ROOT;
-
+ if (null != (mozSrcValue = System.getProperty("MOZ_SRC"))) {
+ OUTPUT_FILE_ROOT = mozSrcValue + File.separator +
+ "mozilla" + File.separator + "java" + File.separator +
+ "webclient" + File.separator + OUTPUT_FILE_ROOT;
+ }
+ else {
+ assertTrue(null != (OUTPUT_FILE_ROOT = System.getProperty("build.test.results.dir")));
+ }
+ outputRoot = new File(OUTPUT_FILE_ROOT);
+ assertTrue(outputRoot.exists());
+
LOGGER.info(this.getClass().getName() + " setUp()");
}