[icedtea-web] resurrection of (output)console?
Jiri Vanek
jvanek at redhat.com
Mon Nov 4 07:10:50 PST 2013
On 11/04/2013 12:29 PM, Jiri Vanek wrote:
> On 11/04/2013 01:56 AM, Omair Majid wrote:
>> * Jiri Vanek <jvanek at redhat.com> [2013-11-02 06:16]:
>>> On 11/01/2013 05:11 PM, Omair Majid wrote:
>>>> Hi Jiri,
>>>>
>>>> * Jiri Vanek<jvanek at redhat.com> [2013-11-01 11:40]:
>>>>> In itw, there is many times mentioned console, but afaik it was never
>>>>> implemented.
>>>>
>>>> /me points to plugin/icedteanp/java/sun/applet/JavaConsole.java
>>>>
>>>
>>> ok :) How it is used? :)))
>>
>> Last I looked, there were two ways to enable it:
>
> You had to look centuries ago, afaik it never worked.
>>
>> 1. Using the ControlPanel, which writes out the deployment configuration
>> property "deployment.console.startup.mode". Not sure if anything is
>> reading it or not.
>
> this was never enabled
>>
>> 2. Using the browser. The browser calls into the plugin, and the plugin
>> calls passes a message to the java-side of the plugin asking to display
>> the console [1]. Last I tried this, you had to add an extension to
>> Firefox to add a button to display the console.
>
> Yes, this was implemented, but unluckily the possibility to show console disapeared from
> browser(s?) :(
>>
>>> have you ever tried to trace it in code? I did, and it is ..not used,
>>> nor connected... Although it have many interesting features, it is not
>>> used at all. Thtas why it was not included in current refactorings.
>>
>>
>> [1] http://icedtea.classpath.org/hg/icedtea6/rev/aa17512747b1?revcount=20
>>
>
> The attache dpatch enables java console for 1.4. Also is answer on "what happend to java.stdout and
> java.stderr fiels in 1.5 :)
>
> before you will wonder about removed redirectStreams, please test patch :). Also it is remove in
> 1.5. Imho "debug" should have nothing to do with "redirecting" also it was used wrongly, and made
> consoel even less usefull...
> Now it is working as it should. ICEDTEAPLIGIN_DEBUG is setting level of verbosity, and console is
> jsut another form of output.
> Maybe when deployment.console.startup.mode is in DISABLED, then maybe those two files should not be
> crated.. But Unelss you insists, I would ratehr left it for another paptch (if ever).
>
>
>
> For head, much more work is needed:
and here is version for head.
> - moce JavaConsole from plugin to netx (..logging package perhaps?)
> it will:
> - allow to show it from error dialogue
done
> - get rid of perpetual reloading of textAreas
done
> - allwo proper integrating with OutputControler
done
> - positive consequence will be enabling of it also for javaws
done
>
fiexed is also handling of "DISABLED"
> - improve it :)
> - pre-java logs
> - maybe soem filtering
> - changing properties in runtime
tbd :)
Also I have found that debug on can cause forever living thread in itw-settings/javaws. It is not
casued by this patch, and I'm on it.
unhappy
J.
-------------- next part --------------
diff -r 6a7915fdff8c NEWS
--- a/NEWS Fri Nov 01 13:23:25 2013 +0100
+++ b/NEWS Mon Nov 04 16:08:16 2013 +0100
@@ -12,6 +12,7 @@
* IcedTea-Web now using tagsoup as default (tagsoup dependence) sanitizer for input
* JDK older then 1.5 no longer supported
* IcedTea-Web is now following XDG .config and .cache specification(RH947647)
+* Enabled and enhanced javaconsole for plugin and javaws
* Cache Viewer
- Can be closed by ESC key
- Enabling and disabling of operational buttons is handled properly
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/config/Defaults.java
--- a/netx/net/sourceforge/jnlp/config/Defaults.java Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/config/Defaults.java Mon Nov 04 16:08:16 2013 +0100
@@ -337,7 +337,9 @@
BasicValueValidators.getStringValidator(new String[] {
DeploymentConfiguration.CONSOLE_DISABLE,
DeploymentConfiguration.CONSOLE_HIDE,
- DeploymentConfiguration.CONSOLE_SHOW
+ DeploymentConfiguration.CONSOLE_SHOW,
+ DeploymentConfiguration.CONSOLE_SHOW_PLUGIN,
+ DeploymentConfiguration.CONSOLE_SHOW_JAVAWS
}),
DeploymentConfiguration.CONSOLE_HIDE
},
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Mon Nov 04 16:08:16 2013 +0100
@@ -64,14 +64,11 @@
public static final int JNLP_ASSOCIATION_ASK_USER = 2;
public static final int JNLP_ASSOCIATION_REPLACE_ASK = 3;
- /*
- * FIXME these should be moved into JavaConsole, but there is a strange
- * dependency in the build system. First all of netx is built. Then the
- * plugin is built. So we cannot refer to plugin code in here :(
- */
public static final String CONSOLE_HIDE = "HIDE";
public static final String CONSOLE_SHOW = "SHOW";
public static final String CONSOLE_DISABLE = "DISABLE";
+ public static final String CONSOLE_SHOW_PLUGIN = "SHOW_PLUGIN_ONLY";
+ public static final String CONSOLE_SHOW_JAVAWS = "SHOW_JAVAWS_ONLY";
public static final String KEY_USER_CACHE_DIR = "deployment.user.cachedir";
public static final String KEY_USER_PERSISTENCE_CACHE_DIR = "deployment.user.pcachedir";
@@ -160,6 +157,8 @@
* Console
*/
public static final String KEY_CONSOLE_STARTUP_MODE = "deployment.console.startup.mode";
+ //search for values above CONSOLE_*
+
/*
* Desktop Integration
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Mon Nov 04 16:08:16 2013 +0100
@@ -91,9 +91,11 @@
(Translator.R("DPEnableSyslogHint"))
};
- ComboItem[] javaConsoleItems = { new ComboItem(Translator.R("DPDisable"), "DISABLE"),
- new ComboItem(Translator.R("DPHide"), "HIDE"),
- new ComboItem(Translator.R("DPShow"), "SHOW"), };
+ ComboItem[] javaConsoleItems = { new ComboItem(Translator.R("DPDisable"), DeploymentConfiguration.CONSOLE_DISABLE),
+ new ComboItem(Translator.R("DPHide"), DeploymentConfiguration.CONSOLE_HIDE),
+ new ComboItem(Translator.R("DPShow"), DeploymentConfiguration.CONSOLE_SHOW),
+ new ComboItem(Translator.R("DPShowPluginOnly"), DeploymentConfiguration.CONSOLE_SHOW_PLUGIN),
+ new ComboItem(Translator.R("DPShowJavawsOnly"), DeploymentConfiguration.CONSOLE_SHOW_JAVAWS) };
JLabel consoleLabel = new JLabel(Translator.R("DPJavaConsole"));
JComboBox consoleComboBox = new JComboBox();
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Nov 04 16:08:16 2013 +0100
@@ -415,7 +415,10 @@
DPDisable=Disable
DPHide=Hide on startup
DPShow=Show on startup
+DPShowPluginOnly=Show on startup, only for plugin
+DPShowJavawsOnly=Show on startup, only for javaws
DPJavaConsole=Java Console
+DPJavaConsoleDisabledHint=Sorry, java console is disabled, turn it to hide, or show in itw-settings
# Control Panel - DesktopShortcutPanel
DSPNeverCreate=Never create
@@ -525,6 +528,7 @@
SPLASHmainL3 = No further information available, try to launch the browser from the command line and examine the output.
SPLASHcloseAndCopyShorter = Close and copy to clipboard
SPLASHmainL4 = The folloing exception has occured. For more information, try to launch the browser from the command line and examine the output.
+SPLASHmainL2 = You can get some more information by checking console, or even turn debug on in itw-settings
SPLASHexWas = Exception was:
SPLASHcfl = Can't follow link to
SPLASHvendorsInfo = Information from vendor of your application
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Nov 04 16:08:16 2013 +0100
@@ -67,8 +67,8 @@
import net.sourceforge.jnlp.security.VariableX509TrustManager;
import net.sourceforge.jnlp.services.XServiceManagerStub;
import net.sourceforge.jnlp.util.FileUtils;
+import net.sourceforge.jnlp.util.logging.JavaConsole;
import net.sourceforge.jnlp.util.logging.OutputController;
-import net.sourceforge.jnlp.util.TeeOutputStream;
import net.sourceforge.jnlp.util.logging.LogConfig;
import sun.net.www.protocol.jar.URLJarFile;
@@ -162,9 +162,6 @@
/** a lock which is held to indicate that an instance of netx is running */
private static FileLock fileLock;
- public static final String STDERR_FILE = "java.stderr";
- public static final String STDOUT_FILE = "java.stdout";
-
/**
* Returns whether the JNLP runtime environment has been
@@ -196,6 +193,16 @@
try {
config.load();
config.copyTo(System.getProperties());
+ if (DeploymentConfiguration.CONSOLE_SHOW.equals(
+ JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE))
+ || (DeploymentConfiguration.CONSOLE_SHOW_PLUGIN.equals(
+ JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE))
+ && !isApplication)
+ || (DeploymentConfiguration.CONSOLE_SHOW_JAVAWS.equals(
+ JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE))
+ && isApplication)) {
+ JavaConsole.getConsole().showConsoleLater();
+ }
} catch (ConfigurationException e) {
/* exit if there is a fatal exception loading the configuration */
if (isApplication) {
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java
--- a/netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java Mon Nov 04 16:08:16 2013 +0100
@@ -64,7 +64,10 @@
import javax.swing.event.HyperlinkListener;
import net.sourceforge.jnlp.LaunchException;
import net.sourceforge.jnlp.about.AboutDialog;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.runtime.Translator;
+import net.sourceforge.jnlp.util.logging.JavaConsole;
import net.sourceforge.jnlp.util.logging.OutputController;
public class JEditorPaneBasedExceptionDialog extends JDialog implements HyperlinkListener {
@@ -74,6 +77,7 @@
private JButton closeAndCopyButton;
private JButton homeButton;
private JButton aboutButton;
+ private JButton consoleButton;
private JEditorPane htmlErrorAndHelpPanel;
private JLabel exceptionLabel;
private JLabel iconLabel;
@@ -142,6 +146,7 @@
htmlErrorAndHelpPanel = new JEditorPane();
homeButton = new JButton();
aboutButton = new JButton();
+ consoleButton = new JButton();
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -166,9 +171,9 @@
GroupLayout jPanel2Layout = new GroupLayout(topPanel);
topPanel.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
- jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel2Layout.createSequentialGroup().addContainerGap().addComponent(closeButton).addContainerGap().addComponent(aboutButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 314, Short.MAX_VALUE).addComponent(closeAndCopyButton).addContainerGap()));
+ jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel2Layout.createSequentialGroup().addContainerGap().addComponent(closeButton).addContainerGap().addComponent(aboutButton).addContainerGap().addComponent(consoleButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 314, Short.MAX_VALUE).addComponent(closeAndCopyButton).addContainerGap()));
jPanel2Layout.setVerticalGroup(
- jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup().addContainerGap(24, Short.MAX_VALUE).addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(closeButton).addComponent(aboutButton).addComponent(closeAndCopyButton)).addContainerGap()));
+ jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup().addContainerGap(24, Short.MAX_VALUE).addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(closeButton).addComponent(aboutButton).addComponent(consoleButton).addComponent(closeAndCopyButton)).addContainerGap()));
exceptionLabel.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
exceptionLabel.setHorizontalAlignment(SwingConstants.CENTER);
@@ -204,6 +209,26 @@
}
}
});
+
+ consoleButton.setText(Translator.R("DPJavaConsole"));
+ consoleButton.addActionListener(new java.awt.event.ActionListener() {
+
+ @Override
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ try{
+ JavaConsole.getConsole().showConsoleLater(true);
+ }catch(Exception ex){
+ OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex);
+ JOptionPane.showConfirmDialog(JEditorPaneBasedExceptionDialog.this, ex);
+ }
+ }
+ });
+ if (DeploymentConfiguration.CONSOLE_DISABLE.equals(
+ JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE))
+ ){
+ consoleButton.setEnabled(false);
+ consoleButton.setToolTipText(Translator.R("DPJavaConsoleDisabledHint"));
+ }
GroupLayout jPanel1Layout = new GroupLayout(mainPanel);
mainPanel.setLayout(jPanel1Layout);
@@ -271,6 +296,9 @@
StringBuilder s = new StringBuilder("<html><body>");
String info = "<p>"
+ Translator.R(InfoItem.SPLASH + "mainL1", createLink())
+ + " </p> \n" +
+ "<p>"
+ + Translator.R(InfoItem.SPLASH + "mainL2", createLink())
+ " </p> \n";
String t = "<p>"
+ Translator.R(InfoItem.SPLASH + "mainL3")
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/util/logging/JavaConsole.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java Mon Nov 04 16:08:16 2013 +0100
@@ -0,0 +1,349 @@
+/* JavaConsole -- A java console for the plugin
+ Copyright (C) 2009 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package net.sourceforge.jnlp.util.logging;
+
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.ImageResources;
+
+/**
+ * A simple Java console for IcedTeaPlugin
+ *
+ */
+public class JavaConsole {
+ private static JavaConsole console;
+
+ public static JavaConsole getConsole() {
+ if (console == null) {
+ console = new JavaConsole();
+ }
+ return console;
+ }
+
+
+ JDialog consoleWindow;
+ JTextArea stdErrText;
+ JTextArea stdOutText;
+
+ public JavaConsole() {
+ initialize();
+ }
+
+
+
+ /**
+ * Initialize the console
+ */
+ private void initialize() {
+
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ } catch (Exception e) {
+ OutputController.getLogger().log(OutputController.Level.ERROR_ALL,e);
+ }
+
+ final String logDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR);
+
+ consoleWindow = new JDialog((JFrame)null, "Java Console");
+ consoleWindow.setIconImages(ImageResources.INSTANCE.getApplicationImages());
+
+ JPanel contentPanel = new JPanel();
+ contentPanel.setLayout(new GridBagLayout());
+
+ GridBagConstraints c;
+
+ Font monoSpace = new Font("Monospaced", Font.PLAIN, 12);
+
+
+ stdOutText = new JTextArea();
+ JScrollPane stdOutScrollPane = new JScrollPane(stdOutText);
+ stdOutScrollPane.setBorder(new TitledBorder(
+ new EmptyBorder(5, 5, 5, 5), "System.out"));
+ stdOutText.setEditable(false);
+ stdOutText.setFont(monoSpace);
+
+ stdErrText = new JTextArea();
+ JScrollPane stdErrScrollPane = new JScrollPane(stdErrText);
+ stdErrScrollPane.setBorder(new TitledBorder(
+ new EmptyBorder(5, 5, 5, 5), "System.err"));
+ stdErrText.setEditable(false);
+ stdErrText.setFont(monoSpace);
+
+ JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+ stdOutScrollPane, stdErrScrollPane);
+
+ c = new GridBagConstraints();
+ c.fill = GridBagConstraints.BOTH;
+ c.gridheight = 10;
+ c.weighty = 1;
+
+ contentPanel.add(splitPane, c);
+
+ /* buttons */
+
+ c = new GridBagConstraints();
+ c.gridy = 10;
+ c.gridheight = 1;
+ c.weightx = 0.5;
+ c.weighty = 0;
+
+ JPanel buttonPanel = new JPanel();
+ contentPanel.add(buttonPanel, c);
+
+ JButton gcButton = new JButton("Run GC");
+ buttonPanel.add(gcButton);
+ gcButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ printMemoryInfo();
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Performing Garbage Collection....");
+ System.gc();
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Done");
+ printMemoryInfo();
+ }
+
+ });
+
+ JButton finalizersButton = new JButton("Run Finalizers");
+ buttonPanel.add(finalizersButton);
+ finalizersButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ printMemoryInfo();
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Running finalization....");
+ Runtime.getRuntime().runFinalization();
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Done");
+ printMemoryInfo();
+ }
+ });
+
+ JButton memoryButton = new JButton("Memory Info");
+ buttonPanel.add(memoryButton);
+ memoryButton.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ printMemoryInfo();
+ }
+
+ });
+
+ JButton systemPropertiesButton = new JButton("System Properties");
+ buttonPanel.add(systemPropertiesButton);
+ systemPropertiesButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ printSystemProperties();
+ }
+
+ });
+
+ JButton classloadersButton = new JButton("Classloaders");
+ buttonPanel.add(classloadersButton);
+ classloadersButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ printClassLoaders();
+ }
+
+ });
+
+ JButton threadListButton = new JButton("Thread List");
+ buttonPanel.add(threadListButton);
+ threadListButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ printThreadInfo();
+ }
+
+ });
+
+ JButton closeButton = new JButton("Close");
+ buttonPanel.add(closeButton);
+ closeButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ hideConsole();
+ }
+ });
+ }
+ });
+
+ consoleWindow.add(contentPanel);
+ consoleWindow.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+ consoleWindow.pack();
+ consoleWindow.setSize(new Dimension(900, 600));
+ consoleWindow.setMinimumSize(new Dimension(900, 300));
+
+ splitPane.setDividerLocation(0.5);
+ splitPane.setResizeWeight(0.5);
+ }
+
+ public void showConsole() {
+ showConsole(false);
+ }
+
+ public void showConsole(boolean b) {
+ consoleWindow.setModal(b);
+ consoleWindow.setVisible(true);
+ }
+
+ public void hideConsole() {
+ consoleWindow.setModal(false);
+ consoleWindow.setVisible(false);
+ }
+
+ public void showConsoleLater() {
+ showConsoleLater(false);
+ }
+ public void showConsoleLater(final boolean b) {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ JavaConsole.getConsole().showConsole(b);
+ }
+ });
+ }
+
+ public void hideConsoleLater() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ JavaConsole.getConsole().hideConsole();
+ }
+ });
+ }
+
+ protected void printSystemProperties() {
+
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "System Properties:");
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "");
+ Properties p = System.getProperties();
+ Set<Object> keys = p.keySet();
+ for (Object key : keys) {
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, key.toString() + ": " + p.get(key));
+ }
+
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
+ }
+
+ private void printClassLoaders() {
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Available Classloaders: ");
+ //disbaled for while
+ //Set<String> loaders = PluginAppletSecurityContext.getLoaderInfo().keySet();
+ //for (String loader : loaders) {
+ // OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, loader + "\n"
+ // + " codebase = "
+ // + PluginAppletSecurityContext.getLoaderInfo().get(loader));
+ //}
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
+ }
+
+ private void printMemoryInfo() {
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----- ");
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Memory Info:");
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Max Memory: "
+ + String.format("%1$10d", Runtime.getRuntime().maxMemory()));
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Total Memory: "
+ + String.format("%1$10d", Runtime.getRuntime().totalMemory()));
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Free Memory: "
+ + String.format("%1$10d", Runtime.getRuntime().freeMemory()));
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
+
+ }
+
+ private void printThreadInfo() {
+ Map<Thread, StackTraceElement[]> map = Thread.getAllStackTraces();
+ Set<Thread> keys = map.keySet();
+ for (Thread key : keys) {
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Thread " + key.getId() + ": " + key.getName());
+ for (StackTraceElement element : map.get(key)) {
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " " + element);
+ }
+
+ }
+ }
+
+ public static void main(String[] args) {
+
+ final JavaConsole console = new JavaConsole();
+
+ boolean toShowConsole = false;
+
+ for (String arg : args) {
+ if ("--show-console".equals(arg)) {
+ toShowConsole = true;
+ }
+ }
+
+ if (toShowConsole) {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ console.showConsole();
+ }
+ });
+ }
+
+ }
+
+ void logOutput(String s) {
+ stdOutText.setText(stdOutText.getText()+s+"\n");
+ }
+
+ void logError(String s) {
+ stdErrText.setText(stdErrText.getText()+s+"\n");
+ }
+
+
+
+}
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/util/logging/LogConfig.java
--- a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java Mon Nov 04 16:08:16 2013 +0100
@@ -156,6 +156,11 @@
void setLogToSysLog(boolean logToSysLog) {
this.logToSysLog = logToSysLog;
}
+
+ boolean isLogToConsole() {
+ return !DeploymentConfiguration.CONSOLE_DISABLE.equals(
+ JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE));
+ }
diff -r 6a7915fdff8c netx/net/sourceforge/jnlp/util/logging/OutputController.java
--- a/netx/net/sourceforge/jnlp/util/logging/OutputController.java Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/OutputController.java Mon Nov 04 16:08:16 2013 +0100
@@ -45,16 +45,30 @@
public class OutputController {
- public static enum Level {
+ public static enum Level {
MESSAGE_ALL, // - stdout/log in all cases
MESSAGE_DEBUG, // - stdout/log in verbose/debug mode
WARNING_ALL, // - stdout+stderr/log in all cases (default for
WARNING_DEBUG, // - stdou+stde/logrr in verbose/debug mode
ERROR_ALL, // - stderr/log in all cases (default for
- ERROR_DEBUG, // - stderr/log in verbose/debug mode
+ ERROR_DEBUG; // - stderr/log in verbose/debug mode
//ERROR_DEBUG is default for Throwable
//MESSAGE_VERBOSE is defautrl for String
+
+ private static boolean isOutput(MessageWithLevel s) {
+ return s.level == Level.MESSAGE_ALL
+ || s.level == Level.MESSAGE_DEBUG
+ || s.level == Level.WARNING_ALL
+ || s.level == Level.WARNING_DEBUG;
+ }
+
+ private static boolean isError(MessageWithLevel s) {
+ return s.level == Level.ERROR_ALL
+ || s.level == Level.ERROR_DEBUG
+ || s.level == Level.WARNING_ALL
+ || s.level == Level.WARNING_DEBUG;
+ }
}
private static final class MessageWithLevel {
@@ -134,16 +148,10 @@
}
}
if (LogConfig.getLogConfig().isLogToStreams()) {
- if (s.level == Level.MESSAGE_ALL
- || s.level == Level.MESSAGE_DEBUG
- || s.level == Level.WARNING_ALL
- || s.level == Level.WARNING_DEBUG) {
+ if (Level.isOutput(s)) {
outLog.log(message);
}
- if (s.level == Level.ERROR_ALL
- || s.level == Level.ERROR_DEBUG
- || s.level == Level.WARNING_ALL
- || s.level == Level.WARNING_DEBUG) {
+ if (Level.isError(s)) {
errLog.log(message);
}
}
@@ -153,6 +161,14 @@
if (LogConfig.getLogConfig().isLogToSysLog()) {
getSystemLog().log(message);
}
+ if (LogConfig.getLogConfig().isLogToConsole()) {
+ if (Level.isOutput(s)){
+ JavaConsole.getConsole().logOutput(message);
+ }
+ if (Level.isError(s)){
+ JavaConsole.getConsole().logError(message);
+ }
+ }
}
diff -r 6a7915fdff8c plugin/icedteanp/java/sun/applet/JavaConsole.java
--- a/plugin/icedteanp/java/sun/applet/JavaConsole.java Fri Nov 01 13:23:25 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,371 +0,0 @@
-/* JavaConsole -- A java console for the plugin
- Copyright (C) 2009 Red Hat
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-IcedTea is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-package sun.applet;
-
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import net.sourceforge.jnlp.config.DeploymentConfiguration;
-import net.sourceforge.jnlp.runtime.JNLPRuntime;
-import net.sourceforge.jnlp.util.ImageResources;
-import net.sourceforge.jnlp.util.logging.OutputController;
-
-/**
- * A simple Java console for IcedTeaPlugin
- *
- */
-public class JavaConsole {
-
- private boolean initialized = false;
-
- JFrame consoleWindow;
- JTextArea stdErrText;
- JTextArea stdOutText;
-
- /**
- * Initialize the console
- */
- public void initialize() {
-
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (Exception e) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL,e);
- }
-
- final String logDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR);
-
- consoleWindow = new JFrame("Java Console");
- consoleWindow.setIconImages(ImageResources.INSTANCE.getApplicationImages());
-
- JPanel contentPanel = new JPanel();
- contentPanel.setLayout(new GridBagLayout());
-
- GridBagConstraints c;
-
- Font monoSpace = new Font("Monospaced", Font.PLAIN, 12);
-
- /* std out */
-
- stdOutText = new JTextArea();
- JScrollPane stdOutScrollPane = new JScrollPane(stdOutText);
- stdOutScrollPane.setBorder(new TitledBorder(
- new EmptyBorder(5, 5, 5, 5), "System.out"));
- stdOutText.setEditable(false);
- stdOutText.setFont(monoSpace);
-
- TextAreaUpdater stdOutUpdater = new TextAreaUpdater(new File(logDir,
- PluginMain.PLUGIN_STDOUT_FILE), stdOutText);
- stdOutUpdater.setName("IcedteaPlugin Console Thread(System.out)");
-
- /* std err */
-
- stdErrText = new JTextArea();
- JScrollPane stdErrScrollPane = new JScrollPane(stdErrText);
- stdErrScrollPane.setBorder(new TitledBorder(
- new EmptyBorder(5, 5, 5, 5), "System.err"));
- stdErrText.setEditable(false);
- stdErrText.setFont(monoSpace);
-
- TextAreaUpdater stdErrUpdater = new TextAreaUpdater(new File(logDir,
- PluginMain.PLUGIN_STDERR_FILE), stdErrText);
- stdErrUpdater.setName("IcedteaPlugin Console Thread(System.err)");
-
- JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
- stdOutScrollPane, stdErrScrollPane);
-
- c = new GridBagConstraints();
- c.fill = GridBagConstraints.BOTH;
- c.gridheight = 10;
- c.weighty = 1;
-
- contentPanel.add(splitPane, c);
-
- /* buttons */
-
- c = new GridBagConstraints();
- c.gridy = 10;
- c.gridheight = 1;
- c.weightx = 0.5;
- c.weighty = 0;
-
- JPanel buttonPanel = new JPanel();
- contentPanel.add(buttonPanel, c);
-
- JButton gcButton = new JButton("Run GC");
- buttonPanel.add(gcButton);
- gcButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- printMemoryInfo();
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Performing Garbage Collection....");
- System.gc();
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Done");
- printMemoryInfo();
- }
-
- });
-
- JButton finalizersButton = new JButton("Run Finalizers");
- buttonPanel.add(finalizersButton);
- finalizersButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- printMemoryInfo();
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Running finalization....");
- Runtime.getRuntime().runFinalization();
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Done");
- printMemoryInfo();
- }
- });
-
- JButton memoryButton = new JButton("Memory Info");
- buttonPanel.add(memoryButton);
- memoryButton.addActionListener(new ActionListener() {
-
- public void actionPerformed(ActionEvent e) {
- printMemoryInfo();
- }
-
- });
-
- JButton systemPropertiesButton = new JButton("System Properties");
- buttonPanel.add(systemPropertiesButton);
- systemPropertiesButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- printSystemProperties();
- }
-
- });
-
- JButton classloadersButton = new JButton("Classloaders");
- buttonPanel.add(classloadersButton);
- classloadersButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- printClassLoaders();
- }
-
- });
-
- JButton threadListButton = new JButton("Thread List");
- buttonPanel.add(threadListButton);
- threadListButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- printThreadInfo();
- }
-
- });
-
- JButton closeButton = new JButton("Close");
- buttonPanel.add(closeButton);
- closeButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- hideConsole();
- }
- });
- }
- });
-
- stdOutUpdater.start();
- stdErrUpdater.start();
-
- consoleWindow.add(contentPanel);
- consoleWindow.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
- consoleWindow.pack();
- consoleWindow.setSize(new Dimension(900, 600));
- consoleWindow.setMinimumSize(new Dimension(900, 300));
-
- initialized = true;
-
- splitPane.setDividerLocation(0.5);
- splitPane.setResizeWeight(0.5);
- }
-
- public void showConsole() {
-
- if (!initialized) {
- initialize();
- }
-
- consoleWindow.setVisible(true);
- }
-
- public void hideConsole() {
- consoleWindow.setVisible(false);
- }
-
- protected void printSystemProperties() {
-
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "System Properties:");
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "");
- Properties p = System.getProperties();
- Set<Object> keys = p.keySet();
- for (Object key : keys) {
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, key.toString() + ": " + p.get(key));
- }
-
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
- }
-
- private void printClassLoaders() {
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Available Classloaders: ");
- Set<String> loaders = PluginAppletSecurityContext.getLoaderInfo().keySet();
- for (String loader : loaders) {
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, loader + "\n"
- + " codebase = "
- + PluginAppletSecurityContext.getLoaderInfo().get(loader));
- }
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
- }
-
- private void printMemoryInfo() {
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----- ");
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Memory Info:");
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Max Memory: "
- + String.format("%1$10d", Runtime.getRuntime().maxMemory()));
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Total Memory: "
- + String.format("%1$10d", Runtime.getRuntime().totalMemory()));
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " Free Memory: "
- + String.format("%1$10d", Runtime.getRuntime().freeMemory()));
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " ----");
-
- }
-
- private void printThreadInfo() {
- Map<Thread, StackTraceElement[]> map = Thread.getAllStackTraces();
- Set<Thread> keys = map.keySet();
- for (Thread key : keys) {
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Thread " + key.getId() + ": " + key.getName());
- for (StackTraceElement element : map.get(key)) {
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, " " + element);
- }
-
- }
- }
-
- public static void main(String[] args) {
-
- final JavaConsole console = new JavaConsole();
-
- boolean toShowConsole = false;
-
- for (String arg : args) {
- if ("--show-console".equals(arg)) {
- toShowConsole = true;
- }
- }
-
- if (toShowConsole) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- console.showConsole();
- }
- });
- }
-
- }
-
- /**
- * This thread updates the text on a JTextArea based on the text in a file
- */
- class TextAreaUpdater extends Thread {
-
- File fileToRead;
- JTextArea outputTextArea;
-
- public TextAreaUpdater(File file, JTextArea textArea) {
- fileToRead = file;
- outputTextArea = textArea;
- setDaemon(true);
- }
-
- public void run() {
-
- try {
- BufferedReader reader = new BufferedReader(new FileReader(
- fileToRead));
- String line;
- while (true) {
- while ((line = reader.readLine()) != null) {
- outputTextArea.insert(line + "\n", outputTextArea
- .getDocument().getLength());
- outputTextArea.setCaretPosition(outputTextArea
- .getText().length());
- }
- Thread.sleep(1000);
- }
-
- } catch (FileNotFoundException e) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL,e);
- } catch (IOException e) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL,e);
- } catch (InterruptedException e) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL,e);
- Thread.currentThread().interrupt();
- }
-
- }
-
- }
-
-}
diff -r 6a7915fdff8c plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Fri Nov 01 13:23:25 2013 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Mon Nov 04 16:08:16 2013 +0100
@@ -235,7 +235,7 @@
private ClassLoader liveconnectLoader = ClassLoader.getSystemClassLoader();
int identifier = 0;
- public static PluginStreamHandler streamhandler;
+ private static PluginStreamHandler streamhandler;
long startTime = 0;
@@ -321,6 +321,10 @@
streamhandler = sh;
}
+ public static PluginStreamHandler getStreamhandler() {
+ return streamhandler;
+ }
+
public static Map<String, String> getLoaderInfo() {
Hashtable<String, String> map = new Hashtable<String, String>();
diff -r 6a7915fdff8c plugin/icedteanp/java/sun/applet/PluginMain.java
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Fri Nov 01 13:23:25 2013 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Nov 04 16:08:16 2013 +0100
@@ -88,9 +88,6 @@
* The main entry point into PluginAppletViewer.
*/
public class PluginMain {
- // the files where stdout/stderr are sent to
- public static final String PLUGIN_STDERR_FILE = "java.stderr";
- public static final String PLUGIN_STDOUT_FILE = "java.stdout";
// This is used in init(). Getting rid of this is desirable but depends
// on whether the property that uses it is necessary/standard.
diff -r 6a7915fdff8c plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
--- a/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java Fri Nov 01 13:23:25 2013 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java Mon Nov 04 16:08:16 2013 +0100
@@ -44,11 +44,11 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
import java.nio.charset.Charset;
import javax.swing.SwingUtilities;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.logging.JavaConsole;
import net.sourceforge.jnlp.util.logging.OutputController;
public class PluginStreamHandler {
@@ -58,7 +58,6 @@
private RequestQueue queue = new RequestQueue();
- private JavaConsole console = new JavaConsole();
private PluginMessageConsumer consumer;
private volatile boolean shuttingDown = false;
@@ -242,9 +241,9 @@
private void handlePluginMessage(String message) {
if (message.equals("plugin showconsole")) {
- showConsole();
+ JavaConsole.getConsole().showConsoleLater();
} else if (message.equals("plugin hideconsole")) {
- hideConsole();
+ JavaConsole.getConsole().hideConsoleLater();
} else {
// else this is something that was specifically requested
finishCallRequest(message);
@@ -374,20 +373,4 @@
return;
}
-
- private void showConsole() {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- console.showConsole();
- }
- });
- }
-
- private void hideConsole() {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- console.hideConsole();
- }
- });
- }
}
More information about the distro-pkg-dev
mailing list