[icedtea-web] resurrection of (output)console?
Jiri Vanek
jvanek at redhat.com
Mon Nov 4 03:29:25 PST 2013
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:
- moce JavaConsole from plugin to netx (..logging package perhaps?)
it will:
- allow to show it from error dialogue
- get rid of perpetual reloading of textAreas
- allwo proper integrating with OutputControler
- positive consequence will be enabling of it also for javaws
- improve it :)
- pre-java logs
- maybe soem filtering
- changing properties in runtime
unhappy
J.
-------------- next part --------------
diff -r 511a213f0206 NEWS
--- a/NEWS Wed Oct 30 10:36:43 2013 +0100
+++ b/NEWS Mon Nov 04 12:18:40 2013 +0100
@@ -12,6 +12,7 @@
* Dialogs center on screen before becoming visible
* Plugin
- RH976833: Multiple applets on one page cause deadlock
+* Enabled javaconsole for plugin
New in release 1.4.1 (2013-09-19):
* Improved and cleaned Temporary internet files panel
diff -r 511a213f0206 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Wed Oct 30 10:36:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Mon Nov 04 12:18:40 2013 +0100
@@ -148,6 +148,7 @@
* Console
*/
public static final String KEY_CONSOLE_STARTUP_MODE = "deployment.console.startup.mode";
+ public static final String VALUE_CONSOLE_STARTUP_MODE_SHOW = "SHOW";
/*
* Desktop Integration
diff -r 511a213f0206 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Oct 30 10:36:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Nov 04 12:18:40 2013 +0100
@@ -130,9 +130,6 @@
/** whether debug mode is on */
private static boolean debug = false;
- /** whether streams should be redirected */
- private static boolean redirectStreams = false;
-
/** mutex to wait on, for initialization */
public static Object initMutex = new Object();
@@ -364,7 +361,7 @@
private static void initializeStreams() {
Boolean enableLogging = Boolean.valueOf(config
.getProperty(DeploymentConfiguration.KEY_ENABLE_LOGGING));
- if (redirectStreams || enableLogging) {
+
String logDir = config.getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR);
try {
@@ -375,17 +372,12 @@
FileUtils.createParentDir(outFile);
FileUtils.createRestrictedFile(outFile, true);
- if (redirectStreams) {
- System.setErr(new PrintStream(new FileOutputStream(errFile)));
- System.setOut(new PrintStream(new FileOutputStream(outFile)));
- } else {
System.setErr(new TeeOutputStream(new FileOutputStream(errFile), System.err));
System.setOut(new TeeOutputStream(new FileOutputStream(outFile), System.out));
- }
+
} catch (Exception e) {
e.printStackTrace();
}
- }
}
/**
@@ -527,16 +519,6 @@
debug = enabled;
}
- /**
- * Sets whether the standard output/error streams should be redirected to
- * the loggging files.
- *
- * @throws IllegalStateException if the runtime has already been initialized
- */
- public static void setRedirectStreams(boolean redirect) {
- checkInitialized();
- redirectStreams = redirect;
- }
/**
* Sets the default update policy.
diff -r 511a213f0206 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Wed Oct 30 10:36:43 2013 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Mon Nov 04 12:18:40 2013 +0100
@@ -234,7 +234,7 @@
private ClassLoader liveconnectLoader = ClassLoader.getSystemClassLoader();
int identifier = 0;
- public static PluginStreamHandler streamhandler;
+ private static PluginStreamHandler streamhandler;
long startTime = 0;
@@ -320,6 +320,12 @@
streamhandler = sh;
}
+ public static PluginStreamHandler getStreamhandler() {
+ return streamhandler;
+ }
+
+
+
public static Map<String, String> getLoaderInfo() {
Hashtable<String, String> map = new Hashtable<String, String>();
diff -r 511a213f0206 plugin/icedteanp/java/sun/applet/PluginMain.java
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Oct 30 10:36:43 2013 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Nov 04 12:18:40 2013 +0100
@@ -106,14 +106,15 @@
try {
PluginStreamHandler streamHandler = connect(args[0], args[1]);
- boolean redirectStreams = System.getenv().containsKey("ICEDTEAPLUGIN_DEBUG");
-
- // must be called before JNLPRuntime.initialize()
- JNLPRuntime.setRedirectStreams(redirectStreams);
PluginAppletSecurityContext sc = new PluginAppletSecurityContext(0);
sc.prePopulateLCClasses();
PluginAppletSecurityContext.setStreamhandler(streamHandler);
+ //the properties are initialised during classlaoder creation
+ if (DeploymentConfiguration.VALUE_CONSOLE_STARTUP_MODE_SHOW.equals(
+ JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE))) {
+ PluginAppletSecurityContext.getStreamhandler().showConsole();
+ }
AppletSecurityContextManager.addContext(0, sc);
PluginAppletViewer.setStreamhandler(streamHandler);
diff -r 511a213f0206 plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
--- a/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java Wed Oct 30 10:36:43 2013 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java Mon Nov 04 12:18:40 2013 +0100
@@ -44,7 +44,6 @@
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;
@@ -76,7 +75,7 @@
pluginOutputWriter =
new BufferedWriter(new OutputStreamWriter
(outputstream, Charset.forName("UTF-8")));
- }
+ }
public void startProcessing() {
@@ -373,7 +372,7 @@
return;
}
- private void showConsole() {
+ public void showConsole() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
console.showConsole();
More information about the distro-pkg-dev
mailing list