Fixed FELIX-3656 : Change the label for the dependency finder plugin to "Dependency Finder" from "Packages"
https://issues.apache.org/jira/browse/FELIX-3656
- actually renamed it to Package Dependencies, not 'Dependency Finder'
- set it correctly to the OSGi category as actually shows who provides and who uses the packages (e.g. Package Admin functionality)
- updated the pom.xml and now you can correctly import the project into Eclipse
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1694631 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/packageadmin/pom.xml b/webconsole-plugins/packageadmin/pom.xml
index fcb4e95..f9089e0 100644
--- a/webconsole-plugins/packageadmin/pom.xml
+++ b/webconsole-plugins/packageadmin/pom.xml
@@ -51,19 +51,6 @@
</scm>
<build>
- <!-- add UTF-8-to-ISO translated resources -->
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <directory>target/classes</directory>
- <includes>
- <include>OSGI-INF/**</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
<plugins>
<!-- translate UTF-8 encoded properties files to ISO-8859-1 -->
@@ -102,10 +89,13 @@
<Bundle-Activator>
org.apache.felix.webconsole.plugins.packageadmin.internal.Activator
</Bundle-Activator>
+ <Include-Resource>
+ {maven-resources},OSGI-INF=target/classes/OSGI-INF
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -151,12 +141,12 @@
<version>1.4</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>3.1.8</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
diff --git a/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java b/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java
index 5a96333..84a937d 100644
--- a/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java
+++ b/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java
@@ -74,7 +74,7 @@
WebConsolePlugin(BundleContext bc, Object pa)
{
- super(LABEL, TITLE, CSS);
+ super(LABEL, TITLE, CATEGORY, CSS);
this.pa = (PackageAdmin) pa;
this.bc = bc;
diff --git a/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties b/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties
index d555ac5..8b3c7d3 100644
--- a/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ b/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties
@@ -26,7 +26,7 @@
# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
# plugin while building the bundle
#
-pluginTitle=Packages
+pluginTitle=Package Dependencies
find.label=Packages/Classes:
find.btn=Find
find.tip=Enter a list of package or class names
diff --git a/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties b/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
index 8b96e6a..5bd60c2 100644
--- a/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
+++ b/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
@@ -26,7 +26,7 @@
# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
# plugin while building the bundle
#
-pluginTitle=Java пакети
+pluginTitle=Зависимости м/у пакети
find.label=Пакети/класове:
find.btn=Търсене
find.tip=Въведете списък с пакети или имена на класове