You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2007/05/22 17:58:31 UTC
svn commit: r540621 - in /felix/trunk: framework/pom.xml main/pom.xml
main/src/main/resources/config.properties
Author: rickhall
Date: Tue May 22 08:58:30 2007
New Revision: 540621
URL: http://svn.apache.org/viewvc?view=rev&rev=540621
Log:
Modified the framework and main JARs to include the Service Tracker package.
Modified:
felix/trunk/framework/pom.xml
felix/trunk/main/pom.xml
felix/trunk/main/src/main/resources/config.properties
Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?view=diff&rev=540621&r1=540620&r2=540621
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Tue May 22 08:58:30 2007
@@ -32,6 +32,11 @@
<artifactId>org.osgi.core</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -43,8 +48,8 @@
<instructions>
<Bundle-Name>Apache Felix Framework</Bundle-Name>
<Bundle-Description>OSGi R4 framework implementation.</Bundle-Description>
- <Export-Package>org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel</Export-Package>
- <Private-Package>org.apache.felix.*</Private-Package>
+ <Export-Package>org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
+ <Private-Package>org.apache.felix.moduleloader.*,org.apache.felix.framework.*</Private-Package>
<Import-Package>!*</Import-Package>
<Include-Resource>{src/main/resources/},org/osgi/framework/=target/classes/org/osgi/framework/</Include-Resource>
</instructions>
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?view=diff&rev=540621&r1=540620&r2=540621
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Tue May 22 08:58:30 2007
@@ -36,6 +36,10 @@
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -87,7 +91,7 @@
<Main-Class>org.apache.felix.main.Main</Main-Class>
<Bundle-Name>Apache Felix</Bundle-Name>
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
- <Private-Package>org.apache.felix.main.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.startlevel,org.osgi.service.url</Private-Package>
+ <Private-Package>org.apache.felix.main.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.startlevel,org.osgi.service.url,org.osgi.util.tracker</Private-Package>
<Import-Package>!*</Import-Package>
<Include-Resource>{src/main/resources/}</Include-Resource>
</instructions>
Modified: felix/trunk/main/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/resources/config.properties?view=diff&rev=540621&r1=540620&r2=540621
==============================================================================
--- felix/trunk/main/src/main/resources/config.properties (original)
+++ felix/trunk/main/src/main/resources/config.properties Tue May 22 08:58:30 2007
@@ -21,7 +21,8 @@
org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
org.osgi.service.packageadmin; version=1.2.0, \
org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0 \
+ org.osgi.service.url; version=1.0.0,
+ org.osgi.util.tracker; version=1.3.2 \
${jre-${java.specification.version}}
#org.osgi.framework.bootdelegation=sun.*,com.sun.*