Author: gnodet
Date: Fri Mar 18 13:14:01 2011
New Revision: 1082906
URL: http://svn.apache.org/viewvc?rev=1082906&view=rev
Log:
FELIX-2885 - The config admin bundle does not indicate its provided and
required services dependencies
Removed:
felix/trunk/configadmin/obr.xml
Modified:
felix/trunk/configadmin/pom.xml
Modified: felix/trunk/configadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=1082906&r1=1082905&r2=1082906&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Fri Mar 18 13:14:01 2011
@@ -74,6 +74,8 @@
<bundle.file.name>
${bundle.build.name}/${project.build.finalName}.jar
</bundle.file.name>
+
+ <api-package-version>1.0</api-package-version>
</properties>
@@ -129,7 +131,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.5-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -146,22 +148,32 @@
</Bundle-Activator>
<Export-Package>
org.apache.felix.cm;
- org.apache.felix.cm.file;version=1.0,
- org.osgi.service.cm
+
org.apache.felix.cm.file;version=${api-package-version};provide:=true,
+ org.osgi.service.cm;provide:=true
</Export-Package>
<Private-Package>
org.apache.felix.cm.impl,
org.osgi.util.tracker
</Private-Package>
<Import-Package>
- org.apache.felix.cm;
-
org.apache.felix.cm.file;version="[$(version;==;$(@)),$(version;=+;$(@)))",
-
org.osgi.service.cm;version="[$(version;==;$(@)),$(version;=+;$(@)))",
*
</Import-Package>
<DynamicImport-Package>
org.osgi.service.log;version="1.3"
</DynamicImport-Package>
+ <Export-Service>
+
org.osgi.service.cm.ConfigurationAdmin;
+
service.description="Configuration Admin Service Specification 1.3
Implementation";
+
service.pid="org.osgi.service.cm.ConfigurationAdmin";
+
service.vendor="Apache Software Foundation",
+
org.apache.felix.cm.PersistenceManager;
+
service.description="Platform Filesystem Persistence Manager";
+
service.pid="org.apache.felix.cm.file.FilePersistenceManager";
+
service.vendor="Apache Software Foundation"
+ </Export-Service>
+ <Import-Service>
+
org.osgi.service.log.LogService;availability:=optional;multiple:=false
+ </Import-Service>
</instructions>
</configuration>
</plugin>
