You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2009/10/07 10:38:18 UTC
svn commit: r822622 - in /felix/trunk/scr: pom.xml src/main/java/org/osgi/
src/test/java/org/apache/felix/scr/impl/MockBundle.java
Author: fmeschbe
Date: Wed Oct 7 08:38:18 2009
New Revision: 822622
URL: http://svn.apache.org/viewvc?rev=822622&view=rev
Log:
FELIX-1711 use official OSGi libraries as dependencies, control
imported and exported package versions (to be able to work with
R4.0 Framework and Configuration Admin). Remove own copy of the
ComponentConstants, add 4.1 new start/stop methods to MockBundle
(for unit tests only)
Removed:
felix/trunk/scr/src/main/java/org/osgi/
Modified:
felix/trunk/scr/pom.xml
felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/MockBundle.java
Modified: felix/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=822622&r1=822621&r2=822622&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Wed Oct 7 08:38:18 2009
@@ -38,14 +38,14 @@
</scm>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -107,16 +107,29 @@
</Bundle-Activator>
<Export-Package>
org.apache.felix.scr;version=${pom.version},
- org.osgi.service.component;version=1.0;-split-package:=merge-first
+ org.osgi.service.component
</Export-Package>
<Private-Package>
org.apache.felix.scr.impl.*,
org.osgi.util.tracker
</Private-Package>
<Import-Package>
- org.osgi.service.cm;
+ <!--
+ The Felix Shell support is optional
+ -->
org.apache.felix.shell; resolution:=optional,
- *
+
+ <!--
+ Framework version 1.3 (from R4.0) is enough,
+ the Bundle.getBundleContext method is guarded
+ -->
+ org.osgi.framework;version=1.3,
+
+ <!--
+ Configuration Admin is optional and if it is
+ present, version 1.2 (from R4.0) is enough
+ -->
+ org.osgi.service.cm;version=1.2;resolution:=optional
</Import-Package>
<DynamicImport-Package>
org.osgi.service.log
Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/MockBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/MockBundle.java?rev=822622&r1=822621&r2=822622&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/MockBundle.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/MockBundle.java Wed Oct 7 08:38:18 2009
@@ -140,12 +140,24 @@
}
+ public void start( int options )
+ {
+
+ }
+
+
public void stop()
{
}
+ public void stop( int options )
+ {
+
+ }
+
+
public void uninstall()
{