From ebef5f4da8681a897027a8186743b2bbe4132dbc Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Thu, 12 Jul 2001 19:58:29 +0000 Subject: [PATCH] bug=80906 ra=edburns author=Nikolay Igotti Major cleanup and new component architecture for Waterfall. git-svn-id: svn://10.0.0.236/trunk@99134 18797224-902f-48f8-a5cc-f745e15eee43 --- .../java/pluggable-jvm/wf/build/java/Defs.gmk | 16 +-- .../wf/build/java/FileListCommon.mk | 33 +++++-- .../wf/build/java/FileListUnix.mk | 16 +-- .../wf/build/java/FileListWin.mk | 18 ++-- .../pluggable-jvm/wf/build/java/GNUmakefile | 25 +++-- .../pluggable-jvm/wf/build/java/Rules.gmk | 18 ++-- .../java/pluggable-jvm/wf/build/java/defs.mk | 18 ++-- .../wf/build/java/ext/GNUmakefile | 18 ++-- .../wf/build/java/ext/makefile.win | 20 ++-- .../wf/build/java/ext/moz6/FileListExt.mk | 16 +-- .../wf/build/java/ext/moz6/GNUmakefile | 17 ++-- .../wf/build/java/ext/moz6/makefile.win | 23 +++-- .../pluggable-jvm/wf/build/java/makefile.win | 35 ++++--- .../java/pluggable-jvm/wf/build/java/rules.mk | 18 ++-- .../java/pluggable-jvm/wf/build/unix/Defs.gmk | 37 +++++-- .../pluggable-jvm/wf/build/unix/GNUmakefile | 19 ++-- .../java/pluggable-jvm/wf/build/unix/dump.sh | 16 +-- .../pluggable-jvm/wf/build/unix/gtktest.c | 17 ++-- .../pluggable-jvm/wf/build/unix/set_paths | 28 +----- .../pluggable-jvm/wf/build/unix/set_paths.csh | 18 ++-- .../pluggable-jvm/wf/build/win32/makefile.win | 64 ++++++------ .../pluggable-jvm/wf/build/win32/set_env.bat | 16 +-- .../pluggable-jvm/wf/include/awt_Plugin.h | 29 ++++-- .../include/sun_jvmp_generic_motif_Plugin.h | 25 +++++ ..._jvmp_generic_motif_PthreadSynchroObject.h | 25 +++++ .../wf/include/sun_jvmp_mozilla_JSObject.h | 25 +++++ ..._jvmp_mozilla_JavaScriptProtectionDomain.h | 25 +++++ .../sun_jvmp_mozilla_MozillaAppletPeer.h | 25 +++++ .../sun_jvmp_mozilla_MozillaPeerFactory.h | 25 +++++ .../java/pluggable-jvm/wf/java/plugin.policy | 20 ++-- .../wf/java/sun/jvmp/BrowserSupport.java | 19 ++-- .../wf/java/sun/jvmp/ComponentException.java | 19 ++-- .../wf/java/sun/jvmp/ComponentLoader.java | 50 +++++----- .../wf/java/sun/jvmp/HostObjectPeer.java | 19 ++-- .../java/sun/jvmp/HostObjectPeerFactory.java | 19 ++-- .../wf/java/sun/jvmp/IDList.java | 23 +++-- .../wf/java/sun/jvmp/IDObject.java | 19 ++-- .../wf/java/sun/jvmp/MultipleHashtable.java | 28 +++--- .../wf/java/sun/jvmp/NativeFrame.java | 19 ++-- .../wf/java/sun/jvmp/NativeThread.java | 19 ++-- .../wf/java/sun/jvmp/ObjectFactory.java | 19 ++-- .../wf/java/sun/jvmp/PluggableJVM.java | 76 ++++++++------- .../wf/java/sun/jvmp/SynchroObject.java | 19 ++-- .../wf/java/sun/jvmp/WaterfallExtension.java | 42 ++++---- .../jvmp/generic/GenericSynchroObject.java | 19 ++-- .../java/sun/jvmp/generic/motif/Plugin.java | 19 ++-- .../generic/motif/PthreadSynchroObject.java | 19 ++-- .../java/sun/jvmp/generic/win32/Plugin.java | 19 ++-- .../sun/jvmp/netscape4/MozillaAppletPeer.java | 19 ++-- .../jvmp/netscape4/MozillaHostObjectPeer.java | 19 ++-- .../jvmp/netscape4/NetscapePeerFactory.java | 19 ++-- .../jvmp/security/AccessControlDecider.java | 19 ++-- .../sun/jvmp/security/CallingContext.java | 19 ++-- .../sun/jvmp/security/ExtSecurityManager.java | 19 ++-- .../java/sun/jvmp/security/SecurityCaps.java | 19 ++-- .../wf/java/sun/jvmp/security/WFPolicy.java | 39 +++++--- .../java/sun/jvmp/test/MyActionListener.java | 19 ++-- .../wf/java/sun/jvmp/test/MyDialog.java | 19 ++-- .../java/sun/jvmp/test/TestPeerFactory.java | 19 ++-- mozilla/java/pluggable-jvm/wf/public/jvmp.h | 17 ++-- .../pluggable-jvm/wf/public/jvmp_cap_vals.h | 17 ++-- .../java/pluggable-jvm/wf/public/jvmp_caps.h | 17 ++-- .../pluggable-jvm/wf/public/jvmp_drawing.h | 17 ++-- .../pluggable-jvm/wf/public/jvmp_errors.h | 17 ++-- .../java/pluggable-jvm/wf/public/jvmp_event.h | 17 ++-- .../pluggable-jvm/wf/public/jvmp_extension.h | 17 ++-- .../pluggable-jvm/wf/public/jvmp_security.h | 17 ++-- .../pluggable-jvm/wf/public/jvmp_threading.h | 17 ++-- .../pluggable-jvm/wf/public/jvmp_vendor.h | 17 ++-- .../pluggable-jvm/wf/public/linux/jvmp_md.h | 17 ++-- .../java/pluggable-jvm/wf/public/shmtran.h | 17 ++-- .../pluggable-jvm/wf/public/solaris/jvmp_md.h | 17 ++-- .../pluggable-jvm/wf/public/win32/jvmp_md.h | 17 ++-- .../java/pluggable-jvm/wf/src/host/host.cpp | 17 ++-- .../wf/src/host/test_extension.c | 17 ++-- .../pluggable-jvm/wf/src/plugin/java_plugin.c | 24 ++--- .../pluggable-jvm/wf/src/plugin/jpthreads.c | 19 ++-- .../pluggable-jvm/wf/src/plugin/jpthreads.h | 17 ++-- .../wf/src/plugin/mozilla/XmHelper.c | 17 ++-- .../wf/src/plugin/mozilla/wf_moz6_common.h | 97 +++++++++---------- .../wf/src/plugin/mozilla/wfe_mozilla.c | 26 ++--- .../wf/src/plugin/mozilla/wfm6_native.c | 33 ++++--- .../wf/src/plugin/netscape4/JavaPlugin.c | 17 ++-- .../wf/src/plugin/netscape4/Makefile | 48 +++++---- .../wf/src/plugin/netscape4/wfe_netscape4.c | 17 ++-- .../pluggable-jvm/wf/src/plugin/unix/Makefile | 16 +-- .../wf/src/plugin/unix/java_plugin_shm.c | 17 ++-- .../wf/src/plugin/unix/java_plugin_shm_host.c | 17 ++-- .../wf/src/plugin/unix/jvmp_exec.c | 17 ++-- .../pluggable-jvm/wf/src/plugin/unix/native.c | 42 +++++--- .../wf/src/plugin/unix/shmtran.c | 17 ++-- .../wf/src/plugin/win32/native.c | 19 ++-- .../java/pluggable-jvm/wf/tests/LC/LC.java | 19 ++-- .../java/pluggable-jvm/wf/tests/LC/LC1.java | 19 ++-- .../wf/tests/https/SecureApplet.java | 19 ++-- 95 files changed, 1180 insertions(+), 1009 deletions(-) diff --git a/mozilla/java/pluggable-jvm/wf/build/java/Defs.gmk b/mozilla/java/pluggable-jvm/wf/build/java/Defs.gmk index 3a4080a36e3..1b36b285afc 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/Defs.gmk +++ b/mozilla/java/pluggable-jvm/wf/build/java/Defs.gmk @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: Defs.gmk,v 1.1.1.1 2001-05-10 18:12:21 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: Defs.gmk,v 1.2 2001-07-12 19:57:32 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# MAKEFLAGS += --no-print-directory diff --git a/mozilla/java/pluggable-jvm/wf/build/java/FileListCommon.mk b/mozilla/java/pluggable-jvm/wf/build/java/FileListCommon.mk index 4485f1f3b55..aec74b07392 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/FileListCommon.mk +++ b/mozilla/java/pluggable-jvm/wf/build/java/FileListCommon.mk @@ -8,21 +8,23 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: FileListCommon.mk,v 1.1.1.1 2001-05-10 18:12:21 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: FileListCommon.mk,v 1.2 2001-07-12 19:57:33 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# FILES_java = \ + sun/jvmp/ConsoleWindow.java \ + sun/jvmp/DebugOutputStream.java \ sun/jvmp/HostObjectPeer.java \ sun/jvmp/PluggableJVM.java \ sun/jvmp/ObjectFactory.java \ @@ -45,4 +47,17 @@ FILES_java = \ sun/jvmp/security/AccessControlDecider.java \ sun/jvmp/security/CallingContext.java \ sun/jvmp/security/WFPolicy.java \ - sun/jvmp/generic/GenericSynchroObject.java + netscape/javascript/JSObject.java \ + netscape/javascript/JSException.java \ + netscape/javascript/JSUtil.java \ + sun/jvmp/javascript/JSContext.java \ + sun/jvmp/generic/GenericSynchroObject.java \ + sun/jvmp/applet/WFAppletViewer.java \ + sun/jvmp/applet/AppletManager.java \ + sun/jvmp/applet/WFAppletContext.java \ + sun/jvmp/applet/WFAppletClassLoader.java \ + sun/jvmp/applet/WFAppletSecurityManager.java \ + sun/jvmp/applet/AppletViewerArgs.java \ + sun/jvmp/applet/ProxyInfo.java \ + sun/jvmp/applet/ProxyType.java \ + sun/jvmp/applet/ProxyHandler.java diff --git a/mozilla/java/pluggable-jvm/wf/build/java/FileListUnix.mk b/mozilla/java/pluggable-jvm/wf/build/java/FileListUnix.mk index e86bf51ab89..a03345f0187 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/FileListUnix.mk +++ b/mozilla/java/pluggable-jvm/wf/build/java/FileListUnix.mk @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: FileListUnix.mk,v 1.1.1.1 2001-05-10 18:12:21 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: FileListUnix.mk,v 1.2 2001-07-12 19:57:33 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# FILES_java += \ sun/jvmp/generic/motif/Plugin.java \ diff --git a/mozilla/java/pluggable-jvm/wf/build/java/FileListWin.mk b/mozilla/java/pluggable-jvm/wf/build/java/FileListWin.mk index a9e018d5b44..a6991ff16e1 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/FileListWin.mk +++ b/mozilla/java/pluggable-jvm/wf/build/java/FileListWin.mk @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: FileListWin.mk,v 1.1.1.1 2001-05-10 18:12:21 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: FileListWin.mk,v 1.2 2001-07-12 19:57:33 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# FILES_java=$(FILES_java)\ - sun/jvmp/generic/win32/Plugin.java + sun/jvmp/generic/win32/Plugin.java \ No newline at end of file diff --git a/mozilla/java/pluggable-jvm/wf/build/java/GNUmakefile b/mozilla/java/pluggable-jvm/wf/build/java/GNUmakefile index e713c270e12..d22d94cb71b 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/GNUmakefile +++ b/mozilla/java/pluggable-jvm/wf/build/java/GNUmakefile @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: GNUmakefile,v 1.2 2001-05-11 23:31:33 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: GNUmakefile,v 1.3 2001-07-12 19:57:33 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# ifndef WFJDKHOME all classes: @@ -33,7 +33,7 @@ BUILDDIR = . JAVASRCDIR = ../../java CLASSDESTDIR = ../unix/classes ADDCLASSPATH = ../unix/classes -PATH_SEP=: +SUBDIRS = ext default: all @@ -44,7 +44,7 @@ include $(BUILDDIR)/Defs.gmk include $(BUILDDIR)/Rules.gmk endif -all: classes +all: classes exts release: all wf.jar @@ -55,4 +55,9 @@ wf.jar: $(MV) wf.jar ..; \ echo " done." +exts: + @echo "Making Waterfall extension components" + @cd ext; \ + $(MAKE) all + .PHONY : all classes clean exts diff --git a/mozilla/java/pluggable-jvm/wf/build/java/Rules.gmk b/mozilla/java/pluggable-jvm/wf/build/java/Rules.gmk index 144364085c2..cef59d396b6 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/Rules.gmk +++ b/mozilla/java/pluggable-jvm/wf/build/java/Rules.gmk @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: Rules.gmk,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: Rules.gmk,v 1.2 2001-07-12 19:57:33 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# $(CLASSDESTDIR): @mkdir -p $@ @@ -31,7 +31,7 @@ $(CLASSDESTDIR): .compile.classlist: @if [ -s .classes.list ] ; \ then echo "Compiling Java files"; cat .classes.list; \ - $(JAVAC_CMD) -d $(CLASSDESTDIR) -classpath $(CLASSDESTDIR)$(PATH_SEP)$(ADDCLASSPATH)$(PATH_SEP)$(CLASSPATH)\ + $(JAVAC_CMD) -deprecation -d $(CLASSDESTDIR) -classpath $(CLASSDESTDIR) -classpath $(ADDCLASSPATH)\ $(shell if [ -s .classes.list ] ; then cat .classes.list; fi ) ; \ fi diff --git a/mozilla/java/pluggable-jvm/wf/build/java/defs.mk b/mozilla/java/pluggable-jvm/wf/build/java/defs.mk index db303dfaf0f..5e21bf66a1e 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/defs.mk +++ b/mozilla/java/pluggable-jvm/wf/build/java/defs.mk @@ -8,22 +8,22 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: defs.mk,v 1.1.1.1 2001-05-10 18:12:21 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: defs.mk,v 1.2 2001-07-12 19:57:34 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# DEL=del/f/q DELTREE=rmdir/s/q MV=move JAVAC_CMD=$(WFJDKHOME)\bin\javac.exe -JAR_CMD = $(WFJDKHOME)\bin\jar.exe +JAR_CMD = $(WFJDKHOME)\bin\jar.exe \ No newline at end of file diff --git a/mozilla/java/pluggable-jvm/wf/build/java/ext/GNUmakefile b/mozilla/java/pluggable-jvm/wf/build/java/ext/GNUmakefile index c8ce51a902a..a9618eca3a7 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/ext/GNUmakefile +++ b/mozilla/java/pluggable-jvm/wf/build/java/ext/GNUmakefile @@ -8,21 +8,21 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: GNUmakefile,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: GNUmakefile,v 1.2 2001-07-12 19:57:36 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# -SUBDIRS = jpav moz6 +SUBDIRS = moz6 av all clean: @for i in $(SUBDIRS) ; do \ diff --git a/mozilla/java/pluggable-jvm/wf/build/java/ext/makefile.win b/mozilla/java/pluggable-jvm/wf/build/java/ext/makefile.win index c5068a782ab..ec71807c87c 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/ext/makefile.win +++ b/mozilla/java/pluggable-jvm/wf/build/java/ext/makefile.win @@ -8,23 +8,23 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: makefile.win,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: makefile.win,v 1.2 2001-07-12 19:57:36 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# all clean: - @ cd jpav + @ cd moz6 @ $(MAKE) -fmakefile.win -nologo $@ - @ cd ..\moz6 + @ cd ..\av @ $(MAKE) -fmakefile.win -nologo $@ diff --git a/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/FileListExt.mk b/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/FileListExt.mk index 446a4c64830..2fc670e1f29 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/FileListExt.mk +++ b/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/FileListExt.mk @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: FileListExt.mk,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: FileListExt.mk,v 1.2 2001-07-12 19:57:37 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# FILES_java =\ sun/jvmp/mozilla/MozillaAppletPeer.java \ diff --git a/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/GNUmakefile b/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/GNUmakefile index 46bf197ab56..4d5dfbc7ae3 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/GNUmakefile +++ b/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/GNUmakefile @@ -8,25 +8,24 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: GNUmakefile,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: GNUmakefile,v 1.2 2001-07-12 19:57:37 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# BUILDDIR = ../.. JAVASRCDIR = ../../../../java CLASSDESTDIR = ../../../unix/ext/moz6 ADDCLASSPATH=../../../unix/classes:../../../unix/ext/moz6 -PATH_SEP=: include FileListExt.mk diff --git a/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/makefile.win b/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/makefile.win index ccea2f0922d..833826a28d9 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/makefile.win +++ b/mozilla/java/pluggable-jvm/wf/build/java/ext/moz6/makefile.win @@ -8,25 +8,24 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: makefile.win,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: makefile.win,v 1.2 2001-07-12 19:57:38 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# BUILDDIR = ..\.. JAVASRCDIR = ..\..\..\..\java CLASSDESTDIR = ..\..\..\win32\ext\moz6 ADDCLASSPATH=..\..\..\win32\classes;..\..\..\win32\ext\moz6 -PATH_SEP=; PKG3=sun.jvmp.mozilla @@ -44,7 +43,7 @@ all: moz6.jar moz6.jar: classes @ echo Creating moz6.jar... @ cd $(CLASSDESTDIR) - @$(JAR_CMD) cf moz6.jar sun - -@$(DEL) ..\moz6.jar 2>NUL - @$(MV) moz6.jar .. + @ $(JAR_CMD) cf moz6.jar sun + -@ $(DEL) ..\moz6.jar > NUL + @ $(MV) moz6.jar .. @ echo Done diff --git a/mozilla/java/pluggable-jvm/wf/build/java/makefile.win b/mozilla/java/pluggable-jvm/wf/build/java/makefile.win index 08a5daa9026..4d8fb01ce02 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/makefile.win +++ b/mozilla/java/pluggable-jvm/wf/build/java/makefile.win @@ -8,24 +8,27 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: makefile.win,v 1.2 2001-05-11 23:31:35 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: makefile.win,v 1.3 2001-07-12 19:57:34 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# PKG=sun.jvmp +PKG2=sun.jvmp.applet PKG6=sun.jvmp.mozilla PKG7=sun.jvmp.netscape4 PKG8=sun.jvmp.security +PKG9=sun.jvmp.javascript +PKG10=netscape.javascript PKG11=sun.jvmp.generic.win32 PKG12=sun.jvmp.test PKG13=sun.jvmp.generic @@ -33,7 +36,7 @@ PKG13=sun.jvmp.generic BUILDDIR=. JAVASRCDIR=..\..\java ADDCLASSPATH=..\win32\classes -PATH_SEP=; +SUBDIRS=ext !include FileListCommon.mk !include FileListWin.mk @@ -46,16 +49,22 @@ FILES_class = $(FILES_class:netscape/javascript=../win32/classes/netscape/javasc !include rules.mk -all: classes +all: classes exts release: all wf.jar +exts: + @ cd ext + @ $(MAKE) -f makefile.win -nologo all + @ cd .. + wf.jar: - @ echo "Creating wf.jar file" + @ echo Creating wf.jar... @ cd $(CLASSDESTDIR) - -@ $(JAR_CMD) cf wf.jar sun netscape + @ $(JAR_CMD) cf wf.jar sun netscape > NUL + @ echo Done -@$(DEL) ..\wf.jar - -@$(MV) wf.jar .. + @$(MV) wf.jar .. .PHONY : all classes clean release exts diff --git a/mozilla/java/pluggable-jvm/wf/build/java/rules.mk b/mozilla/java/pluggable-jvm/wf/build/java/rules.mk index 9b99cb51e0b..f7ecb17d201 100644 --- a/mozilla/java/pluggable-jvm/wf/build/java/rules.mk +++ b/mozilla/java/pluggable-jvm/wf/build/java/rules.mk @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: rules.mk,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: rules.mk,v 1.2 2001-07-12 19:57:34 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# # nmake isn't the best make program I know about FILES_class = $(FILES_class:.java=.class) @@ -96,7 +96,7 @@ delete.classlist: compile.classlist: @if exist .classes.list echo "Compiling Java classes" @if exist .classes.list type .classes.list - @if exist .classes.list $(JAVAC_CMD) -d $(CLASSDESTDIR) -classpath $(CLASSDESTDIR)$(PATH_SEP)$(ADDCLASSPATH)$(PATH_SEP)$(CLASSPATH) \ + @if exist .classes.list $(JAVAC_CMD) -d $(CLASSDESTDIR) -classpath $(CLASSDESTDIR) -classpath $(ADDCLASSPATH) \ @.classes.list clean: diff --git a/mozilla/java/pluggable-jvm/wf/build/unix/Defs.gmk b/mozilla/java/pluggable-jvm/wf/build/unix/Defs.gmk index 618f3f90930..7671963cd06 100644 --- a/mozilla/java/pluggable-jvm/wf/build/unix/Defs.gmk +++ b/mozilla/java/pluggable-jvm/wf/build/unix/Defs.gmk @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: Defs.gmk,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: Defs.gmk,v 1.2 2001-07-12 19:57:39 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# BUILDDIR=. ROOTDIR=../.. @@ -32,16 +32,22 @@ LD = gcc CCOPT = -g CP = cp TAR = tar +ECHO = echo # type of really used JVM # values: _JVMP_IBMJVM, _JVMP_SUNJVM #JVMTYPE = _JVMP_IBMJVM JVMTYPE = _JVMP_SUNJVM -JVMKIND = hotspot +# use hotspot for older 1.3 and client for 1.3.1 and 1.4 +#JVMKIND = hotspot #JVMKIND = classic +JVMKIND = client # using pthreads, should be defined by smth like configure THREADTYPE = _JVMP_PTHREADS +# use shared memory and 2 process approach USE_SHM = 0 +# set to 1 if you want to compile pJava-compatible WF +WF_PJAVA = 0 uname = $(shell uname) ifeq ($(uname), SunOS) @@ -107,3 +113,16 @@ CFLAGS += -DJVMP_USE_SHM else PLUGINLIBS+=-lpthread endif + +ifeq ($(WF_PJAVA), 1) +CFLAGS += -DWF_PJAVA +endif + + + + + + + + + diff --git a/mozilla/java/pluggable-jvm/wf/build/unix/GNUmakefile b/mozilla/java/pluggable-jvm/wf/build/unix/GNUmakefile index 98f36aa7fec..15e0f11c7cd 100644 --- a/mozilla/java/pluggable-jvm/wf/build/unix/GNUmakefile +++ b/mozilla/java/pluggable-jvm/wf/build/unix/GNUmakefile @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: GNUmakefile,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: GNUmakefile,v 1.2 2001-07-12 19:57:39 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# include Defs.gmk #___________________________________________________________________ @@ -138,9 +138,8 @@ host_objs: $(HOSTOBJS) $(HOSTPROG): $(HOSTOBJS) $(CXX) -o $(HOSTPROG) $(HOSTOBJS) $(HOSTLIBS) -clean: java_clean +clean: rm -f $(HOSTPROG) $(PLUGINOBJS) $(HOSTOBJS) core *.so *.o $(PRELOAD_HACK) plugin.policy - java_clean: @cd ../java; $(MAKE) clean diff --git a/mozilla/java/pluggable-jvm/wf/build/unix/dump.sh b/mozilla/java/pluggable-jvm/wf/build/unix/dump.sh index f310b4979ad..b3773962724 100644 --- a/mozilla/java/pluggable-jvm/wf/build/unix/dump.sh +++ b/mozilla/java/pluggable-jvm/wf/build/unix/dump.sh @@ -8,18 +8,18 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: dump.sh,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: dump.sh,v 1.2 2001-07-12 19:57:39 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# tar czvf /tmp/jp.tgz /ws/M2308/mozilla/modules/jvmp/java/ /ws/M2308/mozilla/modules/jvmp/public/ /ws/M2308/mozilla/modules/jvmp/src/ /ws/M2308/mozilla/modules/jvmp/build/java/ /ws/M2308/mozilla/modules/jvmp/build/unix/GNUmakefile diff --git a/mozilla/java/pluggable-jvm/wf/build/unix/gtktest.c b/mozilla/java/pluggable-jvm/wf/build/unix/gtktest.c index de6df707fdc..a2c9a6ee66f 100644 --- a/mozilla/java/pluggable-jvm/wf/build/unix/gtktest.c +++ b/mozilla/java/pluggable-jvm/wf/build/unix/gtktest.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: gtktest.c,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: gtktest.c,v 1.2 2001-07-12 19:57:39 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include diff --git a/mozilla/java/pluggable-jvm/wf/build/unix/set_paths b/mozilla/java/pluggable-jvm/wf/build/unix/set_paths index a92c528c195..51b0e631a1c 100644 --- a/mozilla/java/pluggable-jvm/wf/build/unix/set_paths +++ b/mozilla/java/pluggable-jvm/wf/build/unix/set_paths @@ -1,35 +1,11 @@ #!/bin/sh - -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is The Waterfall Java Plugin Module -# -# The Initial Developer of the Original Code is Sun Microsystems Inc -# Portions created by Sun Microsystems Inc are Copyright (C) 2001 -# All Rights Reserved. -# -# $Id: set_paths,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# -# -# Contributor(s): -# -# Nikolay N. Igotti - WFHOME=`pwd` # Customizable part JVMTYPE=sun #JVMTYPE=ibm -JVM_KIND=hotspot +#JVM_KIND=hotspot #JVM_KIND=classic +JVM_KIND=client XTXMMIX=1 # End of customizable part diff --git a/mozilla/java/pluggable-jvm/wf/build/unix/set_paths.csh b/mozilla/java/pluggable-jvm/wf/build/unix/set_paths.csh index 4c4c0fd6a01..6a244573083 100644 --- a/mozilla/java/pluggable-jvm/wf/build/unix/set_paths.csh +++ b/mozilla/java/pluggable-jvm/wf/build/unix/set_paths.csh @@ -1,5 +1,4 @@ #!/bin/csh -x - # # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file @@ -10,19 +9,20 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: set_paths.csh,v 1.1.1.1 2001-05-10 18:12:22 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: set_paths.csh,v 1.2 2001-07-12 19:57:41 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# + setenv WFHOME `pwd` # Customizable part diff --git a/mozilla/java/pluggable-jvm/wf/build/win32/makefile.win b/mozilla/java/pluggable-jvm/wf/build/win32/makefile.win index b31d8e2c297..f62663b39f4 100644 --- a/mozilla/java/pluggable-jvm/wf/build/win32/makefile.win +++ b/mozilla/java/pluggable-jvm/wf/build/win32/makefile.win @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: makefile.win,v 1.1.1.1 2001-05-10 18:12:23 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: makefile.win,v 1.2 2001-07-12 19:57:43 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# BUILDDIR=. ROOTDIR=..\.. @@ -54,7 +54,7 @@ EXTRA_CFLAGS = $(CCDEBUG) -D$(JVMTYPE) -D$(THREADTYPE) -DXP_WIN32 -DARCH="\"win CFLAGS = -nologo -DWIN32 $(PICFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) -WX CXXFLAGS = $(CFLAGS) -I$(HOSTINCPATH) -I$(HOSTINCPATH)\glib -I$(HOSTINCPATH)\gdk -DXP_WIN32 -LIBFLAGS = -nologo -debug +LIBFLAGS = -nologo -debug -incremental:NO PLUGINCSRCDIR = ..\..\src\plugin PLUGINMDDIR = ..\..\src\plugin\win32 @@ -103,7 +103,6 @@ HOSTLIBS=$(HOSTLIBPATH)\glib-1.3.lib $(HOSTLIBPATH)\gtk-1.3.lib $(HOSTLIBPATH)\g {$(PLUGINMDDIR)}.c{$(OBJDIR)}.obj: @$(CC) $(CFLAGS) -D_JVMP_IMPLEMENTATION -c -Fo$@ $< {$(HOSTCPPSRCDIR)}.cpp{$(OBJDIR)}.obj: - @echo $< @$(CXX) $(CXXFLAGS) -c -Fo$@ $< {$(MOZEXTSRCDIR)}.c{$(OBJDIR)}.obj: @$(CC) $(CFLAGS) -c -Fo$@ $< @@ -115,27 +114,26 @@ HOSTLIBS=$(HOSTLIBPATH)\glib-1.3.lib $(HOSTLIBPATH)\gtk-1.3.lib $(HOSTLIBPATH)\g all: makefile.win ext plugin release: all - @ cd ..\java - @ $(MAKE) -fmakefile.win release - @ cd ..\win32 - @ IF NOT EXIST wfrelease $(MKDIR) wfrelease - @ $(DELTREE) wfrelease > NUL - @ $(MKDIR) wfrelease\ext - @ $(CP) wf.jar wfrelease > NUL - @ $(CP) $(PLUGIN_DLL) wfrelease > NUL - @ $(CP) $(MOZEXT_DLL) wfrelease > NUL - @ $(CP) $(PLUGIN_NATIVE_DLL) wfrelease > NUL - @ $(CP) plugin.policy wfrelease > NUL - @ $(CP) ext\*.jar wfrelease\ext\ - @ $(ZIP) -r wf-bin.zip wfrelease - @ echo "Release is wf-bin.zip" + @ cd ..\java + @ $(MAKE) -fmakefile.win release + @ cd ..\win32 + -@ $(DELTREE) wfrelease > NUL + @ IF NOT EXIST wfrelease $(MKDIR) wfrelease + @ IF NOT EXIST wfrelease\ext $(MKDIR) wfrelease\ext + @ $(CP) wf.jar wfrelease > NUL + @ $(CP) $(PLUGIN_DLL) wfrelease > NUL + @ $(CP) $(MOZEXT_DLL) wfrelease > NUL + @ $(CP) $(PLUGIN_NATIVE_DLL) wfrelease > NUL + @ $(CP) plugin.policy wfrelease > NUL + @ $(CP) ext\*.jar wfrelease\ext > NUL + @ $(ZIP) -r wf-bin.zip wfrelease + @ echo "Release is wf-bin.zip" .SUFFIXES: .SUFFIXES: .cpp .c .obj .cpp.obj: $(CXX) $(CFLAGS) -c $< -plugin_no_java: plugin_objs plugin_dll plugin_native_dll plugin_exec plugin.policy -#$(INSTALLER) +plugin_no_java: plugin_objs plugin_dll plugin_native_dll plugin_exec plugin.policy $(INSTALLER) plugin: plugin_no_java java_classes plugin_objs: $(PLUGINOBJS) $(PLUGIN_NATIVE_OBJS) plugin_dll: $(PLUGIN_DLL) @@ -144,7 +142,7 @@ $(MOZEXT_DLL): $(MOZEXTOBJS) @echo linking $@ @$(LD) $(LIBFLAGS) -dll -def:wfe_mozilla.def -out:$@ $(MOZEXTOBJS) $(TESTEXT_DLL): $(TESTEXTOBJS) - @echo linking $< + @echo linking $@ @$(LD) $(LIBFLAGS) -dll -def:wfe_test.def -out:$(TESTEXT_DLL) $(TESTEXTOBJS) $(PLUGIN_DLL): $(PLUGINOBJS) @echo linking $@ @@ -157,8 +155,9 @@ $(PLUGIN_NATIVE_DLL): $(PLUGIN_NATIVE_OBJS) plugin.policy: ..\..\java\plugin.policy @$(CP) ..\..\java\plugin.policy . > NUL java_classes: - @ cd ..\java - $(MAKE) -fmakefile.win all + @ echo Making Java classes + @ cd ..\java + @$(MAKE) -fmakefile.win all host_prog: $(HOSTOBJS) $(HOSTPROG) @@ -170,15 +169,14 @@ $(HOSTPROG): $(HOSTOBJS) clean: @echo Removing compiled files.. - @-del/Q $(PLUGINOBJS) $(HOSTOBJS) *.exe *.dll *.obj *.ilk *.exp *.lib *.pdb - @rm -rf ext + @-del/Q $(PLUGINOBJS) $(HOSTOBJS) *.exe *.dll *.obj @cd ..\java @$(MAKE) -fmakefile.win clean $(INSTALLER): $(INSTOBJS) - @echo Compiling installer - $(LD) $(LIBFLAGS) -out:$(INSTALLER) $(INSTOBJS) $(INSTLIBS) + @echo Linking installer + @$(LD) $(LIBFLAGS) -out:$(INSTALLER) $(INSTOBJS) $(INSTLIBS) plugin_exec: .PHONY: java_classes clean all host_objs plugin_native_dll plugin_exec release diff --git a/mozilla/java/pluggable-jvm/wf/build/win32/set_env.bat b/mozilla/java/pluggable-jvm/wf/build/win32/set_env.bat index 2eeb163213c..d7e88f9f97b 100755 --- a/mozilla/java/pluggable-jvm/wf/build/win32/set_env.bat +++ b/mozilla/java/pluggable-jvm/wf/build/win32/set_env.bat @@ -8,19 +8,19 @@ @REM IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or @REM implied. See the License for the specific language governing @REM rights and limitations under the License. -@REM +@REM @REM The Original Code is The Waterfall Java Plugin Module -@REM +@REM @REM The Initial Developer of the Original Code is Sun Microsystems Inc @REM Portions created by Sun Microsystems Inc are Copyright (C) 2001 @REM All Rights Reserved. -@REM -@REM $Id: set_env.bat,v 1.1.1.1 2001-05-10 18:12:23 edburns%acm.org Exp $ -@REM @REM -@REM Contributor(s): -@REM -@REM Nikolay N. Igotti +@REM $Id: set_env.bat,v 1.2 2001-07-12 19:57:43 edburns%acm.org Exp $ +@REM +@REM Contributor(s): +@REM +@REM Nikolay N. Igotti +@REM @echo off echo Setting some variables for WF.... diff --git a/mozilla/java/pluggable-jvm/wf/include/awt_Plugin.h b/mozilla/java/pluggable-jvm/wf/include/awt_Plugin.h index 30c1ca87fa2..d9d695608ac 100644 --- a/mozilla/java/pluggable-jvm/wf/include/awt_Plugin.h +++ b/mozilla/java/pluggable-jvm/wf/include/awt_Plugin.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,23 +9,32 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: awt_Plugin.h,v 1.1.1.1 2001-05-10 18:12:26 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: awt_Plugin.h,v 1.2 2001-07-12 19:57:44 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ /* - * Export functions for Netscape to use to get AWT info + * @(#)awt_Plugin.h 1.5 00/05/04 + * + * Copyright 2000 Sun Microsystems, Inc. All rights reserved. + * Copyright 2000 Sun Microsystems, Inc. Tous droits réservés. + * + * This software is the proprietary information of Sun Microsystems, Inc. + * Use is subject to license terms. + */ + +/* + * Fix 4221246: Export functions for Netscape to use to get AWT info */ #ifndef _AWT_PLUGIN_H_ diff --git a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_Plugin.h b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_Plugin.h index 2a96862af4d..28f0614e563 100644 --- a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_Plugin.h +++ b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_Plugin.h @@ -1,3 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is The Waterfall Java Plugin Module + * + * The Initial Developer of the Original Code is Sun Microsystems Inc + * Portions created by Sun Microsystems Inc are Copyright (C) 2001 + * All Rights Reserved. + * + * $Id: sun_jvmp_generic_motif_Plugin.h,v 1.2 2001-07-12 19:57:44 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ + /* DO NOT EDIT THIS FILE - it is machine generated */ #include /* Header for class sun_plugin_generic_motif_Plugin */ diff --git a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_PthreadSynchroObject.h b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_PthreadSynchroObject.h index 33428b02bb9..89e17ee8867 100644 --- a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_PthreadSynchroObject.h +++ b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_generic_motif_PthreadSynchroObject.h @@ -1,3 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is The Waterfall Java Plugin Module + * + * The Initial Developer of the Original Code is Sun Microsystems Inc + * Portions created by Sun Microsystems Inc are Copyright (C) 2001 + * All Rights Reserved. + * + * $Id: sun_jvmp_generic_motif_PthreadSynchroObject.h,v 1.2 2001-07-12 19:57:44 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ + /* DO NOT EDIT THIS FILE - it is machine generated */ #include /* Header for class sun_jvmp_generic_motif_PthreadSynchroObject */ diff --git a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JSObject.h b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JSObject.h index 81be0b9c28b..02ecdc40bb6 100644 --- a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JSObject.h +++ b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JSObject.h @@ -1,3 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is The Waterfall Java Plugin Module + * + * The Initial Developer of the Original Code is Sun Microsystems Inc + * Portions created by Sun Microsystems Inc are Copyright (C) 2001 + * All Rights Reserved. + * + * $Id: sun_jvmp_mozilla_JSObject.h,v 1.2 2001-07-12 19:57:46 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ + /* DO NOT EDIT THIS FILE - it is machine generated */ #include /* Header for class sun_jvmp_mozilla_JSObject */ diff --git a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JavaScriptProtectionDomain.h b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JavaScriptProtectionDomain.h index 1d05daa88f7..d0f6a91bf6b 100644 --- a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JavaScriptProtectionDomain.h +++ b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_JavaScriptProtectionDomain.h @@ -1,3 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is The Waterfall Java Plugin Module + * + * The Initial Developer of the Original Code is Sun Microsystems Inc + * Portions created by Sun Microsystems Inc are Copyright (C) 2001 + * All Rights Reserved. + * + * $Id: sun_jvmp_mozilla_JavaScriptProtectionDomain.h,v 1.2 2001-07-12 19:57:46 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ + /* DO NOT EDIT THIS FILE - it is machine generated */ #include /* Header for class sun_jvmp_mozilla_JavaScriptProtectionDomain */ diff --git a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaAppletPeer.h b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaAppletPeer.h index e72f9454686..b25a62ef460 100644 --- a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaAppletPeer.h +++ b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaAppletPeer.h @@ -1,3 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is The Waterfall Java Plugin Module + * + * The Initial Developer of the Original Code is Sun Microsystems Inc + * Portions created by Sun Microsystems Inc are Copyright (C) 2001 + * All Rights Reserved. + * + * $Id: sun_jvmp_mozilla_MozillaAppletPeer.h,v 1.2 2001-07-12 19:57:46 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ + /* DO NOT EDIT THIS FILE - it is machine generated */ #include /* Header for class sun_jvmp_mozilla_MozillaAppletPeer */ diff --git a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaPeerFactory.h b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaPeerFactory.h index 494bbf4dd2f..d0cfd98104c 100644 --- a/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaPeerFactory.h +++ b/mozilla/java/pluggable-jvm/wf/include/sun_jvmp_mozilla_MozillaPeerFactory.h @@ -1,3 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is The Waterfall Java Plugin Module + * + * The Initial Developer of the Original Code is Sun Microsystems Inc + * Portions created by Sun Microsystems Inc are Copyright (C) 2001 + * All Rights Reserved. + * + * $Id: sun_jvmp_mozilla_MozillaPeerFactory.h,v 1.2 2001-07-12 19:57:46 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ + /* DO NOT EDIT THIS FILE - it is machine generated */ #include /* Header for class sun_jvmp_mozilla_MozillaPeerFactory */ diff --git a/mozilla/java/pluggable-jvm/wf/java/plugin.policy b/mozilla/java/pluggable-jvm/wf/java/plugin.policy index de371c8fe36..83342770edc 100644 --- a/mozilla/java/pluggable-jvm/wf/java/plugin.policy +++ b/mozilla/java/pluggable-jvm/wf/java/plugin.policy @@ -1,5 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * +/* * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of @@ -9,22 +8,21 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: plugin.policy,v 1.1.1.1 2001-05-10 18:12:26 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: plugin.policy,v 1.2 2001-07-12 19:57:51 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ -grant codeBase "file:${jvmp.home}/classes/" { +grant codeBase "file:${jvmp.home}/classes/*" { permission java.security.AllPermission; }; grant codeBase "file:${jvmp.home}/wf.jar" { diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/BrowserSupport.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/BrowserSupport.java index 65a2c4cc752..6c985960a57 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/BrowserSupport.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/BrowserSupport.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: BrowserSupport.java,v 1.1.1.1 2001-05-10 18:12:26 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: BrowserSupport.java,v 1.2 2001-07-12 19:57:52 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentException.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentException.java index b61987da66e..d7e27384e82 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentException.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentException.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: ComponentException.java,v 1.1.1.1 2001-05-10 18:12:26 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: ComponentException.java,v 1.2 2001-07-12 19:57:52 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentLoader.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentLoader.java index 3c13726acfd..d3fa1b09740 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentLoader.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ComponentLoader.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: ComponentLoader.java,v 1.1.1.1 2001-05-10 18:12:26 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: ComponentLoader.java,v 1.2 2001-07-12 19:57:52 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; @@ -60,15 +59,11 @@ class ComponentLoader Class factory = null; Manifest mf = jis.getManifest(); Attributes a = mf.getMainAttributes(); - // this is magic to allow component to provide - // custom protocol handlers - String pkgs = - a.getValue(new Attributes.Name("Protocol-Handlers")); - if (pkgs != null) jvm.registerProtocolHandlers(comploader, pkgs); String classname = - a.getValue(new Attributes.Name("Factory-Class")); - if (classname == null) return null; - + a.getValue(new Attributes.Name("Factory-Class")); + // if this component not pretend to be autoregistered + // just skip it + if (classname == null) return null; factory = Class.forName(classname, true, comploader); Method m = factory.getDeclaredMethod("getFactory", new Class[]{PluggableJVM.class, @@ -109,13 +104,20 @@ class ComponentLoader if (dir == null || !dir.isDirectory()) return; File[] comps = dir.listFiles(); if (comps == null) return; - try { - for (int i=0; i - */ + * $Id: HostObjectPeer.java,v 1.2 2001-07-12 19:57:53 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/HostObjectPeerFactory.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/HostObjectPeerFactory.java index 2c788f8f766..7f3dcf90d93 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/HostObjectPeerFactory.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/HostObjectPeerFactory.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: HostObjectPeerFactory.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: HostObjectPeerFactory.java,v 1.2 2001-07-12 19:57:53 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDList.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDList.java index 07d3d4e9004..f7c274755f3 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDList.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDList.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: IDList.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: IDList.java,v 1.2 2001-07-12 19:57:53 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; @@ -33,7 +32,7 @@ import java.util.Hashtable; public class IDList { protected Vector m_items; protected Hashtable m_ids; - // this is common for + // this is common for all instances static int m_nextID = 1; public IDList() { @@ -94,7 +93,7 @@ public class IDList { } else { - m_items.add(o); + m_items.addElement(o); id = getId(m_items.indexOf(o)); } o.setID(id); diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDObject.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDObject.java index 6d428167c2f..63b57e36476 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDObject.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/IDObject.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: IDObject.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: IDObject.java,v 1.2 2001-07-12 19:57:53 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/MultipleHashtable.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/MultipleHashtable.java index 221c2df1c50..585b521f1b4 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/MultipleHashtable.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/MultipleHashtable.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,27 +9,26 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: MultipleHashtable.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: MultipleHashtable.java,v 1.2 2001-07-12 19:57:53 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; import java.util.*; /** * utility class - hashtable with multiple values per key - */ + **/ public class MultipleHashtable extends Hashtable { @@ -42,7 +41,7 @@ public class MultipleHashtable extends Hashtable { Vector v = getVector(key); if (v == null) v = new Vector(); - v.add(value); + v.addElement(value); return super.put(key, v); } @@ -50,9 +49,4 @@ public class MultipleHashtable extends Hashtable { return (Vector)super.get(key); } -// public Object get(Object key) -// { -// // I know, I'm bad :) -// return null; -// } } diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeFrame.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeFrame.java index ce8d6669a59..6cdec9029c2 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeFrame.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeFrame.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: NativeFrame.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: NativeFrame.java,v 1.2 2001-07-12 19:57:53 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeThread.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeThread.java index eb83e5b9f89..2844d294a7d 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeThread.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/NativeThread.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: NativeThread.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: NativeThread.java,v 1.2 2001-07-12 19:57:54 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ObjectFactory.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ObjectFactory.java index 399e66a3855..bfb82b0161b 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ObjectFactory.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/ObjectFactory.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: ObjectFactory.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: ObjectFactory.java,v 1.2 2001-07-12 19:57:54 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/PluggableJVM.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/PluggableJVM.java index cc2122d9ba9..9f77724511c 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/PluggableJVM.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/PluggableJVM.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: PluggableJVM.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: PluggableJVM.java,v 1.2 2001-07-12 19:57:54 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ /** * Main Waterfall Java class. It works as a message queue handler. @@ -180,7 +179,6 @@ public abstract class PluggableJVM public boolean registerService(ObjectFactory f) { int proceed = 0; - trace("registerService " +f, LOG_DEBUG); if (f == null) return false; Enumeration e = f.getCIDs(); if (e == null) return false; @@ -197,9 +195,10 @@ public abstract class PluggableJVM if (f.equals(f1)) continue; if (!f.handleConflict(cid, f1) || f1.handleConflict(cid, f)) continue; - } - + } hashCID.put(cid, f); + trace("registered service "+f+" for contract ID "+cid, + LOG_INFO); proceed++; } } catch (Exception ex) { @@ -249,7 +248,7 @@ public abstract class PluggableJVM } } return (proceed > 0); - } + } public PermissionCollection getExtensionsPermissions(CodeSource codesource) @@ -285,6 +284,7 @@ public abstract class PluggableJVM } return p; } + // XXX: kill me ASAP public CodeSource getCodeSource() { @@ -304,6 +304,20 @@ public abstract class PluggableJVM // fallback to defaults return tryToGetHandler(null, "sun.net.www.protocol", protocol); } + + /** + * It registers packages that can be loader with this classloader + * as URL handlers, according to standard procedure described + * in java.net.URL documentation. + **/ + public void registerProtocolHandlers(ClassLoader loader, + String pkgs) + { + synchronized (protocolHandlers) + { + protocolHandlers.addElement(new ProtoHandlerDesc(loader, pkgs)); + } + } /***************** END OF PUBLIC METHODS *************************/ /*****************************************************************/ /* methods from here accessible only to JNI calls, or to our subclasses */ @@ -331,7 +345,10 @@ public abstract class PluggableJVM // stuff like components autoregistration moved to this thread // to minimize latency String wfHome = System.getProperty("jvmp.home"); - loader.registerAllInDir(new File(wfHome, "ext")); + synchronized (loader) + { + loader.registerAllInDir(new File(wfHome, "ext")); + } running = true; runMainLoop(); } @@ -341,8 +358,10 @@ public abstract class PluggableJVM // init AWT here if (inited) return; Frame f = new Frame(); - f.setBounds(0, 0, 0, 0); + f.setBounds(0, 0, 1, 1); f.addNotify(); + //f.show(); + //f.hide(); f.removeNotify(); f = null; @@ -364,6 +383,7 @@ public abstract class PluggableJVM codesource = new CodeSource(c.toURL(), null); policy = new WFPolicy(this, c.toURL()); java.security.Policy.setPolicy(policy); + //trace("policy is "+java.security.Policy.getPolicy(), LOG_DEBUG); } catch (Exception e) { trace("Wow, cannot set system wide policy: "+e, LOG_CRITICAL); } @@ -408,14 +428,7 @@ public abstract class PluggableJVM { Frame f = getFrameWithId(id); NativeFrame nf = null; - if (f != null) - { - Object lock = f.getTreeLock(); - synchronized (lock) - { - nf = SysUnregisterWindow(id); - } - } + if (f != null) nf = SysUnregisterWindow(id); if (nf == null) return 0; // remove from ID table nativeFrames.remove(id); @@ -819,14 +832,14 @@ public abstract class PluggableJVM switch (id) { case CMD_CTL_CONSOLE: - //log("CMD_CTL_CONSOLE: "+data); + //trace("CMD_CTL_CONSOLE: "+data, LOG_DEBUG); switch ((int)data) { case 0: - console.hide(); + if (console.isVisible()) console.setVisible(false); return 1; case 1: - console.show(); + if (!console.isVisible()) console.setVisible(true); return 1; case 2: return (console.isVisible() ? 2 : 1); @@ -915,15 +928,6 @@ public abstract class PluggableJVM //e.printStackTrace(); } return null; -} - - void registerProtocolHandlers(ClassLoader loader, - String pkgs) - { - synchronized (protocolHandlers) - { - protocolHandlers.add(new ProtoHandlerDesc(loader, pkgs)); - } } }; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/SynchroObject.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/SynchroObject.java index 5a3b6b83e12..11d2fe6a81d 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/SynchroObject.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/SynchroObject.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: SynchroObject.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: SynchroObject.java,v 1.2 2001-07-12 19:57:54 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/WaterfallExtension.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/WaterfallExtension.java index 20fda4dffe2..4059e101544 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/WaterfallExtension.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/WaterfallExtension.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: WaterfallExtension.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: WaterfallExtension.java,v 1.2 2001-07-12 19:57:54 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp; @@ -66,7 +65,9 @@ class WaterfallExtension implements AccessControlDecider, IDObject m_classname = classname; try { - classpath = getDefaultClassPath() + classpath; + // XXX: I dunno, if default should be in classpath + classpath = //getDefaultClassPath() + + classpath; URL[] urls = getURLs(classpath); ClassLoader loader = this.getClass().getClassLoader(); @@ -182,8 +183,8 @@ class WaterfallExtension implements AccessControlDecider, IDObject url = new URL(classpath.substring(pos)); else url = new URL(classpath.substring(pos, i)); - //m_jvm.trace("adding URL: "+ url, PluggableJVM.LOG_DEBUG); - v.add(url); + m_jvm.trace("adding URL: "+ url, PluggableJVM.LOG_DEBUG); + v.addElement(url); pos = i+1; } while (i > -1); @@ -215,13 +216,14 @@ class WaterfallExtension implements AccessControlDecider, IDObject if (dir == null || !dir.isDirectory()) return ""; File[] comps = dir.listFiles(); if (comps == null) return ""; - try { - for (int i=0; i - */ + * $Id: GenericSynchroObject.java,v 1.2 2001-07-12 19:57:56 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.generic; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/Plugin.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/Plugin.java index ac81ba73122..0092e41d565 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/Plugin.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/Plugin.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: Plugin.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: Plugin.java,v 1.2 2001-07-12 19:57:58 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ // XXX: this class depends on sun.awt.* package sun.jvmp.generic.motif; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/PthreadSynchroObject.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/PthreadSynchroObject.java index dc36d57485f..5054e5d9a30 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/PthreadSynchroObject.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/motif/PthreadSynchroObject.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: PthreadSynchroObject.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: PthreadSynchroObject.java,v 1.2 2001-07-12 19:57:58 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.generic.motif; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/win32/Plugin.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/win32/Plugin.java index abb21928202..a28a1eb6ea8 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/win32/Plugin.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/generic/win32/Plugin.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: Plugin.java,v 1.1.1.1 2001-05-10 18:12:27 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: Plugin.java,v 1.2 2001-07-12 19:57:59 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.generic.win32; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaAppletPeer.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaAppletPeer.java index e6d2b84a859..f1a5e06f1ad 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaAppletPeer.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaAppletPeer.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: MozillaAppletPeer.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: MozillaAppletPeer.java,v 1.2 2001-07-12 19:58:01 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.netscape4; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaHostObjectPeer.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaHostObjectPeer.java index 892635f9a6f..356f38723b2 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaHostObjectPeer.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/MozillaHostObjectPeer.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: MozillaHostObjectPeer.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: MozillaHostObjectPeer.java,v 1.2 2001-07-12 19:58:01 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.netscape4; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/NetscapePeerFactory.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/NetscapePeerFactory.java index aa7ad1d5231..edf1e8a953b 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/NetscapePeerFactory.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/netscape4/NetscapePeerFactory.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: NetscapePeerFactory.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: NetscapePeerFactory.java,v 1.2 2001-07-12 19:58:01 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.netscape4; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/AccessControlDecider.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/AccessControlDecider.java index 590808ca3ff..dedc4eda738 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/AccessControlDecider.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/AccessControlDecider.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: AccessControlDecider.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: AccessControlDecider.java,v 1.2 2001-07-12 19:58:02 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.security; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/CallingContext.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/CallingContext.java index 17fa0f6b5ba..7d2f5c25ddf 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/CallingContext.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/CallingContext.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: CallingContext.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: CallingContext.java,v 1.2 2001-07-12 19:58:02 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.security; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/ExtSecurityManager.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/ExtSecurityManager.java index 2683606a0aa..0bcb85b78f7 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/ExtSecurityManager.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/ExtSecurityManager.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: ExtSecurityManager.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: ExtSecurityManager.java,v 1.2 2001-07-12 19:58:02 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.security; import java.util.*; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/SecurityCaps.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/SecurityCaps.java index 18af138854b..3780ea5da26 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/SecurityCaps.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/SecurityCaps.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: SecurityCaps.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: SecurityCaps.java,v 1.2 2001-07-12 19:58:03 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.security; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/WFPolicy.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/WFPolicy.java index 9b88267e1fd..3ca3b540235 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/WFPolicy.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/security/WFPolicy.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: WFPolicy.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: WFPolicy.java,v 1.2 2001-07-12 19:58:03 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.security; @@ -31,8 +30,9 @@ import java.security.*; import java.net.*; import java.util.*; -public class WFPolicy extends sun.security.provider.PolicyFile +public class WFPolicy extends Policy { + Policy sysPolicy; URL wfcodebase; PluggableJVM jvm; String wfextpath; @@ -41,6 +41,7 @@ public class WFPolicy extends sun.security.provider.PolicyFile this.wfcodebase = wfcodebase; wfextpath = wfcodebase.getPath()+"ext"; this.jvm = jvm; + this.sysPolicy = Policy.getPolicy(); } protected boolean isAllPermissionGranted(CodeSource codesource) @@ -66,7 +67,8 @@ public class WFPolicy extends sun.security.provider.PolicyFile PluggableJVM.LOG_DEBUG); return perms; } - PermissionCollection p = super.getPermissions(codesource); + PermissionCollection p = null; + if (sysPolicy != null) p = sysPolicy.getPermissions(codesource); if (p != null) { for (Enumeration e=p.elements(); e.hasMoreElements(); ) @@ -80,4 +82,17 @@ public class WFPolicy extends sun.security.provider.PolicyFile } return perms; } + + public void refresh() + { + if (sysPolicy != null) sysPolicy.refresh(); + } } + + + + + + + + diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyActionListener.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyActionListener.java index 4e34999eb1e..c38662816d9 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyActionListener.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyActionListener.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: MyActionListener.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: MyActionListener.java,v 1.2 2001-07-12 19:58:04 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.test; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyDialog.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyDialog.java index 43573b2e9eb..70ba19e11f9 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyDialog.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/MyDialog.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: MyDialog.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: MyDialog.java,v 1.2 2001-07-12 19:58:04 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.test; diff --git a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/TestPeerFactory.java b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/TestPeerFactory.java index 3c0286df449..15762f8e49e 100644 --- a/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/TestPeerFactory.java +++ b/mozilla/java/pluggable-jvm/wf/java/sun/jvmp/test/TestPeerFactory.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: TestPeerFactory.java,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: TestPeerFactory.java,v 1.2 2001-07-12 19:58:04 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ package sun.jvmp.test; diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp.h b/mozilla/java/pluggable-jvm/wf/public/jvmp.h index 4b4cd0e93bf..772d7bbdaa5 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp.h,v 1.2 2001-07-12 19:58:06 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_cap_vals.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_cap_vals.h index bf0fc52141c..6cc7139604b 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_cap_vals.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_cap_vals.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_cap_vals.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_cap_vals.h,v 1.2 2001-07-12 19:58:06 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_CAP_VALS_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_caps.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_caps.h index 9869fac7c88..3ba99e12eb7 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_caps.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_caps.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_caps.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_caps.h,v 1.2 2001-07-12 19:58:06 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_CAPS_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_drawing.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_drawing.h index ebc55cba83a..916b3cbc2ef 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_drawing.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_drawing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_drawing.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_drawing.h,v 1.2 2001-07-12 19:58:07 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_DRAWING_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_errors.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_errors.h index 24d1760fb26..3704da8c2d1 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_errors.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_errors.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_errors.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_errors.h,v 1.2 2001-07-12 19:58:07 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_ERRORS_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_event.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_event.h index d106d4b4b0e..4cbd269cce0 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_event.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_event.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_event.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_event.h,v 1.2 2001-07-12 19:58:07 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_EVENT_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_extension.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_extension.h index 51e3302bac8..74e6c0858a2 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_extension.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_extension.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_extension.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_extension.h,v 1.2 2001-07-12 19:58:07 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_EXTENSION_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_security.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_security.h index aceab1214a5..86b0a25e35c 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_security.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_security.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_security.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_security.h,v 1.2 2001-07-12 19:58:08 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_SECURITY_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_threading.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_threading.h index bc4ddd004d4..876f6b5ea6b 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_threading.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_threading.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_threading.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_threading.h,v 1.2 2001-07-12 19:58:08 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_THREADING_H diff --git a/mozilla/java/pluggable-jvm/wf/public/jvmp_vendor.h b/mozilla/java/pluggable-jvm/wf/public/jvmp_vendor.h index ac583c3ce10..adb7ffaec96 100644 --- a/mozilla/java/pluggable-jvm/wf/public/jvmp_vendor.h +++ b/mozilla/java/pluggable-jvm/wf/public/jvmp_vendor.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_vendor.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_vendor.h,v 1.2 2001-07-12 19:58:08 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_VENDOR_H diff --git a/mozilla/java/pluggable-jvm/wf/public/linux/jvmp_md.h b/mozilla/java/pluggable-jvm/wf/public/linux/jvmp_md.h index bd678299c86..43b2f6271b4 100644 --- a/mozilla/java/pluggable-jvm/wf/public/linux/jvmp_md.h +++ b/mozilla/java/pluggable-jvm/wf/public/linux/jvmp_md.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_md.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_md.h,v 1.2 2001-07-12 19:58:10 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_MD_H diff --git a/mozilla/java/pluggable-jvm/wf/public/shmtran.h b/mozilla/java/pluggable-jvm/wf/public/shmtran.h index ede218f2087..96aa5367d2d 100644 --- a/mozilla/java/pluggable-jvm/wf/public/shmtran.h +++ b/mozilla/java/pluggable-jvm/wf/public/shmtran.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: shmtran.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: shmtran.h,v 1.2 2001-07-12 19:58:08 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_SHMTRAN_H diff --git a/mozilla/java/pluggable-jvm/wf/public/solaris/jvmp_md.h b/mozilla/java/pluggable-jvm/wf/public/solaris/jvmp_md.h index 282df791f19..8c4a4d26b1f 100644 --- a/mozilla/java/pluggable-jvm/wf/public/solaris/jvmp_md.h +++ b/mozilla/java/pluggable-jvm/wf/public/solaris/jvmp_md.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_md.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_md.h,v 1.2 2001-07-12 19:58:11 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_MD_H diff --git a/mozilla/java/pluggable-jvm/wf/public/win32/jvmp_md.h b/mozilla/java/pluggable-jvm/wf/public/win32/jvmp_md.h index af15d5ffb4d..2e1057fa532 100644 --- a/mozilla/java/pluggable-jvm/wf/public/win32/jvmp_md.h +++ b/mozilla/java/pluggable-jvm/wf/public/win32/jvmp_md.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_md.h,v 1.1.1.1 2001-05-10 18:12:32 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_md.h,v 1.2 2001-07-12 19:58:13 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef _JVMP_MD_H diff --git a/mozilla/java/pluggable-jvm/wf/src/host/host.cpp b/mozilla/java/pluggable-jvm/wf/src/host/host.cpp index f149438e7ab..c19eaf0d9e7 100644 --- a/mozilla/java/pluggable-jvm/wf/src/host/host.cpp +++ b/mozilla/java/pluggable-jvm/wf/src/host/host.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: host.cpp,v 1.1.1.1 2001-05-10 18:12:33 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: host.cpp,v 1.2 2001-07-12 19:58:14 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include diff --git a/mozilla/java/pluggable-jvm/wf/src/host/test_extension.c b/mozilla/java/pluggable-jvm/wf/src/host/test_extension.c index ddd13760c06..a1157e7832d 100644 --- a/mozilla/java/pluggable-jvm/wf/src/host/test_extension.c +++ b/mozilla/java/pluggable-jvm/wf/src/host/test_extension.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: test_extension.c,v 1.1.1.1 2001-05-10 18:12:34 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: test_extension.c,v 1.2 2001-07-12 19:58:14 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include "jvmp.h" diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/java_plugin.c b/mozilla/java/pluggable-jvm/wf/src/plugin/java_plugin.c index 458d06ce8cd..bf90fc2c51d 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/java_plugin.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/java_plugin.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: java_plugin.c,v 1.1.1.1 2001-05-10 18:12:35 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: java_plugin.c,v 1.2 2001-07-12 19:58:15 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ /** @@ -78,8 +77,11 @@ static MUTEX_T* jvm_mutex = NULL; #endif /* default JNI version used by Waterfall */ +#ifdef WF_PJAVA +#define DEFAULT_JNI_VERSION JNI_VERSION_1_1 +#else #define DEFAULT_JNI_VERSION JNI_VERSION_1_2 - +#endif /* level of verbosity printed with PlugableJVM.trace method: lesser number - lesser output */ #define DEBUG_LEVEL 10 @@ -297,7 +299,7 @@ static jint loadJVM(const char* name) { free(java_home); free(jre_home); free(newlibpath); */ - //PLUGIN_LOG2("loading JVM from %s", libjvm); + /* PLUGIN_LOG2("loading JVM from %s", libjvm); */ handle = JVMP_LoadDLL (libjvm, DL_MODE); free (libjvm); if (!handle) { diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.c b/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.c index 30f042aeab2..f7488a3ffbd 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jpthreads.c,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jpthreads.c,v 1.2 2001-07-12 19:58:16 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include "jpthreads.h" @@ -153,7 +152,7 @@ void* JVMP_FindSymbol(dll_t dll, const char* sym) int JVMP_UnloadDLL(dll_t dll) { - // XXX: fix me + /* XXX: fix me */ return 0; } diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.h b/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.h index f2592873999..d7050c82218 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.h +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/jpthreads.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jpthreads.h,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jpthreads.h,v 1.2 2001-07-12 19:58:16 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include "jvmp.h" diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/XmHelper.c b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/XmHelper.c index 065ffbed549..df40945940d 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/XmHelper.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/XmHelper.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: XmHelper.c,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: XmHelper.c,v 1.2 2001-07-12 19:58:19 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wf_moz6_common.h b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wf_moz6_common.h index e3a00ecf1f4..2476b07ad49 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wf_moz6_common.h +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wf_moz6_common.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: wf_moz6_common.h,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: wf_moz6_common.h,v 1.2 2001-07-12 19:58:19 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #ifndef __wf_moz6_common_h @@ -69,7 +68,7 @@ typedef struct JavaObjectWrapper JavaObjectWrapper; #define WF_APPLETPEER_CID "@sun.com/wf/mozilla/appletpeer;1" -enum JSCallType { // Possible JS call type +enum JSCallType { /* Possible JS call type */ JS_Unknown = 0, JS_GetWindow = 1, JS_ToString, @@ -85,65 +84,65 @@ enum JSCallType { // Possible JS call type struct JSObject_CallInfo { - const char* pszUrl; // URL of the CodeSource object in the Java call - jobjectArray jCertArray; // Certificate array of the CodeSource object - jintArray jCertLengthArray; // Certificate length array of the CodeSource object - int iNumOfCerts; // Number of certificates in the cert and cert length array - jobject jAccessControlContext; // AccessControlContext object that represents the Java callstack - enum JSCallType type; // Type of JSObject call - jthrowable jException; // Java exception object as the result of the call - JavaObjectWrapper* pWrapper; // native-Java glueing object + const char* pszUrl; + jobjectArray jCertArray; + jintArray jCertLengthArray; + int iNumOfCerts; + jobject jAccessControlContext; + enum JSCallType type; + jthrowable jException; + JavaObjectWrapper* pWrapper; union { struct __GetWindow { - void* pPlugin; // Plug-in instance corresponded to the JSObject call - jint iNativeJSObject; // Native JS object as the result of the GetWindow call + void* pPlugin; + jint iNativeJSObject; } __getWindow; struct __Finalize { - jint iNativeJSObject; // Native JS object that needs to be finalized + jint iNativeJSObject; } __finalize; struct __ToString { - jint iNativeJSObject; // Native JS object that corresponded to the JSObject.toString - jstring jResult; // Result of JSObject.toString + jint iNativeJSObject; + jstring jResult; } __toString; struct __Call { - const jchar* pszMethodName; // Method name - int iMethodNameLen; // Length of method name - jobjectArray jArgs; // Argument for the JSObject.Call - jint iNativeJSObject; // Native JS object corresponded to the JSObject.call - jobject jResult; // Result of JSObject.call + const jchar* pszMethodName; + int iMethodNameLen; + jobjectArray jArgs; + jint iNativeJSObject; + jobject jResult; } __call; struct __Eval { - const jchar* pszEval; // String to be evaluated - int iEvalLen; // Length of the evaluatation string - jint iNativeJSObject; // Native JS object corresponded to the JSObject.eval - jobject jResult; // Result of JSObject.eval + const jchar* pszEval; + int iEvalLen; + jint iNativeJSObject; + jobject jResult; } __eval; struct __GetMember { - const jchar* pszName; // Member name - int iNameLen; // Length of member name - jint iNativeJSObject; // Native JS object corresponded to the JSObject.getMember - jobject jResult; // Result of JSObject.getMember + const jchar* pszName; + int iNameLen; + jint iNativeJSObject; + jobject jResult; } __getMember; struct __SetMember { - const jchar* pszName; // Member name - int iNameLen; // Length of member name - jint iNativeJSObject; // Native JS object corresponded to the JSObject.setMember - jobject jValue; // Result of JSObject.setMember + const jchar* pszName; + int iNameLen; + jint iNativeJSObject; + jobject jValue; } __setMember; struct __RemoveMember { - const jchar* pszName; // Member name - int iNameLen; // Length of member name - jint iNativeJSObject; // Native JS object corresponded to the JSObject.removeMember + const jchar* pszName; + int iNameLen; + jint iNativeJSObject; } __removeMember; struct __GetSlot { - int iIndex; // Slot number - jint iNativeJSObject; // Native JS object corresponded to the JSObject.getSlot - jobject jResult; // Result of JSObject.getSlot + int iIndex; + jint iNativeJSObject; + jobject jResult; } __getSlot; struct __SetSlot { - int iIndex; // Slot number - jobject jValue; // Value to set in the slot - jint iNativeJSObject; // Native JS object corresponded to the JSObject.setSlot + int iIndex; + jobject jValue; + jint iNativeJSObject; } __setSlot; } data; }; diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfe_mozilla.c b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfe_mozilla.c index dca428a60eb..cc3e5c13664 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfe_mozilla.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfe_mozilla.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: wfe_mozilla.c,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: wfe_mozilla.c,v 1.2 2001-07-12 19:58:19 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include "jvmp.h" @@ -87,8 +86,13 @@ static jint JNICALL JVMPExt_GetBootstrapClass(char* *bootstrapClassPath, fprintf(stderr, "Env variable WFHOME not set"); return JNI_FALSE; } - classpath = (char*)malloc(strlen(home)+20); - sprintf(classpath, "file://%s/classes/", home); + classpath = (char*)malloc(strlen(home)+25); + /* those DOSish disk letters make me crazy!!! */ +#ifdef XP_WIN32 + sprintf(classpath, "file:/%s/ext/moz6.jar", home); +#else + sprintf(classpath, "file://%s/ext/moz6.jar", home); +#endif /* should be defined in installation time */ *bootstrapClassPath = classpath; *bootstrapClassName = "sun.jvmp.mozilla.MozillaPeerFactory"; diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfm6_native.c b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfm6_native.c index e2e0eb5aae4..afe575dc863 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfm6_native.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/mozilla/wfm6_native.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: wfm6_native.c,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: wfm6_native.c,v 1.2 2001-07-12 19:58:20 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include @@ -323,7 +322,7 @@ Java_sun_jvmp_mozilla_MozillaPeerFactory_nativeHandleCall JS object? */ static jmethodID m = NULL; jobject jObj = NULL; - fprintf(stderr, "Java_WrapJSObject: %lx %lx\n", + fprintf(stderr, "Java_WrapJSObject: %x %x\n", call->data.__wrapJSObject.jstid, call->data.__wrapJSObject.jsObject); if (!m) @@ -534,9 +533,19 @@ Java_sun_jvmp_mozilla_MozillaPeerFactory_nativeHandleCall jException = (*env)->ExceptionOccurred(env); if (jException) { - fprintf(stderr, "hmm, exception in handle call\n"); + fprintf(stderr, "wfm6_native.c: hmm, exception in handle call %d\n", call->type); + /* XXX: this behavior is kinda incorrect, but otherwise + * Mozilla with no LiveConnect just crashes on pages like + * http://javaapplets.com, when call goes in JS->Java direction. + * I have no complete understanding of reason of this crash, maybe + * incorrect Mozilla code - I'm not sure. + */ +#if 0 jException = (*env)->NewLocalRef(env, jException); call->jException = jException; +#else + (*env)->ExceptionDescribe(env); +#endif (*env)->ExceptionClear(env); } return 1; @@ -744,7 +753,7 @@ Java_sun_jvmp_mozilla_JSObject_JSFinalize { struct JSObject_CallInfo* pInfo = NULL; - fprintf(stderr, "Java_sun_jvmp_mozilla_JSObject_JSFinalize: %lx\n", + fprintf(stderr, "Java_sun_jvmp_mozilla_JSObject_JSFinalize: %x\n", nativeJSObject); if (getBrowserWrapper(env, NULL, jsClass) == NULL) return; diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/JavaPlugin.c b/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/JavaPlugin.c index 09de8f1a54e..e8711bf32a7 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/JavaPlugin.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/JavaPlugin.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: JavaPlugin.c,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: JavaPlugin.c,v 1.2 2001-07-12 19:58:21 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ /* -*- Mode: C; tab-width: 4; -*- */ diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/Makefile b/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/Makefile index 23471d78404..bbf5a825cf8 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/Makefile +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/Makefile @@ -1,28 +1,26 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is The Waterfall Java Plugin Module - * - * The Initial Developer of the Original Code is Sun Microsystems Inc - * Portions created by Sun Microsystems Inc are Copyright (C) 2001 - * All Rights Reserved. - * - * $Id: Makefile,v 1.1.1.1 2001-05-10 18:12:36 edburns%acm.org Exp $ - * - * - * Contributor(s): - * - * Nikolay N. Igotti - */ +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is The Waterfall Java Plugin Module +# +# The Initial Developer of the Original Code is Sun Microsystems Inc +# Portions created by Sun Microsystems Inc are Copyright (C) 2001 +# All Rights Reserved. +# +# $Id: Makefile,v 1.2 2001-07-12 19:58:21 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# #!make ################################################################################ diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/wfe_netscape4.c b/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/wfe_netscape4.c index 4f03419c966..df00e352480 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/wfe_netscape4.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/netscape4/wfe_netscape4.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: wfe_netscape4.c,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: wfe_netscape4.c,v 1.2 2001-07-12 19:58:22 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include "jvmp.h" diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/Makefile b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/Makefile index 2a978f10424..ea5afa31b21 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/Makefile +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/Makefile @@ -8,19 +8,19 @@ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. -# +# # The Original Code is The Waterfall Java Plugin Module -# +# # The Initial Developer of the Original Code is Sun Microsystems Inc # Portions created by Sun Microsystems Inc are Copyright (C) 2001 # All Rights Reserved. -# -# $Id: Makefile,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ -# # -# Contributor(s): -# -# Nikolay N. Igotti +# $Id: Makefile,v 1.2 2001-07-12 19:58:23 edburns%acm.org Exp $ +# +# Contributor(s): +# +# Nikolay N. Igotti +# CFLAGS=-Wall -g -I../../../public/ -DJVMP_USE_SHM all: shmtran.o jvmp_exec host diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm.c b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm.c index c46d8920c2c..7bf3aefec13 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: java_plugin_shm.c,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: java_plugin_shm.c,v 1.2 2001-07-12 19:58:23 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ /* diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm_host.c b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm_host.c index 472febba551..7487efd4835 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm_host.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/java_plugin_shm_host.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: java_plugin_shm_host.c,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: java_plugin_shm_host.c,v 1.2 2001-07-12 19:58:23 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ /* diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/jvmp_exec.c b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/jvmp_exec.c index 6410a1c9928..9f808bf5078 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/jvmp_exec.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/jvmp_exec.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: jvmp_exec.c,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: jvmp_exec.c,v 1.2 2001-07-12 19:58:24 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/native.c b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/native.c index 7a5950edbf1..866c020601e 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/native.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/native.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: native.c,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: native.c,v 1.2 2001-07-12 19:58:24 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ /* Waterfall headers */ @@ -102,14 +101,16 @@ static WidgetClass getVendorShellWidgetClass() { static int initAWTGlue() { + static int inited = 0; #define AWT_RESOLVE(method) awt.##method = \ (method##_t) dlsym(awtDLL, #method); \ if (awt.##method == NULL) { \ - fprintf(stderr, "dlsyn: %s", dlerror()); \ + fprintf(stderr, "dlsym: %s", dlerror()); \ return 0; \ } char awtPath[MAXPATHLEN]; + if (inited) return 1; /* JAVA_HOME/JAVAHOME set by Waterfall before, see java_plugin.c */ #ifdef _JVMP_SUNJVM sprintf(awtPath, "%s/lib/" ARCH "/" AWTDLL, @@ -119,7 +120,7 @@ static int initAWTGlue() sprintf(awtPath, "%s/bin/" AWTDLL, getenv("JAVAHOME")); #endif - //fprintf(stderr,"loading %s\n", awtPath); + /* fprintf(stderr,"loading %s\n", awtPath); */ awtDLL = dlopen(awtPath, RTLD_NOW); if (awtDLL == NULL) { @@ -130,6 +131,7 @@ static int initAWTGlue() awt.getAwtLockFunctions(&LockIt, &UnLockIt, &NoFlushUnlockIt, NULL); AWT_RESOLVE(getAwtData); AWT_RESOLVE(getAwtDisplay); + inited = 1; return 1; } @@ -211,12 +213,30 @@ Java_sun_jvmp_generic_motif_Plugin_getWidget(JNIEnv *env, jclass clz, return PTR_TO_JLONG(w); } +/** the only reason of this #if is request of pjava team - they don't have + * working JNI_OnLoad. If it will be fixed - remove it at all, as it looks + * nasty. + **/ +#if (defined WF_PJAVA) +#if (defined __GNUC__) +void init() __attribute__ ((constructor)); +void init() +{ + fprintf(stderr, "pJava-ready WF native code\n"); + initAWTGlue(); +} +#else +#error "Implement constructor-like init() function for your compiler" +#endif +#else JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { if (!initAWTGlue()) return 0; return JNI_VERSION_1_2; } +#endif + static jlong getTimeMillis() { diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/shmtran.c b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/shmtran.c index 9a07a393f15..376c9adfa9e 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/unix/shmtran.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/unix/shmtran.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: shmtran.c,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: shmtran.c,v 1.2 2001-07-12 19:58:24 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ #include "shmtran.h" diff --git a/mozilla/java/pluggable-jvm/wf/src/plugin/win32/native.c b/mozilla/java/pluggable-jvm/wf/src/plugin/win32/native.c index 8e2edb72887..8bca4f61e24 100644 --- a/mozilla/java/pluggable-jvm/wf/src/plugin/win32/native.c +++ b/mozilla/java/pluggable-jvm/wf/src/plugin/win32/native.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,19 +9,18 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: native.c,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti + * $Id: native.c,v 1.2 2001-07-12 19:58:26 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti */ -// nothing here yet +// nothing here yet \ No newline at end of file diff --git a/mozilla/java/pluggable-jvm/wf/tests/LC/LC.java b/mozilla/java/pluggable-jvm/wf/tests/LC/LC.java index c21ddb19297..f1b9ba2ca01 100644 --- a/mozilla/java/pluggable-jvm/wf/tests/LC/LC.java +++ b/mozilla/java/pluggable-jvm/wf/tests/LC/LC.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: LC.java,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: LC.java,v 1.2 2001-07-12 19:58:27 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ import java.util.*; import java.awt.*; diff --git a/mozilla/java/pluggable-jvm/wf/tests/LC/LC1.java b/mozilla/java/pluggable-jvm/wf/tests/LC/LC1.java index 5acdf916d38..eb20637b053 100644 --- a/mozilla/java/pluggable-jvm/wf/tests/LC/LC1.java +++ b/mozilla/java/pluggable-jvm/wf/tests/LC/LC1.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: LC1.java,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: LC1.java,v 1.2 2001-07-12 19:58:27 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ import java.util.*; import java.awt.*; diff --git a/mozilla/java/pluggable-jvm/wf/tests/https/SecureApplet.java b/mozilla/java/pluggable-jvm/wf/tests/https/SecureApplet.java index 2efc3f9f0cf..489279800fd 100644 --- a/mozilla/java/pluggable-jvm/wf/tests/https/SecureApplet.java +++ b/mozilla/java/pluggable-jvm/wf/tests/https/SecureApplet.java @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file @@ -9,20 +9,19 @@ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is The Waterfall Java Plugin Module - * + * * The Initial Developer of the Original Code is Sun Microsystems Inc * Portions created by Sun Microsystems Inc are Copyright (C) 2001 * All Rights Reserved. - * - * $Id: SecureApplet.java,v 1.1.1.1 2001-05-10 18:12:37 edburns%acm.org Exp $ - * * - * Contributor(s): - * - * Nikolay N. Igotti - */ + * $Id: SecureApplet.java,v 1.2 2001-07-12 19:58:29 edburns%acm.org Exp $ + * + * Contributor(s): + * + * Nikolay N. Igotti + */ import java.util.*; import java.awt.*;