diff --git a/mozilla/java/dist/build.xml b/mozilla/java/dist/build.xml
index 92f29e6e731..f213918c129 100644
--- a/mozilla/java/dist/build.xml
+++ b/mozilla/java/dist/build.xml
@@ -318,6 +318,8 @@
          file="${objdir}/java/dom/jni/${so.prefix}javadomjni.${jni.extension}" />
     <copy todir="${dist.home}/bin/${platform}/bin" 
           file="${objdir}/java/webclient/src_moz/${so.prefix}${name}.${jni.extension}" />
+    <copy todir="${dist.home}/lib" 
+          file="${basedir}/../external/MozillaInterfaces.jar" />
 
   </target>
 
diff --git a/mozilla/java/dist/netbeans/build.xml b/mozilla/java/dist/netbeans/build.xml
index dd8c3bca87b..bc9bed2c79f 100755
--- a/mozilla/java/dist/netbeans/build.xml
+++ b/mozilla/java/dist/netbeans/build.xml
@@ -165,11 +165,19 @@
 
         <property file="webclient.properties" />
         
+        <path id="javaxpcom.path">
+            <pathelement path="${javaxpcom.jar}:${MozillaInterfaces.jar}" />
+        </path>
+        
         <condition property="preconditions.met">
-            <or>
-                <available file="${browser.bin.dir}/${so.prefix}xul.${so.extension}" />
-                <available file="${browser.bin.dir}/${so.prefix}xpcom.${so.extension}" />
-            </or>
+            <and>
+                <or>
+                    <available file="${browser.bin.dir}/${so.prefix}xul.${so.extension}" />
+                    <available file="${browser.bin.dir}/${so.prefix}xpcom.${so.extension}" />
+                </or>
+                <available file="${javaxpcom.jar}" />
+                <available file="${MozillaInterfaces.jar}" />
+            </and>
         </condition>
         
         <uptodate property="do.copy.binaries">
@@ -185,6 +193,11 @@ to the binary directory of the host browser in the webclient.properties
 file?  The current value of this property is:
 ${browser.bin.dir} and this directory must contain the file
 ${so.prefix}xul.${so.extension}.
+
+Also, you must make sure the properties javaxpcom.jar and 
+MozillaInterfaces.jar are valid.  
+javaxpcom.jar is currently ${javaxpcom.jar}
+MozillaInterfaces.jar is currently ${MozillaInterfaces.jar}
     </fail>
         
     </target>
@@ -240,6 +253,7 @@ ${so.prefix}xul.${so.extension}.
             
                     <classpath>
                         <path path="${run.test.classpath}"/>
+                        <path refid="javaxpcom.path" />
                     </classpath>
 
         </java>
@@ -256,6 +270,7 @@ ${so.prefix}xul.${so.extension}.
                 <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
                     <classpath>
                         <path path="@{classpath}"/>
+                        <path refid="javaxpcom.path" />
                     </classpath>
                     <compilerarg line="${javac.compilerargs}"/>
                     <customize/>
@@ -310,6 +325,7 @@ ${so.prefix}xul.${so.extension}.
                     </batchtest>
                     <classpath>
                         <path path="${run.test.classpath}"/>
+                        <path refid="javaxpcom.path" />
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -339,8 +355,10 @@ ${so.prefix}xul.${so.extension}.
                     <jvmarg value="-Xnoagent"/>
                     <jvmarg value="-Djava.compiler=none"/>
                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-                    <jvmarg value="-DNSPR_LOG_MODULES=webclient:4,webclientstub:4,pluglets:4"/>
+                    <jvmarg value="-DNSPR_LOG_MODULES=javadom:4,webclient:4,webclientstub:4,pluglets:4"/>
+                    <env key="NSPR_LOG_MODULES" value="${nspr.log.modules}" />
                     <jvmarg value="-DNSPR_LOG_FILE=${basedir}${FILE_PATH_SEP}${build.dir}${FILE_PATH_SEP}webclient.log"/>
+                    <env key="NSPR_LOG_FILE" file="${basedir}/${build.dir}/${nspr.log.filename}" />
                     <jvmarg value="-Dbuild.test.results.dir=${basedir}${FILE_PATH_SEP}${build.test.results.dir}" />
                     <jvmarg value="-DBROWSER_BIN_DIR=${browser.bin.dir}"/>
                     <jvmarg value="-Dhttp.proxyHost=${http.proxyHost}" />
@@ -349,8 +367,10 @@ ${so.prefix}xul.${so.extension}.
                     <jvmarg line="-Djava.util.logging.config.file=${basedir}${FILE_PATH_SEP}logging.properties"/>
                     <jvmarg line="-Djava.library.path=${browser.bin.dir}" />
                     <jvmarg line="${run.jvmargs}"/>
+                    <arg value="${test.browser.url}" />
                     <classpath>
                         <path path="@{classpath}"/>
+                        <path refid="javaxpcom.path" />
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
diff --git a/mozilla/java/dist/netbeans/nbproject/project.properties b/mozilla/java/dist/netbeans/nbproject/project.properties
index cdb3d06397c..8dd49d4d62f 100755
--- a/mozilla/java/dist/netbeans/nbproject/project.properties
+++ b/mozilla/java/dist/netbeans/nbproject/project.properties
@@ -20,9 +20,11 @@ file.reference.main-java=../test/manual/src/main/java
 file.reference.main-java-1=../test/automated/src/main/java
 file.reference.main-java-2=../src/main/java
 file.reference.webclient-2_0_a9.jar=../lib/webclient-2_0_a9.jar
+file.reference.MozillaInterfaces.jar=../lib/MozillaInterfaces.jar
 jar.compress=false
 javac.classpath=\
     ${file.reference.webclient-2_0_a9.jar}:\
+    ${file.reference.MozillaInterfaces.jar}:\
     ${libs.junit.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
diff --git a/mozilla/java/dist/netbeans/webclient.properties b/mozilla/java/dist/netbeans/webclient.properties
index b3da8b5172e..6639029f118 100755
--- a/mozilla/java/dist/netbeans/webclient.properties
+++ b/mozilla/java/dist/netbeans/webclient.properties
@@ -1,7 +1,9 @@
 # START required modifications
 
 #Make this point to the bin directory of your XULRUNNER installation
-browser.bin.dir=C:\\Projects\\chaff\\xulrunner
+browser.bin.dir=F:\\Projects\\mozilla\\MOZILLA_NIH\\FIREFOX_2_0_0_3_RELEASE\\mozilla\\xulrunner-win32_d.obj\\dist\\bin
+javaxpcom.jar=${browser.bin.dir}/javaxpcom.jar
+MozillaInterfaces.jar=${browser.bin.dir}/../sdk/lib/MozillaInterfaces.jar
 
 # END required modifications
 
@@ -12,7 +14,7 @@ browser.bin.dir=C:\\Projects\\chaff\\xulrunner
 # Windows
 #debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
 
-test.browser.url=http://jazoon.com/
+test.browser.url=f:\\Projects\\mozilla\\MOZILLA_NIH\\FIREFOX_2_0_0_3_RELEASE\\mozilla\\java\\webclient\\test\\automated\\src\\test\\FireBugTest.html
 # http.proxyHost=webcache.east.sun.com
 # http.proxyPort=8080
 # http.nonProxyHosts=".sfbay.sun.com|.east.sun.com|.central.sun.com"
diff --git a/mozilla/java/external/MozillaInterfaces.jar b/mozilla/java/external/MozillaInterfaces.jar
new file mode 100755
index 00000000000..b53c228062c
Binary files /dev/null and b/mozilla/java/external/MozillaInterfaces.jar differ
diff --git a/mozilla/java/webclient/test/automated/src/test/FireBugTest.html b/mozilla/java/webclient/test/automated/src/test/FireBugTest.html
new file mode 100755
index 00000000000..5eebf02b274
--- /dev/null
+++ b/mozilla/java/webclient/test/automated/src/test/FireBugTest.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>Test of FireBug from Webclient</title>
+  </head>
+
+  <body>
+    <h1>Test of FireBug from Webclient</h1>
+
+<script type="text/javascript">
+
+function doAlert() {
+      alert("alert1");
+      var a = "a";
+      var b = "b";
+      var c = "c";
+      return false;
+}
+
+</script>
+
+<input type="submit" onclick="doAlert();" />
+
+
+    <hr>
+    <address><a href="mailto:Ed Burns <ed.burns@sun.com>"></a></address>
+<!-- Created: Fri Nov 02 11:04:37 Eastern Standard Time 2007 -->
+<!-- hhmts start -->
+Last modified: Fri Nov 09 19:27:13 Eastern Standard Time 2007
+<!-- hhmts end -->
+  </body>
+</html>