commit 487c44d1511fa290fd9dc775403b9cd9caad9fa6
author Richard S. Hall <rickhall@apache.org> Tue May 22 15:58:30 2007 +0000
committer Richard S. Hall <rickhall@apache.org> Tue May 22 15:58:30 2007 +0000
tree 85647f2ca44607308cb2cc4d1b1ba5a206ec9ca5
parent d9ff045634ed431b9729b1f45666e1a7b799bd79

Modified the framework and main JARs to include the Service Tracker package.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@540621 13f79535-47bb-0310-9956-ffa450edef68

framework/pom.xml

diff --git a/framework/pom.xml b/framework/pom.xml
index 5c7da03..f801259 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -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>

main/pom.xml

diff --git a/main/pom.xml b/main/pom.xml
index d5bbd25..c224e58 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -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>

main/src/main/resources/config.properties

diff --git a/main/src/main/resources/config.properties b/main/src/main/resources/config.properties
index 54fedfa..3574a5c 100644
--- a/main/src/main/resources/config.properties
+++ b/main/src/main/resources/config.properties
@@ -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.*