felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r548447 - in /felix/trunk: pom.xml servicebinder/pom.xml shell.gui.plugin/pom.xml shell.gui/pom.xml wireadmin/pom.xml
Date Mon, 18 Jun 2007 19:05:50 GMT
Author: rickhall
Date: Mon Jun 18 12:05:48 2007
New Revision: 548447

URL: http://svn.apache.org/viewvc?view=rev&rev=548447
Log:
Ported these projects to use the Bundle Plugin.

Modified:
    felix/trunk/pom.xml
    felix/trunk/servicebinder/pom.xml
    felix/trunk/shell.gui.plugin/pom.xml
    felix/trunk/shell.gui/pom.xml
    felix/trunk/wireadmin/pom.xml

Modified: felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom.xml?view=diff&rev=548447&r1=548446&r2=548447
==============================================================================
--- felix/trunk/pom.xml (original)
+++ felix/trunk/pom.xml Mon Jun 18 12:05:48 2007
@@ -131,6 +131,8 @@
         <module>main</module>
         <module>shell</module>
         <module>shell.tui</module>
+        <module>shell.gui</module>
+        <module>shell.gui.plugin</module>
         <module>bundlerepository</module>
         <module>log</module>
         <module>eventadmin</module>
@@ -139,6 +141,8 @@
         <module>configadmin</module>
         <module>metatype</module>
         <module>dependencymanager</module>
+        <module>servicebinder</module>
+        <module>wireadmin</module>
         
         <module>ipojo/core</module>
         <module>ipojo/metadata</module>
@@ -154,14 +158,10 @@
         </property>
       </activation>
       <modules>
-        <module>shell.gui</module>
-        <module>shell.gui.plugin</module>
         <module>org.apache.felix.daemon</module>
 
         <module>examples</module>
 
-        <module>servicebinder</module>
-        <module>wireadmin</module>
         <module>upnp.extra</module>
         <module>upnp.basedriver</module>
         <module>upnp.tester</module>

Modified: felix/trunk/servicebinder/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/servicebinder/pom.xml?view=diff&rev=548447&r1=548446&r2=548447
==============================================================================
--- felix/trunk/servicebinder/pom.xml (original)
+++ felix/trunk/servicebinder/pom.xml Mon Jun 18 12:05:48 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 Service Binder</name>
   <artifactId>org.apache.felix.servicebinder</artifactId>
   <dependencies>
@@ -24,38 +24,28 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <entries>
-              <property>
-                <name>Metadata-Location</name>
-                <value>metadata.xml</value>
-              </property>
-            </entries>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <bundleName>Service Binder</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <!--<bundleVersion>1.1.2</bundleVersion>-->
-            <bundleDescription>
+          <instructions>
+            <Bundle-Name>Service Binder</Bundle-Name>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>Apache Felix</Bundle-Vendor>
+            <!--<Bundle-Version>1.1.2</Bundle-Version>-->
+            <Bundle-Description>
               This bundle provides a mechanism to automate service dependency management.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.servicebinder.impl.Activator
-            </bundleActivator>
-            <exportPackage>
+            </Bundle-Activator>
+            <Export-Package>
               org.apache.felix.servicebinder; specification-version="1.1.0",org.apache.felix.servicebinder.architecture;
specification-version="1.1.0"
-            </exportPackage>
-            <importPackage>
-            	 org.osgi.framework
-            </importPackage>
-            <metadataLocation>
-              metadata.xml
-            </metadataLocation>
-          </osgiManifest>
+            </Export-Package>
+            <Private-Package>org.apache.felix.servicebinder.*,org.kxml2.*,org.xmlpull.*</Private-Package>
+            <Import-Package>!org.apache.felix.servicebinder.*,*</Import-Package>
+            <Metadata-Location>metadata.xml</Metadata-Location>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>

Modified: felix/trunk/shell.gui.plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell.gui.plugin/pom.xml?view=diff&rev=548447&r1=548446&r2=548447
==============================================================================
--- felix/trunk/shell.gui.plugin/pom.xml (original)
+++ felix/trunk/shell.gui.plugin/pom.xml Mon Jun 18 12:05:48 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 Shell GUI Plugin</name>
   <artifactId>org.apache.felix.shell.gui.plugin</artifactId>
   <dependencies>
@@ -37,22 +37,19 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>ShellGUIPlugin</bundleName>
-            <bundleDescription>A simple set of plugins for the ShellGUI bundle.</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportService>org.apache.felix.shell.gui.Plugin</exportService>
-            <importService>org.apache.felix.shell.ShellService,org.apache.felix.bundlerepository.RepostioryAdmin</importService>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>ShellGUIPlugin</Bundle-Name>
+            <Bundle-Description>A simple set of plugins for the ShellGUI bundle.</Bundle-Description>
+            <Bundle-Activator>org.apache.felix.shell.gui.plugin.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Export-Service>org.apache.felix.shell.gui.Plugin</Export-Service>
+            <Import-Service>org.apache.felix.shell.ShellService,org.apache.felix.bundlerepository.RepostioryAdmin</Import-Service>
+            <Private-Package>org.apache.felix.shell.gui.plugin.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>

Modified: felix/trunk/shell.gui/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell.gui/pom.xml?view=diff&rev=548447&r1=548446&r2=548447
==============================================================================
--- felix/trunk/shell.gui/pom.xml (original)
+++ felix/trunk/shell.gui/pom.xml Mon Jun 18 12:05:48 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 Shell GUI</name>
   <artifactId>org.apache.felix.shell.gui</artifactId>
   <dependencies>
@@ -19,21 +19,18 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>ShellGUI</bundleName>
-            <bundleDescription>A simple plugin-oriented GUI shell.</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/shellgui/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>${pom.artifactId}; specification-version="1.0.0"</exportPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>ShellGUI</Bundle-Name>
+            <Bundle-Description>A simple plugin-oriented GUI shell.</Bundle-Description>
+            <Bundle-Activator>org.apache.felix.shell.gui.impl.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Export-Package>org.apache.felix.shell.gui; specification-version="1.0.0"</Export-Package>
+            <Private-Package>org.apache.felix.shell.gui.impl</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>

Modified: felix/trunk/wireadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/wireadmin/pom.xml?view=diff&rev=548447&r1=548446&r2=548447
==============================================================================
--- felix/trunk/wireadmin/pom.xml (original)
+++ felix/trunk/wireadmin/pom.xml Mon Jun 18 12:05:48 2007
@@ -5,8 +5,8 @@
     <version>0.9.0-incubator-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix WireAdmin</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Wire Admin</name>
   <artifactId>org.apache.felix.wireadmin</artifactId>
   <dependencies>
     <dependency>
@@ -25,25 +25,22 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>WireAdmin</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-Name>WireAdmin</Bundle-Name>
+            <Bundle-Vendor>Apache Felix</Bundle-Vendor>
+            <Bundle-Description>
               Implementation of the WireAdmin Service.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.wireadmin.Activator
-            </bundleActivator>
-            <bundleSymbolicName>org.apache.felix.wireadmin</bundleSymbolicName>
-            <importPackage>
-              org.osgi.framework, org.osgi.service.wireadmin; specification-version=1.0.0
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Bundle-SymbolicName>org.apache.felix.wireadmin</Bundle-SymbolicName>
+            <Private-Package>org.apache.felix.wireadmin.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>



Mime
View raw message