Small modifications and enhancements
git-svn-id: https://svn.apache.org/repos/asf/karaf/sandbox/pieber/karaf-webconsole/trunk@1159161 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index fff195f..55ef3f7 100644
--- a/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -13,6 +13,6 @@
</service>
- <bean id="provider" class="org.apache.karaf.webconsole.blueprint.internal.internal.navigation.BlueprintNavigationProvider" />
+ <bean id="provider" class="org.apache.karaf.webconsole.blueprint.internal.navigation.BlueprintNavigationProvider" />
</blueprint>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0bcd977..e96d1bf 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -46,7 +46,7 @@
org.ops4j.pax.wicket.util,
org.ops4j.pax.wicket.util.proxy,
<!-- karaf -->
- org.apache.karaf.featurtes.core
+ org.apache.karaf.features
</Import-Package>
</instructions>
</configuration>
diff --git a/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesActionsPanel.java b/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesActionsPanel.java
index a277c1f..1b5ad39 100644
--- a/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesActionsPanel.java
+++ b/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/feature/FeaturesActionsPanel.java
@@ -15,8 +15,8 @@
private FeaturesService featuresService;
private ExtendedFeature extendedFeature;
- private static ResourceReference INSTALL_IMG = new ResourceReference(FeaturesActionsPanel.class, "images/feature_install.png");
- private static ResourceReference UNINSTALL_IMG = new ResourceReference(FeaturesActionsPanel.class, "images/feature_uninstall.png");
+ private static ResourceReference INSTALL_IMG = new ResourceReference(FeaturesActionsPanel.class,"images/feature_install.png");
+ private static ResourceReference UNINSTALL_IMG = new ResourceReference(FeaturesActionsPanel.class,"images/feature_uninstall.png");
public FeaturesActionsPanel(String componentId, IModel<?> model) {
diff --git a/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java b/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java
index 20fa8df..a9577fc 100644
--- a/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java
+++ b/karaf/src/main/java/org/apache/karaf/webconsole/karaf/internal/navigation/KarafConsoleTab.java
@@ -1,13 +1,13 @@
package org.apache.karaf.webconsole.karaf.internal.navigation;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.karaf.webconsole.core.navigation.ConsoleTab;
import org.apache.karaf.webconsole.karaf.internal.feature.FeaturesPage;
import org.apache.karaf.webconsole.karaf.internal.repository.RepositoriesPage;
import org.apache.wicket.Page;
+import java.util.HashMap;
+import java.util.Map;
+
public class KarafConsoleTab implements ConsoleTab {
public String getLabel() {
@@ -20,7 +20,8 @@
public Map<String, Class<? extends Page>> getItems() {
Map<String, Class<? extends Page>> features = new HashMap<String, Class<? extends Page>>();
- features.put("repositories", RepositoriesPage.class);
+ features.put("Repositories list", RepositoriesPage.class);
+ features.put("Features list", FeaturesPage.class);
return features;
}
diff --git a/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/images/feature_install.png b/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/images/feature_install.png
similarity index 100%
rename from karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/images/feature_install.png
rename to karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/images/feature_install.png
Binary files differ
diff --git a/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/images/feature_uninstall.png b/karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/images/feature_uninstall.png
similarity index 100%
rename from karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/images/feature_uninstall.png
rename to karaf/src/main/resources/org/apache/karaf/webconsole/karaf/internal/feature/images/feature_uninstall.png
Binary files differ
diff --git a/osgi/pom.xml b/osgi/pom.xml
index a55d998..c859eb6 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -21,11 +21,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>4.2.0</version>
@@ -72,9 +67,7 @@
net.sf.cglib.reflect;version="[2,3)",
<!-- and servlet api -->
javax.servlet,
- javax.servlet.http,
- <!-- karaf -->
- org.apache.karaf.features
+ javax.servlet.http
</Import-Package>
</instructions>
</configuration>
