You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/01/31 08:58:25 UTC
svn commit: r617036 - in /openejb/trunk/openejb3:
container/openejb-core/pom.xml container/openejb-loader/pom.xml pom.xml
server/openejb-client/pom.xml server/openejb-cxf/pom.xml
server/openejb-http/pom.xml
Author: dblevins
Date: Wed Jan 30 23:58:20 2008
New Revision: 617036
URL: http://svn.apache.org/viewvc?rev=617036&view=rev
Log:
Patch from Guillaume Nodet OPENEJB-752: Release OpenEJB as OSGi bundles
Thanks, Guillaume!
Modified:
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-loader/pom.xml
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/server/openejb-client/pom.xml
openejb/trunk/openejb3/server/openejb-cxf/pom.xml
openejb/trunk/openejb3/server/openejb-http/pom.xml
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=617036&r1=617035&r2=617036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Wed Jan 30 23:58:20 2008
@@ -31,6 +31,24 @@
<artifactId>openejb-core</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Container :: Core</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ javax.enterprise.deploy*;resolution:=optional,
+ javax.jms*;resolution:=optional,
+ javax.xml.registry*;resolution:=optional,
+ javax.xml.rpc*;resolution:=optional,
+ org.apache.activemq*;resolution:=optional,
+ org.apache.catalina*;resolution:=optional,
+ org.apache.commons.dbcp*;resolution:=optional,
+ org.apache.xerces*;resolution:=optional,
+ org.apache.xml.resolver*;resolution:=optional,
+ *
+ </openejb.osgi.import.pkg>
+ <openejb.osgi.export>
+ org.apache.openejb.client;partial=true;mandatory=partial;version=${openejb.osgi.export.version},
+ org.apache.openejb*;version=${openejb.osgi.export.version}
+ </openejb.osgi.export>
+ </properties>
<build>
<resources>
<resource>
@@ -142,6 +160,21 @@
<exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
</excludes>
</configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${openejb.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Export-Package>${openejb.osgi.export}</Export-Package>
+ <Import-Package>${openejb.osgi.import}</Import-Package>
+ <Private-Package>${openejb.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache OpenEJB</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/pom.xml?rev=617036&r1=617035&r2=617036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-loader/pom.xml Wed Jan 30 23:58:20 2008
@@ -30,6 +30,12 @@
<artifactId>openejb-loader</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Container :: Loader</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.apache.catalina*;resolution:=optional,
+ *
+ </openejb.osgi.import.pkg>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=617036&r1=617035&r2=617036&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Wed Jan 30 23:58:20 2008
@@ -107,6 +107,16 @@
<version>3.0-SNAPSHOT</version>
-->
<xbeanVersion>3.3</xbeanVersion>
+
+
+ <!-- OSGi bundles properties -->
+ <openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>
+ <openejb.osgi.private.pkg>!*</openejb.osgi.private.pkg>
+ <openejb.osgi.export>${openejb.osgi.export.pkg}*;version=${openejb.osgi.export.version}</openejb.osgi.export>
+ <openejb.osgi.export.pkg>org.apache.openejb</openejb.osgi.export.pkg>
+ <openejb.osgi.export.version>${project.version}</openejb.osgi.export.version>
+ <openejb.osgi.import>${openejb.osgi.import.pkg}</openejb.osgi.import>
+ <openejb.osgi.symbolic.name>${groupId}.${artifactId}</openejb.osgi.symbolic.name>
</properties>
<build>
@@ -201,6 +211,41 @@
<goals>deploy</goals>
<arguments>-Prelease</arguments>
</configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${openejb.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Export-Package>${openejb.osgi.export}</Export-Package>
+ <Import-Package>${openejb.osgi.import}</Import-Package>
+ <Private-Package>${openejb.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache OpenEJB</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: openejb/trunk/openejb3/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/pom.xml?rev=617036&r1=617035&r2=617036&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-client/pom.xml Wed Jan 30 23:58:20 2008
@@ -30,6 +30,14 @@
<artifactId>openejb-client</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Server :: Client</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ *
+ </openejb.osgi.import.pkg>
+ <openejb.osgi.require.bundle>
+ org.apache.openejb.openejb-core
+ </openejb.osgi.require.bundle>
+ </properties>
<build>
<plugins>
<plugin>
@@ -58,6 +66,22 @@
<exclude>src/main/resources/META-INF/org.apache.openejb.client.IdentityResolver/*</exclude>
</excludes>
</configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${openejb.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Export-Package>${openejb.osgi.export}</Export-Package>
+ <Import-Package>${openejb.osgi.import}</Import-Package>
+ <Private-Package>${openejb.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache OpenEJB</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Require-Bundle>${openejb.osgi.require.bundle}</Require-Bundle>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: openejb/trunk/openejb3/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/pom.xml?rev=617036&r1=617035&r2=617036&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/pom.xml Wed Jan 30 23:58:20 2008
@@ -30,6 +30,12 @@
<artifactId>openejb-cxf</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Server :: CXF</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.apache.xml.resolver*;resolution:=optional,
+ *
+ </openejb.osgi.import.pkg>
+ </properties>
<build>
<plugins>
<plugin>
Modified: openejb/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-http/pom.xml?rev=617036&r1=617035&r2=617036&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-http/pom.xml Wed Jan 30 23:58:20 2008
@@ -30,6 +30,12 @@
<artifactId>openejb-http</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Server :: Http</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.mortbay*;resolution:=optional,
+ *
+ </openejb.osgi.import.pkg>
+ </properties>
<build>
<plugins>
<plugin>