[jboss-osgi-commits] JBoss-OSGI SVN: r101118 - in projects/jboss-osgi: projects/bundles/jndi/trunk and 2 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Thu Feb 18 11:01:50 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-18 11:01:49 -0500 (Thu, 18 Feb 2010)
New Revision: 101118
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/testsuite/example/pom.xml
Log:
[JBOSGI-293] Cannot start example-jndi on Felix
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-18 16:00:28 UTC (rev 101117)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-18 16:01:49 UTC (rev 101118)
@@ -100,16 +100,15 @@
org.osgi.service.packageadmin;version="[1.2,2.0)",
org.osgi.util.tracker;version="[1.4,2.0)",
- <!-- FIXME: make optional -->
- org.jboss.osgi.jndi,
- org.jboss.net.sockets,
- org.jnp.interfaces,
-
- <!--
+ <!-- FIXME: make optional
org.jboss.osgi.jndi;resolution:=optional,
org.jboss.net.sockets;resolution:=optional,
org.jnp.interfaces;resolution:=optional,
-->
+ org.jboss.osgi.jndi;version="[1.0,2.0)",
+ org.jboss.net.sockets;version="[2.2,3.0)",
+ org.jnp.interfaces;version="[5.0,6.0)",
+
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-18 16:00:28 UTC (rev 101117)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-18 16:01:49 UTC (rev 101118)
@@ -88,23 +88,31 @@
org.jboss.osgi.jndi;version=${version}
</Export-Package>
<Import-Package>
+
+ <!-- system -->
javax.naming*,
- javax.net,
- org.jboss.logging,
- org.jboss.net.sockets,
- org.jboss.util.naming,
- org.jboss.util.threadpool,
- org.jnp.interfaces,
+ javax.net,
+ <!-- jboss -->
+ org.jboss.logging;version="[2.1,3.0)",
+ org.jboss.net.sockets;version="[2.2,3.0)",
+ org.jboss.util.naming;version="[2.2,3.0)",
+ org.jboss.util.threadpool;version="[2.2,3.0)",
+ org.jnp.interfaces;version="[5.0,6.0)",
+
+ <!-- jboss-osgi -->
org.jboss.osgi.common*;version="[1.0,2.0)",
org.jboss.osgi.spi*;version="[1.0,2.0)",
+
+ <!-- osgi -->
org.osgi.framework;version="[1.5,2.0)",
+
</Import-Package>
<Embed-Dependency>
- jnpserver;inline=false,
+ jnpserver;inline=false
</Embed-Dependency>
<_exportcontents>
- org.jnp.interfaces;version=5.0.1,
+ org.jnp.interfaces;version=5.0.1
</_exportcontents>
</instructions>
</configuration>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-18 16:00:28 UTC (rev 101117)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-18 16:01:49 UTC (rev 101118)
@@ -37,7 +37,7 @@
org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.net.protocol,
+ org.jboss.net.protocol;version=2.2,
org.jboss.virtual;version=2.1,
org.jboss.virtual.plugins.registry;version=2.1,
org.jboss.virtual.plugins.context.jar;version=2.1,
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-18 16:00:28 UTC (rev 101117)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-18 16:01:49 UTC (rev 101118)
@@ -37,7 +37,7 @@
org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.net.protocol,
+ org.jboss.net.protocol;version=2.2,
org.jboss.virtual;version=2.1,
org.jboss.virtual.plugins.registry;version=2.1,
org.jboss.virtual.plugins.context.jar;version=2.1,
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-18 16:00:28 UTC (rev 101117)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-18 16:01:49 UTC (rev 101118)
@@ -22,8 +22,7 @@
<entry><key>org.osgi.framework.system.packages.extra</key><value>
<!-- jnp naming -->
- org.jnp.interfaces,
- org.jnp.server,
+ org.jnp.interfaces;version=5.0,
<!-- logging -->
org.apache.log4j;version=1.2,
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-18 16:00:28 UTC (rev 101117)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-18 16:01:49 UTC (rev 101118)
@@ -232,6 +232,8 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
+ <!-- [JBOSGI-293] Cannot start example-jndi on Felix -->
+ <exclude>org/jboss/test/osgi/example/jndi/**</exclude>
<!-- Functionality not supported in Felix -->
<exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
<exclude>org/jboss/test/osgi/example/microcontainer/**</exclude>
More information about the jboss-osgi-commits
mailing list