[FELIX-4369] [FELIX-4370] Initial work towards supporting the OSGi Repository 1.0 spec
This commit provides a start for support of reading the spec-compliant Repository XML. The API for reading the XML hasn't changed, however when an XML document is encountered with the http://www.osgi.org/xmlns/repository/v1.0.0 name space it is parsed as a spec-compliant Repository XML.
This commit provides a start for supporting the Repository Service API, the actual Repository Service is not yet registered, but an implementation of this API can be obtained by wrapping the RepositoryAdmin object with the OSGiRepositoryImpl class.
Part of the work is based on and inspired by the OBR-Repository mapping as used by the Apache Aries Subsystems project (thanks!).
This work is by no means finished, it's just a start. Old clients should still work (at least the existing unit tests all pass) and new unit tests were added.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1563841 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 0553f45..5b5980e 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Felix Bundle Repository</name>
<description>Bundle repository service.</description>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.6.7-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/bundlerepository</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/bundlerepository</developerConnection>
@@ -46,6 +46,12 @@
<artifactId>org.osgi.service.obr</artifactId>
<version>1.0.2</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -68,13 +74,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <version>5.0.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.1.0</version>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -91,13 +97,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>1.5</target>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.felix.bundlerepository;version="2.0"</Export-Package>
+ <Export-Package>
+ org.osgi.service.repository,
+ org.apache.felix.bundlerepository;version="2.1"
+ </Export-Package>
<Private-Package>
org.kxml2.io,
org.xmlpull.v1,