Author: apetrelli
Date: Mon Jul 14 10:34:37 2008
New Revision: 676657
URL: http://svn.apache.org/viewvc?rev=676657&view=rev
Log:
TILES-282
Merge from trunk to TILES_2_0_X branch.
Now Tiles JARs will be built OSGi-compliant.
Modified:
tiles/framework/branches/TILES_2_0_X/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
Modified: tiles/framework/branches/TILES_2_0_X/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/pom.xml?rev=676657&r1=676656&r2=676657&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/pom.xml Mon Jul 14 10:34:37 2008
@@ -81,20 +81,57 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestEntries>
-
<Specification-Title>${project.name}</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
-
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
-
<Implementation-Title>${project.name}</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
-
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- </manifestEntries>
+ <manifestFile>${tiles.manifestfile}</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
</archive>
</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>
+ <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>${tiles.osgi.symbolicName}</Bundle-SymbolicName>
+ <Export-Package>${tiles.osgi.export}</Export-Package>
+
<Private-Package>${tiles.osgi.private}</Private-Package>
+ <Import-Package>${tiles.osgi.import}</Import-Package>
+
<DynamicImport-Package>${tiles.osgi.dynamicImport}</DynamicImport-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+
<Specification-Title>${project.name}</Specification-Title>
+
<Specification-Version>${project.version}</Specification-Version>
+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+
<Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
+
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<defaultGoal>install</defaultGoal>
</build>
@@ -165,6 +202,15 @@
</plugins>
</reporting>
+ <properties>
+
<tiles.osgi.symbolicName>org.apache.${artifactId}</tiles.osgi.symbolicName>
+
<tiles.osgi.export>org.apache.tiles.*;version=${pom.version}</tiles.osgi.export>
+ <tiles.osgi.import>*</tiles.osgi.import>
+ <tiles.osgi.dynamicImport />
+ <tiles.osgi.private />
+ <tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
+ </properties>
+
<dependencies />
<profiles>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml?rev=676657&r1=676656&r2=676657&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-api/pom.xml Mon Jul 14 10:34:37
2008
@@ -36,6 +36,10 @@
<description>Tiles APIs, containing interfaces and classes to interact with
Tiles.</description>
+ <properties>
+ <tiles.osgi.symbolicName>org.apache.tiles.api</tiles.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml?rev=676657&r1=676656&r2=676657&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml Mon Jul 14 10:34:37
2008
@@ -36,6 +36,10 @@
<description>Tiles Core Library, including basic implementation of the APIs.
</description>
+ <properties>
+ <tiles.osgi.symbolicName>org.apache.tiles.core</tiles.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml?rev=676657&r1=676656&r2=676657&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml Mon Jul 14 10:34:37
2008
@@ -36,6 +36,10 @@
<description>Tiles JSP support: Classes and tag libraries to use Tiles in a
JSP environment.</description>
+ <properties>
+ <tiles.osgi.symbolicName>org.apache.tiles.jsp</tiles.osgi.symbolicName>
+ </properties>
+
<build>
<resources>
<resource>
