You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/10/15 14:51:49 UTC
svn commit: r825482 - in /felix/trunk/karaf: ./
webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/
webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/
webconsole/gogo/src/main/java/org/apache/felix/karaf/w...
Author: gnodet
Date: Thu Oct 15 12:51:48 2009
New Revision: 825482
URL: http://svn.apache.org/viewvc?rev=825482&view=rev
Log:
FELIX-1759: upgrade karaf to latest web console
Removed:
felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AbstractResourceAwareWebConsolePlugin.java
felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/AbstractResourceAwareWebConsolePlugin.java
felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/AbstractResourceAwareWebConsolePlugin.java
Modified:
felix/trunk/karaf/pom.xml
felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java
felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java
felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java
Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=825482&r1=825481&r2=825482&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Thu Oct 15 12:51:48 2009
@@ -80,7 +80,7 @@
<felix.osgi.version>1.4.0</felix.osgi.version>
<felix.plugin.version>2.0.0</felix.plugin.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
- <felix.webconsole.version>1.2.10</felix.webconsole.version>
+ <felix.webconsole.version>2.0.0</felix.webconsole.version>
<felix.metatype.version>1.0.2</felix.metatype.version>
<geronimo.blueprint.version>1.0.0</geronimo.blueprint.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
Modified: felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java?rev=825482&r1=825481&r2=825482&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java (original)
+++ felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java Thu Oct 15 12:51:48 2009
@@ -37,7 +37,7 @@
/**
* Felix Web Console plugin for interacting with the {@link AdminService}
*/
-public class AdminPlugin extends AbstractResourceAwareWebConsolePlugin {
+public class AdminPlugin extends AbstractWebConsolePlugin {
public static final String NAME = "admin";
public static final String LABEL = "Admin";
Modified: felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java?rev=825482&r1=825481&r2=825482&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java (original)
+++ felix/trunk/karaf/webconsole/features/src/main/java/org/apache/felix/karaf/webconsole/features/FeaturesPlugin.java Thu Oct 15 12:51:48 2009
@@ -25,10 +25,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Properties;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -40,17 +37,15 @@
import org.apache.felix.karaf.features.FeaturesService;
import org.apache.felix.karaf.features.Repository;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
-
import org.json.JSONException;
import org.json.JSONWriter;
-
import org.osgi.framework.BundleContext;
/**
* The <code>FeaturesPlugin</code>
*/
-public class FeaturesPlugin extends AbstractResourceAwareWebConsolePlugin
+public class FeaturesPlugin extends AbstractWebConsolePlugin
{
/** Pseudo class version ID to keep the IDE quite. */
Modified: felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java?rev=825482&r1=825481&r2=825482&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java (original)
+++ felix/trunk/karaf/webconsole/gogo/src/main/java/org/apache/felix/karaf/webconsole/gogo/GogoPlugin.java Thu Oct 15 12:51:48 2009
@@ -22,30 +22,30 @@
package org.apache.felix.karaf.webconsole.gogo;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.PipedOutputStream;
-import java.io.PipedInputStream;
-import java.io.InterruptedIOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.ByteArrayInputStream;
+import java.io.InterruptedIOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
import java.io.PrintStream;
-import java.io.InputStream;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.util.List;
import java.util.concurrent.Callable;
import java.util.zip.GZIPOutputStream;
-import java.util.List;
-import java.net.URL;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
-import org.apache.felix.karaf.shell.console.jline.Console;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.shell.console.completer.AggregateCompleter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.felix.karaf.shell.console.Completer;
+import org.apache.felix.karaf.shell.console.completer.AggregateCompleter;
+import org.apache.felix.karaf.shell.console.jline.Console;
+import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.osgi.framework.BundleContext;
import org.osgi.service.command.CommandProcessor;
import org.osgi.service.command.CommandSession;
@@ -53,7 +53,7 @@
/**
* The <code>GogoPlugin</code>
*/
-public class GogoPlugin extends AbstractResourceAwareWebConsolePlugin {
+public class GogoPlugin extends AbstractWebConsolePlugin {
/** Pseudo class version ID to keep the IDE quite. */
private static final long serialVersionUID = 1L;