Author: niallp
Date: Thu Jun 5 01:13:33 2008
New Revision: 663497
URL: http://svn.apache.org/viewvc?rev=663497&view=rev
Log:
STR-3148 Add OSGi headers to the jar's MANIFEST files
Modified:
struts/struts1/trunk/core/pom.xml
struts/struts1/trunk/el/pom.xml
struts/struts1/trunk/extras/pom.xml
struts/struts1/trunk/faces/pom.xml
struts/struts1/trunk/mailreader-dao/pom.xml
struts/struts1/trunk/pom.xml
struts/struts1/trunk/scripting/pom.xml
struts/struts1/trunk/taglib/pom.xml
struts/struts1/trunk/tiles/pom.xml
struts/struts1/trunk/tiles2/pom.xml
Modified: struts/struts1/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
</site>
</distributionManagement>
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.core</struts.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
Modified: struts/struts1/trunk/el/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/el/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/el/pom.xml (original)
+++ struts/struts1/trunk/el/pom.xml Thu Jun 5 01:13:33 2008
@@ -47,6 +47,11 @@
<url>scp://people.apache.org/www/struts.apache.org/1.x/struts-el</url>
</site>
</distributionManagement>
+
+ <properties>
+
<struts.osgi.symbolicName>org.apache.strutsel.taglib</struts.osgi.symbolicName>
+
<struts.osgi.export>org.apache.strutsel.*;version=${pom.version}</struts.osgi.export>
+ </properties>
<build>
<resources>
Modified: struts/struts1/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/extras/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/extras/pom.xml (original)
+++ struts/struts1/trunk/extras/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
</site>
</distributionManagement>
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.extras</struts.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
Modified: struts/struts1/trunk/faces/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/faces/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/faces/pom.xml (original)
+++ struts/struts1/trunk/faces/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
</site>
</distributionManagement>
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.faces</struts.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
Modified: struts/struts1/trunk/mailreader-dao/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/mailreader-dao/pom.xml (original)
+++ struts/struts1/trunk/mailreader-dao/pom.xml Thu Jun 5 01:13:33 2008
@@ -41,6 +41,10 @@
<url>http://svn.apache.org/repos/asf/struts/struts1/trunk/mailreader-dao/</url>
</scm>
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.apps.mailreader.dao</struts.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
Modified: struts/struts1/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Thu Jun 5 01:13:33 2008
@@ -172,6 +172,7 @@
<version>2.1</version>
<configuration>
<archive>
+ <manifestFile>${struts.manifestfile}</manifestFile>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -192,6 +193,12 @@
<parseHtml>true</parseHtml>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ <inherited>true</inherited>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -218,6 +225,33 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <manifestLocation>target/osgi</manifestLocation>
+ <instructions>
+ <_nouses>true</_nouses>
+
<Bundle-SymbolicName>${struts.osgi.symbolicName}</Bundle-SymbolicName>
+ <Export-Package>${struts.osgi.export}</Export-Package>
+
<Private-Package>${struts.osgi.private}</Private-Package>
+ <Import-Package>${struts.osgi.import}</Import-Package>
+
<DynamicImport-Package>${struts.osgi.dynamicImport}</DynamicImport-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
<defaultGoal>install</defaultGoal>
@@ -268,6 +302,12 @@
<properties>
<myfaces.version>1.0.9</myfaces.version>
+
<struts.osgi.symbolicName>org.apache.${artifactId}</struts.osgi.symbolicName>
+
<struts.osgi.export>org.apache.struts.*;version=${pom.version}</struts.osgi.export>
+ <struts.osgi.import>*</struts.osgi.import>
+ <struts.osgi.dynamicImport />
+ <struts.osgi.private />
+ <struts.manifestfile>target/osgi/MANIFEST.MF</struts.manifestfile>
</properties>
<dependencyManagement>
Modified: struts/struts1/trunk/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/pom.xml (original)
+++ struts/struts1/trunk/scripting/pom.xml Thu Jun 5 01:13:33 2008
@@ -47,6 +47,10 @@
<url>scp://people.apache.org/www/struts.apache.org/1.x/struts-scripting</url>
</site>
</distributionManagement>
+
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.scripting</struts.osgi.symbolicName>
+ </properties>
<build>
<resources>
Modified: struts/struts1/trunk/taglib/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/pom.xml (original)
+++ struts/struts1/trunk/taglib/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
</site>
</distributionManagement>
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.taglib</struts.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
Modified: struts/struts1/trunk/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/pom.xml (original)
+++ struts/struts1/trunk/tiles/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
</site>
</distributionManagement>
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.tiles</struts.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
Modified: struts/struts1/trunk/tiles2/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==============================================================================
--- struts/struts1/trunk/tiles2/pom.xml (original)
+++ struts/struts1/trunk/tiles2/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
</site>
</distributionManagement>
+ <properties>
+
<struts.osgi.symbolicName>org.apache.struts.tiles2</struts.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
