You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2009/10/23 23:17:49 UTC
svn commit: r829242 - in /openejb/trunk/openejb3: container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/client/
container/openejb-core/src/main/resources/ container/openejb-loader/
deps/javaee-api/
Author: jlaskowski
Date: Fri Oct 23 21:17:48 2009
New Revision: 829242
URL: http://svn.apache.org/viewvc?rev=829242&view=rev
Log:
More OSGi-related changes, mainly in manifest generation
Modified:
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties
openejb/trunk/openejb3/container/openejb-loader/pom.xml
openejb/trunk/openejb3/deps/javaee-api/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=829242&r1=829241&r2=829242&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Fri Oct 23 21:17:48 2009
@@ -32,6 +32,8 @@
<name>OpenEJB :: Container :: Core</name>
<properties>
<openejb.osgi.import.pkg>
+ org.apache.activemq.ra;resolution:=optional,
+ org.apache.commons.dbcp.managed;resolution:=optional,
oracle.toplink.*;resolution:=optional,
org.apache.openjpa.*;resolution:=optional,
org.eclipse.persistence.*;resolution:=optional,
@@ -46,6 +48,7 @@
org.apache.commons.dbcp*;resolution:=optional,
org.apache.xerces*;resolution:=optional,
org.apache.xml.resolver*;resolution:=optional,
+ javax.transaction*,
*
</openejb.osgi.import.pkg>
<openejb.osgi.export>
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java?rev=829242&r1=829241&r2=829242&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java Fri Oct 23 21:17:48 2009
@@ -76,7 +76,7 @@
}
private Context getLocalInitialContext(Hashtable env) throws javax.naming.NamingException {
- Context context = null;
+ Context context;
try {
ClassLoader cl = SystemInstance.get().getClassLoader();
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties?rev=829242&r1=829241&r2=829242&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/openejb-version.properties Fri Oct 23 21:17:48 2009
@@ -16,7 +16,7 @@
#
# $Rev$ $Date$
#
-copyright=Copyright 1999-2008 (C) Apache OpenEJB Project, All Rights Reserved.
+copyright=Copyright 1999-2009 (C) Apache OpenEJB Project, All Rights Reserved.
url=http://openejb.apache.org/
version=${pom.version}
date=@DATE-REPLACED-BY-MAVEN@
Modified: openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/pom.xml?rev=829242&r1=829241&r2=829242&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-loader/pom.xml Fri Oct 23 21:17:48 2009
@@ -30,11 +30,12 @@
<packaging>jar</packaging>
<name>OpenEJB :: Container :: Loader</name>
<properties>
- <openejb.osgi.import.pkg>
+ <openejb.osgi.import>
org.apache.catalina*;resolution:=optional,
!sun.misc.*,
+ org.apache.openejb.*,
*
- </openejb.osgi.import.pkg>
+ </openejb.osgi.import>
</properties>
<dependencies>
<dependency>
@@ -48,5 +49,19 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Require-Bundle>org.apache.openejb.core</Require-Bundle>
+ <Import-Package>org.apache.openejb,javax.transaction,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: openejb/trunk/openejb3/deps/javaee-api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/javaee-api/pom.xml?rev=829242&r1=829241&r2=829242&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/javaee-api/pom.xml (original)
+++ openejb/trunk/openejb3/deps/javaee-api/pom.xml Fri Oct 23 21:17:48 2009
@@ -49,34 +49,54 @@
</includes>
</filter>
</filters>
- <transformers>
+ <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
- <Export-Package>javax.xml, javax.xml.ws, javax.xml.ws.handler, javax.xml.ws.handler.soap, javax.xml.ws.spi, javax.xml.ws.http, javax.xml.ws.soap,javax.xml.soap, javax.xml.namespace, javax.xml.registry, javax.xml.registry.infomodel, javax.xml.rpc, javax.xml.rpc.encoding, javax.xml.rpc.handler, javax.xml.rpc.handler.soap, javax.xml.rpc.holders, javax.xml.rpc.server, javax.xml.rpc.soap, javax.xml.stream, javax.xml.stream.events, javax.xml.stream.util, javax.xml.bind, javax.xml.bind.annotation, javax.xml.bind.annotation.adapters, javax.xml.bind.attachment, javax.xml.bind.helpers, javax.xml.bind.util, javax.mail, javax.mail.event, javax.mail.internet, javax.mail.search, javax.mail.util, javax.activation, javax.annotation, javax.annotation.security, javax.ejb, javax.ejb.spi, javax.interceptor, javax.resource, javax.resource.cci, javax.resource.spi, javax.resource.spi.endpoint, javax.resource.spi.security, javax.resource.spi.work, javax.enterprise, javax.enterprise.deploy,
javax.enterprise.deploy.model, javax.enterprise.deploy.model.exceptions, javax.enterprise.deploy.shared, javax.enterprise.deploy.shared.factories, javax.enterprise.deploy.spi, javax.enterprise.deploy.spi.exceptions, javax.enterprise.deploy.spi.factories, javax.enterprise.deploy.spi.status, javax.management, javax.management.j2ee, javax.management.j2ee.statistics, javax.security, javax.security.jacc, javax.jms, javax.persistence, javax.persistence.spi, javax.transaction, javax.transaction.xa, javax.servlet, javax.servlet.http, javax.servlet.resources, javax.jws, javax.jws.soap, org.apache.geronimo, org.apache.geronimo.mail, org.apache.geronimo.mail.handlers, org.apache.geronimo.mail.util</Export-Package>
+ <Export-Package>javax.xml, javax.xml.ws, javax.xml.ws.handler, javax.xml.ws.handler.soap,
+ javax.xml.ws.spi, javax.xml.ws.http, javax.xml.ws.soap,javax.xml.soap, javax.xml.namespace,
+ javax.xml.registry, javax.xml.registry.infomodel, javax.xml.rpc, javax.xml.rpc.encoding,
+ javax.xml.rpc.handler, javax.xml.rpc.handler.soap, javax.xml.rpc.holders, javax.xml.rpc.server,
+ javax.xml.rpc.soap, javax.xml.stream, javax.xml.stream.events, javax.xml.stream.util,
+ javax.xml.bind, javax.xml.bind.annotation, javax.xml.bind.annotation.adapters,
+ javax.xml.bind.attachment, javax.xml.bind.helpers, javax.xml.bind.util, javax.mail,
+ javax.mail.event, javax.mail.internet, javax.mail.search, javax.mail.util, javax.activation,
+ javax.annotation, javax.annotation.security, javax.ejb, javax.ejb.spi, javax.interceptor,
+ javax.resource, javax.resource.cci, javax.resource.spi, javax.resource.spi.endpoint,
+ javax.resource.spi.security, javax.resource.spi.work, javax.enterprise, javax.enterprise.deploy,
+ javax.enterprise.deploy.model, javax.enterprise.deploy.model.exceptions,
+ javax.enterprise.deploy.shared, javax.enterprise.deploy.shared.factories,
+ javax.enterprise.deploy.spi, javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories, javax.enterprise.deploy.spi.status, javax.management,
+ javax.management.j2ee, javax.management.j2ee.statistics, javax.security, javax.security.jacc,
+ javax.jms, javax.persistence, javax.persistence.spi, javax.transaction;version="5.0",
+ javax.transaction.xa;version="5.0", javax.servlet, javax.servlet.http, javax.servlet.resources,
+ javax.jws, javax.jws.soap, org.apache.geronimo, org.apache.geronimo.mail,
+ org.apache.geronimo.mail.handlers, org.apache.geronimo.mail.util
+ </Export-Package>
</manifestEntries>
</transformer>
</transformers>
-
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <unzip src="${project.build.directory}/javaee-api-${pom.version}.jar" dest="${project.build.directory}/classes"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <unzip src="${project.build.directory}/javaee-api-${pom.version}.jar"
+ dest="${project.build.directory}/classes"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>