[infinispan-commits] Infinispan SVN: r2392 - in trunk: cachestore/cloud and 14 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Sep 16 01:48:00 EDT 2010
Author: trustin
Date: 2010-09-16 01:48:00 -0400 (Thu, 16 Sep 2010)
New Revision: 2392
Modified:
trunk/cachestore/bdbje/pom.xml
trunk/cachestore/cloud/pom.xml
trunk/cachestore/jdbc/pom.xml
trunk/cachestore/jdbm/pom.xml
trunk/cachestore/remote/pom.xml
trunk/client/hotrod-client/pom.xml
trunk/core/pom.xml
trunk/lucene-directory/pom.xml
trunk/parent/pom.xml
trunk/query/pom.xml
trunk/server/core/pom.xml
trunk/server/hotrod/pom.xml
trunk/server/memcached/pom.xml
trunk/server/websocket/pom.xml
trunk/tools/pom.xml
trunk/tree/pom.xml
Log:
[ISPN-222] (Package according to OSGi specs) Made all JAR artifacts OSGi bundles, except demos and jopr plugin
[ISPN-655] (Build fails for 'Infinispan REST Server' due to missing version property '${version.slf4j}') Added 'version.slf4j' property to parent/pom.xml
Modified: trunk/cachestore/bdbje/pom.xml
===================================================================
--- trunk/cachestore/bdbje/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/cachestore/bdbje/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-cachestore-bdbje</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan BDBJE CacheStore</name>
<description>Infinispan BerkeleyDB JavaEdition CacheStore module</description>
<dependencies>
@@ -27,4 +28,20 @@
<url>http://download.oracle.com/maven/</url>
</repository>
</repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.loaders.bdbje.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/cachestore/cloud/pom.xml
===================================================================
--- trunk/cachestore/cloud/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/cachestore/cloud/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -10,6 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-cloud</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan CloudCacheStore</name>
<description>Infinispan CloudCacheStore module</description>
@@ -103,6 +104,17 @@
</systemProperties>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.loaders.cloud.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: trunk/cachestore/jdbc/pom.xml
===================================================================
--- trunk/cachestore/jdbc/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/cachestore/jdbc/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-cachestore-jdbc</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan JDBC CacheStore</name>
<description>Infinispan JDBC CacheStore module</description>
@@ -36,4 +37,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.loaders.jdbc.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/cachestore/jdbm/pom.xml
===================================================================
--- trunk/cachestore/jdbm/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/cachestore/jdbm/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -10,6 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-jdbm</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan JDBM CacheStore</name>
<description>Infinispan JDBM CacheStore module</description>
<properties>
@@ -34,4 +35,19 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.loaders.jdbm.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/cachestore/remote/pom.xml
===================================================================
--- trunk/cachestore/remote/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/cachestore/remote/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -10,6 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-remote</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan remote CacheStore</name>
<description>Infinispan remote CacheStore based on Hotrod protocol</description>
<properties>
@@ -42,4 +43,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.loaders.remote.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/client/hotrod-client/pom.xml
===================================================================
--- trunk/client/hotrod-client/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/client/hotrod-client/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,9 +11,9 @@
</parent>
<artifactId>infinispan-client-hotrod</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Client Hotrod Module</name>
<description>Infinispan client hotrod module</description>
- <packaging>jar</packaging>
<properties>
<version.avro>1.3.3</version.avro>
</properties>
@@ -69,4 +69,20 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.client.hotrod.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/core/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -12,6 +12,7 @@
</parent>
<artifactId>infinispan-core</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Core</name>
<description>Infinispan core module</description>
Modified: trunk/lucene-directory/pom.xml
===================================================================
--- trunk/lucene-directory/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/lucene-directory/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-lucene-directory</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Lucene Directory Implementation</name>
<description>A Lucene directory implementation based on Infinispan</description>
@@ -70,6 +71,18 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.lucene.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/parent/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -115,6 +115,7 @@
<version.rhq.plugingen>1.4.0.B01</version.rhq.plugingen>
<version.rhq>1.2.0.GA</version.rhq>
<version.scala>2.8.0</version.scala>
+ <version.slf4j>1.6.1</version.slf4j>
<version.spymemcached>2.5</version.spymemcached>
<version.testng>5.11</version.testng>
<version.webdav.servlet>2.0</version.webdav.servlet>
@@ -234,6 +235,21 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>http://www.infinispan.org/</Bundle-DocURL>
+ <Export-Package>
+ ${project.groupId}.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
<!-- ensure parallel test execution -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: trunk/query/pom.xml
===================================================================
--- trunk/query/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/query/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-query</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Query API</name>
<description>Infinispan Query API module</description>
<dependencies>
@@ -35,4 +36,20 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.query.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/server/core/pom.xml
===================================================================
--- trunk/server/core/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/server/core/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-server-core</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Server Core Module</name>
<description>Infinispan server core module</description>
@@ -60,8 +61,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.server.core.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
-
</build>
-
</project>
Modified: trunk/server/hotrod/pom.xml
===================================================================
--- trunk/server/hotrod/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/server/hotrod/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-server-hotrod</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Server Hotrod Module</name>
<description>Infinispan server hotrod module</description>
@@ -61,8 +62,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.server.hotrod.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
-
</build>
-
</project>
Modified: trunk/server/memcached/pom.xml
===================================================================
--- trunk/server/memcached/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/server/memcached/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-server-memcached</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Server Memcached Module</name>
<description>Infinispan server memcached module</description>
@@ -61,6 +62,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.server.memcached.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: trunk/server/websocket/pom.xml
===================================================================
--- trunk/server/websocket/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/server/websocket/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -10,6 +10,7 @@
</parent>
<artifactId>infinispan-server-websocket</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan WebSocket Server</name>
<description>WebSocket interface for Infinispan</description>
@@ -29,4 +30,19 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.server.websocket.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/tools/pom.xml
===================================================================
--- trunk/tools/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/tools/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -12,6 +12,7 @@
</parent>
<artifactId>infinispan-tools</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Tools</name>
<description>Infinispan - Tools for project</description>
@@ -79,4 +80,20 @@
</dependencies>
</profile>
</profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.tools.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/tree/pom.xml
===================================================================
--- trunk/tree/pom.xml 2010-09-16 05:45:49 UTC (rev 2391)
+++ trunk/tree/pom.xml 2010-09-16 05:48:00 UTC (rev 2392)
@@ -11,6 +11,7 @@
</parent>
<artifactId>infinispan-tree</artifactId>
+ <packaging>bundle</packaging>
<name>Infinispan Tree API</name>
<description>Infinispan tree API module</description>
<dependencies>
@@ -28,4 +29,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ ${project.groupId}.tree.*;version=${project.version};-split-package:=error
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
More information about the infinispan-commits
mailing list