You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2018/05/24 05:49:10 UTC
svn commit: r1832138 - in /felix/trunk/connect: pom.xml
src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java
Author: gnodet
Date: Thu May 24 05:49:10 2018
New Revision: 1832138
URL: http://svn.apache.org/viewvc?rev=1832138&view=rev
Log:
Merge branch 'FELIX-5860' into trunk
Modified:
felix/trunk/connect/pom.xml
felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java
Modified: felix/trunk/connect/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/connect/pom.xml?rev=1832138&r1=1832137&r2=1832138&view=diff
==============================================================================
--- felix/trunk/connect/pom.xml (original)
+++ felix/trunk/connect/pom.xml Thu May 24 05:49:10 2018
@@ -58,13 +58,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -103,32 +103,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <target>1.6</target>
- <source>1.6</source>
+ <target>1.7</target>
+ <source>1.7</source>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>check-java-version</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java15</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
Modified: felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java?rev=1832138&r1=1832137&r2=1832138&view=diff
==============================================================================
--- felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java Thu May 24 05:49:10 2018
@@ -18,12 +18,7 @@
*/
package org.apache.felix.connect.felix.framework;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -348,6 +343,15 @@ class ServiceRegistrationImpl<T> impleme
}
@Override
+ public Dictionary<String, Object> getProperties() {
+ Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
+ for (String key : getPropertyKeys()) {
+ dictionary.put(key, getProperty(key));
+ }
+ return dictionary;
+ }
+
+ @Override
public Bundle getBundle()
{
// The spec says that this should return null if
@@ -506,6 +510,7 @@ class ServiceRegistrationImpl<T> impleme
// If ranks are equal, then sort by service id in descending order.
return (id.compareTo(otherId) < 0) ? 1 : -1;
}
+
}
private class ServiceReferenceMap implements Map<String, Object>