You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/09/26 08:30:50 UTC
svn commit: r1809715 - in /felix/trunk/webconsole-plugins/event:
changelog.txt pom.xml
src/main/java/org/apache/felix/webconsole/plugins/event/internal/PropertiesEditorSupport.java
Author: cziegeler
Date: Tue Sep 26 08:30:50 2017
New Revision: 1809715
URL: http://svn.apache.org/viewvc?rev=1809715&view=rev
Log:
FELIX-5702 : Plugin should work without configuration admin
Modified:
felix/trunk/webconsole-plugins/event/changelog.txt
felix/trunk/webconsole-plugins/event/pom.xml
felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PropertiesEditorSupport.java
Modified: felix/trunk/webconsole-plugins/event/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/event/changelog.txt?rev=1809715&r1=1809714&r2=1809715&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/event/changelog.txt (original)
+++ felix/trunk/webconsole-plugins/event/changelog.txt Tue Sep 26 08:30:50 2017
@@ -1,3 +1,13 @@
+Changes from 1.1.6 to 1.1.8
+---------------------------
+** Improvement
+ * [FELIX-5702] - Plugin should work without configuration admin
+
+** Bug
+ * [FELIX-5701] - metatype.properties file must not be in OSGI-INF/metatype
+ * [FELIX-5668] - Prevent Nullpointer when receiving a ServiceEvent for a service that has been already unregistered
+
+
Changes from 1.1.4 to 1.1.6
---------------------------
** Improvement
Modified: felix/trunk/webconsole-plugins/event/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/event/pom.xml?rev=1809715&r1=1809714&r2=1809715&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/event/pom.xml (original)
+++ felix/trunk/webconsole-plugins/event/pom.xml Tue Sep 26 08:30:50 2017
@@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -81,12 +81,17 @@
<Bundle-Activator>
org.apache.felix.webconsole.plugins.event.internal.Activator
</Bundle-Activator>
+ <Import-Package>
+ org.osgi.service.cm;version="[1.2,2)";resolution:=optional,
+ org.osgi.service.event;;version="[1.2,2)",*
+ </Import-Package>
<Private-Package>
org.apache.felix.webconsole.plugins.event.*
</Private-Package>
<DynamicImport-Package>
- org.osgi.service.event,org.osgi.service.cm,
- javax.servlet,javax.servlet.http
+ org.osgi.service.cm;version="[1.2,2)",
+ javax.servlet,
+ javax.servlet.http
</DynamicImport-Package>
<Include-Resource>{maven-resources},OSGI-INF=target/classes/OSGI-INF</Include-Resource>
<Embed-Dependency>
@@ -121,14 +126,14 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
+ <artifactId>osgi.core</artifactId>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PropertiesEditorSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PropertiesEditorSupport.java?rev=1809715&r1=1809714&r2=1809715&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PropertiesEditorSupport.java (original)
+++ felix/trunk/webconsole-plugins/event/src/main/java/org/apache/felix/webconsole/plugins/event/internal/PropertiesEditorSupport.java Tue Sep 26 08:30:50 2017
@@ -16,6 +16,7 @@
*/
package org.apache.felix.webconsole.plugins.event.internal;
+import java.util.Dictionary;
import java.util.Hashtable;
import java.util.StringTokenizer;
@@ -34,11 +35,11 @@ public class PropertiesEditorSupport
/**
* Converts the properties from the request to a key-value hashtable.
- *
+ *
* @param request the request to process
* @return the converted properties
*/
- public static final Hashtable convertProperties(HttpServletRequest request)
+ public static final Dictionary convertProperties(HttpServletRequest request)
{
String keys[] = request.getParameterValues("key"); //$NON-NLS-1$
String vals[] = request.getParameterValues("val"); //$NON-NLS-1$
@@ -95,7 +96,7 @@ public class PropertiesEditorSupport
throw new IllegalArgumentException("Unsupported type!");
}
}
-
+
private static final byte[] decodeHex(String data)
{
final StringTokenizer tok = new StringTokenizer(data, "[]{},;: \t"); //$NON-NLS-1$