[jboss-osgi-commits] JBoss-OSGI SVN: r100477 - in projects/jboss-osgi: projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers and 18 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Fri Feb 5 07:47:00 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-05 07:46:56 -0500 (Fri, 05 Feb 2010)
New Revision: 100477
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
[JBOSGI-145] JAXB classes are loaded from the system classpath
Prevent leakage from packages in common/lib into the OSGi classspace
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -52,7 +52,7 @@
* The ClassLoaderPolicy for OSGi bundles.
*
* @author Thomas.Diesler at jboss.com
- * @since 11-Sep-2209
+ * @since 11-Sep-2009
*/
public class OSGiClassLoaderPolicy extends VFSClassLoaderPolicy
{
Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.osgi.framework.classloading;
+
+// $Id$
+
+import org.jboss.classloading.spi.dependency.ClassLoading;
+
+/**
+ * The ClassLoading for OSGi bundles.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 05-Jan-2010
+ */
+public class OSGiClassLoading extends ClassLoading
+{
+
+}
Property changes on: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -64,6 +64,7 @@
@Override
protected ClassLoaderPolicyModule createModule(DeploymentUnit unit, ClassLoadingMetaData metaData)
{
- return new OSGiModule(unit, metaData);
+ OSGiModule module = new OSGiModule(unit, metaData);
+ return module;
}
}
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-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-05 12:46:56 UTC (rev 100477)
@@ -21,10 +21,6 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- <!-- [JBOSGI-287] Optional import loaded from system classloader -->
- javax.servlet,
- javax.servlet.http,
-
<!-- loging -->
org.apache.log4j;version=1.2,
org.slf4j;version=1.5,
@@ -197,6 +193,7 @@
********************************
-->
+ <bean name="OSGiClassLoading" class="org.jboss.osgi.framework.classloading.OSGiClassLoading"/>
<bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem" />
<bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" >
<constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
@@ -216,7 +213,7 @@
</bean>
<bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/>
<bean name="OSGiModuleDeployer" class="org.jboss.osgi.framework.deployers.OSGiModuleDeployerTempWorkaround">
- <property name="classLoading"><inject bean="ClassLoading" /></property>
+ <property name="classLoading"><inject bean="OSGiClassLoading" /></property>
</bean>
<!--
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-05 12:46:56 UTC (rev 100477)
@@ -52,6 +52,7 @@
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
<version.izpack>4.3.1</version.izpack>
+ <version.javax.servlet>2.5</version.javax.servlet>
<version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0.Beta1-SNAPSHOT</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
@@ -269,6 +270,13 @@
<version>${version.ops4j.pax.web}</version>
</dependency>
+ <!-- javax.* -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet}</version>
+ </dependency>
+
<!-- org.osgi -->
<dependency>
<groupId>org.osgi</groupId>
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-05 12:46:56 UTC (rev 100477)
@@ -36,16 +36,10 @@
<!-- Properties -->
<properties>
- <version.javax.servlet>2.4</version.javax.servlet>
</properties>
<!-- Dependencies -->
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${version.javax.servlet}</version>
- </dependency>
</dependencies>
<!-- Build -->
@@ -290,8 +284,6 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
- <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
- <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude>
<!-- [JBOSGI-204] Failure in Bundle.start() uninstalls the bundle -->
<exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
<!-- Functionality not supported in JBossMC -->
@@ -336,8 +328,6 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
- <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
- <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude>
<!-- [JBOSGI-204] Failure in Bundle.start() uninstalls the bundle -->
<exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
<!-- Functionality not supported in JBossMC -->
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -105,6 +105,7 @@
Bundle serviceBundle = packageAdmin.getBundle(JAXBService.class);
Bundle contextBundle = packageAdmin.getBundle(JAXBContext.class);
+ // Test that the JAXBService as well as the JAXBContext come from the provided bundle
assertEquals("jboss-osgi-jaxb", serviceBundle.getSymbolicName());
assertEquals("jboss-osgi-jaxb", serviceBundle, contextBundle);
}
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 12:46:56 UTC (rev 100477)
@@ -70,6 +70,11 @@
</list>
</property>
</bean>
+ <!--
+ <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ -->
<bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
<constructor>
<parameter><inject bean="OSGiBundleManager" /></parameter>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2010-02-05 12:46:56 UTC (rev 100477)
@@ -171,6 +171,7 @@
<!-- jbosgi287 -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi287-bundleA.jar" files="${tests.resources.dir}/jbosgi287/jbosgi287-bundleA.bnd" />
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi287-bundleB.jar" files="${tests.resources.dir}/jbosgi287/jbosgi287-bundleB.bnd" />
+ <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi287-bundleC.jar" files="${tests.resources.dir}/jbosgi287/jbosgi287-bundleC.bnd" />
<!-- localization -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/localization-simple-host.jar" files="${tests.resources.dir}/localization/localization-simple-host.bnd" />
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+
+package javax.xml.ws;
+
+/** The <code>WebServiceException</code> class is the base
+ * exception class for all JAX-WS API runtime exceptions.
+ *
+ * @since JAX-WS 2.0
+**/
+
+ at SuppressWarnings("serial")
+public class WebServiceException extends java.lang.RuntimeException
+{
+
+ /** Constructs a new exception with <code>null</code> as its
+ * detail message. The cause is not initialized.
+ **/
+ public WebServiceException()
+ {
+ super();
+ }
+
+ /** Constructs a new exception with the specified detail
+ * message. The cause is not initialized.
+ * @param message The detail message which is later
+ * retrieved using the getMessage method
+ **/
+ public WebServiceException(String message)
+ {
+ super(message);
+ }
+
+ /** Constructs a new exception with the specified detail
+ * message and cause.
+ *
+ * @param message The detail message which is later retrieved
+ * using the getMessage method
+ * @param cause The cause which is saved for the later
+ * retrieval throw by the getCause method
+ **/
+ public WebServiceException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ /** Constructs a new WebServiceException with the specified cause
+ * and a detail message of <tt>(cause==null ? null :
+ * cause.toString())</tt> (which typically contains the
+ * class and detail message of <tt>cause</tt>).
+ *
+ * @param cause The cause which is saved for the later
+ * retrieval throw by the getCause method.
+ * (A <tt>null</tt> value is permitted, and
+ * indicates that the cause is nonexistent or
+ * unknown.)
+ **/
+ public WebServiceException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -163,7 +163,7 @@
@Test
public void testHiddenPrivatePackage() throws Exception
{
- if ("jbossmc".equals(getFramework()))
+ if ("jbossmc".equals(getFrameworkName()))
{
System.out.println("FIXME [JBOSGI-245] Framework fragments");
return;
@@ -209,7 +209,7 @@
@Test
public void testFragmentExportsPackage() throws Exception
{
- if ("jbossmc".equals(getFramework()))
+ if ("jbossmc".equals(getFrameworkName()))
{
System.out.println("FIXME [JBOSGI-245] Framework fragments");
return;
@@ -288,7 +288,7 @@
@Test
public void testFragmentRequireBundle() throws Exception
{
- if ("jbossmc".equals(getFramework()))
+ if ("jbossmc".equals(getFrameworkName()))
{
System.out.println("FIXME [JBOSGI-245] Framework fragments");
return;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -86,7 +86,7 @@
@Test
public void testCircularNoSelfDependency() throws Exception
{
- if ("jbossmc".equals(getFramework()))
+ if ("jbossmc".equals(getFrameworkName()))
{
System.out.println("FIXME [JBOSGI-151] Cannot resolve circular dependencies");
return;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -23,7 +23,8 @@
//$Id: OSGi284TestCase.java 100204 2010-02-01 10:14:11Z thomas.diesler at jboss.com $
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
@@ -106,11 +107,10 @@
}
}
-
@Test
public void testResolvedOptionalImportReverse() throws Exception
{
- if ("jbossmc".equals(getFramework()))
+ if ("jbossmc".equals(getFrameworkName()))
{
System.out.println("FIXME [JBOSGI-287] Optional import loaded from system classloader");
return;
@@ -145,4 +145,36 @@
runtime.shutdown();
}
}
+
+ @Test
+ public void testServletAPI() throws Exception
+ {
+ OSGiRuntime runtime = getDefaultRuntime();
+ try
+ {
+ // Bundle-SymbolicName: jbosgi287-bundleC
+ // Export-Package: javax.xml.ws
+ // Import-Package: javax.xml.ws
+ OSGiBundle bundleA = runtime.installBundle("jbosgi287-bundleC.jar");
+
+ OSGiBundle exporterA = bundleA.loadClass("javax.xml.ws.WebServiceException");
+ assertEquals(Bundle.RESOLVED, bundleA.getState());
+ assertEquals(bundleA, exporterA);
+
+ // Try to load a class that is not part of the bundle
+ try
+ {
+ bundleA.loadClass("javax.xml.ws.WebServiceContext");
+ fail("ClassNotFoundException expected");
+ }
+ catch (ClassNotFoundException ex)
+ {
+ // expected
+ }
+ }
+ finally
+ {
+ runtime.shutdown();
+ }
+ }
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -231,7 +231,7 @@
@Test
public void testUninstallX() throws Exception
{
- if ("jbossmc".equals(getFramework()))
+ if ("jbossmc".equals(getFrameworkName()))
{
System.out.println("FIXME [JBOSGI-213] Unexpected dependee state changes");
return;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java 2010-02-05 12:46:56 UTC (rev 100477)
@@ -82,7 +82,7 @@
assertNotNull("Storage dir not null", storageRoot);
File dataFile;
- if ("equinox".equals(getFramework()))
+ if ("equinox".equals(getFrameworkName()))
{
dataFile = new File(storageRoot + "/org.eclipse.osgi/bundles/" + bundleA.getBundleId() + "/data/" + filename);
}
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 12:46:56 UTC (rev 100477)
@@ -55,6 +55,11 @@
********************************
-->
+ <!--
+ <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ -->
<bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
<constructor>
<parameter><inject bean="OSGiBundleManager" /></parameter>
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd 2010-02-05 12:46:56 UTC (rev 100477)
@@ -0,0 +1,6 @@
+# bnd build -classpath target/test-classes -output target/test-libs/jbosgi287-bundleB.jar src/test/resources/jbosgi287/jbosgi287-bundle.bnd
+
+Bundle-SymbolicName: jbosgi287-bundleC
+Export-Package: javax.xml.ws
+Import-Package: javax.xml.ws
+
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-05 10:53:42 UTC (rev 100476)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-05 12:46:56 UTC (rev 100477)
@@ -182,6 +182,12 @@
<scope>provided</scope>
</dependency>
+ <!-- javax.* -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
<!-- OPS4J -->
<dependency>
<groupId>org.ops4j.pax.web</groupId>
More information about the jboss-osgi-commits
mailing list