felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvalc...@apache.org
Subject svn commit: r1694631 - in /felix/trunk/webconsole-plugins/packageadmin: ./ src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/ src/main/resources/OSGI-INF/l10n/
Date Fri, 07 Aug 2015 08:34:28 GMT
Author: vvalchev
Date: Fri Aug  7 08:34:27 2015
New Revision: 1694631

URL: http://svn.apache.org/r1694631
Log:
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

Modified:
    felix/trunk/webconsole-plugins/packageadmin/pom.xml
    felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java
    felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties
    felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties

Modified: felix/trunk/webconsole-plugins/packageadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/packageadmin/pom.xml?rev=1694631&r1=1694630&r2=1694631&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/packageadmin/pom.xml (original)
+++ felix/trunk/webconsole-plugins/packageadmin/pom.xml Fri Aug  7 08:34:27 2015
@@ -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>

Modified: felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java?rev=1694631&r1=1694630&r2=1694631&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java
(original)
+++ felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/WebConsolePlugin.java
Fri Aug  7 08:34:27 2015
@@ -74,7 +74,7 @@ class WebConsolePlugin extends SimpleWeb
 
     WebConsolePlugin(BundleContext bc, Object pa)
     {
-        super(LABEL, TITLE, CSS);
+        super(LABEL, TITLE, CATEGORY, CSS);
 
         this.pa = (PackageAdmin) pa;
         this.bc = bc;

Modified: felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=1694631&r1=1694630&r2=1694631&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties
(original)
+++ felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle.properties
Fri Aug  7 08:34:27 2015
@@ -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

Modified: felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties?rev=1694631&r1=1694630&r2=1694631&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
(original)
+++ felix/trunk/webconsole-plugins/packageadmin/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
Fri Aug  7 08:34:27 2015
@@ -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=Въведете списък с пакети
или имена на класове



Mime
View raw message