Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged branch JAVADEV_PR3_20001002 into trunk.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@82247 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2000-11-02 23:33:21 +00:00
parent 19a05b26cb
commit aee4ebbf93
71 changed files with 1537 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/java/webclient/classes_spec/Makefile.in
View File

@@ -76,9 +76,12 @@ ifneq ($(PACKAGE_BUILD),)
if test ! -d $(PACKAGE_LIB) ; then mkdir $(PACKAGE_LIB) ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar ; then rm -f $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/blackwood.jar ; then rm -f $(PACKAGE_LIB)/blackwood.jar ; else true ; fi ;
jar -xvf $(topsrcdir)/java/external/dom2.jar $(topsrcdir)/dist/classes/.
jar -cvf $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar $(topsrcdir)/dist/classes/org
ln -s blackwood.$(VERSION_NUMBER).jar $(PACKAGE_LIB)/blackwood.jar
cd $(topsrcdir)/dist/classes ; \
jar -xvf ../../java/external/dom2.jar ; \
jar -cvfM0 blackwood.$(VERSION_NUMBER).jar org ; \
cp blackwood.$(VERSION_NUMBER).jar ../javadev/lib/blackwood.$(VERSION_NUMBER).jar ;
cd $(topsrcdir)/dist/javadev/lib ; \
ln -s blackwood.$(VERSION_NUMBER).jar $(PACKAGE_LIB)/blackwood.jar ;
endif
doc::

56
mozilla/java/webclient/classes_spec/org/mozilla/webclient/CurrentPage.java
View File

@@ -20,6 +20,62 @@
* Contributor(s): Ed Burns <edburns@acm.org>
*/
/*
* W3C® IPR SOFTWARE NOTICE
* Copyright © 1994-2000 World Wide Web Consortium, (Massachusetts
* Institute of Technology, Institut National de Recherche en
* Informatique et en Automatique, Keio University). All Rights
* Reserved. http://www.w3.org/Consortium/Legal/
* This W3C work (including software, documents, or other related items) is
* being provided by the copyright holders under the following
* license. By obtaining, using and/or copying this work, you (the
* licensee) agree that you have read, understood, and will comply with
* the following terms and conditions:
* Permission to use, copy, and modify this software and its documentation,
* with or without modification, for any purpose and without fee or
* royalty is hereby granted, provided that you include the following on
* ALL copies of the software and documentation or portions thereof,
* including modifications, that you make:
* The full text of this NOTICE in a location viewable to users of the
* redistributed or derivative work.
* Any pre-existing intellectual property disclaimers, notices, or terms
* and conditions. If none exist, a short notice of the following form
* (hypertext is preferred, text is permitted) should be used within the
* body of any redistributed or derivative code: "Copyright ©
* [$date-of-software] World Wide Web Consortium, (Massachusetts
* Institute of Technology, Institut National de Recherche en
* Informatique et en Automatique, Keio University). All Rights
* Reserved. http://www.w3.org/Consortium/Legal/"
* Notice of any changes or modifications to the W3C files, including
* the date changes were made. (We recommend you provide URIs to the
* location from which the code is derived.)
* THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
* HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
* INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR
* FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
* DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
* TRADEMARKS OR OTHER RIGHTS.
* COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
* SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
* SOFTWARE OR DOCUMENTATION.
* The name and trademarks of copyright holders may NOT be used in
* advertising or publicity pertaining to the software without specific,
* written prior permission. Title to copyright in this software and any
* associated documentation will at all times remain with copyright
* holders.
*/
package org.mozilla.webclient;
import java.util.Properties;

44
mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
View File

@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
* This is a test application for using the BrowserControl.
*
* @version $Id: EMWindow.java,v 1.21 2000-09-20 21:53:01 edburns%acm.org Exp $
* @version $Id: EMWindow.java,v 1.22 2000-11-02 23:33:10 edburns%acm.org Exp $
*
* @see org.mozilla.webclient.BrowserControlFactory
@@ -113,34 +113,34 @@ public class EMWindow extends Frame implements DialogClient, ActionListener, Doc
// Create the Menu Bar
menuBar = new MenuBar();
this.setMenuBar(menuBar);
Menu fileMenu = new Menu("File");
// Menu fileMenu = new Menu("File");
Menu viewMenu = new Menu("View");
Menu searchMenu = new Menu("Search");
// Menu searchMenu = new Menu("Search");
Menu editMenu = new Menu("Edit");
MenuItem newItem = new MenuItem("New Window");
MenuItem closeItem = new MenuItem("Close");
MenuItem findItem = new MenuItem("Find");
MenuItem findNextItem = new MenuItem("Find Next");
// MenuItem newItem = new MenuItem("New Window");
// MenuItem closeItem = new MenuItem("Close");
// MenuItem findItem = new MenuItem("Find");
// MenuItem findNextItem = new MenuItem("Find Next");
MenuItem sourceItem = new MenuItem("View Page Source");
MenuItem pageInfoItem = new MenuItem("View Page Info");
MenuItem selectAllItem = new MenuItem("Select All");
MenuItem copyItem = new MenuItem("Copy");
menuBar.add(fileMenu);
// menuBar.add(fileMenu);
menuBar.add(viewMenu);
menuBar.add(searchMenu);
// menuBar.add(searchMenu);
menuBar.add(editMenu);
fileMenu.add(newItem);
newItem.addActionListener(this);
fileMenu.add(closeItem);
closeItem.addActionListener(this);
searchMenu.add(findItem);
findItem.addActionListener(this);
searchMenu.add(findNextItem);
findNextItem.addActionListener(this);
// fileMenu.add(newItem);
// newItem.addActionListener(this);
// fileMenu.add(closeItem);
// closeItem.addActionListener(this);
// searchMenu.add(findItem);
// findItem.addActionListener(this);
// searchMenu.add(findNextItem);
// findNextItem.addActionListener(this);
viewMenu.add(sourceItem);
sourceItem.addActionListener(this);
viewMenu.add(pageInfoItem);
pageInfoItem.addActionListener(this);
// viewMenu.add(pageInfoItem);
// pageInfoItem.addActionListener(this);
editMenu.add(selectAllItem);
selectAllItem.addActionListener(this);
editMenu.add(copyItem);
@@ -165,8 +165,8 @@ public class EMWindow extends Frame implements DialogClient, ActionListener, Doc
stopButton.setEnabled(false);
refreshButton = makeItem(buttonsPanel, "Refresh", 3, 0, 1, 1, 0.0, 0.0);
refreshButton.setEnabled(false);
makeItem(buttonsPanel, "Bookmarks", 4, 0, 1, 1, 0.0, 0.0);
makeItem(buttonsPanel, "DOMViewer", 5, 0, 1, 1, 0.0, 0.0);
// makeItem(buttonsPanel, "Bookmarks", 4, 0, 1, 1, 0.0, 0.0);
// makeItem(buttonsPanel, "DOMViewer", 5, 0, 1, 1, 0.0, 0.0);
// Create the control panel
controlPanel = new Panel();
@@ -312,7 +312,7 @@ public void delete()
domViewer.setVisible(false);
domViewer.dispose();
domViewer = null;
}
}
BrowserControlFactory.deleteBrowserControl(browserControl);
browserControl = null;
this.hide();

21
mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/CurrentPageImpl.java
View File

@@ -103,18 +103,23 @@ public void findInPage(String stringToFind, boolean forward, boolean matchCase)
ParameterCheck.nonNull(stringToFind);
myFactory.throwExceptionIfNotInitialized();
synchronized(myBrowserControl) {
/* synchronized(myBrowserControl) {
nativeFindInPage(nativeWebShell, stringToFind, forward, matchCase);
}
}*/
throw new UnimplementedException("\nUnimplementedException -----\n API Function CurrentPage::findInPage is not implemented in Webclient release 0.9\n");
}
public void findNextInPage(boolean forward)
{
myFactory.throwExceptionIfNotInitialized();
synchronized(myBrowserControl) {
/* synchronized(myBrowserControl) {
nativeFindNextInPage(nativeWebShell, forward);
}
}*/
throw new UnimplementedException("\nUnimplementedException -----\n API Function CurrentPage::findNextInPage is not implemented in Webclient release 0.9\n");
}
public String getCurrentURL()
@@ -211,9 +216,11 @@ public void resetFind()
{
myFactory.throwExceptionIfNotInitialized();
synchronized(myBrowserControl) {
/* synchronized(myBrowserControl) {
nativeResetFind(nativeWebShell);
}
}*/
throw new UnimplementedException("\nUnimplementedException -----\n API Function CurrentPage::resetFind is not implemented in Webclient release 0.9\n");
}
public void selectAll()
@@ -261,7 +268,7 @@ public static void main(String [] args)
Assert.setEnabled(true);
Log.setApplicationName("CurrentPageImpl");
Log.setApplicationVersion("0.0");
Log.setApplicationVersionDate("$Id: CurrentPageImpl.java,v 1.8 2000-07-22 02:48:25 edburns%acm.org Exp $");
Log.setApplicationVersionDate("$Id: CurrentPageImpl.java,v 1.9 2000-11-02 23:33:12 edburns%acm.org Exp $");
}

2
mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/ImplObjectNative.java
View File

@@ -146,7 +146,7 @@ WindowControlImpl.java
public void delete()
{
nativeWebShell = -1;
System.out.println("debug: edburns: ImplObjectNative.delete()");
System.out.println("ImplObjectNative.delete()");
super.delete();
}

4
mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WrapperFactoryImpl.java
View File

@@ -114,7 +114,7 @@ public Object newImpl(String interfaceName,
interfaceName +
": not implemented.");
}
System.out.println("debug: edburns: native library does implement " +
System.out.println("native library does implement " +
interfaceName);
if (BrowserControl.WINDOW_CONTROL_NAME == interfaceName) {
result = new WindowControlImpl(this, browserControl);
@@ -222,7 +222,7 @@ public static void main(String [] args)
WrapperFactory me = new WrapperFactoryImpl();
Log.setApplicationName("WrapperFactoryImpl");
Log.setApplicationVersion("0.0");
Log.setApplicationVersionDate("$Id: WrapperFactoryImpl.java,v 1.2 2000-03-07 22:10:08 ashuk%eng.sun.com Exp $");
Log.setApplicationVersionDate("$Id: WrapperFactoryImpl.java,v 1.3 2000-11-02 23:33:13 edburns%acm.org Exp $");
}

326
mozilla/java/webclient/src_moz/Makefile.in
View File

@@ -1,166 +1,160 @@
# 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 mozilla.org code.
#
# The Initial Developer of the Original Code is Sun Microsystems,
# Inc. Portions created by Sun are
# Copyright (C) 1999 Sun Microsystems, Inc. All
# Rights Reserved.
#
# Contributor(s):
DEPTH = ../../..
topsrcdir = $(DEPTH)
srcdir = $(topsrcdir)/java/webclient/src_moz
VPATH = $(topsrcdir)/java/webclient/src_moz
# We don't need to build the stubs in the BAL case.
ifeq ($(BAL_INTERFACE),)
DIRS = motif
endif
JAVAHOME = $(JDKHOME)
include $(DEPTH)/config/autoconf.mk
ifneq ($(BAL_INTERFACE),)
LIBRARY_NAME = webclient_bal
else
LIBRARY_NAME = webclient
endif
CPPSRCS = \
ns_util.cpp \
ns_util_export.cpp \
dom_util.cpp \
nsActions.cpp \
rdf_util.cpp \
BookmarksImpl.cpp \
CBrowserContainer.cpp \
CurrentPageImpl.cpp \
HistoryImpl.cpp \
ISupportsPeer.cpp \
NativeEventThread.cpp \
NavigationImpl.cpp \
RDFEnumeration.cpp \
RDFTreeNode.cpp \
WindowControlImpl.cpp \
WrapperFactoryImpl.cpp \
nsSetupRegistry.cpp \
motif/MotifBrowserControlCanvas.cpp \
motif/gtkmozilla.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_GTK
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt
endif
endif
ifneq ($(BAL_INTERFACE),)
CXXFLAGS += -DBAL_INTERFACE
endif
EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/lib -L$(DEPTH)/dist/bin/components -lwidget_gtk
ifneq ($(BAL_INTERFACE),)
EXTRA_DSO_LDOPTS += -lwc_share_bal
else
EXTRA_DSO_LDOPTS += -lwc_share
endif
ifeq ($(OS_ARCH),Linux)
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share
else
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share
endif
ifneq ($(PACKAGE_BUILD),)
ifneq ($(VERSION_NUMBER),)
VERSION_NUMBER=0.9
endif # VERSION_NUMBER
PACKAGE_DIR=$(topsrcdir)/dist/javadev
PACKAGE_LIB=$(PACKAGE_DIR)/lib
PACKAGE_EXAMPLE=$(PACKAGE_DIR)/example
endif # PACKAGE_BUILD
export:: linkSetupRegistry
linkSetupRegistry:
rm -f nsSetupRegistry.cpp
ln -s $(DEPTH)/xpfe/bootstrap/nsSetupRegistry.cpp .
clobber_all::
rm -f nsSetupRegistry.cpp
buildRunems:
ifeq ($(BAL_INTERFACE),)
ifeq ($(PACKAGE_BUILD),)
@echo +++ Creating runem. Use this to run the test browser.
rm -f runem
@echo #!/bin/sh > runem
@echo $(PERL) ../src_share/runem.pl $(DIST)/bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
chmod 755 runem
else
@echo +++ Commercial Packaging - Creating runem. Used to run test
rm -f runem
@echo #!/bin/sh > runem
@echo $(PERL) runem.pl ../../ org.mozilla.test.EmbeddedMozilla "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
chmod 755 runem
if test ! -d $(PACKAGE_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ;
cp $(topsrcdir)/dist/bin/libwebclientstub.so $(PACKAGE_LIB)/libwebclientstub.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libwebclient.so $(PACKAGE_LIB)/libwebclient.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/lib/libwc_share.a $(PACKAGE_LIB)/libwc_share.a.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libpluglet.so $(topsrcdir)/dist/bin/components/libpluglet.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libjavadom.so $(topsrcdir)/dist/bin/components/libjavadom.so.$(VERSION_NUMBER)
rm -r $(topsrcdir)/dist/bin/components/libpluglet.so
rm -r $(topsrcdir)/dist/bin/components/libjavadom.so
chmod 555 $(PACKAGE_LIB)/libwebclientstub.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libwebclient.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libwc_share.a.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavadomjni.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER)
chmod 555 $(topsrcdir)/dist/bin/components/libpluglet.so.$(VERSION_NUMBER)
chmod 555 $(topsrcdir)/dist/bin/components/libjavadom.so.$(VERSION_NUMBER)
if test ! -d $(PACKAGE_LIB)/libwc_share.a ; then ln -s libwc_share.a.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwc_share.a ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libwebclientstub.so ; then ln -s libwebclientstub.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclientstub.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libwebclient.so ; then ln -s libwebclient.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclient.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavadomjni.so ; then ln -s libjavadomjni.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavadomjni.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libplugletjni.so ; then ln -s libplugletjni.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libplugletjni.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libpluglet.so ; then ln -s libpluglet.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libpluglet.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavadom.so ; then ln -s libjavadom.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavadom.so ; else true ; fi ;
if test ! -d $(topsrcdir)/dist/bin/components/libpluglet.so ; then ln -s libpluglet.so.$(VERSION_NUMBER) $(topsrcdir)/dist/bin/components/libpluglet.so ; else true ; fi ;
if test ! -d $(topsrcdir)/dist/bin/components/libjavadom.so ; then ln -s libjavadom.so.$(VERSION_NUMBER) $(topsrcdir)/dist/bin/components/libjavadom.so ; else true ; fi ;
if test ! -d $(PACKAGE_EXAMPLE)/runem ; then cp $(topsrcdir)/java/webclient/src_moz/runem $(PACKAGE_EXAMPLE)/runem ; else true ; fi ;
if test ! -d $(PACKAGE_EXAMPLE)/runem.pl ; then cp $(topsrcdir)/java/webclient/src_share/runem_commercial.pl $(PACKAGE_EXAMPLE)/runem.pl ; else true ; fi ;
chmod 755 $(PACKAGE_EXAMPLE)/runem.pl
endif # PACKAGE_BUILD
endif # BAL_INTERFACE
install:: buildRunems
# 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 mozilla.org code.
#
# The Initial Developer of the Original Code is Sun Microsystems,
# Inc. Portions created by Sun are
# Copyright (C) 1999 Sun Microsystems, Inc. All
# Rights Reserved.
#
# Contributor(s):
DEPTH = ../../..
topsrcdir = $(DEPTH)
srcdir = $(topsrcdir)/java/webclient/src_moz
VPATH = $(topsrcdir)/java/webclient/src_moz
# We don't need to build the stubs in the BAL case.
ifeq ($(BAL_INTERFACE),)
DIRS = motif
endif
JAVAHOME = $(JDKHOME)
include $(DEPTH)/config/autoconf.mk
ifneq ($(BAL_INTERFACE),)
LIBRARY_NAME = webclient_bal
else
LIBRARY_NAME = webclient
endif
CPPSRCS = \
ns_util.cpp \
ns_util_export.cpp \
dom_util.cpp \
nsActions.cpp \
rdf_util.cpp \
BookmarksImpl.cpp \
CBrowserContainer.cpp \
CurrentPageImpl.cpp \
HistoryImpl.cpp \
ISupportsPeer.cpp \
NativeEventThread.cpp \
NavigationImpl.cpp \
RDFEnumeration.cpp \
RDFTreeNode.cpp \
WindowControlImpl.cpp \
WrapperFactoryImpl.cpp \
motif/MotifBrowserControlCanvas.cpp \
motif/gtkmozilla.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_GTK
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -lxpfelocation_s -L/usr/X11R6/lib -lXt
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -lxpfelocation_s -L/usr/X11R6/lib -lXt
endif
endif
ifneq ($(BAL_INTERFACE),)
CXXFLAGS += -DBAL_INTERFACE
endif
EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/lib -L$(DEPTH)/dist/bin/components -lwidget_gtk
ifneq ($(BAL_INTERFACE),)
EXTRA_DSO_LDOPTS += -lwc_share_bal
else
EXTRA_DSO_LDOPTS += -lwc_share
endif
ifeq ($(OS_ARCH),Linux)
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share
else
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share
endif
ifneq ($(PACKAGE_BUILD),)
ifneq ($(VERSION_NUMBER),)
VERSION_NUMBER=0.9
endif # VERSION_NUMBER
PACKAGE_DIR=$(topsrcdir)/dist/javadev
PACKAGE_LIB=$(PACKAGE_DIR)/lib
PACKAGE_EXAMPLE=$(PACKAGE_DIR)/example
endif # PACKAGE_BUILD
clobber_all::
buildRunems:
ifeq ($(BAL_INTERFACE),)
ifeq ($(PACKAGE_BUILD),)
@echo +++ Creating runem. Use this to run the test browser.
rm -f runem
@echo #!/bin/sh > runem
@echo $(PERL) ../src_share/runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
chmod 755 runem
else
@echo +++ Commercial Packaging - Copying runem_solaris. Used to run test
if test ! -d $(PACKAGE_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ;
cp $(topsrcdir)/dist/bin/libwebclientstub.so $(PACKAGE_LIB)/libwebclientstub.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libwebclient.so $(PACKAGE_LIB)/libwebclient.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/lib/libwc_share.a $(PACKAGE_LIB)/libwc_share.a.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER)
rm -f $(topsrcdir)/dist/bin/libwebclientstub.so
rm -f $(topsrcdir)/dist/lib/libwebclientstub.so
rm -f $(topsrcdir)/dist/bin/libwebclient.so
rm -f $(topsrcdir)/dist/lib/libwebclient.so
rm -f $(topsrcdir)/dist/lib/libwc_share.a
rm -f $(topsrcdir)/dist/bin/libjavadomjni.so
rm -f $(topsrcdir)/dist/lib/libjavadomjni.so
rm -f $(topsrcdir)/dist/bin/libplugletjni.so
rm -f $(topsrcdir)/dist/lib/libplugletjni.so
rm -f $(topsrcdir)/dist/bin/components/libpluglet.so
rm -f $(topsrcdir)/dist/lib/components/libpluglet.so
rm -f $(topsrcdir)/dist/bin/components/libjavadom.so
rm -f $(topsrcdir)/dist/lib/components/libjavadom.so
chmod 555 $(PACKAGE_LIB)/libwebclientstub.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libwebclient.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libwc_share.a.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavadomjni.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER)
if test ! -d $(PACKAGE_LIB)/libwc_share.a ; then ln -s libwc_share.a.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwc_share.a ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libwebclientstub.so ; then ln -s libwebclientstub.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclientstub.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libwebclient.so ; then ln -s libwebclient.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclient.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavadomjni.so ; then ln -s libjavadomjni.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavadomjni.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libplugletjni.so ; then ln -s libplugletjni.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libplugletjni.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libpluglet.so ; then ln -s libpluglet.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libpluglet.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavadom.so ; then ln -s libjavadom.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavadom.so ; else true ; fi ;
if test ! -d $(PACKAGE_EXAMPLE)/runem ; then cp $(topsrcdir)/java/webclient/src_share/runem_solaris $(PACKAGE_EXAMPLE)/runem ; else true ; fi ;
chmod 755 $(PACKAGE_EXAMPLE)/runem
cp $(topsrcdir)/java/README.commercial $(PACKAGE_DIR)/README
endif # PACKAGE_BUILD
endif # BAL_INTERFACE
install:: buildRunems

9
mozilla/java/webclient/src_moz/Makefile.win
View File

@@ -44,7 +44,6 @@ OBJS = \
.\$(OBJDIR)\RDFEnumeration.obj \
.\$(OBJDIR)\RDFTreeNode.obj \
.\$(OBJDIR)\ISupportsPeer.obj \
# .\$(OBJDIR)\nsSetupRegistry.obj \
$(NULL)
@@ -76,7 +75,6 @@ LLIBS = \
$(DIST)\lib\nspr4.lib \
$(DIST)\lib\plc4.lib \
$(DIST)\lib\plds4.lib \
# $(DEPTH)\xpfe\bootstrap\$(OBJDIR)\nsSetupRegistry.obj \
$(NULL)
WIN_LIBS= \
@@ -121,17 +119,13 @@ INCS = \
!CMDSWITCHES -S
# generate the jni header
export:: nsSetupRegistry.cpp
nsSetupRegistry.cpp:
copy $(MOZ_SRC)\mozilla\xpfe\bootstrap\nsSetupRegistry.cpp
buildRunems:
!ifdef BAL_INTERFACE
!else
@echo +++ Creating runem.bat. Use this to run the test browser.
rm -f runem.bat
@echo $(PERL) ..\src_share\runem.pl $(DIST)\bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
@echo $(PERL) ..\src_share\runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
!endif
install:: $(DLL) buildRunems
@@ -142,6 +136,5 @@ clobber_all:: clobber
clobber::
rm -f $(DIST)\bin\$(DLLNAME).dll
rm -f nsSetupRegistry.cpp
rm -f runem.bat

19
mozilla/java/webclient/src_moz/NativeEventThread.cpp
View File

@@ -113,14 +113,6 @@ extern const char * gBinDir; // defined in WrapperFactoryImpl.cpp
#endif // XP_PC
//
// Functions to hook into mozilla
//
extern "C" void NS_SetupRegistry();
extern nsresult NS_AutoregisterComponents();
//
// Local functions
//
@@ -410,7 +402,7 @@ int processEventLoop(WebShellInitContext * initContext)
// PENDING(edburns): revisit this. Not sure why this is necessary, but
// this fixes bug 44327
printf("%c", 8); // 8 is ASCII for backspace
// printf("%c", 8); // 8 is ASCII for backspace
return 1;
}
@@ -455,7 +447,6 @@ void DoMozInitialization(WebShellInitContext * initContext)
// It is vitally important to call NS_InitEmbedding before calling
// anything else.
NS_InitEmbedding(pathFile, nsnull);
// NS_SetupRegistry();
rv = NS_GetGlobalComponentManager(&gComponentManager);
if (NS_FAILED(rv)) {
::util_ThrowExceptionToJava(env, "NS_GetGlobalComponentManager() failed.");
@@ -471,8 +462,6 @@ void DoMozInitialization(WebShellInitContext * initContext)
gComponentManager->RegisterComponentLib(kSHistoryCID, nsnull,
nsnull, APPSHELL_DLL,
PR_FALSE, PR_FALSE);
NS_AutoregisterComponents();
// handle the profile manager nonsense
nsCOMPtr<nsICmdLineService> cmdLine =do_GetService(kCmdLineServiceCID);
nsCOMPtr<nsIProfile> profile = do_GetService(NS_PROFILE_CONTRACTID);
@@ -645,10 +634,6 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(initContext->docShell));
webShell->SetContainer(wsContainer);
// set the URIContentListener
nsCOMPtr<nsIURIContentListener> contentListener(do_QueryInterface(initContext->browserContainer));
webBrowser->SetParentURIContentListener(contentListener);
// set the TreeOwner
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(initContext->docShell));
nsCOMPtr<nsIDocShellTreeOwner> treeOwner(do_QueryInterface(initContext->browserContainer));
@@ -688,7 +673,7 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
}
initContext->initComplete = TRUE;
#if DEBUG_RAPTOR_CANVAS
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,

5
mozilla/java/webclient/src_moz/motif/gtkmozilla.cpp
View File

@@ -98,8 +98,9 @@ gtk_mozilla_get_type (void)
sizeof (GtkMozillaClass),
(GtkClassInitFunc) gtk_mozilla_class_init,
(GtkObjectInitFunc) gtk_mozilla_init,
(GtkArgSetFunc) NULL,
(GtkArgGetFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL
};
mozilla_type = gtk_type_unique (GTK_TYPE_LAYOUT, &mozilla_info);
}

14
mozilla/java/webclient/src_moz/rdf_util.cpp
View File

@@ -21,7 +21,6 @@
*/
#include "rdf_util.h"
#include "rdf_progids.h"
#include "ns_globals.h" // for prLogModuleInfo and gComponentManager
@@ -45,6 +44,8 @@ nsCOMPtr<nsIRDFResource> kNC_Folder = nsnull;
nsCOMPtr<nsIRDFResource> kRDF_type = nsnull;
static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
nsresult rdf_InitRDFUtils()
{
@@ -75,7 +76,7 @@ nsresult rdf_InitRDFUtils()
if (nsnull == gRDF) {
// get the RDF service
gRDF = do_GetService(NS_RDFSERVICE_PROGID, &rv);
gRDF = do_GetService(kRDFServiceCID, &rv);
if (NS_FAILED(rv)) {
return rv;
}
@@ -83,7 +84,7 @@ nsresult rdf_InitRDFUtils()
if (nsnull == gRDFCU) {
// get the RDF service
gRDFCU = do_GetService(NS_CONTAINERUTILS_PROGID, &rv);
gRDFCU = do_GetService(kRDFContainerUtilsCID, &rv);
if (NS_FAILED(rv)) {
return rv;
}
@@ -313,6 +314,13 @@ void rdf_recursiveResourceTraversal(nsCOMPtr<nsIRDFResource> currentResource)
void rdf_printArcLabels(nsCOMPtr<nsIRDFResource> currentResource)
{
if (!currentResource) {
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3, ("resource: null\n"));
}
return;
}
nsCOMPtr<nsISimpleEnumerator> labels;
nsCOMPtr<nsISupports> supportsResult;
nsCOMPtr<nsIRDFResource> resourceResult;

34
mozilla/java/webclient/src_share/runem.pl
View File

@@ -28,10 +28,13 @@
# Verification, usage checking
#
$ARGC = $#ARGV + 1;
$MIN_ARGC = 3;
$MIN_ARGC = 2;
if ($MIN_ARGC > $ARGC) {
print "usage runem.pl <mozilla bin dir> <class name> <depth>\n";
if ($MIN_ARGC > $ARGC || !($ENV{"MOZILLA_FIVE_HOME"})) {
if (!($ENV{"MOZILLA_FIVE_HOME"})) {
print "MOZILLA_FIVE_HOME must be set to the absolute path\nto the mozilla bin directory.\n";
}
print "usage runem.pl <class name> <depth>\n";
exit -1;
}
@@ -39,8 +42,8 @@ if ($MIN_ARGC > $ARGC) {
# Constant definitions
#
$CLASSNAME = $ARGV[1];
$DEPTH = $ARGV[2];
$CLASSNAME = $ARGV[0];
$DEPTH = $ARGV[1];
# determine the path separator
$_ = $ENV{PATH};
@@ -57,31 +60,14 @@ if ($SEP eq "/") {
$IS_UNIX = 1;
}
if ($IS_UNIX) {
# Under red hat linux $ENV{"PWD"} is undefined,
# so it only appends a '/' to argv[0].
if ( $ENV{"PWD"} == "" ) {
$BINDIR = $ARGV[0];
}
else {
$BINDIR = $ENV{"PWD"} . $SEP . $ARGV[0];
}
}
else {
open(CD, "cd |");
$_ = <CD>;
chop;
close(CD);
$BINDIR = $_ . $SEP . $ARGV[0];
}
$BINDIR = $ENV{"MOZILLA_FIVE_HOME"};
$JAVA_CMD = $ENV{"JDKHOME"} . $SEP . "bin" . $SEP . "java";
#
# set up environment vars
#
$ENV{"MOZILLA_FIVE_HOME"} = $BINDIR;
# prepend mozilla dist to path
$ENV{PATH} = $BINDIR . $CPSEP . $ENV{PATH};

42
mozilla/java/webclient/src_share/runem_commercial.pl
View File

@@ -28,10 +28,13 @@
# Verification, usage checking
#
$ARGC = $#ARGV + 1;
$MIN_ARGC = 2;
$MIN_ARGC = 1;
if ($MIN_ARGC > $ARGC) {
print "usage runem.pl <mozilla bin dir> <class name>\n";
if ($MIN_ARGC > $ARGC || !($ENV{"MOZILLA_FIVE_HOME"})) {
if (!($ENV{"MOZILLA_FIVE_HOME"})) {
print "MOZILLA_FIVE_HOME must be set to the absolute path\nto the mozilla bin directory.\n";
}
print "usage runem.pl <class name>\n";
exit -1;
}
@@ -39,7 +42,7 @@ if ($MIN_ARGC > $ARGC) {
# Constant definitions
#
$CLASSNAME = $ARGV[1];
$CLASSNAME = $ARGV[0];
# determine the path separator
$_ = $ENV{PATH};
@@ -56,31 +59,14 @@ if ($SEP eq "/") {
$IS_UNIX = 1;
}
if ($IS_UNIX) {
# Under red hat linux $ENV{"PWD"} is undefined,
# so it only appends a '/' to argv[0].
if ( $ENV{"PWD"} == "" ) {
$BINDIR = $ARGV[0];
}
else {
$BINDIR = $ENV{"PWD"} . $SEP . $ARGV[0];
}
}
else {
open(CD, "cd |");
$_ = <CD>;
chop;
close(CD);
$BINDIR = $_ . $SEP . $ARGV[0];
}
$BINDIR = $ENV{"MOZILLA_FIVE_HOME"};
$JAVA_CMD = $ENV{"JDKHOME"} . $SEP . "bin" . $SEP . "java";
#
# set up environment vars
#
$ENV{"MOZILLA_FIVE_HOME"} = $BINDIR;
# prepend mozilla dist to path
$ENV{PATH} = $BINDIR . $CPSEP . $ENV{PATH};
@@ -113,11 +99,12 @@ $ENV{"CLASSPATH"} = $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "tools.jar" .
$CPSEP . $ENV{"JDKHOME"} . $SEP . "lib" . $SEP . "rt.jar" . $CPSEP .
$ENV{"CLASSPATH"};
if ($IS_UNIX) {
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP . $BINDIR . $SEP . ".." .
$SEP . "classes";
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP . $BINDIR . $SEP . "javadev" .
$SEP . "lib" . $SEP . "blackwood.jar";
}
else {
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP ."../lib" . $SEP . "blackwood.jar";
$ENV{"CLASSPATH"} = $ENV{"CLASSPATH"} . $CPSEP . $BINDIR . $SEP . "javadev" .
$SEP . "lib" . $SEP . "blackwood.jar";
}
# build up the command invocation string
@@ -128,7 +115,8 @@ if ($SEP eq "/") {
$cmd = $cmd . " -native";
}
#tack on the java library path
$cmd = $cmd . " -Djava.library.path=" . $BINDIR;
$cmd = $cmd . " -Djava.library.path=" . $BINDIR . $CPSEP . $BINDIR . $SEP .
"javadev" . $SEP . "lib";
#tack on the classpath, class name, and bin dir
$cmd = $cmd . " -classpath " . $ENV{"CLASSPATH"} . " " . $CLASSNAME . " " .
$BINDIR;

47
mozilla/java/webclient/src_share/runem_solaris Normal file
View File

@@ -0,0 +1,47 @@
#!/bin/sh
#
script_args=""
if [ $# -gt 0 ]; then
script_args=$1
else
script_args="auto.blank"
fi
echo "args = $script_args"
JDKHOME=`pwd`/../../java
MOZILLA_FIVE_HOME=`pwd`/../..
ARCH=`uname -p`
LD_LIBRARY_PATH=$JDKHOME/lib/$ARCH/client:$JDKHOME/lib/$ARCH:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=$JDKHOME/lib:$JDKHOME/lib/$ARCH/native_threads:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../lib:`pwd`/../..:`pwd`/../../components:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=`pwd`/../../dist/lib:$LD_LIBRARY_PATH
echo "LD_LIBRARY_PATH =" $LD_LIBRARY_PATH
if [ "$CLASSPATH" = "" ]; then
CLASSPATH=$JDKHOME/lib/tools.jar:$JDKHOME/lib/rt.jar:`pwd`/../lib/blackwood.jar
else
CLASSPATH=$JDKHOME/lib/tools.jar:$JDKHOME/lib/rt.jar:`pwd`/../lib/blackwood.jar:$CLASSPATH
fi
echo "CLASSPATH =" $CLASSPATH
libpath=`pwd`/../..:`pwd`/../../components:`pwd`/../lib
testclass="org.mozilla.webclient.test.EmbeddedMozilla"
bindir=`pwd`/../..
export LD_LIBRARY_PATH
export CLASSPATH
export JDKHOME
export MOZILLA_FIVE_HOME
args="-native -Djava.library.path=$libpath -classpath $CLASSPATH $testclass $bindir $script_args"
cmd="$JDKHOME/bin/java $args"
echo "CMD = " $cmd
eval $cmd