You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/12/05 15:23:25 UTC
svn commit: r1210472 - in /openejb/trunk/openejb:
container/openejb-core/pom.xml container/openejb-jee/pom.xml
container/openejb-loader/pom.xml pom.xml server/openejb-client/pom.xml
Author: rmannibucau
Date: Mon Dec 5 14:23:25 2011
New Revision: 1210472
URL: http://svn.apache.org/viewvc?rev=1210472&view=rev
Log:
OPENEJB-1627 pach from cmoulliard about osgi imports. Thanks Charles.
Modified:
openejb/trunk/openejb/container/openejb-core/pom.xml
openejb/trunk/openejb/container/openejb-jee/pom.xml
openejb/trunk/openejb/container/openejb-loader/pom.xml
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/server/openejb-client/pom.xml
Modified: openejb/trunk/openejb/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/pom.xml?rev=1210472&r1=1210471&r2=1210472&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-core/pom.xml Mon Dec 5 14:23:25 2011
@@ -32,52 +32,181 @@
<name>OpenEJB :: Container :: Core</name>
<properties>
<openejb.osgi.import.pkg>
- !org.apache.geronimo.specs,
- 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,
- org.hibernate.*;resolution:=optional,
- org.quartz.*;resolution:=optional,
- org.hsqldb.jdbc;resolution:=optional,
- javax.enterprise.deploy*;resolution:=optional,
- javax.jms*;resolution:=optional,
- javax.mail*;resolution:=optional,
- javax.xml.registry*;resolution:=optional,
- javax.xml.rpc*;resolution:=optional,
- org.apache.activemq*;resolution:=optional,
- org.apache.kahadb*;resolution:=optional,
- org.apache.catalina*;resolution:=optional,
- org.apache.commons.dbcp*;resolution:=optional,
- org.apache.xerces*;resolution:=optional,
- org.apache.xml.resolver*;resolution:=optional,
- org.junit*;resolution:=optional,
- org.apache.log4j.*;resolution:=optional,
- org.slf4j.*;resolution:=optional,
- javax.annotation;version="[1.1.0,2.0.0)",
- javax.annotation.security;version="[1.1.0,2.0.0)",
- javax.annotation.sql;version="[1.1.0,2.0.0)",
- javax.transaction;version="[1.1.0,2.0.0)",
- javax.transaction.xa;version="[1.1.0,2.0.0)",
- javax.ejb;version=3.1,
- javax.ejb.embeddable;version=3.1,
- javax.ejb.spi;version=3.1,
- javax.xml.ws,
- org.apache.openejb.api,
- org.apache.openejb.loader,
- org.apache.openejb.jee,
- org.apache.openejb.jee.jpa,
- org.apache.openejb.jee.bval,
- org.apache.openejb.jee.oejb2,
- org.apache.openejb.jee.oejb3,
- org.apache.openejb.jee.sun;resolution:=optional,
- org.apache.openejb.jee.wls,
- !org.apache.openejb.jee.was,
- *
+ javassist.util.proxy,
+ javax.annotation;version="[1.1.0,2.0.0)",
+ javax.annotation.security;version="[1.1.0,2.0.0)",
+ javax.annotation.sql;version="[1.1.0,2.0.0)",
+ javax.crypto,
+ javax.crypto.spec,
+ javax.decorator,
+ javax.ejb;version=3.1,
+ javax.ejb.embeddable;version=3.1,
+ javax.ejb.spi;version=3.1,
+ javax.el,
+ javax.enterprise.context,
+ javax.enterprise.context.spi,
+ javax.enterprise.deploy.model;resolution:=optional,
+ javax.enterprise.deploy.shared;resolution:=optional,
+ javax.enterprise.deploy.spi;resolution:=optional,
+ javax.enterprise.deploy.spi.exceptions;resolution:=optional,
+ javax.enterprise.deploy.spi.factories;resolution:=optional,
+ javax.enterprise.deploy.spi.status;resolution:=optional,
+ javax.enterprise.event,
+ javax.enterprise.inject,
+ javax.enterprise.inject.spi,
+ javax.inject,
+ javax.interceptor,
+ javax.jms;resolution:=optional,
+ javax.jws,
+ javax.mail;resolution:=optional;version="[1.4,2)",
+ javax.management,
+ javax.management.j2ee,
+ javax.management.loading,
+ javax.management.openmbean,
+ javax.naming,
+ javax.naming.spi,
+ javax.persistence,
+ javax.persistence.criteria,
+ javax.persistence.metamodel,
+ javax.persistence.spi,
+ javax.resource,
+ javax.resource.spi,
+ javax.resource.spi.endpoint,
+ javax.resource.spi.work,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.message.callback,
+ javax.security.auth.spi,
+ javax.security.jacc,
+ javax.servlet,
+ javax.servlet.http,
+ javax.servlet.jsp,
+ javax.sql,
+ javax.transaction;version="[1.1.0,2.0.0)",
+ javax.transaction.xa;version="[1.1.0,2.0.0)",
+ javax.validation,
+ javax.validation.bootstrap,
+ javax.ws.rs,
+ javax.ws.rs.core,
+ javax.ws.rs.ext,
+ javax.wsdl,
+ javax.wsdl.extensions.http,
+ javax.wsdl.extensions.soap,
+ javax.wsdl.factory,
+ javax.wsdl.xml,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.bind.annotation.adapters,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.registry;resolution:=optional,
+ javax.xml.rpc;resolution:=optional,
+ javax.xml.rpc.handler;resolution:=optional,
+ javax.xml.transform,
+ javax.xml.transform.sax,
+ javax.xml.transform.stream,
+ javax.xml.validation,
+ javax.xml.ws,
+ javax.xml.ws.handler,
+ javax.xml.ws.soap,
+ javax.xml.ws.spi,
+ javax.xml.ws.wsaddressing,
+ org.apache.activemq.broker;resolution:=optional;version="[5.4,6)",
+ org.apache.activemq.ra;resolution:=optional;version="[5.4,6)",
+ org.apache.activemq.store;resolution:=optional;version="[5.4,6)",
+ org.apache.activemq.store.jdbc;resolution:=optional;version="[5.4,6)",
+ org.apache.activemq.store.memory;resolution:=optional;version="[5.4,6)",
+ org.apache.bval.jsr303.resolver,
+ org.apache.commons.beanutils,
+ org.apache.commons.cli;version="[1.2,2)",
+ org.apache.commons.dbcp;resolution:=optional;version="[1.4,2)",
+ org.apache.commons.dbcp.managed;resolution:=optional;version="[1.4,2)",
+ org.apache.commons.lang;version="[2.6,3)",
+ org.apache.commons.lang.math;version="[2.6,3)",
+ org.apache.geronimo.connector;version="[3.0,4)",
+ org.apache.geronimo.connector.outbound;version="[3.0,4)",
+ org.apache.geronimo.connector.outbound.connectionmanagerconfig;version="[3.0,4)",
+ org.apache.geronimo.connector.outbound.connectiontracking;version="[3.0,4)",
+ org.apache.geronimo.connector.work;version="[3.0,4)",
+ org.apache.geronimo.osgi.locator,
+ org.apache.geronimo.transaction.log;version="[3.0,4)",
+ org.apache.geronimo.transaction.manager;version="[3.0,4)",
+ org.apache.kahadb.util;resolution:=optional;version="[5.4,6)",
+ org.apache.log4j;resolution:=optional,
+ org.apache.openejb.api;version="[4.0,5)",
+ org.apache.openejb.jee;version="[4.0,5)",
+ org.apache.openejb.jee.bval;version="[4.0,5)",
+ org.apache.openejb.jee.jpa;version="[4.0,5)",
+ org.apache.openejb.jee.oejb2;version="[4.0,5)",
+ org.apache.openejb.jee.oejb3;version="[4.0,5)",
+ org.apache.openejb.jee.sun;resolution:=optional;version="[4.0,5)",
+ org.apache.openejb.jee.wls;version="[4.0,5)",
+ org.apache.openejb.loader;version="[4.0,5)",
+ org.apache.openjpa.event;resolution:=optional;version="[2.1,3)",
+ org.apache.openjpa.persistence;resolution:=optional;version="[2.1,3)",
+ org.apache.webbeans.annotation;version="[1.1,2)",
+ org.apache.webbeans.component;version="[1.1,2)",
+ org.apache.webbeans.component.creation;version="[1.1,2)",
+ org.apache.webbeans.config;version="[1.1,2)",
+ org.apache.webbeans.container;version="[1.1,2)",
+ org.apache.webbeans.context;version="[1.1,2)",
+ org.apache.webbeans.context.creational;version="[1.1,2)",
+ org.apache.webbeans.conversation;version="[1.1,2)",
+ org.apache.webbeans.decorator;version="[1.1,2)",
+ org.apache.webbeans.deployment;version="[1.1,2)",
+ org.apache.webbeans.deployment.stereotype;version="[1.1,2)",
+ org.apache.webbeans.ee.event;version="[1.1,2)",
+ org.apache.webbeans.ejb.common.component;version="[1.1,2)",
+ org.apache.webbeans.ejb.common.util;version="[1.1,2)",
+ org.apache.webbeans.el;version="[1.1,2)",
+ org.apache.webbeans.exception;version="[1.1,2)",
+ org.apache.webbeans.exception.inject;version="[1.1,2)",
+ org.apache.webbeans.inject;version="[1.1,2)",
+ org.apache.webbeans.intercept;version="[1.1,2)",
+ org.apache.webbeans.intercept.webbeans;version="[1.1,2)",
+ org.apache.webbeans.jms;version="[1.1,2)",
+ org.apache.webbeans.logger;version="[1.1,2)",
+ org.apache.webbeans.plugins;version="[1.1,2)",
+ org.apache.webbeans.portable;version="[1.1,2)",
+ org.apache.webbeans.portable.events;version="[1.1,2)",
+ org.apache.webbeans.portable.events.discovery;version="[1.1,2)",
+ org.apache.webbeans.portable.events.generics;version="[1.1,2)",
+ org.apache.webbeans.proxy;version="[1.1,2)",
+ org.apache.webbeans.service;version="[1.1,2)",
+ org.apache.webbeans.spi;version="[1.1,2)",
+ org.apache.webbeans.spi.adaptor;version="[1.1,2)",
+ org.apache.webbeans.spi.api;version="[1.1,2)",
+ org.apache.webbeans.spi.plugins;version="[1.1,2)",
+ org.apache.webbeans.util;version="[1.1,2)",
+ org.apache.webbeans.web.context;version="[1.1,2)",
+ org.apache.webbeans.xml;version="[1.1,2)",
+ org.apache.xbean.asm;version="[3.1,4)",
+ org.apache.xbean.asm.commons;version="[3.1,4)",
+ org.apache.xbean.finder;version="[3.8,4)",
+ org.apache.xbean.finder.archive;version="[3.8,4)",
+ org.apache.xbean.finder.filter;version="[3.8,4)",
+ org.apache.xbean.naming.context;version="[3.8,4)",
+ org.apache.xbean.naming.reference;version="[3.8,4)",
+ org.apache.xbean.propertyeditor;version="[3.8,4)",
+ org.apache.xbean.recipe;version="[3.8,4)",
+ org.hsqldb.jdbc;resolution:=optional,
+ org.junit.rules;resolution:=optional,
+ org.junit.runners;resolution:=optional,
+ org.junit.runners.model;resolution:=optional,
+ org.omg.CORBA,
+ org.osgi.framework,
+ org.quartz;resolution:=optional,
+ org.quartz.impl;resolution:=optional,
+ org.quartz.spi;resolution:=optional,
+ org.slf4j;resolution:=optional;version="[1.6,2)",
+ org.w3c.dom,
+ org.w3c.dom.ls,
+ org.xml.sax,
+ org.xml.sax.helpers
</openejb.osgi.import.pkg>
<openejb.osgi.export>
- !org.apache.openejb.javaee.api.activator,
org.apache.openejb.cdi.*;version=${openejb.osgi.export.version},
org.apache.openejb*;version=${openejb.osgi.export.version}
org.apache.openejb;version=${openejb.osgi.export.version}
Modified: openejb/trunk/openejb/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/pom.xml?rev=1210472&r1=1210471&r2=1210472&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-jee/pom.xml Mon Dec 5 14:23:25 2011
@@ -31,7 +31,11 @@
<name>OpenEJB :: Container :: Java EE</name>
<properties>
- <openejb.osgi.import.pkg>!org.apache.geronimo,javax.persistence;resolution:=optional,javax.xml.*;resolution:=optional,*</openejb.osgi.import.pkg>
+ <openejb.osgi.import.pkg>
+ org.apache.geronimo.specs.jpa;resolution:=optional,
+ org.apache.geronimo.specs.activation;resolution:=optional,
+ *
+ </openejb.osgi.import.pkg>
</properties>
<build>
Modified: openejb/trunk/openejb/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/pom.xml?rev=1210472&r1=1210471&r2=1210472&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-loader/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-loader/pom.xml Mon Dec 5 14:23:25 2011
@@ -30,39 +30,13 @@
<packaging>jar</packaging>
<name>OpenEJB :: Container :: Loader</name>
<properties>
- <openejb.osgi.import>
- org.apache.geronimo.*;resolution:=optional,
- org.apache.catalina*;resolution:=optional,
- !sun.misc.*,
- org.apache.openejb,
- javax.transaction*;version=1.1,
- *
- </openejb.osgi.import>
+ <openejb.osgi.import.pkg />
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<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;version="1.1",*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
-
Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1210472&r1=1210471&r2=1210472&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Mon Dec 5 14:23:25 2011
@@ -96,12 +96,12 @@
<!-- OSGi bundles properties -->
<openejb.bundle.activator/>
<openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>
+ <openejb.osgi.import>${openejb.osgi.import.pkg}</openejb.osgi.import>
+ <openejb.osgi.export.pkg>org.apache.openejb</openejb.osgi.export.pkg>
+ <openejb.osgi.export>${openejb.osgi.export.pkg}*;version=${openejb.osgi.export.version}</openejb.osgi.export>
<openejb.osgi.private.pkg>!*</openejb.osgi.private.pkg>
<openejb.osgi.dynamic.import.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.dynamic.import>${openejb.osgi.dynamic.import.pkg}</openejb.osgi.dynamic.import>
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
+ <version>2.0.1</version> <!-- don't use 2.3.5 since there is an issue with private packages imports -->
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -215,7 +215,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
+ <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: openejb/trunk/openejb/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/pom.xml?rev=1210472&r1=1210471&r2=1210472&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb/server/openejb-client/pom.xml Mon Dec 5 14:23:25 2011
@@ -30,11 +30,35 @@
<packaging>jar</packaging>
<name>OpenEJB :: Server :: Client</name>
<properties>
- <openejb.osgi.import.pkg>
- javax.transaction;version="1.1",
- javax.mail.*;version="1.4";resolution:=optional,
- *
- </openejb.osgi.import.pkg>
+ <openejb.osgi.import.pkg>
+ javax.ejb,
+ javax.jws,
+ javax.mail;resolution:=optional;version=1.4,
+ javax.naming,
+ javax.naming.spi,
+ javax.net,
+ javax.net.ssl,
+ javax.rmi,
+ javax.rmi.CORBA,
+ javax.security.auth,
+ javax.security.auth.callback,
+ javax.security.auth.login,
+ javax.security.auth.spi,
+ javax.sql,
+ javax.transaction;version=1.1,
+ javax.xml.bind,
+ javax.xml.namespace,
+ javax.xml.transform,
+ javax.xml.ws,
+ javax.xml.ws.handler,
+ javax.xml.ws.soap,
+ javax.xml.ws.spi,
+ javax.xml.ws.wsaddressing,
+ org.apache.geronimo.osgi.locator,
+ org.omg.CORBA,
+ org.osgi.framework,
+ org.w3c.dom
+ </openejb.osgi.import.pkg>
</properties>
<build>
<plugins>