You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2008/01/28 09:32:52 UTC
svn commit: r615758 - in /geronimo/components/txmanager/trunk:
geronimo-connector/pom.xml geronimo-transaction/pom.xml pom.xml
Author: gnodet
Date: Mon Jan 28 00:32:37 2008
New Revision: 615758
URL: http://svn.apache.org/viewvc?rev=615758&view=rev
Log:
Tranform into OSGi bundles
Modified:
geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
geronimo/components/txmanager/trunk/pom.xml
Modified: geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-connector/pom.xml?rev=615758&r1=615757&r2=615758&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-connector/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-connector/pom.xml Mon Jan 28 00:32:37 2008
@@ -29,7 +29,13 @@
</parent>
<artifactId>geronimo-connector</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo TxManager :: Connector</name>
+
+ <properties>
+ <geronimo.txmanager.osgi.export.pkg>org.apache.geronimo.connector</geronimo.txmanager.osgi.export.pkg>
+ <geronimo.txmanager.osgi.import.pkg>*</geronimo.txmanager.osgi.import.pkg>
+ </properties>
<dependencies>
<dependency>
Modified: geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml?rev=615758&r1=615757&r2=615758&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml Mon Jan 28 00:32:37 2008
@@ -29,7 +29,13 @@
</parent>
<artifactId>geronimo-transaction</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo TxManager :: Transaction</name>
+
+ <properties>
+ <geronimo.txmanager.osgi.export.pkg>org.apache.geronimo.transaction</geronimo.txmanager.osgi.export.pkg>
+ <geronimo.txmanager.osgi.import.pkg>org.objectweb.howl*;resolution:=optional,*</geronimo.txmanager.osgi.import.pkg>
+ </properties>
<dependencies>
<dependency>
Modified: geronimo/components/txmanager/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/pom.xml?rev=615758&r1=615757&r2=615758&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/pom.xml (original)
+++ geronimo/components/txmanager/trunk/pom.xml Mon Jan 28 00:32:37 2008
@@ -49,7 +49,13 @@
element, and it will need to be changed manually before a release,
as the maven-release-plugin will not update this value.
-->
- <version>2.1-SNAPSHOT</version>
+ <version>2.2-SNAPSHOT</version>
+
+ <!-- OSGi properties -->
+ <geronimo.txmanager.osgi.export>${geronimo.txmanager.osgi.export.pkg}*;version=${version}</geronimo.txmanager.osgi.export>
+ <geronimo.txmanager.osgi.export.pkg />
+ <geronimo.txmanager.osgi.import.pkg />
+ <geronimo.txmanager.osgi.private.pkg />
</properties>
<dependencyManagement>
@@ -63,13 +69,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>1.1.1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -208,6 +214,29 @@
<jdkName>1.5</jdkName>
<jdkLevel>1.5</jdkLevel>
<linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.2.0</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${geronimo.txmanager.osgi.export}</Export-Package>
+ <Import-Package>${geronimo.txmanager.osgi.import.pkg}*</Import-Package>
+ <Private-Package>${geronimo.txmanager.osgi.private.pkg}</Private-Package>
+ </instructions>
+ <unpackBundle>true</unpackBundle>
</configuration>
</plugin>
</plugins>