Return-Path: 
 <commits-return-11473-apmail-karaf-commits-archive=karaf.apache.org@karaf.apache.org>
X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org
Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DB7C710BC5
	for <apmail-karaf-commits-archive@minotaur.apache.org>;
 Thu,  2 May 2013 17:16:57 +0000 (UTC)
Received: (qmail 40714 invoked by uid 500); 2 May 2013 17:16:57 -0000
Delivered-To: apmail-karaf-commits-archive@karaf.apache.org
Received: (qmail 40688 invoked by uid 500); 2 May 2013 17:16:57 -0000
Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@karaf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@karaf.apache.org>
List-Post: <mailto:commits@karaf.apache.org>
List-Id: <commits.karaf.apache.org>
Reply-To: dev@karaf.apache.org
Delivered-To: mailing list commits@karaf.apache.org
Received: (qmail 40681 invoked by uid 99); 2 May 2013 17:16:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 17:16:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 17:16:56 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id CB320238899C;
	Thu,  2 May 2013 17:16:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1478453 - in
 /karaf/branches/karaf-2.3.x/webconsole/gogo/src/main:
 java/org/apache/karaf/webconsole/gogo/ resources/OSGI-INF/blueprint/
Date: Thu, 02 May 2013 17:16:35 -0000
To: commits@karaf.apache.org
From: jbonofre@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130502171635.CB320238899C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbonofre
Date: Thu May  2 17:16:34 2013
New Revision: 1478453

URL: http://svn.apache.org/r1478453
Log:
[KARAF-2285] Fixed Gogo WebConsole plugin for Equinox

Modified:
    karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
    karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java
    karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
    karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml

Modified: karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java?rev=1478453&r1=1478452&r2=1478453&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java (original)
+++ karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java Thu May  2 17:16:34 2013
@@ -19,7 +19,6 @@
  * Based on http://antony.lesuisse.org/software/ajaxterm/
  *  Public Domain License
  */
-
 package org.apache.karaf.webconsole.gogo;
 
 import java.io.ByteArrayInputStream;
@@ -47,86 +46,67 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * The <code>GogoPlugin</code>
+ * WebConsole plugin for Gogo shell.
  */
 public class GogoPlugin extends AbstractWebConsolePlugin {
 
-    /** Pseudo class version ID to keep the IDE quite. */
-    private static final long serialVersionUID = 1L;
-
     private final Logger logger = LoggerFactory.getLogger(GogoPlugin.class);
 
     public static final String NAME = "gogo";
-
     public static final String LABEL = "Gogo";
-
     public static final int TERM_WIDTH = 120;
     public static final int TERM_HEIGHT = 39;
 
-
-
     private BundleContext bundleContext;
-
     private CommandProcessor commandProcessor;
 
-    public void setBundleContext(BundleContext bundleContext)
-    {
+    public void setBundleContext(BundleContext bundleContext) {
         this.bundleContext = bundleContext;
     }
 
-    public void setCommandProcessor(CommandProcessor commandProcessor)
-    {
+    public void setCommandProcessor(CommandProcessor commandProcessor) {
         this.commandProcessor = commandProcessor;
     }
 
-    /*
-    * Blueprint lifecycle callback methods
-    */
-
-    public void start()
-    {
-        super.activate( bundleContext );
-        this.logger.info( LABEL + " plugin activated" );
+    public void start() {
+        super.activate(bundleContext);
+        this.logger.info(LABEL + " plugin activated");
     }
 
-    public void stop()
-    {
-        this.logger.info( LABEL + " plugin deactivated" );
+    public void stop() {
+        this.logger.info(LABEL + " plugin deactivated");
         super.deactivate();
     }
 
-    //
-    // AbstractWebConsolePlugin interface
-    //
-    public String getLabel()
-    {
+    @Override
+    public String getLabel() {
         return NAME;
     }
 
-
-    public String getTitle()
-    {
+    @Override
+    public String getTitle() {
         return LABEL;
     }
 
-
-    protected void renderContent( HttpServletRequest request, HttpServletResponse response ) throws IOException
-    {
+    @Override
+    protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws IOException {
         PrintWriter pw = response.getWriter();
 
         String appRoot = request.getContextPath() + request.getServletPath();
-        pw.println( "<link href=\"" + appRoot + "/gogo/res/ui/gogo.css\" rel=\"stylesheet\" type=\"text/css\" />" );
-        pw.println( "<script src=\"" + appRoot + "/gogo/res/ui/gogo.js\" type=\"text/javascript\"></script>" );
-        pw.println( "<div id='console'><div id='term'></div></div>" );
-        pw.println( "<script type=\"text/javascript\"><!--" );
-        pw.println( "window.onload = function() { gogo.Terminal(document.getElementById(\"term\"), " + TERM_WIDTH + ", " + TERM_HEIGHT + "); }" );
-        pw.println( "--></script>" );
+        pw.println("<link href=\"" + appRoot + "/gogo/res/ui/gogo.css\" rel=\"stylesheet\" type=\"text/css\" />");
+        pw.println("<script src=\"" + appRoot + "/gogo/res/ui/gogo.js\" type=\"text/javascript\"></script>");
+        pw.println("<div id='console'><div id='term'></div></div>");
+        pw.println("<script type=\"text/javascript\"><!--");
+        pw.println("window.onload = function() { gogo.Terminal(document.getElementById(\"term\"), " + TERM_WIDTH + ", " + TERM_HEIGHT + "); }");
+        pw.println("--></script>");
     }
 
-    protected URL getResource( String path )
-    {
-        path = path.substring( NAME.length() + 1 );
-        URL url = this.getClass().getClassLoader().getResource( path );
+    protected URL getResource(String path) {
+        path = path.substring(NAME.length() + 1);
+        if (path == null || path.isEmpty()) {
+            return null;
+        }
+        URL url = this.getClass().getClassLoader().getResource(path);
         if (url != null) {
             InputStream ins = null;
             try {
@@ -168,7 +148,7 @@ public class GogoPlugin extends Abstract
                 response.setHeader("Content-Encoding", "gzip");
                 response.setHeader("Content-Type", "text/html");
                 try {
-                    GZIPOutputStream gzos =  new GZIPOutputStream(response.getOutputStream());
+                    GZIPOutputStream gzos = new GZIPOutputStream(response.getOutputStream());
                     gzos.write(dump.getBytes());
                     gzos.close();
                 } catch (IOException ie) {
@@ -181,7 +161,6 @@ public class GogoPlugin extends Abstract
         }
     }
 
-
     public class SessionTerminal implements Runnable {
 
         private Terminal terminal;
@@ -200,12 +179,12 @@ public class GogoPlugin extends Abstract
                 PrintStream pipedOut = new PrintStream(new PipedOutputStream(out), true);
 
                 console = new Console(commandProcessor,
-                                      new PipedInputStream(in),
-                                      pipedOut,
-                                      pipedOut,
-                                      new WebTerminal(TERM_WIDTH, TERM_HEIGHT),
-                                      null,
-                                      null);
+                        new PipedInputStream(in),
+                        pipedOut,
+                        pipedOut,
+                        new WebTerminal(TERM_WIDTH, TERM_HEIGHT),
+                        null,
+                        null);
                 CommandSession session = console.getSession();
                 session.put("APPLICATION", System.getProperty("karaf.name", "root"));
                 session.put("USER", "karaf");
@@ -248,12 +227,12 @@ public class GogoPlugin extends Abstract
 
         public void run() {
             try {
-                for (;;) {
+                for (; ; ) {
                     byte[] buf = new byte[8192];
                     int l = out.read(buf);
                     InputStreamReader r = new InputStreamReader(new ByteArrayInputStream(buf, 0, l));
                     StringBuilder sb = new StringBuilder();
-                    for (;;) {
+                    for (; ; ) {
                         int c = r.read();
                         if (c == -1) {
                             break;
@@ -277,4 +256,5 @@ public class GogoPlugin extends Abstract
         }
 
     }
+
 }

Modified: karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java?rev=1478453&r1=1478452&r2=1478453&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java (original)
+++ karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java Thu May  2 17:16:34 2013
@@ -24,7 +24,6 @@
  * See http://www.ecma-international.org/publications/standards/Ecma-048.htm
  *       and http://vt100.net/docs/vt510-rm/
  */
-
 package org.apache.karaf.webconsole.gogo;
 
 import java.util.Arrays;

Modified: karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java?rev=1478453&r1=1478452&r2=1478453&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java (original)
+++ karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java Thu May  2 17:16:34 2013
@@ -30,9 +30,11 @@ public class WebTerminal extends Termina
     }
 
     public void init() throws Exception {
+        // nothing to do
     }
 
     public void restore() throws Exception {
+        // nothing to do
     }
 
     public int getWidth() {

Modified: karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml?rev=1478453&r1=1478452&r2=1478453&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml (original)
+++ karaf/branches/karaf-2.3.x/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml Thu May  2 17:16:34 2013
@@ -25,7 +25,6 @@
         <property name="commandProcessor" ref="commandProcessor" />
         <property name="bundleContext" ref="blueprintBundleContext" />
     </bean>
-
     <service ref="gogoPlugin" interface="javax.servlet.Servlet" >
         <service-properties>
             <entry key="felix.webconsole.label" value="gogo"/>