You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2008/05/16 15:14:47 UTC
svn commit: r657051 - in /felix/trunk/webconsole: ./
src/main/java/org/apache/felix/ src/main/java/org/apache/felix/webconsole/
src/main/java/org/apache/felix/webconsole/internal/
src/main/java/org/apache/felix/webconsole/internal/compendium/ src/main/...
Author: fmeschbe
Date: Fri May 16 06:14:45 2008
New Revision: 657051
URL: http://svn.apache.org/viewvc?rev=657051&view=rev
Log:
FELIX-562 - Oops wrong package, sling should not be in it
Added:
felix/trunk/webconsole/src/main/java/org/apache/felix/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Action.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/ConfigurationPrinter.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Render.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/BaseManagementPlugin.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/OsgiManagerActivator.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/OsgiManagerActivator.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/
- copied from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/
- copied from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/
- copied from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/
- copied from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/
- copied from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingManager.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
- copied, changed from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingHttpContext.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/
- copied from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/system/
Removed:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/SlingHttpContext.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/SlingManager.java
felix/trunk/webconsole/src/main/java/org/apache/sling/
Modified:
felix/trunk/webconsole/pom.xml
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AbstractScrPlugin.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentRenderAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/AjaxBundleDetailsAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleListRender.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/RefreshPackagesAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/SetStartLevelAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StartAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StopAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UninstallAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UpdateAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/AssemblyListRender.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/AbstractObrPlugin.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/InstallFromRepoAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/RefreshRepoAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/Logger.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/GCAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownAction.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownRender.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatRender.java
Modified: felix/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Fri May 16 06:14:45 2008
@@ -61,14 +61,14 @@
<configuration>
<instructions>
<Bundle-Activator>
- org.apache.sling.felix.webconsole.internal.OsgiManagerActivator
+ org.apache.felix.webconsole.internal.OsgiManagerActivator
</Bundle-Activator>
<Export-Package>
- org.apache.sling.felix.webconsole,
+ org.apache.felix.webconsole,
</Export-Package>
<Private-Package>
- !org.apache.sling.felix.webconsole,
- org.apache.sling.felix.webconsole.*,
+ !org.apache.felix.webconsole,
+ org.apache.felix.webconsole.*,
<!-- File Upload functionality -->
org.apache.commons.fileupload,
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Action.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Action.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Action.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Action.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole;
+package org.apache.felix.webconsole;
import java.io.IOException;
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/ConfigurationPrinter.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/ConfigurationPrinter.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/ConfigurationPrinter.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/ConfigurationPrinter.java Fri May 16 06:14:45 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole;
+package org.apache.felix.webconsole;
import java.io.PrintWriter;
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Render.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Render.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Render.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/Render.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole;
+package org.apache.felix.webconsole;
import java.io.IOException;
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/BaseManagementPlugin.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/BaseManagementPlugin.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/BaseManagementPlugin.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/BaseManagementPlugin.java Fri May 16 06:14:45 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole.internal;
+package org.apache.felix.webconsole.internal;
-import org.apache.sling.felix.webconsole.internal.servlet.Logger;
+import org.apache.felix.webconsole.internal.servlet.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/OsgiManagerActivator.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/OsgiManagerActivator.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/OsgiManagerActivator.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/OsgiManagerActivator.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/OsgiManagerActivator.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/OsgiManagerActivator.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/OsgiManagerActivator.java Fri May 16 06:14:45 2008
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole.internal;
+package org.apache.felix.webconsole.internal;
-import org.apache.sling.felix.webconsole.internal.servlet.SlingManager;
+import org.apache.felix.webconsole.internal.servlet.OsgiManager;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class OsgiManagerActivator implements BundleActivator {
- private SlingManager slingManager;
+ private OsgiManager slingManager;
public void start(BundleContext bundleContext) {
- slingManager = new SlingManager(bundleContext);
+ slingManager = new OsgiManager(bundleContext);
}
public void stop(BundleContext arg0) {
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal;
+package org.apache.felix.webconsole.internal;
import java.io.IOException;
import java.io.InputStream;
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.felix.webconsole.Render;
+import org.apache.felix.webconsole.Render;
/**
* The <code>Util</code> TODO
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AbstractScrPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AbstractScrPlugin.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AbstractScrPlugin.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AbstractScrPlugin.java Fri May 16 06:14:45 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole.internal.compendium;
+package org.apache.felix.webconsole.internal.compendium;
import org.apache.felix.scr.ScrService;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.util.tracker.ServiceTracker;
public class AbstractScrPlugin extends BaseManagementPlugin {
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.compendium;
+package org.apache.felix.webconsole.internal.compendium;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -32,7 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Action;
+import org.apache.felix.webconsole.Action;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java Fri May 16 06:14:45 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole.internal.compendium;
+package org.apache.felix.webconsole.internal.compendium;
import java.io.PrintWriter;
import java.util.Arrays;
@@ -29,7 +29,7 @@
import org.apache.felix.scr.Component;
import org.apache.felix.scr.Reference;
import org.apache.felix.scr.ScrService;
-import org.apache.sling.felix.webconsole.ConfigurationPrinter;
+import org.apache.felix.webconsole.ConfigurationPrinter;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentRenderAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentRenderAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentRenderAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentRenderAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.compendium;
+package org.apache.felix.webconsole.internal.compendium;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,9 +31,9 @@
import org.apache.felix.scr.Component;
import org.apache.felix.scr.Reference;
import org.apache.felix.scr.ScrService;
-import org.apache.sling.felix.webconsole.Action;
-import org.apache.sling.felix.webconsole.Render;
-import org.apache.sling.felix.webconsole.internal.Util;
+import org.apache.felix.webconsole.Action;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.Util;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.compendium;
+package org.apache.felix.webconsole.internal.compendium;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,9 +29,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Render;
-import org.apache.sling.felix.webconsole.internal.Util;
-import org.apache.sling.felix.webconsole.internal.core.SetStartLevelAction;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.Util;
+import org.apache.felix.webconsole.internal.core.SetStartLevelAction;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManagerBase.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.compendium;
+package org.apache.felix.webconsole.internal.compendium;
import java.util.HashMap;
import java.util.Locale;
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/AjaxBundleDetailsAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/AjaxBundleDetailsAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/AjaxBundleDetailsAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/AjaxBundleDetailsAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import java.io.IOException;
import java.util.ArrayList;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleAction.java Fri May 16 06:14:45 2008
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
-import org.apache.sling.felix.webconsole.Action;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.Action;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
abstract class BundleAction extends BaseManagementPlugin implements Action {
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleListRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleListRender.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleListRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleListRender.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import java.io.IOException;
import java.io.PrintWriter;
@@ -24,9 +24,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Render;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
-import org.apache.sling.felix.webconsole.internal.Util;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.internal.Util;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/InstallAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import java.io.File;
import java.io.FileInputStream;
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.fileupload.FileItem;
-import org.apache.sling.felix.webconsole.internal.Util;
+import org.apache.felix.webconsole.internal.Util;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/RefreshPackagesAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/RefreshPackagesAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/RefreshPackagesAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/RefreshPackagesAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/SetStartLevelAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/SetStartLevelAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/SetStartLevelAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/SetStartLevelAction.java Fri May 16 06:14:45 2008
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Action;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.Action;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.service.startlevel.StartLevel;
/**
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StartAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StartAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StartAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StartAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StopAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StopAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StopAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/StopAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UninstallAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UninstallAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UninstallAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UninstallAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UpdateAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UpdateAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UpdateAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/UpdateAction.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.core;
+package org.apache.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/AssemblyListRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/AssemblyListRender.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/AssemblyListRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/AssemblyListRender.java Fri May 16 06:14:45 2008
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.misc;
+package org.apache.felix.webconsole.internal.misc;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.felix.webconsole.internal.core.BundleListRender;
+import org.apache.felix.webconsole.internal.core.BundleListRender;
import org.osgi.framework.Bundle;
public class AssemblyListRender extends BundleListRender {
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.misc;
+package org.apache.felix.webconsole.internal.misc;
import java.io.File;
import java.io.FileInputStream;
@@ -41,9 +41,9 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.felix.webconsole.ConfigurationPrinter;
-import org.apache.sling.felix.webconsole.Render;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.ConfigurationPrinter;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/AbstractObrPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/AbstractObrPlugin.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/AbstractObrPlugin.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/AbstractObrPlugin.java Fri May 16 06:14:45 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole.internal.obr;
+package org.apache.felix.webconsole.internal.obr;
//import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
//import org.apache.sling.osgi.assembly.installer.InstallerService;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/BundleRepositoryRender.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.obr;
+package org.apache.felix.webconsole.internal.obr;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -23,8 +23,8 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.sling.felix.webconsole.Render;
-import org.apache.sling.felix.webconsole.internal.Util;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.Util;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/InstallFromRepoAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/InstallFromRepoAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/InstallFromRepoAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/InstallFromRepoAction.java Fri May 16 06:14:45 2008
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.obr;
+package org.apache.felix.webconsole.internal.obr;
-import org.apache.sling.felix.webconsole.Action;
+import org.apache.felix.webconsole.Action;
public abstract class InstallFromRepoAction extends AbstractObrPlugin implements Action {
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/RefreshRepoAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/RefreshRepoAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/RefreshRepoAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/obr/RefreshRepoAction.java Fri May 16 06:14:45 2008
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.obr;
+package org.apache.felix.webconsole.internal.obr;
-import org.apache.sling.felix.webconsole.Action;
+import org.apache.felix.webconsole.Action;
public abstract class RefreshRepoAction extends AbstractObrPlugin implements Action {
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener.java Fri May 16 06:14:45 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole.internal.servlet;
+package org.apache.felix.webconsole.internal.servlet;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -27,9 +27,9 @@
class ConfigurationListener implements ManagedService {
- private final SlingManager slingManager;
+ private final OsgiManager slingManager;
- static ServiceRegistration create(SlingManager slingManager) {
+ static ServiceRegistration create(OsgiManager slingManager) {
ConfigurationListener cl = new ConfigurationListener(slingManager);
Dictionary props = new Hashtable();
@@ -42,7 +42,7 @@
ManagedService.class.getName(), cl, props);
}
- private ConfigurationListener(SlingManager slingManager) {
+ private ConfigurationListener(OsgiManager slingManager) {
this.slingManager = slingManager;
}
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/Logger.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/Logger.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/Logger.java Fri May 16 06:14:45 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.felix.webconsole.internal.servlet;
+package org.apache.felix.webconsole.internal.servlet;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingManager.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.servlet;
+package org.apache.felix.webconsole.internal.servlet;
import java.io.IOException;
import java.io.PrintWriter;
@@ -40,28 +40,28 @@
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.servlet.ServletRequestContext;
-import org.apache.sling.felix.webconsole.Action;
-import org.apache.sling.felix.webconsole.Render;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
-import org.apache.sling.felix.webconsole.internal.Util;
-import org.apache.sling.felix.webconsole.internal.compendium.AjaxConfigManagerAction;
-import org.apache.sling.felix.webconsole.internal.compendium.ComponentConfigurationPrinter;
-import org.apache.sling.felix.webconsole.internal.compendium.ComponentRenderAction;
-import org.apache.sling.felix.webconsole.internal.compendium.ConfigManager;
-import org.apache.sling.felix.webconsole.internal.core.AjaxBundleDetailsAction;
-import org.apache.sling.felix.webconsole.internal.core.BundleListRender;
-import org.apache.sling.felix.webconsole.internal.core.InstallAction;
-import org.apache.sling.felix.webconsole.internal.core.RefreshPackagesAction;
-import org.apache.sling.felix.webconsole.internal.core.SetStartLevelAction;
-import org.apache.sling.felix.webconsole.internal.core.StartAction;
-import org.apache.sling.felix.webconsole.internal.core.StopAction;
-import org.apache.sling.felix.webconsole.internal.core.UninstallAction;
-import org.apache.sling.felix.webconsole.internal.core.UpdateAction;
-import org.apache.sling.felix.webconsole.internal.misc.ConfigurationRender;
-import org.apache.sling.felix.webconsole.internal.system.GCAction;
-import org.apache.sling.felix.webconsole.internal.system.ShutdownAction;
-import org.apache.sling.felix.webconsole.internal.system.ShutdownRender;
-import org.apache.sling.felix.webconsole.internal.system.VMStatRender;
+import org.apache.felix.webconsole.Action;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.internal.Util;
+import org.apache.felix.webconsole.internal.compendium.AjaxConfigManagerAction;
+import org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter;
+import org.apache.felix.webconsole.internal.compendium.ComponentRenderAction;
+import org.apache.felix.webconsole.internal.compendium.ConfigManager;
+import org.apache.felix.webconsole.internal.core.AjaxBundleDetailsAction;
+import org.apache.felix.webconsole.internal.core.BundleListRender;
+import org.apache.felix.webconsole.internal.core.InstallAction;
+import org.apache.felix.webconsole.internal.core.RefreshPackagesAction;
+import org.apache.felix.webconsole.internal.core.SetStartLevelAction;
+import org.apache.felix.webconsole.internal.core.StartAction;
+import org.apache.felix.webconsole.internal.core.StopAction;
+import org.apache.felix.webconsole.internal.core.UninstallAction;
+import org.apache.felix.webconsole.internal.core.UpdateAction;
+import org.apache.felix.webconsole.internal.misc.ConfigurationRender;
+import org.apache.felix.webconsole.internal.system.GCAction;
+import org.apache.felix.webconsole.internal.system.ShutdownAction;
+import org.apache.felix.webconsole.internal.system.ShutdownRender;
+import org.apache.felix.webconsole.internal.system.VMStatRender;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -76,7 +76,7 @@
* @scr.component ds="no" label="%manager.name"
* description="%manager.description"
*/
-public class SlingManager extends GenericServlet {
+public class OsgiManager extends GenericServlet {
/** Pseudo class version ID to keep the IDE quite. */
private static final long serialVersionUID = 1L;
@@ -155,7 +155,7 @@
private Dictionary configuration;
- public SlingManager(BundleContext bundleContext) {
+ public OsgiManager(BundleContext bundleContext) {
this.bundleContext = bundleContext;
this.log = new Logger(bundleContext);
@@ -390,9 +390,9 @@
private static class HttpServiceTracker extends ServiceTracker {
- private final SlingManager slingManager;
+ private final OsgiManager slingManager;
- HttpServiceTracker(SlingManager slingManager) {
+ HttpServiceTracker(OsgiManager slingManager) {
super(slingManager.getBundleContext(), HttpService.class.getName(),
null);
this.slingManager = slingManager;
@@ -417,9 +417,9 @@
private static class OperationServiceTracker extends ServiceTracker {
- private final SlingManager slingManager;
+ private final OsgiManager slingManager;
- OperationServiceTracker(SlingManager slingManager) {
+ OperationServiceTracker(OsgiManager slingManager) {
super(slingManager.getBundleContext(), Action.SERVICE, null);
this.slingManager = slingManager;
}
@@ -443,9 +443,9 @@
private static class RenderServiceTracker extends ServiceTracker {
- private final SlingManager slingManager;
+ private final OsgiManager slingManager;
- RenderServiceTracker(SlingManager slingManager) {
+ RenderServiceTracker(OsgiManager slingManager) {
super(slingManager.getBundleContext(), Render.SERVICE, null);
this.slingManager = slingManager;
}
@@ -478,7 +478,7 @@
// register the servlet and resources
try {
- HttpContext httpContext = new SlingHttpContext(httpService, realm,
+ HttpContext httpContext = new OsgiManagerHttpContext(httpService, realm,
userId, password);
Dictionary servletConfig = toStringConfig(config);
Copied: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java (from r657050, felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingHttpContext.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java?p2=felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingHttpContext.java&r1=657050&r2=657051&rev=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingHttpContext.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.servlet;
+package org.apache.felix.webconsole.internal.servlet;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -26,7 +26,7 @@
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
-final class SlingHttpContext implements HttpContext {
+final class OsgiManagerHttpContext implements HttpContext {
private static final String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
@@ -52,7 +52,7 @@
private final HttpContext base;
- SlingHttpContext(HttpService httpService, String realm, String userId, String password) {
+ OsgiManagerHttpContext(HttpService httpService, String realm, String userId, String password) {
this.base = httpService.createDefaultHttpContext();
this.realm = realm;
this.userId = userId;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/GCAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/GCAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/GCAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/GCAction.java Fri May 16 06:14:45 2008
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.system;
+package org.apache.felix.webconsole.internal.system;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Action;
+import org.apache.felix.webconsole.Action;
public class GCAction implements Action {
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownAction.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownAction.java Fri May 16 06:14:45 2008
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.system;
+package org.apache.felix.webconsole.internal.system;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Action;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.Action;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.framework.BundleException;
import org.osgi.service.log.LogService;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownRender.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/ShutdownRender.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.system;
+package org.apache.felix.webconsole.internal.system;
import java.io.IOException;
import java.io.PrintWriter;
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Render;
+import org.apache.felix.webconsole.Render;
public class ShutdownRender implements Render {
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatRender.java?rev=657051&r1=657050&r2=657051&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatRender.java Fri May 16 06:14:45 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.felix.webconsole.internal.system;
+package org.apache.felix.webconsole.internal.system;
import java.io.IOException;
import java.io.PrintWriter;
@@ -23,10 +23,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.felix.webconsole.Render;
-import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
-import org.apache.sling.felix.webconsole.internal.Util;
-import org.apache.sling.felix.webconsole.internal.core.SetStartLevelAction;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.BaseManagementPlugin;
+import org.apache.felix.webconsole.internal.Util;
+import org.apache.felix.webconsole.internal.core.SetStartLevelAction;
public class VMStatRender extends BaseManagementPlugin implements Render {