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/01/05 06:13:27 UTC
svn commit: r1777417 - in /felix/trunk/scr-2.0.x: changelog.txt pom.xml
src/main/java/org/apache/felix/scr/impl/manager/RegionConfigurationSupport.java
src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
Author: cziegeler
Date: Thu Jan 5 06:13:26 2017
New Revision: 1777417
URL: http://svn.apache.org/viewvc?rev=1777417&view=rev
Log:
Revert R7 changes
Modified:
felix/trunk/scr-2.0.x/changelog.txt
felix/trunk/scr-2.0.x/pom.xml
felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/manager/RegionConfigurationSupport.java
felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
Modified: felix/trunk/scr-2.0.x/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scr-2.0.x/changelog.txt?rev=1777417&r1=1777416&r2=1777417&view=diff
==============================================================================
--- felix/trunk/scr-2.0.x/changelog.txt (original)
+++ felix/trunk/scr-2.0.x/changelog.txt Thu Jan 5 06:13:26 2017
@@ -1,3 +1,11 @@
+Changes from 2.0.6 to 2.0.8
+---------------------------
+** Improvement
+ * [FELIX-5459] Use Java 6 as minimum version
+ * [FELIX-5374] Reduce severity of log message from SCR when there is no metatype
+ * [FELIX-5474] Do not call no-arg Bundle.getHeaders() method
+
+
Changes from 2.0.4 to 2.0.6
---------------------------
** Bug
Modified: felix/trunk/scr-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr-2.0.x/pom.xml?rev=1777417&r1=1777416&r2=1777417&view=diff
==============================================================================
--- felix/trunk/scr-2.0.x/pom.xml (original)
+++ felix/trunk/scr-2.0.x/pom.xml Thu Jan 5 06:13:26 2017
@@ -27,14 +27,14 @@
<packaging>bundle</packaging>
<name>Apache Felix Declarative Services</name>
<description>
- Implementation of the Declarative Services specification 1.4
+ Implementation of the Declarative Services specification 1.3
</description>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.0.7-SNAPSHOT</version>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</developerConnection>
- <url>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr-2.0.x</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr-2.0.x</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr-2.0.x</url>
</scm>
<!--
@@ -71,7 +71,7 @@
${bundle.build.name}/${project.build.finalName}.jar
</bundle.file.name>
<felix.java.version>6</felix.java.version>
- <felix.ca.version>1.9.0-SNAPSHOT</felix.ca.version>
+ <felix.ca.version>1.8.12</felix.ca.version>
</properties>
@@ -95,19 +95,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${felix.ca.version}</version>
- <scope>provided</scope>
- </dependency>
-<!--
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>1.5.0</version>
<scope>provided</scope>
</dependency>
- -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
@@ -253,6 +245,12 @@
<version>5.0.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${felix.ca.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${bundle.build.name}</directory>
Modified: felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/manager/RegionConfigurationSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/manager/RegionConfigurationSupport.java?rev=1777417&r1=1777416&r2=1777417&view=diff
==============================================================================
--- felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/manager/RegionConfigurationSupport.java (original)
+++ felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/manager/RegionConfigurationSupport.java Thu Jan 5 06:13:26 2017
@@ -144,9 +144,8 @@ public abstract class RegionConfiguratio
if ( checkBundleLocation( config, bundleContext.getBundle() ) )
{
long changeCount = config.getChangeCount();
- ServiceReference<ManagedService> ref = getManagedServiceReference(bundleContext);
created |= holder.configurationUpdated( new TargetedPID( config.getPid() ),
- new TargetedPID( config.getFactoryPid() ), config.getProcessedProperties(ref), changeCount );
+ new TargetedPID( config.getFactoryPid() ), config.getProperties(), changeCount );
}
}
if ( !created )
@@ -166,9 +165,8 @@ public abstract class RegionConfiguratio
if ( singleton != null && checkBundleLocation( singleton, bundleContext.getBundle() ) )
{
long changeCount = singleton.getChangeCount();
- ServiceReference<ManagedService> ref = getManagedServiceReference(bundleContext);
holder.configurationUpdated( new TargetedPID( singleton.getPid() ), null,
- singleton.getProcessedProperties(ref), changeCount );
+ singleton.getProperties(), changeCount );
}
else
{
@@ -450,8 +448,7 @@ public abstract class RegionConfiguratio
if ( configs != null && configs.length > 0 )
{
Configuration config = configs[0];
- ServiceReference<ManagedService> ref = getManagedServiceReference(bundleContext);
- return new ConfigurationInfo( config.getProcessedProperties(ref), config.getBundleLocation(),
+ return new ConfigurationInfo( config.getProperties(), config.getBundleLocation(),
config.getChangeCount() );
}
}
@@ -478,26 +475,6 @@ public abstract class RegionConfiguratio
return null;
}
- private ServiceReference<ManagedService> getManagedServiceReference(BundleContext bundleContext)
- {
- try {
- Collection<ServiceReference<ManagedService>> refs = bundleContext.getServiceReferences(ManagedService.class,
- "(&(service.bundleid=" + String.valueOf(bundleContext.getBundle().getBundleId()) + ")(!(service.pid=*)))");
- if ( !refs.isEmpty() ) {
- return refs.iterator().next();
- }
- } catch (InvalidSyntaxException e) {
- // this should never happen,
- }
- return bundleContext.registerService(ManagedService.class, new ManagedService() {
-
- public void updated(Dictionary<String, ?> properties) throws ConfigurationException {
- // nothing to do
-
- }
- }, null).getReference();
- }
-
private String filter(String rawPid)
{
return "(service.pid=" + rawPid + ")";
Modified: felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java?rev=1777417&r1=1777416&r2=1777417&view=diff
==============================================================================
--- felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java (original)
+++ felix/trunk/scr-2.0.x/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java Thu Jan 5 06:13:26 2017
@@ -72,9 +72,6 @@ public class XmlHandler implements KXml2
// Namespace URI of Felix DS extensions 1.0
public static final String NAMESPACE_URI_1_0_FELIX_EXTENSIONS = "http://felix.apache.org/xmlns/scr/extensions/v1.0.0";
- // Namespace URI of DS 1.4
- public static final String NAMESPACE_URI_1_4 = "http://www.osgi.org/xmlns/scr/v1.4.0";
-
//extension features
public static final String CONFIGURABLE_SERVICE_PROPERTIES = "configurableServiceProperties";
@@ -153,7 +150,6 @@ public class XmlHandler implements KXml2
NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_2, DSVersion.DS12 );
NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_2_FELIX, DSVersion.DS12Felix );
NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_3, DSVersion.DS13 );
- NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_4, DSVersion.DS14 );
}