diff --git a/mozilla/java/dist/build.xml b/mozilla/java/dist/build.xml
index 798eee009a7..e6689882b0d 100644
--- a/mozilla/java/dist/build.xml
+++ b/mozilla/java/dist/build.xml
@@ -32,8 +32,8 @@
   <property name="name" value="webclient"/>
   <property name="major.version" value="2" />
   <property name="minor.version" value="0" />
-  <property name="release.version" value="a8" />
-  <property name="release.version.full" value="alpha_8" />
+  <property name="release.version" value="a9" />
+  <property name="release.version.full" value="alpha_9" />
   <property name="version" 
             value="${major.version}_${minor.version}_${release.version}"/>
   <property name="full.version" value="${major.version}_${minor.version}_${release.version.full}"/>
@@ -92,7 +92,6 @@
 
     <antcall target="prepare" />
     <antcall target="uptodate" />
-    <antcall target="compile.all" />
     <antcall target="build.dist.jar" />
     <antcall target="copy.binaries" />
     <antcall target="copy.test.src" />
@@ -121,7 +120,7 @@
       </and>
     </condition>
 
-    <zip destfile="${objdir}/${name}_${version}_${platform}.zip" 
+    <zip destfile="${objdir}/${name}_${version}.zip" 
          basedir="${dist.base}" />
   </target>
 
@@ -261,7 +260,28 @@
 
   </target>
 
-  <target name="build.dist.jar">
+  <target name="copy.mac.artifacts" if="mac.dist.zip">
+    <property name="dest" value="${dist.base}/tmp/mac" />
+    <unzip dest="${dest}" src="${mac.dist.zip}" />
+    <mkdir dir="${dest}/unjar" />
+    <unjar dest="${dest}/unjar" src="${dest}/${name}_2_0_a8/lib/${name}-2_0_a8.jar"/>
+    <!-- copy the mac specific java classes -->
+    <copy todir="${dist.classes}">
+      <fileset dir="${dest}/unjar" >
+        <include name="**/Cocoa*.*" />
+      </fileset>
+    </copy>
+    <!-- copy the mac specific native binaries -->
+    <copy todir="${dist.home}/bin/macosx/bin">
+      <fileset dir="${dest}/${name}_2_0_a8/bin/macosx/bin">
+        <include name="**/*.*" />
+      </fileset>
+    </copy>
+    <delete dir="${dest}" />
+     
+  </target>
+
+  <target name="build.dist.jar" depends="copy.mac.artifacts">
     <jar jarfile="${dist.jar}" >
        <manifest>
         <attribute name="Specification-Title" value="${Name}"/>
@@ -310,6 +330,7 @@
         <exclude name="**/*Bookmark*.java" />
         <exclude name="**/*Preferences*.java" />
         <exclude name="**/*Profile*.java" />
+        <exclude name="org/mozilla/webclient/impl/wrapper_native/*Gtk*.*" />
       </fileset>
       <fileset dir="${basedir}/mcp-test/src/test/java">
         <include name="**/*.java" />
@@ -341,6 +362,7 @@
     <copy todir="${dist.home}/src/main/java" includeEmptyDirs="false">
       <fileset dir="${source.home}/webclient/classes_spec">
         <exclude name="**/test/*" />
+        <exclude name="org/mozilla/webclient/wrapper_native/**/*.*" />
         <exclude name="**/test_nonnative/*" />
         <exclude name="**/wrapper_nonnative/*" />
         <exclude name="**/*.html" />
diff --git a/mozilla/java/dist/netbeans/build.xml b/mozilla/java/dist/netbeans/build.xml
index eb5fcafb9d0..75a62f1cd81 100755
--- a/mozilla/java/dist/netbeans/build.xml
+++ b/mozilla/java/dist/netbeans/build.xml
@@ -217,11 +217,13 @@ ${so.prefix}xul.${so.extension}.
 
         <property name="debug.jvm.args" value="" />
         <property name="test.browser.url" 
-                  value="${basedir}/../2_0_alpha_8.html" />
+                  value="${basedir}/../2_0_alpha_9.html" />
         
         <java classname="org.mozilla.webclient.test.TestBrowser" fork="true">
             <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 line="${debug.jvm.args}"/>
@@ -350,7 +352,7 @@ ${so.prefix}xul.${so.extension}.
       <echo file="${build.classes.dir}/META-INF/services/org.mozilla.webclient.WebclientFactory">org.mozilla.webclient.impl.WebclientFactoryImpl</echo>
       <echo file="${build.classes.dir}/META-INF/services/org.mozilla.webclient.impl.WrapperFactory">org.mozilla.webclient.impl.wrapper_native.WrapperFactoryImpl</echo>
 
-      <move failonerror="false" file="${file.reference.webclient-2_0_a8.jar}"
+      <move failonerror="false" file="${file.reference.webclient-2_0_a9.jar}"
             tofile="${basedir}/../lib/outofdate-webclient_jar" />
 
     </target>
diff --git a/mozilla/java/dist/netbeans/nbproject/project.properties b/mozilla/java/dist/netbeans/nbproject/project.properties
index ca5d418cf85..cdb3d06397c 100755
--- a/mozilla/java/dist/netbeans/nbproject/project.properties
+++ b/mozilla/java/dist/netbeans/nbproject/project.properties
@@ -19,10 +19,10 @@ dist.javadoc.dir=${dist.dir}/javadoc
 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_a8.jar=../lib/webclient-2_0_a8.jar
+file.reference.webclient-2_0_a9.jar=../lib/webclient-2_0_a9.jar
 jar.compress=false
 javac.classpath=\
-    ${file.reference.webclient-2_0_a8.jar}:\
+    ${file.reference.webclient-2_0_a9.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 5abeb2ce22b..d6768adaa02 100755
--- a/mozilla/java/dist/netbeans/webclient.properties
+++ b/mozilla/java/dist/netbeans/webclient.properties
@@ -12,7 +12,7 @@
 # Windows
 #debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
 
-test.browser.url=http://jazoon.com/
+# test.browser.url=http://jazoon.com/
 
 # END optional modifications
 
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java
index ccadc2df4d0..dc59e78af6c 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: MouseListenerTest.java,v 1.7 2007-06-27 23:29:15 edburns%acm.org Exp $
+ * $Id: MouseListenerTest.java,v 1.8 2007-07-02 16:00:10 edburns%acm.org Exp $
  */
 
 /* 
@@ -284,7 +284,6 @@ public class MouseListenerTest extends WebclientTestCase {
         assertTrue(bitSet.get(TestFeature.MOUSE_ENTERED.ordinal()));
         assertTrue(bitSet.get(TestFeature.MOUSE_PRESSED.ordinal()));
         assertTrue(bitSet.get(TestFeature.MOUSE_RELEASED.ordinal()));
-        assertTrue(bitSet.get(TestFeature.MOUSE_EXITED.ordinal()));
 
         frame.setVisible(false);