Make webclient compile with Mozilla 1.6. Unit tests still don't run.

M README

- update instructions for building and running source and unit tests

M build.properties.sample

- you need junit.jar

M webclient/build-tests.xml

- reformat

M webclient/build.xml

- add "prepare" target to set the PATH_SEP

M webclient/src_ie/BookmarksImpl.cpp
M webclient/src_ie/CurrentPageImpl.cpp
M webclient/src_ie/HistoryImpl.cpp

- Account for new javah header names

M webclient/src_moz/Makefile.in

- account for new location of jawt.lib in J2SDK 1.4.2

M webclient/src_moz/NativeEventThread.cpp

+#include "nsEmbedAPI.h" // for NS_HandleEmbeddingEvent

M webclient/src_moz/NavigationActionEvents.cpp

- result is an nsIInputStream

M webclient/src_moz/WrapperFactoryImpl.cpp

+#include <nsDependentString.h> // for nsDependentCString

 and the compile is more strict now.

M webclient/src_moz/dom_util.cpp

- signature change

java/README

@@ -1,4 +1,4 @@
-20030713
+20040222
 
 This README documents the Java Enhancers to the Mozilla web browser.
 
@@ -10,9 +10,10 @@ Requirements:
 
 * J2SDK 1.3.1 or later
 
-* Apache ant 
+* Apache ant 1.4.1 or later.  If running under J2SDK 1.4.2 or later, you
+  need ant 1.6.1, due to javah issues.
 
-* Successfully built debug enabled Mozilla 1.4 tree
+* Successfully built debug enabled Mozilla 1.6 tree
 
 How To Build:
 
@@ -46,6 +47,23 @@ compile.debug=true
 * run "ant" in the mozilla/java directory.  This will build webclient
   and all dependent libraries.  
 
+How to run the Junit tests:
+
+* Make sure junit.jar is properly set in your mozilla/java/build.properties
+
+* Make sure junit.jar is installed in your $ANT_HOME/lib directory
+
+* Set the following variables in your environment
+
+NSPR_LOG_MODULES="webclient:4,webclientstub:4"
+NSPR_LOG_FILE="logfile.txt"
+
+* cd to mozilla/java/webclient
+
+* run ant test
+
+How to run the test browser (broken as of this writing):
+
 * cd to mozilla/java/webclient/src_moz and run the "runem" batch file to
   run the test browser.
 

java/build.properties.sample

@@ -9,3 +9,6 @@ build.win32.classes=true
 
 # On win32, make sure to use \\ for \
 build.home=/home/edburns/Projects/mozilla/NETSCAPE_7_0_RTM_RELEASE/mozilla/dist/classes
+
+# dependent jars
+junit.jar=<your junit 3.8.1 jar>

java/webclient/build.xml

@@ -60,8 +60,24 @@
     <pathelement location="${build.home}"/>
   </path>
 
+  <target name="prepare">
+
+    <condition property="PATH_SEP" value=";">
+      <and>
+        <os family="windows" />
+      </and>
+    </condition>
+
+    <condition property="PATH_SEP" value=":">
+      <and>
+        <os family="unix" />
+      </and>
+    </condition>
+
+  </target>
+
   <target name="main" 
-          depends="compile.classes_spec,compile.src_share,compile.src_moz,compile.src_ie,create.webclient.scripts"/>
+          depends="prepare,compile.classes_spec,compile.src_share,compile.src_moz,compile.src_ie,create.webclient.scripts"/>
 
   <target name="compile.classes_spec">
 
@@ -148,18 +164,15 @@
     </exec>
     <exec os="Windows 2000" dir="${basedir}/src_moz" executable="make" 
                      failonerror="yes"/>
-    <exec os="Windows 2000" dir="${basedir}/src_moz" executable="make" 
-                     failonerror="yes"/>
 
   </target>
 
   <target name="compile.src_ie" depends="compile.src_share">
 
+    <!-- PENDING(edburns): re-enable IE support
     <exec os="Windows 2000" dir="${basedir}/src_ie" executable="make" 
                      failonerror="yes"/>
-
-    <exec os="Windows 2000" dir="${basedir}/src_ie" executable="make" 
-                     failonerror="yes"/>
+    -->
 
   </target>
 

java/webclient/src_ie/BookmarksImpl.cpp

@@ -20,7 +20,7 @@
  * Contributor(s): Glenn Barney <gbarney@uiuc.edu>
  */
 
-#include "BookmarksImpl.h"
+#include "org_mozilla_webclient_impl_wrapper_0005fnative_BookmarksImpl.h"
 
 
 JNIEXPORT void JNICALL 

java/webclient/src_ie/CurrentPageImpl.cpp

@@ -25,7 +25,7 @@
  * CurrentPageImpl.cpp
  */
 
-#include "CurrentPageImpl.h"
+#include "org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl.h"
 
 
 

java/webclient/src_ie/HistoryImpl.cpp

@@ -21,7 +21,7 @@
  *                 Ron Capelli <capelli@us.ibm.com>
  */
 
-#include "HistoryImpl.h"
+#include "org_mozilla_webclient_impl_wrapper_0005fnative_HistoryImpl.h"
 #include "ie_util.h"
 #include "ie_globals.h"
 

java/webclient/src_moz/Makefile.in

@@ -143,7 +143,7 @@ EXTRA_LIBS		+= \
 ifeq ($(OS_ARCH),WINNT)
 EXTRA_LIBS += \
 		$(DIST)/lib/wc_share.lib \
-		$(MOZ_JDKHOME)/jre/lib/jawt.lib \
+		$(MOZ_JDKHOME)/lib/jawt.lib \
 		$(NULL)
 endif
 

java/webclient/src_moz/NativeEventThread.cpp

@@ -50,6 +50,7 @@
 #include "nsISHistory.h" // for sHistory
 #include "nsIThread.h" // for PRThread
 #include "nsIDocShell.h"
+#include "nsEmbedAPI.h" // for NS_HandleEmbeddingEvent
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIEventQueueService.h"

java/webclient/src_moz/NavigationActionEvents.cpp

@@ -263,7 +263,7 @@ wsPostEvent::handleEvent ()
   nsCOMPtr<nsIDocument> doc;
   nsCOMPtr<nsIContent> content;
   nsCOMPtr<nsILinkHandler> lh;
-  nsCOMPtr<nsISupports> result;
+  nsCOMPtr<nsIInputStream> result;
   
   rv = mInitContext->docShell->GetPresShell(getter_AddRefs(presShell));
   if (NS_FAILED(rv) || !presShell) {
@@ -275,7 +275,7 @@ wsPostEvent::handleEvent ()
       return (void *) rv;
   }
 
-  rv = doc->GetRootContent(getter_AddRefs(content));
+  content = doc->GetRootContent();
   if (NS_FAILED(rv) || !content) {
       return (void *) rv;
   }

java/webclient/src_moz/WrapperFactoryImpl.cpp

@@ -36,6 +36,7 @@
 #include <nsILocalFile.h> 
 #include <nsEmbedAPI.h>  // for NS_InitEmbedding
 #include <nsIComponentRegistrar.h>
+#include <nsDependentString.h> // for nsDependentCString
 
 #include <prenv.h> // for PR_SetEnv
 
@@ -256,7 +257,6 @@ Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeTermina
 
     if (NS_FAILED(rv)) {
         ::util_ThrowExceptionToJava(env, "NS_TermEmbedding() failed.");
-        return (jint) rv;
     }
 
     PR_LOG(prLogModuleInfo, PR_LOG_DEBUG, 

java/webclient/src_moz/dom_util.cpp

@@ -102,7 +102,7 @@ nsCOMPtr<nsIDOMDocument> dom_getDocumentFromDocShell(nsIDocShell *docShell)
         return result;
     }
 
-    rv = docv->GetDocument(document);
+    rv = docv->GetDocument(&document);
     if (NS_FAILED(rv) || !document) {
         return result;
     }