removing smartupdate related code, because it is not dependent on Java

modules/oji/src/jvmmgr.cpp

@@ -569,15 +569,6 @@ nsJVMMgr::GetJavaErrorString(JNIEnv* env)
 
 PRLogModuleInfo* NSJAVA = NULL;
 
-#ifdef MOZ_SMARTUPDATE
-
-static NS_DEFINE_IID(kIJRIPluginIID, NS_IJRIPLUGIN_IID);
-
-// Should be in a header; must solve build-order problem first
-extern "C" void SU_Initialize(JRIEnv * env);
-
-#endif
-
 nsJVMStatus
 nsJVMMgr::StartupJVM(void)
 {
@@ -637,25 +628,6 @@ nsJVMMgr::StartupJVM(void)
     if (err == NS_OK) {
         /* assume the JVM is running. */
         fStatus = nsJVMStatus_Running;
-#ifdef MOZ_SMARTUPDATE
-        nsIJRIPlugin* jriJVM;
-        if (fJVM->QueryInterface(kIJRIPluginIID, (void**)&jriJVM) == NS_OK) {
-            JRIEnv* env;
-            nsresult err = jriJVM->GetJRIEnv(&env);
-            if (err == NS_OK) {
-                SU_Initialize(env);
-                if (JRI_ExceptionOccurred(env)) {
-#ifdef DEBUG
-                    JVM_PrintToConsole("LJ:  SU_Initialize failed.  Bugs to atotic.\n");
-#endif	
-                    JRI_ExceptionDescribe(env);
-                    JRI_ExceptionClear(env);
-                }
-                jriJVM->ReleaseJRIEnv(env);
-            }
-            jriJVM->Release();
-        }
-#endif
     }
     else {
         ReportJVMError(err);

nav-java/stubs/include/Makefile

@@ -18,6 +18,6 @@ DEPTH	= ../../..
 
 MODULE	= java
 
-EXPORTS	= java.h javasec.h lj.h softupdt.h edtplug.h
+EXPORTS	= java.h javasec.h lj.h edtplug.h
 
 include $(DEPTH)/config/rules.mk

nav-java/stubs/include/Makefile.in

@@ -23,7 +23,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE	= java
 
-EXPORTS	= java.h javasec.h lj.h softupdt.h edtplug.h
+EXPORTS	= java.h javasec.h lj.h edtplug.h
 
 EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
 

nav-java/stubs/include/export.mac

@@ -5,5 +5,4 @@
 edtplug.h
 javasec.h
 java.h
-softupdt.h
 lj.h

nav-java/stubs/include/makefile.win

@@ -42,7 +42,6 @@ export::
     $(MAKE_INSTALL) java.h      $(PUBLIC)\java
     $(MAKE_INSTALL) javasec.h   $(PUBLIC)\java
     $(MAKE_INSTALL) lj.h        $(PUBLIC)\java
-    $(MAKE_INSTALL) softupdt.h  $(PUBLIC)\java
     $(MAKE_INSTALL) edtplug.h   $(PUBLIC)\java
 
 install::

nav-java/stubs/src/stubnj.c

@@ -23,9 +23,6 @@
 /* From nspr */
 #include "prthread.h"
 
-/* From softupdt */
-#include "softupdt.h"
-
 /* From edtplug */
 #include "edtplug.h"
 
@@ -463,28 +460,6 @@ JRI_PUBLIC_API(void) PrintToConsole(const char* bytes)
 #pragma export on
 #endif
 
-/* SU_NewStream                                                                     libnet.so */
-/* ns/modules/softupdt/include/softupdt.h */
-/* ns/modules/softupdt/src/softupdt.c */
-XP_Bool SU_StartSoftwareUpdate(MWContext * context, 
-			       const char * url, 
-			       const char * name, 
-			       SoftUpdateCompletionFunction f,
-			       void * completionClosure,
-                               int32 flags) /* FORCE_INSTALL, SILENT_INSTALL */
-{
-  return SILENT_INSTALL;
-}
-
-/* SU_StartSoftwareUpdate                                                           libmocha.so */
-/* ns/modules/softupdt/include/softupdt.h */
-/* ns/modules/softupdt/src/softupdt.c */
-NET_StreamClass * SU_NewStream (int format_out, void * registration,
-				URL_Struct * request, MWContext *context)
-{
-  return NULL;
-}
-
 
 #ifdef XP_MAC
 #pragma export reset