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/07 15:41:41 UTC

svn commit: r1211455 - in /openejb/trunk/openejb/container: openejb-core/pom.xml openejb-osgi/pom.xml

Author: rmannibucau
Date: Wed Dec  7 14:41:41 2011
New Revision: 1211455

URL: http://svn.apache.org/viewvc?rev=1211455&view=rev
Log:
some OSGi import/export fix from Charles

Modified:
    openejb/trunk/openejb/container/openejb-core/pom.xml
    openejb/trunk/openejb/container/openejb-osgi/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=1211455&r1=1211454&r2=1211455&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-core/pom.xml Wed Dec  7 14:41:41 2011
@@ -209,7 +209,7 @@
     </openejb.osgi.import.pkg>
     <openejb.osgi.export>
       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},
       org.apache.openejb;version=${openejb.osgi.export.version}
     </openejb.osgi.export>
     <openejb.osgi.require>

Modified: openejb/trunk/openejb/container/openejb-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-osgi/pom.xml?rev=1211455&r1=1211454&r2=1211455&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-osgi/pom.xml Wed Dec  7 14:41:41 2011
@@ -86,26 +86,27 @@
               org.apache.commons.dbcp.managed;resolution:=optional;version="[1.4,2)",
               org.apache.commons.logging,
               org.apache.kahadb;resolution:=optional,
-              org.apache.openejb;version="[3.1,4.2)",
-              org.apache.openejb.assembler.classic;version="[3.1,4.2)",
-              org.apache.openejb.cdi;version="[3.1,4.2)",
-              org.apache.openejb.config;version="[3.1,4.2)",
-              org.apache.openejb.core;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.core.ivm;version="[3.1,4.2)",
-              org.apache.openejb.core.managed;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.core.mdb;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.core.security;version="[3.1,4.2)",
-              org.apache.openejb.core.singleton;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.core.stateful;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.core.stateless;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.jee;version="[3.1,4.2)",
-              org.apache.openejb.loader;version="[3.1,4.2)",
-              org.apache.openejb.resource;version="[3.1,4.2)",
-              org.apache.openejb.resource.activemq;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.resource.jdbc;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.resource.quartz;resolution:=optional;version="[3.1,4.2)",
-              org.apache.openejb.server;version="[3.1,4.2)",
-              org.apache.openejb.util;version="[3.1,4.2)",
+              org.apache.openejb;version="[4.0,5.0)",
+              org.apache.openejb.assembler.classic;version="[4.0,5.0)",
+              org.apache.openejb.cdi;version="[4.0,5.0)",
+              org.apache.openejb.config;version="[4.0,5.0)",
+              org.apache.openejb.core;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.core.ivm;version="[4.0,5.0)",
+              org.apache.openejb.core.managed;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.core.mdb;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.core.security;version="[4.0,5.0)",
+              org.apache.openejb.core.security.jacc;version="[4.0,5.0)",
+              org.apache.openejb.core.singleton;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.core.stateful;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.core.stateless;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.jee;version="[4.0,5.0)",
+              org.apache.openejb.loader;version="[4.0,5.0)",
+              org.apache.openejb.resource;version="[4.0,5.0)",
+              org.apache.openejb.resource.activemq;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.resource.jdbc;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.resource.quartz;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.server;resolution:=optional;version="[4.0,5.0)",
+              org.apache.openejb.util;version="[4.0,5.0)"
               org.apache.xerces;resolution:=optional,
               org.apache.xml.resolver;resolution:=optional,
               org.hsqldb.jdbc;resolution:=optional,