[rfc][icedtea-web] log jnlp file to console

[Jiri Vanek]

hi!

This is not just rfc, but  RFC :) as I'm not sure which way to go.  The only one I found suitbale - this oen - is not nice.

Curently all the logs are going to logger, which determine if debug is on and what channels are enabled (stdout/err, file, console)

According to those, it consume the message. This workflow had one exception, the reprinting of jnlpfiel, which went only to console, if debug was online.
Most of the bugreports now contains whole console - and it is very good - but  that measn the jnlp file is missing.


The jnlpfile reprint was excluded, becasue console is using html formatting, to higlight outputs - for palintext the reprint is and willbe working fine, but it is not working with syntax higlighting from obvious reasons.

I wont to avoid escaping of inpout - the message object is sahred between stdou/file/html console/plain console so to make special decoding for html console do need copy of it (and in case of console solid rework of console itself) and then proces via esapcping.
Another issue is that html in java is terribly old, and hard to say what specification it supports (if any).

To my surpise it support <plaintext> (yes nothing else do so...) So I have tryed to include the jnlp reprint wrapped by this tags. And it seems to be working fine wiht all supported outputs without any encodings or copying.

There is drawback - eg firefox now have issues to show everything behind </plaintext> :( (note - <pre> do not work for jeeditorpane:( ))

J.
-------------- next part --------------
diff -r 016df62ed7a3 netx/net/sourceforge/nanoxml/XMLElement.java
--- a/netx/net/sourceforge/nanoxml/XMLElement.java	Mon Oct 20 17:44:45 2014 +0200
+++ b/netx/net/sourceforge/nanoxml/XMLElement.java	Tue Oct 21 14:56:38 2014 +0200
@@ -1165,9 +1165,11 @@
      *             filtered xml file.
      */
     public void sanitizeInput(Reader isr, OutputStream pout) {
+        StringWriter reprintSrc = new StringWriter();
+        PrintWriter reprint = new PrintWriter(reprintSrc);
+        reprint.println("<plaintext>");
         try {
             PrintStream out = new PrintStream(pout);
-
             this.sanitizeCharReadTooMuch = '\0';
             this.reader = isr;
             this.parserLineNr = 0;
@@ -1200,14 +1202,12 @@
                     // what's in the buffer
                     out.print(ch);
                     out.flush();
-                    if (JNLPRuntime.isDebug()) {
-                        if (ch == 10) {
-                            OutputController.getLogger().printOutLn("");
-                            OutputController.getLogger().printOut("line: " + newline + " ");
-                            newline++;
-                        } else {
-                            OutputController.getLogger().printOut(ch+"");
-                        }
+                    if (ch == 10) {
+                        reprint.println();
+                        reprint.print("line: " + newline + " ");
+                        newline++;
+                    } else {
+                        reprint.print(ch + "");
                     }
                     break;
                 } else if (i == 10) {
@@ -1232,44 +1232,44 @@
                             out.print('!');
                             out.print('-');
                             this.sanitizeCharReadTooMuch = ch;
-                            if (JNLPRuntime.isDebug()) {
-                                OutputController.getLogger().printOut("<");
-                                OutputController.getLogger().printOut("!");
-                                OutputController.getLogger().printOut("-");
-                            }
+                            reprint.print("<");
+                            reprint.print("!");
+                            reprint.print("-");
                         }
                     } else {
                         out.print('<');
                         out.print('!');
                         this.sanitizeCharReadTooMuch = ch;
-                        if (JNLPRuntime.isDebug()) {
-                              OutputController.getLogger().printOut("<");
-                              OutputController.getLogger().printOut("!");
-                        }
+                        reprint.print("<");
+                        reprint.print("!");
                     }
                 }
                 // Otherwise we haven't hit a comment, and we should write ch.
                 else {
                     out.print(ch);
-                    if (JNLPRuntime.isDebug()) {
-                        if (ch == 10) {
-                            OutputController.getLogger().printOutLn("");
-                            OutputController.getLogger().printOut("line: " + newline + " ");
-                            newline++;
-                        } else {
-                            OutputController.getLogger().printOut(ch+"");
-                        }
+                    if (ch == 10) {
+                        reprint.println("");
+                        reprint.print("line: " + newline + " ");
+                        newline++;
+                    } else {
+                        reprint.print(ch + "");
                     }
                 }
                 prev = next;
             }
-
             out.close();
             isr.close();
         } catch (Exception e) {
             // Print the stack trace here -- xml.parseFromReader() will
             // throw the ParseException if something goes wrong.
             OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
+        } finally {
+            reprint.println("</plaintext>");
+            reprint.flush();
+            reprint.close();
+            OutputController.getLogger().log("");
+            OutputController.getLogger().log(reprintSrc.toString());
+
         }
     }
 }