M dist/build.xml

- Do not exclude Bookmarks, Prefs, and Profile from core source

M dist/mcp-test/src/test/java/cardemo/CarDemoTest.java

- sleep for 10 seconds after the initial load

M dist/netbeans/build.xml

- add the ability to compile the core source of the webclient library,
  should the user want to modify it.

M webclient/classes_spec/org/mozilla/mcp/MCP.java

- Correctly cause blockingLoad to block until the load completes.


git-svn-id: svn://10.0.0.236/trunk@221343 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/dist/build.xml

@@ -227,9 +227,6 @@
 
     <copy todir="${dist.home}/src/main/java" includeEmptyDirs="false">
       <fileset dir="${source.home}/webclient/classes_spec">
-        <exclude name="**/*Bookmark*.java" />
-        <exclude name="**/*Preferences*.java" />
-        <exclude name="**/*Profile*.java" />
         <exclude name="**/test/*" />
         <exclude name="**/test_nonnative/*" />
         <exclude name="**/wrapper_nonnative/*" />

mozilla/java/dist/mcp-test/src/test/java/cardemo/CarDemoTest.java

@@ -38,6 +38,7 @@ public class CarDemoTest extends WebclientTestCase  {
     public void testCardemo() throws Exception {
         mcp.getRealizedVisibleBrowserWindow();
         mcp.blockingLoad("http://webdev1.sun.com/jsf-ajax-cardemo/faces/chooseLocale.jsp");
+        Thread.currentThread().sleep(10000);
     }
     
 }

mozilla/java/dist/netbeans/build.xml

@@ -328,10 +328,17 @@ ${so.prefix}xul.${so.extension}.
         </macrodef>
     </target>
 
-    <target name="compile.core.src" description="Builds the core webclient java sources.  These sources are shipped precompiled in lib/webclient.jar.  This target is included for convenience only, should you wish to modify and re-compile the webclient core library.">
+    <target name="compile.core.src" depends="-init-check">
       <antcall target="compile">
         <param name="src.dir" value="${basedir}/../src/main/java" />
       </antcall>
+      <!-- set up the interface to implementation mapings -->
+      <mkdir dir="${build.classes.dir}/META-INF/services"/>
+      <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_a5.jar}"
+            tofile="${basedir}/../lib/outofdate-webclient_jar" />
 
     </target>
     

mozilla/java/webclient/classes_spec/org/mozilla/mcp/MCP.java

@@ -166,6 +166,13 @@ public class MCP {
         Navigation2 nav = getNavigation();
         synchronized (this) {
             nav.loadURL(url);
+            try {
+                this.wait();
+            } catch (InterruptedException ex) {
+                LOGGER.throwing(this.getClass().getName(), "blockingLoad",
+                        ex);
+                ex.printStackTrace();
+            }
         }
     }
     
@@ -182,7 +189,9 @@ public class MCP {
             
             switch ((int)type) {
                 case ((int) DocumentLoadEvent.END_DOCUMENT_LOAD_EVENT_MASK):
-                    owner.notifyAll();
+                    synchronized (owner) {
+                        owner.notifyAll();
+                    }
                     break;
                 default:
                     break;