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:09:36 UTC
svn commit: r657050 [1/2] - in /felix/trunk/webconsole: ./
src/main/java/org/apache/sling/felix/
src/main/java/org/apache/sling/felix/webconsole/
src/main/java/org/apache/sling/felix/webconsole/internal/
src/main/java/org/apache/sling/felix/webconsole/...
Author: fmeschbe
Date: Fri May 16 06:09:35 2008
New Revision: 657050
URL: http://svn.apache.org/viewvc?rev=657050&view=rev
Log:
FELIX-562 Refactoring into Apache Felix namespace
+ replace Sling JSON library by official org.json from Maven repo
+ refactor back to JDK 1.3 compatibility (generics, for-each loops)
Added:
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java
- copied, changed from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Action.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java
- copied, changed from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/ConfigurationPrinter.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java
- copied, changed from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Render.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java
- copied, changed from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/BaseManagementPlugin.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/OsgiManagerActivator.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java
- copied, changed from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/
- copied from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/compendium/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/
- copied from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/core/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/
- copied from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/misc/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/
- copied from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/obr/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/
- copied from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/system/
- copied from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/system/
Removed:
felix/trunk/webconsole/DISCLAIMER
felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/
Modified:
felix/trunk/webconsole/NOTICE
felix/trunk/webconsole/pom.xml
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AbstractScrPlugin.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentRenderAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManager.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManagerBase.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/AjaxBundleDetailsAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleListRender.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/InstallAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/RefreshPackagesAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/SetStartLevelAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StartAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StopAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UninstallAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UpdateAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/AssemblyListRender.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/ConfigurationRender.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/AbstractObrPlugin.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/BundleRepositoryRender.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/InstallFromRepoAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/RefreshRepoAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/ConfigurationListener.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/Logger.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingHttpContext.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/SlingManager.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/system/GCAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/system/ShutdownAction.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/system/ShutdownRender.java
felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/system/VMStatRender.java
felix/trunk/webconsole/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified: felix/trunk/webconsole/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/NOTICE?rev=657050&r1=657049&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/NOTICE (original)
+++ felix/trunk/webconsole/NOTICE Fri May 16 06:09:35 2008
@@ -1,4 +1,4 @@
-Apache Sling OSGi Web Console
+Apache Felix OSGi Web Console
Copyright 2007-2008 The Apache Software Foundation
Based on source code originally developed by
Modified: felix/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=657050&r1=657049&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Fri May 16 06:09:35 2008
@@ -17,33 +17,35 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>1-incubator-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.osgi.console.web</artifactId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
<packaging>bundle</packaging>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
- <name>Sling - Sling Management Console</name>
- <description>Sling Management Console Servlet</description>
+ <name>Apache Felix Web Management Console</name>
+ <description>
+ Web Based Management Console for OSGi Frameworks
+ </description>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/osgi/console-web
+ scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/osgi/console-web
+ scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole
</developerConnection>
- <url>
- http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web
- </url>
+ <url>http://svn.apache.org/viewvc/felix/trunk/webconsole</url>
</scm>
<build>
@@ -59,14 +61,14 @@
<configuration>
<instructions>
<Bundle-Activator>
- org.apache.sling.osgi.console.web.internal.SlingManagerActivator
+ org.apache.sling.felix.webconsole.internal.OsgiManagerActivator
</Bundle-Activator>
<Export-Package>
- org.apache.sling.osgi.console.web,
+ org.apache.sling.felix.webconsole,
</Export-Package>
<Private-Package>
- !org.apache.sling.osgi.console.web,
- org.apache.sling.osgi.console.web.*,
+ !org.apache.sling.felix.webconsole,
+ org.apache.sling.felix.webconsole.*,
<!-- File Upload functionality -->
org.apache.commons.fileupload,
@@ -79,13 +81,13 @@
org.apache.commons.io.output,
<!-- Required for JSON data transfer -->
- org.apache.sling.commons.json,
+ org.json,
<!-- Import/Export-Package parsing -->
org.apache.felix.bundlerepository
</Private-Package>
<Import-Package>
- org.apache.sling.*; org.apache.felix.*;
+ org.apache.felix.*;
org.osgi.service.obr;resolution:=optional,*
</Import-Package>
</instructions>
@@ -98,40 +100,55 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
</dependency>
<!-- This adds commons-io transitively -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>1.0.3</version>
<scope>compile</scope>
</dependency>
Copied: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java (from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Action.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java?p2=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Action.java&r1=657025&r2=657050&rev=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Action.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Action.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web;
+package org.apache.sling.felix.webconsole;
import java.io.IOException;
Copied: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java (from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/ConfigurationPrinter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java?p2=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/ConfigurationPrinter.java&r1=657025&r2=657050&rev=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/ConfigurationPrinter.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/ConfigurationPrinter.java Fri May 16 06:09:35 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.console.web;
+package org.apache.sling.felix.webconsole;
import java.io.PrintWriter;
Copied: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java (from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Render.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java?p2=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Render.java&r1=657025&r2=657050&rev=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/Render.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/Render.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web;
+package org.apache.sling.felix.webconsole;
import java.io.IOException;
Copied: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java (from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/BaseManagementPlugin.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java?p2=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/BaseManagementPlugin.java&r1=657025&r2=657050&rev=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/BaseManagementPlugin.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/BaseManagementPlugin.java Fri May 16 06:09:35 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.console.web.internal;
+package org.apache.sling.felix.webconsole.internal;
-import org.apache.sling.osgi.console.web.internal.servlet.Logger;
+import org.apache.sling.felix.webconsole.internal.servlet.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;
Added: 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/sling/felix/webconsole/internal/OsgiManagerActivator.java?rev=657050&view=auto
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/OsgiManagerActivator.java (added)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/OsgiManagerActivator.java Fri May 16 06:09:35 2008
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.felix.webconsole.internal;
+
+import org.apache.sling.felix.webconsole.internal.servlet.SlingManager;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class OsgiManagerActivator implements BundleActivator {
+
+ private SlingManager slingManager;
+
+ public void start(BundleContext bundleContext) {
+ slingManager = new SlingManager(bundleContext);
+ }
+
+ public void stop(BundleContext arg0) {
+ if (slingManager != null) {
+ slingManager.dispose();
+ }
+ }
+
+}
Copied: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java (from r657025, felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java)
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java?p2=felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java&p1=felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java&r1=657025&r2=657050&rev=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/Util.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal;
+package org.apache.sling.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.osgi.console.web.Render;
+import org.apache.sling.felix.webconsole.Render;
/**
* The <code>Util</code> TODO
@@ -116,12 +116,12 @@
return pw;
}
- public static void navigation(PrintWriter pw, Collection<Render> renders, String current, boolean disabled) {
+ public static void navigation(PrintWriter pw, Collection renders, String current, boolean disabled) {
pw.println("<p id='technav'>");
- SortedMap<String, String> map = new TreeMap<String, String>();
- for (Iterator<Render> ri=renders.iterator(); ri.hasNext(); ) {
- Render render = ri.next();
+ SortedMap map = new TreeMap();
+ for (Iterator ri=renders.iterator(); ri.hasNext(); ) {
+ Render render = (Render) ri.next();
if (render.getLabel() == null) {
// ignore renders without a label
} else if (disabled || current.equals(render.getName())) {
@@ -131,7 +131,7 @@
}
}
- for (Iterator<String> li=map.values().iterator(); li.hasNext(); ) {
+ for (Iterator li=map.values().iterator(); li.hasNext(); ) {
pw.println(li.next());
}
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AbstractScrPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AbstractScrPlugin.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AbstractScrPlugin.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AbstractScrPlugin.java Fri May 16 06:09:35 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.console.web.internal.compendium;
+package org.apache.sling.felix.webconsole.internal.compendium;
import org.apache.felix.scr.ScrService;
-import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
+import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.util.tracker.ServiceTracker;
public class AbstractScrPlugin extends BaseManagementPlugin {
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/AjaxConfigManagerAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.compendium;
+package org.apache.sling.felix.webconsole.internal.compendium;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -32,10 +32,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
-import org.apache.sling.osgi.console.web.Action;
+import org.apache.sling.felix.webconsole.Action;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
@@ -47,7 +47,6 @@
/**
* The <code>AjaxConfigManagerAction</code> TODO
- *
*/
public class AjaxConfigManagerAction extends ConfigManagerBase implements
Action {
@@ -124,7 +123,7 @@
json.put(ConfigManager.PID, pid);
json.put("isFactory", isFactory);
- Dictionary<?, ?> props = null;
+ Dictionary props = null;
ObjectClassDefinition ocd;
if (config != null) {
props = config.getProperties();
@@ -137,7 +136,7 @@
if (props != null) {
JSONObject properties = new JSONObject();
- for (Enumeration<?> pe = props.keys(); pe.hasMoreElements();) {
+ for (Enumeration pe = props.keys(); pe.hasMoreElements();) {
Object key = pe.nextElement();
// ignore well known special properties
@@ -168,11 +167,11 @@
}
}
- private Dictionary<?, ?> mergeWithMetaType(Dictionary<?, ?> props,
+ private Dictionary mergeWithMetaType(Dictionary props,
ObjectClassDefinition ocd, JSONObject json) throws JSONException {
if (props == null) {
- props = new Hashtable<String, Object>();
+ props = new Hashtable();
}
if (ocd != null) {
@@ -224,14 +223,14 @@
if (ad[i].getCardinality() == 0) {
// scalar
if (value instanceof Vector) {
- value = ((Vector<?>) value).get(0);
+ value = ((Vector) value).get(0);
} else if (value.getClass().isArray()) {
value = Array.get(value, 0);
}
entry.put("value", value);
} else {
if (value instanceof Vector) {
- value = new JSONArray((Vector<?>) value);
+ value = new JSONArray((Vector) value);
} else if (value.getClass().isArray()) {
value = new JSONArray(
Arrays.asList((Object[]) value));
@@ -274,16 +273,15 @@
} else {
Bundle bundle = this.getBundle(config.getBundleLocation());
- @SuppressWarnings("unchecked")
- Dictionary<String, String> headers = bundle.getHeaders(locale);
- String name = headers.get(Constants.BUNDLE_NAME);
+ Dictionary headers = bundle.getHeaders(locale);
+ String name = (String) headers.get(Constants.BUNDLE_NAME);
if (name == null) {
location = bundle.getSymbolicName();
} else {
location = name + " (" + bundle.getSymbolicName() + ")";
}
- Version v = Version.parseVersion(headers.get(Constants.BUNDLE_VERSION));
+ Version v = Version.parseVersion((String) headers.get(Constants.BUNDLE_VERSION));
location += ", Version " + v.toString();
}
json.put("bundleLocation", location);
@@ -311,10 +309,9 @@
// add sling context into the configuration
if (request.getParameter("sling.context") != null) {
- @SuppressWarnings("unchecked")
- Dictionary<String, Object> props = config.getProperties();
+ Dictionary props = config.getProperties();
if (props == null) {
- props = new Hashtable<String, Object>();
+ props = new Hashtable();
}
props.put("sling.context",
request.getParameter("sling.context"));
@@ -341,20 +338,18 @@
}
} else {
Configuration config = ca.getConfiguration(pid, null);
- @SuppressWarnings("unchecked")
- Dictionary<String, Object> props = config.getProperties();
+ Dictionary props = config.getProperties();
if (props == null) {
- props = new Hashtable<String, Object>();
+ props = new Hashtable();
}
- Map<String, AttributeDefinition> adMap = this.getAttributeDefinitionMap(
- config, null);
+ Map adMap = (Map) this.getAttributeDefinitionMap(config, null);
if (adMap != null) {
StringTokenizer propTokens = new StringTokenizer(propertyList,
",");
while (propTokens.hasMoreTokens()) {
String propName = propTokens.nextToken();
- AttributeDefinition ad = adMap.get(propName);
+ AttributeDefinition ad = (AttributeDefinition) adMap.get(propName);
if (ad == null
|| (ad.getCardinality() == 0 && ad.getType() == AttributeDefinition.STRING)) {
String prop = request.getParameter(propName);
@@ -367,7 +362,7 @@
props.put(propName, this.toType(ad.getType(), prop));
} else {
// array or vector of any type
- Vector<Object> vec = new Vector<Object>();
+ Vector vec = new Vector();
String[] properties = request.getParameterValues(propName);
if (properties != null) {
@@ -426,7 +421,7 @@
}
}
- private Object toArray(int type, Vector<Object> values) {
+ private Object toArray(int type, Vector values) {
int size = values.size();
// short cut for string array
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentConfigurationPrinter.java Fri May 16 06:09:35 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.console.web.internal.compendium;
+package org.apache.sling.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.osgi.console.web.ConfigurationPrinter;
+import org.apache.sling.felix.webconsole.ConfigurationPrinter;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -41,7 +41,6 @@
private ServiceRegistration registration;
- @Override
public void setBundleContext(BundleContext bundleContext) {
super.setBundleContext(bundleContext);
@@ -65,13 +64,15 @@
} else {
// order components by id
- TreeMap<Long, Component> componentMap = new TreeMap<Long, Component>();
- for (Component component : components) {
- componentMap.put(component.getId(), component);
+ TreeMap componentMap = new TreeMap();
+ for (int i=0; i < components.length; i++) {
+ Component component = components[1];
+ componentMap.put(new Long(component.getId()), component);
}
// render components
- for (Component component : componentMap.values()) {
+ for (Iterator ci = componentMap.values().iterator(); ci.hasNext();) {
+ Component component = (Component) ci.next();
component(pw, component);
}
}
@@ -173,15 +174,13 @@
}
private void listProperties(PrintWriter pw, Component component) {
- @SuppressWarnings("unchecked")
- Dictionary<String, Object> props = component.getProperties();
+ Dictionary props = component.getProperties();
if (props != null) {
pw.println(" Properties=");
- TreeSet<String> keys = new TreeSet<String>(
- Collections.list(props.keys()));
- for (Iterator<String> ki = keys.iterator(); ki.hasNext();) {
- String key = ki.next();
+ TreeSet keys = new TreeSet(Collections.list(props.keys()));
+ for (Iterator ki = keys.iterator(); ki.hasNext();) {
+ String key = (String) ki.next();
Object value = props.get(key);
if (value.getClass().isArray()) {
value = Arrays.asList((Object[]) value);
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentRenderAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentRenderAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentRenderAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ComponentRenderAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.compendium;
+package org.apache.sling.felix.webconsole.internal.compendium;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
import org.apache.felix.scr.Component;
import org.apache.felix.scr.Reference;
import org.apache.felix.scr.ScrService;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
-import org.apache.sling.osgi.console.web.Action;
-import org.apache.sling.osgi.console.web.Render;
-import org.apache.sling.osgi.console.web.internal.Util;
+import org.apache.sling.felix.webconsole.Action;
+import org.apache.sling.felix.webconsole.Render;
+import org.apache.sling.felix.webconsole.internal.Util;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentConstants;
@@ -120,14 +120,16 @@
} else {
// order components by id
- TreeMap<String, Component> componentMap = new TreeMap<String, Component>();
- for (Component component : components) {
+ TreeMap componentMap = new TreeMap();
+ for (int i=0; i < components.length; i++) {
+ Component component = components[i];
componentMap.put(component.getName(), component);
}
// render components
long previousComponent = -1;
- for (Component component : componentMap.values()) {
+ for (Iterator ci = componentMap.values().iterator(); ci.hasNext();) {
+ Component component = (Component) ci.next();
if (previousComponent >= 0) {
// prepare for injected table information row
pw.println("<tr id='component" + previousComponent
@@ -352,14 +354,12 @@
}
private void listProperties(JSONArray jsonProps, Component component) {
- @SuppressWarnings("unchecked")
- Dictionary<String, Object> props = component.getProperties();
+ Dictionary props = component.getProperties();
if (props != null) {
StringBuffer buf = new StringBuffer();
- TreeSet<String> keys = new TreeSet<String>(
- Collections.list(props.keys()));
- for (Iterator<String> ki = keys.iterator(); ki.hasNext();) {
- String key = ki.next();
+ TreeSet keys = new TreeSet(Collections.list(props.keys()));
+ for (Iterator ki = keys.iterator(); ki.hasNext();) {
+ String key = (String) ki.next();
buf.append(key).append(" = ");
Object prop = props.get(key);
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManager.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManager.java Fri May 16 06:09:35 2008
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.compendium;
+package org.apache.sling.felix.webconsole.internal.compendium;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Dictionary;
+import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.SortedMap;
@@ -28,9 +29,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.osgi.console.web.Render;
-import org.apache.sling.osgi.console.web.internal.Util;
-import org.apache.sling.osgi.console.web.internal.core.SetStartLevelAction;
+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.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -80,7 +81,8 @@
pw.println("</table>");
}
- private void listConfigurations(PrintWriter pw, boolean optionalMetaType, Locale loc) {
+ private void listConfigurations(PrintWriter pw, boolean optionalMetaType,
+ Locale loc) {
ConfigurationAdmin ca = this.getConfigurationAdmin();
if (ca == null) {
@@ -92,10 +94,10 @@
try {
// get a list of all pids for which MetaData exists
- Map<String, Bundle> metaDataPids = this.getMetadataPids();
+ Map metaDataPids = this.getMetadataPids();
// sorted map of options
- SortedMap<String, String> options = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+ SortedMap options = new TreeMap(String.CASE_INSENSITIVE_ORDER);
// find all ManagedServiceFactories to get the factoryPIDs
ServiceReference[] refs = this.getBundleContext().getServiceReferences(
@@ -121,7 +123,7 @@
}
if (ocd != null || optionalMetaType) {
- options.put("factoryPid="+pid, name);
+ options.put("factoryPid=" + pid, name);
}
}
}
@@ -130,18 +132,22 @@
Configuration[] cfgs = ca.listConfigurations(null);
for (int i = 0; cfgs != null && i < cfgs.length; i++) {
- // ignore configuration object if an entry already exists in the map
+ // ignore configuration object if an entry already exists in the
+ // map
String pid = cfgs[i].getPid();
- if (options.containsKey("pid="+pid) || options.containsKey("factoryPid="+pid)) {
+ if (options.containsKey("pid=" + pid)
+ || options.containsKey("factoryPid=" + pid)) {
continue;
}
- Dictionary<?, ?> props = cfgs[i].getProperties();
- Object slingContext = (props != null) ? props.get("sling.context") : null;
+ Dictionary props = cfgs[i].getProperties();
+ Object slingContext = (props != null)
+ ? props.get("sling.context")
+ : null;
// insert and entry for the pid
- ObjectClassDefinition ocd = this.getObjectClassDefinition(cfgs[i],
- locale);
+ ObjectClassDefinition ocd = this.getObjectClassDefinition(
+ cfgs[i], locale);
String name;
if (ocd != null) {
name = ocd.getName() + " (";
@@ -160,26 +166,27 @@
}
if (ocd != null || optionalMetaType) {
- options.put("pid="+pid, name);
+ options.put("pid=" + pid, name);
}
- // if the configuration is part of a factory, ensure an entry for the factory
+ // if the configuration is part of a factory, ensure an entry
+ // for the factory
if (cfgs[i].getFactoryPid() != null) {
pid = cfgs[i].getFactoryPid();
- if (options.containsValue("factoryPid="+pid)) {
+ if (options.containsValue("factoryPid=" + pid)) {
continue;
}
- String existing = options.remove("pid="+pid);
+ String existing = (String) options.remove("pid=" + pid);
if (existing != null) {
- options.put("factoryPid="+pid, existing);
+ options.put("factoryPid=" + pid, existing);
} else {
Bundle bundle = this.getBundle(cfgs[i].getBundleLocation());
ocd = this.getObjectClassDefinition(bundle, pid, locale);
if (ocd != null) {
- options.put("factoryPid="+pid, ocd.getName());
+ options.put("factoryPid=" + pid, ocd.getName());
} else if (optionalMetaType) {
- options.put("factoryPid="+pid, pid);
+ options.put("factoryPid=" + pid, pid);
}
}
}
@@ -188,9 +195,10 @@
// If there are any meta data PIDs for which there is no existing
// configuration, we add them to the list to create configuration
if (!metaDataPids.isEmpty()) {
- for (Entry<String, Bundle> mdp : metaDataPids.entrySet()) {
+ for(Iterator mdpi=metaDataPids.entrySet().iterator(); mdpi.hasNext(); ) {
+ Entry mdp = (Entry) mdpi.next();
ObjectClassDefinition ocd = this.getObjectClassDefinition(
- mdp.getValue(), mdp.getKey(), locale);
+ (Bundle) mdp.getValue(), (String) mdp.getKey(), locale);
options.put("pid=" + mdp.getKey(), ocd.getName() + " ("
+ mdp.getKey() + ")");
}
@@ -200,7 +208,8 @@
pw.println("<input type='hidden' name='" + Util.PARAM_ACTION
+ "' value='" + SetStartLevelAction.NAME + "'>");
pw.println("<select class='select' name='pid' onChange='configure();'>");
- for (Entry<String, String> entry : options.entrySet()) {
+ for (Iterator ei = options.entrySet().iterator(); ei.hasNext();) {
+ Entry entry = (Entry) ei.next();
pw.print("<option value='" + entry.getKey() + "'>");
pw.print(entry.getValue());
pw.println("</option>");
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManagerBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManagerBase.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManagerBase.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/compendium/ConfigManagerBase.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.compendium;
+package org.apache.sling.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.osgi.console.web.internal.BaseManagementPlugin;
+import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration;
@@ -69,8 +69,8 @@
return (MetaTypeService) metaTypeService.getService();
}
- protected Map<String, Bundle> getMetadataPids() {
- Map<String, Bundle> pids = new HashMap<String, Bundle>();
+ protected Map getMetadataPids() {
+ Map pids = new HashMap();
MetaTypeService mts = this.getMetaTypeService();
if (mts != null) {
Bundle[] bundles = this.getBundleContext().getBundles();
@@ -165,14 +165,14 @@
return null;
}
- protected Map<String, AttributeDefinition> getAttributeDefinitionMap(
+ protected Map getAttributeDefinitionMap(
Configuration config, String locale) {
ObjectClassDefinition ocd = this.getObjectClassDefinition(config,
locale);
if (ocd != null) {
AttributeDefinition[] ad = ocd.getAttributeDefinitions(ObjectClassDefinition.ALL);
if (ad != null) {
- Map<String, AttributeDefinition> adMap = new HashMap<String, AttributeDefinition>();
+ Map adMap = new HashMap();
for (int i = 0; i < ad.length; i++) {
adMap.put(ad[i].getID(), ad[i]);
}
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/AjaxBundleDetailsAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/AjaxBundleDetailsAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/AjaxBundleDetailsAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/AjaxBundleDetailsAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import java.io.IOException;
import java.util.ArrayList;
@@ -23,6 +23,7 @@
import java.util.Date;
import java.util.Dictionary;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@@ -35,9 +36,9 @@
import org.apache.felix.bundlerepository.R4Export;
import org.apache.felix.bundlerepository.R4Import;
import org.apache.felix.bundlerepository.R4Package;
-import org.apache.sling.commons.json.JSONArray;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -64,7 +65,6 @@
// see #activate and #isBootDelegated
private boolean[] bootPkgWildcards;
- @Override
public void setBundleContext(BundleContext bundleContext) {
super.setBundleContext(bundleContext);
@@ -106,8 +106,7 @@
long bundleId = getBundleId(request);
Bundle bundle = getBundleContext().getBundle(bundleId);
if (bundle != null) {
- @SuppressWarnings("unchecked")
- Dictionary<String, String> headers = bundle.getHeaders();
+ Dictionary headers = bundle.getHeaders();
JSONArray props = new JSONArray();
keyVal(props, "Symbolic Name", bundle.getSymbolicName());
@@ -150,7 +149,7 @@
private Integer getStartLevel(Bundle bundle) {
StartLevel sl = getStartLevel();
- return (sl != null) ? sl.getBundleStartLevel(bundle) : null;
+ return (sl != null) ? new Integer(sl.getBundleStartLevel(bundle)) : null;
}
private void listImportExport(JSONArray props, Bundle bundle) {
@@ -159,23 +158,29 @@
return;
}
- Map<String, Bundle> usingBundles = new TreeMap<String, Bundle>();
-
+ Map usingBundles = new TreeMap();
+
ExportedPackage[] exports = packageAdmin.getExportedPackages(bundle);
if (exports != null && exports.length > 0) {
// do alphabetical sort
- Arrays.sort(exports, new Comparator<ExportedPackage>() {
+ Arrays.sort(exports, new Comparator() {
public int compare(ExportedPackage p1, ExportedPackage p2) {
return p1.getName().compareTo(p2.getName());
}
+
+ public int compare(Object o1, Object o2) {
+ return compare((ExportedPackage) o1, (ExportedPackage) o2);
+ }
});
StringBuffer val = new StringBuffer();
- for (ExportedPackage export : exports) {
+ for (int j=0; j < exports.length; j++) {
+ ExportedPackage export = exports[j];
printExport(val, export.getName(), export.getVersion());
Bundle[] ubList = export.getImportingBundles();
if (ubList != null) {
- for (Bundle ub : ubList) {
+ for (int i=0; i < ubList.length; i++) {
+ Bundle ub = ubList[i];
usingBundles.put(ub.getSymbolicName(), ub);
}
}
@@ -188,7 +193,7 @@
exports = packageAdmin.getExportedPackages((Bundle) null);
if (exports != null && exports.length > 0) {
// collect import packages first
- final List<ExportedPackage> imports = new ArrayList<ExportedPackage>();
+ final List imports = new ArrayList();
for (int i = 0; i < exports.length; i++) {
final ExportedPackage ep = exports[i];
final Bundle[] importers = ep.getImportingBundles();
@@ -203,14 +208,20 @@
// now sort
StringBuffer val = new StringBuffer();
if (imports.size() > 0) {
- final ExportedPackage[] packages = imports.toArray(new ExportedPackage[imports.size()]);
- Arrays.sort(packages, new Comparator<ExportedPackage>() {
+ final ExportedPackage[] packages = (ExportedPackage[]) imports.toArray(new ExportedPackage[imports.size()]);
+ Arrays.sort(packages, new Comparator() {
public int compare(ExportedPackage p1, ExportedPackage p2) {
return p1.getName().compareTo(p2.getName());
}
+
+ public int compare(Object o1, Object o2) {
+ return compare((ExportedPackage) o1,
+ (ExportedPackage) o2);
+ }
});
// and finally print out
- for (ExportedPackage ep : packages) {
+ for (int i=0; i < packages.length; i++) {
+ ExportedPackage ep = packages[i];
printImport(val, ep.getName(), ep.getVersion(), ep);
}
} else {
@@ -220,10 +231,11 @@
keyVal(props, "Imported Packages", val.toString());
}
-
+
if (!usingBundles.isEmpty()) {
StringBuffer val = new StringBuffer();
- for (Bundle usingBundle : usingBundles.values()) {
+ for (Iterator ui = usingBundles.values().iterator(); ui.hasNext();) {
+ Bundle usingBundle = (Bundle) ui.next();
val.append(getBundleDescriptor(usingBundle));
val.append("<br />");
}
@@ -232,23 +244,26 @@
}
private void listImportExportsUnresolved(JSONArray props, Bundle bundle) {
- Dictionary<?, ?> dict = bundle.getHeaders();
+ Dictionary dict = bundle.getHeaders();
String target = (String) dict.get(Constants.EXPORT_PACKAGE);
if (target != null) {
R4Package[] pkgs = R4Package.parseImportOrExportHeader(target);
if (pkgs != null && pkgs.length > 0) {
// do alphabetical sort
- Arrays.sort(pkgs, new Comparator<R4Package>() {
+ Arrays.sort(pkgs, new Comparator() {
public int compare(R4Package p1, R4Package p2) {
return p1.getName().compareTo(p2.getName());
}
+
+ public int compare(Object o1, Object o2) {
+ return compare((R4Package) o1, (R4Package) o2);
+ }
});
StringBuffer val = new StringBuffer();
- for (R4Package pkg : pkgs) {
- R4Export export = new R4Export(pkg);
-
+ for (int i=0; i < pkgs.length; i++) {
+ R4Export export = new R4Export(pkgs[i]);
printExport(val, export.getName(), export.getVersion());
}
keyVal(props, "Exported Packages", val.toString());
@@ -261,13 +276,14 @@
if (target != null) {
R4Package[] pkgs = R4Package.parseImportOrExportHeader(target);
if (pkgs != null && pkgs.length > 0) {
- Map<String, R4Import> imports = new TreeMap<String, R4Import>();
- for (R4Package pkg : pkgs) {
+ Map imports = new TreeMap();
+ for (int i=0; i < pkgs.length; i++) {
+ R4Package pkg = pkgs[i];
imports.put(pkg.getName(), new R4Import(pkg));
}
// collect import packages first
- final Map<String, ExportedPackage> candidates = new HashMap<String, ExportedPackage>();
+ final Map candidates = new HashMap();
PackageAdmin packageAdmin = getPackageAdmin();
if (packageAdmin != null) {
ExportedPackage[] exports = packageAdmin.getExportedPackages((Bundle) null);
@@ -276,7 +292,7 @@
for (int i = 0; i < exports.length; i++) {
final ExportedPackage ep = exports[i];
- R4Import imp = imports.get(ep.getName());
+ R4Import imp = (R4Import) imports.get(ep.getName());
if (imp != null && imp.isSatisfied(toR4Export(ep))) {
candidates.put(ep.getName(), ep);
}
@@ -287,8 +303,9 @@
// now sort
StringBuffer val = new StringBuffer();
if (imports.size() > 0) {
- for (R4Import r4Import : imports.values()) {
- ExportedPackage ep = candidates.get(r4Import.getName());
+ for (Iterator ii = imports.values().iterator(); ii.hasNext();) {
+ R4Import r4Import = (R4Import) ii.next();
+ ExportedPackage ep = (ExportedPackage) candidates.get(r4Import.getName());
// if there is no matching export, check whether this
// bundle has the package, ignore the entry in this case
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleAction.java Fri May 16 06:09:35 2008
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
-import org.apache.sling.osgi.console.web.Action;
-import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
+import org.apache.sling.felix.webconsole.Action;
+import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
abstract class BundleAction extends BaseManagementPlugin implements Action {
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleListRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleListRender.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleListRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/BundleListRender.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.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.osgi.console.web.Render;
-import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
-import org.apache.sling.osgi.console.web.internal.Util;
+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.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -351,7 +351,10 @@
// ---------- inner classes ------------------------------------------------
- private static final Comparator<Bundle> BUNDLE_NAME_COMPARATOR = new Comparator<Bundle>() {
+ private static final Comparator BUNDLE_NAME_COMPARATOR = new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return compare((Bundle) o1, (Bundle) o2);
+ }
public int compare(Bundle b1, Bundle b2) {
// the same bundles
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/InstallAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/InstallAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/InstallAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/InstallAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.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.osgi.console.web.internal.Util;
+import org.apache.sling.felix.webconsole.internal.Util;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
@@ -67,8 +67,7 @@
HttpServletResponse response) {
// get the uploaded data
- @SuppressWarnings("unchecked")
- Map<String, FileItem[]> params = (Map<String, FileItem[]>) request.getAttribute(Util.ATTR_FILEUPLOAD);
+ Map params = (Map) request.getAttribute(Util.ATTR_FILEUPLOAD);
if (params == null) {
return true;
}
@@ -127,9 +126,9 @@
return true;
}
- private FileItem getFileItem(Map<String, FileItem[]> params, String name,
+ private FileItem getFileItem(Map params, String name,
boolean isFormField) {
- FileItem[] items = params.get(name);
+ FileItem[] items = (FileItem[]) params.get(name);
if (items != null) {
for (int i = 0; i < items.length; i++) {
if (items[i].isFormField() == isFormField) {
@@ -211,7 +210,6 @@
Thread t = new InstallHelper(this, "Background Install " + bundleFile,
bundleFile) {
- @Override
protected void doRun(InputStream bundleStream)
throws BundleException {
Bundle bundle = getBundleContext().installBundle(location,
@@ -236,7 +234,6 @@
+ bundle.getSymbolicName() + " (" + bundle.getBundleId() + ")",
bundleFile) {
- @Override
protected void doRun(InputStream bundleStream)
throws BundleException {
bundle.update(bundleStream);
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/RefreshPackagesAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/RefreshPackagesAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/RefreshPackagesAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/RefreshPackagesAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/SetStartLevelAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/SetStartLevelAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/SetStartLevelAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/SetStartLevelAction.java Fri May 16 06:09:35 2008
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.osgi.console.web.Action;
-import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
+import org.apache.sling.felix.webconsole.Action;
+import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.service.startlevel.StartLevel;
/**
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StartAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StartAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StartAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StartAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StopAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StopAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StopAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/StopAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UninstallAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UninstallAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UninstallAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UninstallAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UpdateAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UpdateAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UpdateAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/core/UpdateAction.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.core;
+package org.apache.sling.felix.webconsole.internal.core;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/AssemblyListRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/AssemblyListRender.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/AssemblyListRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/AssemblyListRender.java Fri May 16 06:09:35 2008
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.misc;
+package org.apache.sling.felix.webconsole.internal.misc;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.osgi.console.web.internal.core.BundleListRender;
+import org.apache.sling.felix.webconsole.internal.core.BundleListRender;
import org.osgi.framework.Bundle;
public class AssemblyListRender extends BundleListRender {
@@ -37,12 +37,12 @@
protected Bundle[] getBundles() {
Bundle[] bundles = this.getBundleContext().getBundles();
- List<Bundle> assList = new ArrayList<Bundle>();
+ List assList = new ArrayList();
for (int i=0; i < bundles.length; i++) {
if (bundles[i].getHeaders().get("Assembly-Bundles") != null) {
assList.add(bundles[i]);
}
}
- return assList.toArray(new Bundle[assList.size()]);
+ return (Bundle[]) assList.toArray(new Bundle[assList.size()]);
}
}
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/ConfigurationRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/ConfigurationRender.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/ConfigurationRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/misc/ConfigurationRender.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.misc;
+package org.apache.sling.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.osgi.console.web.ConfigurationPrinter;
-import org.apache.sling.osgi.console.web.Render;
-import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
+import org.apache.sling.felix.webconsole.ConfigurationPrinter;
+import org.apache.sling.felix.webconsole.Render;
+import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
@@ -65,7 +65,7 @@
private int cfgPrinterTrackerCount;
- private SortedMap<String, ConfigurationPrinter> configurationPrinters = new TreeMap<String, ConfigurationPrinter>();
+ private SortedMap configurationPrinters = new TreeMap();
public String getName() {
return NAME;
@@ -103,8 +103,8 @@
this.printPreferences(pw);
this.printConfigurations(pw);
- for (ConfigurationPrinter cp : getConfigurationPrinters()) {
- printConfigurationPrinter(pw, cp);
+ for (Iterator cpi = getConfigurationPrinters().iterator(); cpi.hasNext();) {
+ printConfigurationPrinter(pw, (ConfigurationPrinter) cpi.next());
}
pw.println("</pre>");
@@ -113,7 +113,7 @@
pw.println("</table>");
}
- private Collection<ConfigurationPrinter> getConfigurationPrinters() {
+ private Collection getConfigurationPrinters() {
if (cfgPrinterTracker == null) {
cfgPrinterTracker = new ServiceTracker(getBundleContext(),
ConfigurationPrinter.SERVICE, null);
@@ -122,10 +122,11 @@
}
if (cfgPrinterTrackerCount != cfgPrinterTracker.getTrackingCount()) {
- SortedMap<String, ConfigurationPrinter> cp = new TreeMap<String, ConfigurationPrinter>();
+ SortedMap cp = new TreeMap();
Object[] services = cfgPrinterTracker.getServices();
if (services != null) {
- for (Object srv : services) {
+ for (int i = 0; i < services.length; i++) {
+ Object srv = services[i];
ConfigurationPrinter cfgPrinter = (ConfigurationPrinter) srv;
cp.put(cfgPrinter.getTitle(), cfgPrinter);
}
@@ -141,8 +142,9 @@
pw.println("*** System properties:");
Properties props = System.getProperties();
- SortedSet<Object> keys = new TreeSet<Object>(props.keySet());
- for (Object key : keys) {
+ SortedSet keys = new TreeSet(props.keySet());
+ for (Iterator ki = keys.iterator(); ki.hasNext();) {
+ Object key = ki.next();
this.infoLine(pw, null, (String) key, props.get(key));
}
@@ -166,8 +168,9 @@
IOUtils.closeQuietly(ins);
}
- SortedSet<Object> keys = new TreeSet<Object>(props.keySet());
- for (Object key : keys) {
+ SortedSet keys = new TreeSet(props.keySet());
+ for (Iterator ki = keys.iterator(); ki.hasNext();) {
+ Object key = ki.next();
this.infoLine(pw, null, (String) key, props.get(key));
}
@@ -182,7 +185,7 @@
pw.println("*** Assemblies:");
Bundle[] bundles = getBundleContext().getBundles();
- SortedSet<String> keys = new TreeSet<String>();
+ SortedSet keys = new TreeSet();
for (int i = 0; i < bundles.length; i++) {
if (bundles[i].getHeaders().get("Assembly-Bundles") != null) {
keys.add(this.getBundleString(bundles[i], false));
@@ -192,7 +195,7 @@
if (keys.isEmpty()) {
pw.println(" No Assemblies installed");
} else {
- for (Iterator<String> ki = keys.iterator(); ki.hasNext();) {
+ for (Iterator ki = keys.iterator(); ki.hasNext();) {
this.infoLine(pw, null, null, ki.next());
}
}
@@ -206,12 +209,12 @@
// Monitor" [Resolved]
Bundle[] bundles = getBundleContext().getBundles();
- SortedSet<String> keys = new TreeSet<String>();
+ SortedSet keys = new TreeSet();
for (int i = 0; i < bundles.length; i++) {
keys.add(this.getBundleString(bundles[i], true));
}
- for (Iterator<String> ki = keys.iterator(); ki.hasNext();) {
+ for (Iterator ki = keys.iterator(); ki.hasNext();) {
this.infoLine(pw, null, null, ki.next());
}
@@ -222,7 +225,7 @@
pw.println("*** Services:");
// get the list of services sorted by service ID (ascending)
- SortedMap<Object, ServiceReference> srMap = new TreeMap<Object, ServiceReference>();
+ SortedMap srMap = new TreeMap();
try {
ServiceReference[] srs = getBundleContext().getAllServiceReferences(
null, null);
@@ -234,8 +237,8 @@
// expected
}
- for (Iterator<ServiceReference> si = srMap.values().iterator(); si.hasNext();) {
- ServiceReference sr = si.next();
+ for (Iterator si = srMap.values().iterator(); si.hasNext();) {
+ ServiceReference sr = (ServiceReference) si.next();
this.infoLine(pw, null,
String.valueOf(sr.getProperty(Constants.SERVICE_ID)),
@@ -245,7 +248,7 @@
Bundle[] users = sr.getUsingBundles();
if (users != null && users.length > 0) {
- List<String> userString = new ArrayList<String>();
+ List userString = new ArrayList();
for (int i = 0; i < users.length; i++) {
userString.add(this.getBundleString(users[i], false));
}
@@ -324,13 +327,13 @@
try {
Configuration[] configs = ca.listConfigurations(null);
if (configs != null && configs.length > 0) {
- SortedMap<Object, Configuration> sm = new TreeMap<Object, Configuration>();
+ SortedMap sm = new TreeMap();
for (int i = 0; i < configs.length; i++) {
sm.put(configs[i].getPid(), configs[i]);
}
- for (Iterator<Configuration> mi = sm.values().iterator(); mi.hasNext();) {
- this.printConfiguration(pw, mi.next());
+ for (Iterator mi = sm.values().iterator(); mi.hasNext();) {
+ this.printConfiguration(pw, (Configuration) mi.next());
}
} else {
pw.println(" No Configurations available");
@@ -364,16 +367,15 @@
: "Unbound";
this.infoLine(pw, " ", "BundleLocation", loc);
- @SuppressWarnings("unchecked")
- Dictionary<String, Object> props = config.getProperties();
+ Dictionary props = config.getProperties();
if (props != null) {
- SortedSet<String> keys = new TreeSet<String>();
- for (Enumeration<String> ke = props.keys(); ke.hasMoreElements();) {
+ SortedSet keys = new TreeSet();
+ for (Enumeration ke = props.keys(); ke.hasMoreElements();) {
keys.add(ke.nextElement());
}
- for (Iterator<String> ki = keys.iterator(); ki.hasNext();) {
- String key = ki.next();
+ for (Iterator ki = keys.iterator(); ki.hasNext();) {
+ String key = (String) ki.next();
this.infoLine(pw, " ", key, props.get(key));
}
}
@@ -431,8 +433,7 @@
buf.append(bundle.getBundleId());
}
- @SuppressWarnings("unchecked")
- Dictionary<String, String> headers = bundle.getHeaders();
+ Dictionary headers = bundle.getHeaders();
if (headers.get(Constants.BUNDLE_VERSION) != null) {
buf.append(" (").append(headers.get(Constants.BUNDLE_VERSION)).append(
')');
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/AbstractObrPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/AbstractObrPlugin.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/AbstractObrPlugin.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/AbstractObrPlugin.java Fri May 16 06:09:35 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.console.web.internal.obr;
+package org.apache.sling.felix.webconsole.internal.obr;
//import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
//import org.apache.sling.osgi.assembly.installer.InstallerService;
-import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
+import org.apache.sling.felix.webconsole.internal.BaseManagementPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/BundleRepositoryRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/BundleRepositoryRender.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/BundleRepositoryRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/BundleRepositoryRender.java Fri May 16 06:09:35 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.obr;
+package org.apache.sling.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.osgi.console.web.Render;
-import org.apache.sling.osgi.console.web.internal.Util;
+import org.apache.sling.felix.webconsole.Render;
+import org.apache.sling.felix.webconsole.internal.Util;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -48,7 +48,7 @@
super.setBundleContext(bundleContext);
String urlStr = bundleContext.getProperty(REPOSITORY_PROPERTY);
- List<String> urlList = new ArrayList<String>();
+ List urlList = new ArrayList();
if (urlStr != null) {
StringTokenizer st = new StringTokenizer(urlStr);
@@ -57,7 +57,7 @@
}
}
- this.repoURLs = urlList.toArray(new String[urlList.size()]);
+ this.repoURLs = (String[]) urlList.toArray(new String[urlList.size()]);
}
public String getName() {
@@ -256,8 +256,8 @@
pw.println("</table></form>");
}
- private Map<String, Version> getBundles() {
- Map<String, Version> bundles = new HashMap<String, Version>();
+ private Map getBundles() {
+ Map bundles = new HashMap();
Bundle[] installed = getBundleContext().getBundles();
for (int i = 0; i < installed.length; i++) {
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/InstallFromRepoAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/InstallFromRepoAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/InstallFromRepoAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/InstallFromRepoAction.java Fri May 16 06:09:35 2008
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.obr;
+package org.apache.sling.felix.webconsole.internal.obr;
-import org.apache.sling.osgi.console.web.Action;
+import org.apache.sling.felix.webconsole.Action;
public abstract class InstallFromRepoAction extends AbstractObrPlugin implements Action {
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/RefreshRepoAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/RefreshRepoAction.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/RefreshRepoAction.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/obr/RefreshRepoAction.java Fri May 16 06:09:35 2008
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.osgi.console.web.internal.obr;
+package org.apache.sling.felix.webconsole.internal.obr;
-import org.apache.sling.osgi.console.web.Action;
+import org.apache.sling.felix.webconsole.Action;
public abstract class RefreshRepoAction extends AbstractObrPlugin implements Action {
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/ConfigurationListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/ConfigurationListener.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/ConfigurationListener.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/ConfigurationListener.java Fri May 16 06:09:35 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.console.web.internal.servlet;
+package org.apache.sling.felix.webconsole.internal.servlet;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -32,7 +32,7 @@
static ServiceRegistration create(SlingManager slingManager) {
ConfigurationListener cl = new ConfigurationListener(slingManager);
- Dictionary<String, String> props = new Hashtable<String, String>();
+ Dictionary props = new Hashtable();
props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
props.put(Constants.SERVICE_DESCRIPTION,
"Sling Management Console Configuration Receiver");
@@ -46,7 +46,6 @@
this.slingManager = slingManager;
}
- @SuppressWarnings("unchecked")
public void updated(Dictionary config) {
slingManager.updateConfiguration(config);
}
Modified: felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/Logger.java?rev=657050&r1=657025&r2=657050&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/Logger.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/sling/felix/webconsole/internal/servlet/Logger.java Fri May 16 06:09:35 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.console.web.internal.servlet;
+package org.apache.sling.felix.webconsole.internal.servlet;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;