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/31 16:49:20 UTC

svn commit: r543146 - in /felix/trunk: dependencymanager/pom.xml pom.xml

Author: rickhall
Date: Thu May 31 07:49:19 2007
New Revision: 543146

URL: http://svn.apache.org/viewvc?view=rev&rev=543146
Log:
Converted DM to use the bundle plugin and added symbolic name (FELIX-272).

Modified:
    felix/trunk/dependencymanager/pom.xml
    felix/trunk/pom.xml

Modified: felix/trunk/dependencymanager/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/pom.xml?view=diff&rev=543146&r1=543145&r2=543146
==============================================================================
--- felix/trunk/dependencymanager/pom.xml (original)
+++ felix/trunk/dependencymanager/pom.xml Thu May 31 07:49:19 2007
@@ -5,7 +5,7 @@
     <version>0.9.0-incubator-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix Dependency Manager</name>
   <artifactId>org.apache.felix.dependencymanager</artifactId>
   <dependencies>
@@ -19,24 +19,19 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <version>${pom.version}</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>Dependency Manager</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
-              A bundle that provides a run-time service dependency manager.
-            </bundleDescription>
-            <importPackage>
-              org.osgi.framework
-            </importPackage>
-            <exportPackage>
-              org.apache.felix.dependencymanager
-            </exportPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-SymbolicName>org.apache.felix.dependencymanager</Bundle-SymbolicName>
+            <Bundle-Name>Apache Felix Dependency Manager</Bundle-Name>
+            <Bundle-Description>A bundle that provides a run-time service dependency manager.</Bundle-Description>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Export-Package>org.apache.felix.dependencymanager</Export-Package>
+            <Import-Package>!org.apache.felix.dependencymanager,*</Import-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>

Modified: felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom.xml?view=diff&rev=543146&r1=543145&r2=543146
==============================================================================
--- felix/trunk/pom.xml (original)
+++ felix/trunk/pom.xml Thu May 31 07:49:19 2007
@@ -138,6 +138,7 @@
         <module>scr</module>
         <module>configadmin</module>
         <module>metatype</module>
+        <module>dependencymanager</module>
         
         <module>ipojo/core</module>
         <module>ipojo/metadata</module>
@@ -156,7 +157,6 @@
         <module>shell.gui</module>
         <module>shell.gui.plugin</module>
         <module>org.apache.felix.daemon</module>
-        <module>dependencymanager</module>
 
         <module>examples</module>