February 2010 - jboss-osgi-commits

JBoss-OSGI SVN: r100422 - in projects/jboss-osgi/projects/runtime/framework/trunk: src/main/java/org/jboss/osgi/framework/bundle and 14 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: alesj Date: 2010-02-04 11:09:52 -0500 (Thu, 04 Feb 2010) New Revision: 100422 Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServicesTest.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JBossJMXKernel.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvoker.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvokerMBean.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/macosx_x86/ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/macosx_x86/libNative.jnilib projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/windows_x86/ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/windows_x86/Native.dll projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase#testAtJmx.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase.xml Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiNativeCodeMetaDataDeployer.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd Log: [JBOSGI-141]; fix MDRFactory, fix native tests for non-linux env; mac, winz. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 15:58:02 UTC (rev 100421) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 16:09:52 UTC (rev 100422) @@ -49,7 +49,7 @@ <version.drools>5.0.1</version.drools> <version.jboss.classloading>2.2.0.Alpha1</version.jboss.classloading> <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> - <version.jboss.kernel>2.2.0.Alpha2</version.jboss.kernel> + <version.jboss.kernel>2.2.0.Alpha5</version.jboss.kernel> <version.jboss.logging>2.1.0.GA</version.jboss.logging> <version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr> <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces> @@ -134,12 +134,27 @@ <version>${version.jboss.deployers}</version> </dependency> <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-jmx</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> <groupId>org.jboss.kernel</groupId> <artifactId>jboss-kernel</artifactId> <version>${version.jboss.kernel}</version> </dependency> <dependency> <groupId>org.jboss.kernel</groupId> + <artifactId>jboss-jmx-aop-mc-int</artifactId> + <version>${version.jboss.kernel}</version> + </dependency> + <dependency> + <groupId>org.jboss.kernel</groupId> + <artifactId>jboss-jmx-mc-int</artifactId> + <version>${version.jboss.kernel}</version> + </dependency> + <dependency> + <groupId>org.jboss.kernel</groupId> <artifactId>jboss-dependency</artifactId> <version>${version.jboss.kernel}</version> </dependency> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-04 15:58:02 UTC (rev 100421) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -27,7 +27,9 @@ import org.jboss.dependency.spi.Controller; import org.jboss.dependency.spi.ControllerContext; +import org.jboss.kernel.Kernel; import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader; +import org.jboss.metadata.spi.repository.MutableMetaDataRepository; import org.jboss.metadata.spi.retrieval.MetaDataRetrieval; import org.jboss.metadata.spi.retrieval.MetaDataRetrievalFactory; import org.jboss.metadata.spi.scope.CommonLevels; @@ -42,15 +44,18 @@ public class InstanceMetaDataRetrievalFactory implements MetaDataRetrievalFactory { private Controller controller; + private MutableMetaDataRepository repository; @SuppressWarnings("rawtypes") private Set<DictionaryFactory> factories = new CopyOnWriteArraySet<DictionaryFactory>(); - public InstanceMetaDataRetrievalFactory(Controller controller) + public InstanceMetaDataRetrievalFactory(Kernel kernel) { - if (controller == null) - throw new IllegalArgumentException("Null controller"); - this.controller = controller; + if (kernel == null) + throw new IllegalArgumentException("Null kernel"); + + this.controller = kernel.getController(); + this.repository = kernel.getMetaDataRepository().getMetaDataRepository(); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -62,6 +67,8 @@ throw new IllegalArgumentException("Not an instance scope: " + scope); MemoryMetaDataLoader loader = new MemoryMetaDataLoader(new ScopeKey(scope)); + repository.addMetaDataRetrieval(loader); // remember loader + Object qualifier = scope.getQualifier(); ControllerContext context = controller.getContext(qualifier, null); if (context != null) Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java 2010-02-04 15:58:02 UTC (rev 100421) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/ServiceManagerPluginImpl.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -313,8 +313,7 @@ private MetaDataRetrievalFactory getMetaDataRetrievalFactory() { MetaDataRetrievalFactory mdrFactory; - Controller controller = kernel.getController(); - InstanceMetaDataRetrievalFactory imdrf = new InstanceMetaDataRetrievalFactory(controller); + InstanceMetaDataRetrievalFactory imdrf = new InstanceMetaDataRetrievalFactory(kernel); imdrf.addFactory(new OSGiServiceStateDictionaryFactory()); imdrf.addFactory(new KernelDictionaryFactory(kernel.getConfigurator())); // TODO - JMX? Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiNativeCodeMetaDataDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiNativeCodeMetaDataDeployer.java 2010-02-04 15:58:02 UTC (rev 100421) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiNativeCodeMetaDataDeployer.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -101,6 +101,7 @@ osAlias.put("WinVista", "WindowsVista"); osAlias.put("Windows Vista", "WindowsVista"); osAlias.put("Win32", "WindowsVista"); + osAlias.put("Windows 7", "Windows7"); } public OSGiNativeCodeMetaDataDeployer() @@ -226,7 +227,7 @@ boolean osmatch = false; for (String osname : osNames) { - osmatch = (osname.equals(fwOSName) || osname.equals(osAlias.get(fwOSName))); + osmatch = (osname.equalsIgnoreCase(fwOSName) || osname.equalsIgnoreCase(osAlias.get(fwOSName))); if (osmatch == true) break; } Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 15:58:02 UTC (rev 100421) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -28,8 +28,49 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; +import java.util.HashMap; +import java.util.Map; + public class NativeCodeActivatorA implements BundleActivator { + private static Map<String, String> osAliases = new HashMap<String, String>(); + + static + { + osAliases.put("SymbianOS", "Epoc32"); + osAliases.put("hp-ux", "HPUX"); + osAliases.put("Linux", "Linux"); + osAliases.put("Mac OS", "MacOS"); + osAliases.put("Mac OS X", "MacOSX"); + osAliases.put("OS/2", "OS2"); + osAliases.put("procnto", "QNX"); + osAliases.put("Win95", "Windows95"); + osAliases.put("Windows 95", "Windows95"); + osAliases.put("Win32", "Windows95"); + osAliases.put("Win98", "Windows98"); + osAliases.put("Windows 98", "Windows98"); + osAliases.put("Win32", "Windows98"); + osAliases.put("WinNT", "WindowsNT"); + osAliases.put("Windows NT", "WindowsNT"); + osAliases.put("Win32", "WindowsNT"); + osAliases.put("WinCE", "WindowsCE"); + osAliases.put("Windows CE", "WindowsCE"); + osAliases.put("Win2000", "Windows2000"); + osAliases.put("Windows 2000", "Windows2000"); + osAliases.put("Win32", "Windows2000"); + osAliases.put("Win2003", "Windows2003"); + osAliases.put("Windows 2003", "Windows2003"); + osAliases.put("Win32", "Windows2003"); + osAliases.put("Windows Server 2003", "Windows2003"); + osAliases.put("WinXP", "WindowsXP"); + osAliases.put("Windows XP", "WindowsXP"); + osAliases.put("Win32", "WindowsXP"); + osAliases.put("WinVista", "WindowsVista"); + osAliases.put("Windows Vista", "WindowsVista"); + osAliases.put("Win32", "WindowsVista"); + osAliases.put("Windows 7", "Windows7"); + } + public void start(BundleContext context) throws BundleException { Bundle bundle = context.getBundle(); @@ -42,7 +83,13 @@ { String exmsg = ex.getMessage(); long bundleid = bundle.getBundleId(); - String substr = "osgi-store/bundle-" + bundleid + "/linux_x86"; + String os = System.getProperty("os.name"); + String osAlias = osAliases.get(os); + String suffix = osAlias != null ? osAlias.toLowerCase() : ""; + if ("".equals(suffix)) + System.err.println("No such OS mapped to alias: " + os); + + String substr = "osgi-store/bundle-" + bundleid + "/" + suffix; if (exmsg.indexOf(substr) < 0) throw new UnsatisfiedLinkError("Cannot find '" + substr + "' in '" + exmsg + "'"); } Copied: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java (from rev 100347, projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java) =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, 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.test.osgi.service; + +import junit.framework.Test; +import org.jboss.test.osgi.service.support.MockInvokerMBean; + +import javax.management.ObjectName; + +/** + * Test MC's jmx support. + * + * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a> + */ +public class JMXServicesUnitTestCase extends ServicesTest +{ + public JMXServicesUnitTestCase(String name) + { + super(name); + } + + public static Test suite() + { + return suite(JMXServicesUnitTestCase.class); + } + + public void testAtJmx() throws Throwable + { + MockInvokerMBean invoker = (MockInvokerMBean) getBean("Invoker"); + assertNotNull(invoker.getServer()); + ObjectName name = invoker.getServiceName(); + assertNotNull(name); + assertEquals("jboss:service=invoker,type=unified", name.getCanonicalName()); + } + + public void testMBeans() throws Throwable + { + // mix mbean services with bundles -- TODO + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java 2010-02-04 15:58:02 UTC (rev 100421) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -49,7 +49,7 @@ * * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a> */ -public class ServiceMixUnitTestCase extends DeployersTest +public class ServiceMixUnitTestCase extends ServicesTest { public ServiceMixUnitTestCase(String name) { @@ -107,23 +107,6 @@ } } - private static Object getter(Object target, String getter, String name) throws Throwable - { - assertNotNull("Target " + name + " is not null", target); - Class<?> clazz = target.getClass(); - Method m = clazz.getDeclaredMethod(getter); - return m.invoke(target); - } - - private static Object setter(Object target, String setter, Object value, String name) throws Throwable - { - assertNotNull("Target " + name + " is not null", target); - assertNotNull("Value is not null", value); - Class<?> clazz = target.getClass(); - Method m = clazz.getDeclaredMethod(setter, value.getClass()); - return m.invoke(target, value); - } - public void testInjectionToMC() throws Throwable { BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("C", C.class.getName()); Copied: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServicesTest.java (from rev 100347, projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java) =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServicesTest.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServicesTest.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, 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.test.osgi.service; + +import junit.framework.Test; +import org.jboss.beans.metadata.spi.BeanMetaData; +import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder; +import org.jboss.dependency.spi.ControllerState; +import org.jboss.deployers.client.spi.Deployment; +import org.jboss.kernel.spi.dependency.KernelControllerContext; +import org.jboss.test.osgi.DeployersTest; +import org.jboss.test.osgi.service.support.LazyBundle; +import org.jboss.test.osgi.service.support.a.A; +import org.jboss.test.osgi.service.support.c.C; +import org.jboss.test.osgi.service.support.d.D; +import org.jboss.virtual.AssembledDirectory; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; + +import java.lang.reflect.Method; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.List; + +/** + * Test MC's services. + * + * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a> + */ +public abstract class ServicesTest extends DeployersTest +{ + public ServicesTest(String name) + { + super(name); + } + + protected static Object getter(Object target, String getter, String name) throws Throwable + { + assertNotNull("Target " + name + " is not null", target); + Class<?> clazz = target.getClass(); + Method m = clazz.getDeclaredMethod(getter); + return m.invoke(target); + } + + protected static Object setter(Object target, String setter, Object value, String name) throws Throwable + { + assertNotNull("Target " + name + " is not null", target); + assertNotNull("Value is not null", value); + Class<?> clazz = target.getClass(); + Method m = clazz.getDeclaredMethod(setter, value.getClass()); + return m.invoke(target, value); + } +} \ No newline at end of file Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JBossJMXKernel.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JBossJMXKernel.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JBossJMXKernel.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.test.osgi.service.support; + +import org.jboss.beans.metadata.api.annotations.Constructor; +import org.jboss.beans.metadata.api.annotations.Inject; +import org.jboss.classloader.spi.ClassLoaderSystem; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants; + +/** + * Sets up MBeanServer impl. + * + * JDK = org.jboss.jmx.mbeanserver.JBossMBeanServerBuilder + * JBossMX = org.jboss.mx.server.MBeanServerBuilderImpl + * + * by default we use JDK's. + * + * @author <a href="mailto:ales.justin@jboss.com">Ales Justin</a> + */ +public class JBossJMXKernel extends JMXKernel +{ + private static final String MBEAN_SERVER_BUILDER_CLASS_PROPERTY = "javax.management.builder.initial"; + private static final String DEFAULT_MBEAN_SERVER_BUILDER_CLASS = "org.jboss.jmx.mbeanserver.JBossMBeanServerBuilder"; + private String builderClass; + + @Constructor + public JBossJMXKernel(@Inject(bean = KernelConstants.KERNEL_NAME) Kernel kernel, @Inject ClassLoaderSystem system) + { + super(kernel, system); + } + + protected void addProperties() + { + super.addProperties(); + if (builderClass == null) + builderClass = DEFAULT_MBEAN_SERVER_BUILDER_CLASS; + System.setProperty(MBEAN_SERVER_BUILDER_CLASS_PROPERTY, builderClass); + } + + protected void removeProperties() + { + System.clearProperty(MBEAN_SERVER_BUILDER_CLASS_PROPERTY); + super.removeProperties(); + } + + public void setBuilderClass(String builderClass) + { + this.builderClass = builderClass; + } +} Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/JMXKernel.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,119 @@ +package org.jboss.test.osgi.service.support; + +import java.util.Properties; +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import org.jboss.beans.metadata.api.annotations.Constructor; +import org.jboss.beans.metadata.api.annotations.Inject; +import org.jboss.classloader.spi.ClassLoaderSystem; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants; +import org.jboss.system.ServiceController; + +/** + * @author <a href="mailto:ales.justin@jboss.com">Ales Justin</a> + */ +public class JMXKernel +{ + private static final ObjectName CLASSLOADER_SYSTEM_OBJECT_NAME; + + private Kernel kernel; + private ClassLoaderSystem system; + + private Properties properties; + private MBeanServer mbeanServer; + private boolean createdMBeanServer; + private ServiceController serviceController; + + static + { + try + { + CLASSLOADER_SYSTEM_OBJECT_NAME = new ObjectName("jboss.classloader:service=ClassLoaderSystem"); + } + catch (MalformedObjectNameException e) + { + throw new RuntimeException("Unexpected error", e); + } + } + + @Constructor + public JMXKernel(@Inject(bean = KernelConstants.KERNEL_NAME) Kernel kernel, @Inject ClassLoaderSystem system) + { + this.kernel = kernel; + this.system = system; + } + + protected void addProperties() + { + if (properties != null) + System.setProperties(properties); + } + + protected void removeProperties() + { + if (properties != null) + { + for (Object key : properties.keySet()) + System.clearProperty(key.toString()); + } + } + + public void create() + { + addProperties(); + + if (mbeanServer == null) + { + mbeanServer = MBeanServerFactory.createMBeanServer("jboss"); + createdMBeanServer = true; + } + } + + public void start() throws Throwable + { + mbeanServer.registerMBean(system, CLASSLOADER_SYSTEM_OBJECT_NAME); + + serviceController = new ServiceController(); + serviceController.setKernel(kernel); + serviceController.setMBeanServer(mbeanServer); + } + + public void stop() throws Throwable + { + serviceController.shutdown(); + + mbeanServer.unregisterMBean(CLASSLOADER_SYSTEM_OBJECT_NAME); + } + + public void destroy() + { + if (createdMBeanServer) + MBeanServerFactory.releaseMBeanServer(mbeanServer); + + removeProperties(); + } + + public void setProperties(Properties properties) + { + this.properties = properties; + } + + public void setMbeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } + + public ServiceController getServiceController() + { + return serviceController; + } + + public MBeanServer getMbeanServer() + { + return mbeanServer; + } +} Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvoker.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvoker.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvoker.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.test.osgi.service.support; + +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +/** + * Test @JMX usage. + * + * @author <a href="mailto:ales.justin@jboss.com">Ales Justin</a> + */ +public class MockInvoker implements MockInvokerMBean, MBeanRegistration +{ + private MBeanServer server; + private ObjectName serviceName; + + public MBeanServer getServer() + { + return server; + } + + public ObjectName getServiceName() + { + return serviceName; + } + + public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception + { + this.server = server; + this.serviceName = name; + return null; + } + + public void postRegister(Boolean registrationDone) + { + } + + public void preDeregister() throws Exception + { + } + + public void postDeregister() + { + } +} \ No newline at end of file Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvokerMBean.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvokerMBean.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/MockInvokerMBean.java 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.test.osgi.service.support; + +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +/** + * Test @JMX usage. + * + * @author <a href="mailto:ales.justin@jboss.com">Ales Justin</a> + */ +public interface MockInvokerMBean +{ + MBeanServer getServer(); + + ObjectName getServiceName(); +} \ No newline at end of file Copied: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/macosx_x86/libNative.jnilib (from rev 100347, projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/linux_x86-64/libNative.so) =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/macosx_x86/libNative.jnilib (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/macosx_x86/libNative.jnilib 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1 @@ +This is not really a native code library. We dont test linking. Instead we test that the file was extracted correctly. \ No newline at end of file Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/windows_x86/Native.dll =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/windows_x86/Native.dll (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/libs/windows_x86/Native.dll 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1 @@ +This is not really a native code library. We dont test linking. Instead we test that the file was extracted correctly. \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 15:58:02 UTC (rev 100421) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 16:09:52 UTC (rev 100422) @@ -3,7 +3,11 @@ Private-Package: org.jboss.test.osgi.nativecode.bundleA Bundle-NativeCode: \ linux_x86/libNative.so; osname=Linux; processor=x86, \ - linux_x86-64/libNative.so; osname=Linux; processor=x86-64 + linux_x86-64/libNative.so; osname=Linux; processor=x86-64, \ + macosx_x86/libNative.jnilib; osname="mac os x"; processor=x86_64, \ + macosx_x86/libNative.jnilib; osname="mac os x"; processor=ppc, \ + windows_x86/Native.dll; osname=Win32; processor=x86, \ + windows_x86/Native.dll; osname=Windows7; processor=amd86 Include-Resource: libs -removeheaders: Include-Resource Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase#testAtJmx.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase#testAtJmx.xml (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase#testAtJmx.xml 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,7 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="Invoker" class="org.jboss.test.osgi.service.support.MockInvoker"> + <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unified",exposedInterface=org.jboss.test.osgi.service.support.MockInvokerMBean.class,registerDirectly=true)</annotation> + </bean> + +</deployment> \ No newline at end of file Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase.xml (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/service/JMXServicesUnitTestCase.xml 2010-02-04 16:09:52 UTC (rev 100422) @@ -0,0 +1,51 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + +  + + <bean name="JMXKernel" class="org.jboss.test.osgi.service.support.JBossJMXKernel"/> + + <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"/> + <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/> + <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"/> + <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer"> + <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor> + </bean> + +  + + <bean name="BeanAnnotationAdapterFactory" class="org.jboss.kernel.plugins.annotations.BeanAnnotationAdapterFactory"> + <constructor factoryMethod="getInstance"/> + </bean> + + <bean name="BeanAnnotationAdapter"> + <constructor factoryMethod="getBeanAnnotationAdapter"> + <factory bean="BeanAnnotationAdapterFactory"/> + </constructor> + <incallback method="addAnnotationPlugin"/> + <uncallback method="removeAnnotationPlugin"/> + </bean> + +  + <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0" + name="JMXRegistrationAdvice" + class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback" + classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"> + <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property> + </lifecycle-configure> + <lifecycle-create xmlns="urn:jboss:aop-beans:1.0" + name="JMXCreateDestroyAdvice" + class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback" + classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"> + <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property> + </lifecycle-create> + <lifecycle-install xmlns="urn:jboss:aop-beans:1.0" + name="JMXStartStopAdvice" + class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback" + classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"> + <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property> + </lifecycle-install> + +</deployment> \ No newline at end of file

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100419 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 10:55:55 -0500 (Thu, 04 Feb 2010) New Revision: 100419 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml Log: Restore microcontainer-service-jboss-beans.xml Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-04 15:12:30 UTC (rev 100418) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-04 15:55:55 UTC (rev 100419) @@ -433,6 +433,9 @@ override="true"> <include name="org.osgi.compendium.jar" /> </fileset> + <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <include name="microcontainer-service-jboss-beans.xml" /> + </fileset>  @@ -451,6 +454,9 @@ <include name="org.eclipse.osgi.util.jar" /> <include name="pax-web-extender-war.jar" /> </fileset> + <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <include name="microcontainer-service-jboss-beans.xml" /> + </fileset>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100417 - in projects/jboss-osgi: trunk/testsuite/example/src/test/resources/META-INF and 1 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 09:41:34 -0500 (Thu, 04 Feb 2010) New Revision: 100417 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Log: Revert support for circular dependencies. Supported at MC level needed Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 14:04:16 UTC (rev 100416) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 14:41:34 UTC (rev 100417) @@ -54,7 +54,7 @@ * @author thomas.diesler(a)jboss.com * @since 10-Sep-2009 */ -public class BasicResolverImpl extends AbstractResolver +public class BasicResolverImpl extends AbstractResolver { /** The log */ private static final Logger log = Logger.getLogger(BasicResolverImpl.class); @@ -74,7 +74,7 @@ AbstractBundleState bundleState = AbstractBundleState.assertBundleState(bundle); if (bundleState instanceof OSGiBundleState == false) return null; - + return super.addBundle(bundle); } @@ -84,7 +84,7 @@ AbstractBundleState bundleState = AbstractBundleState.assertBundleState(bundle); if (bundleState instanceof OSGiBundleState == false) return null; - + ResolverBundle removedBundle = super.removeBundle(bundle); bundleCapabilitiesMap.remove(bundleState); @@ -133,46 +133,36 @@ unresolvedBundles.add(OSGiBundleState.assertBundleState(aux)); } - // Add the capabilities and requirements of the unresolved bundles - for (OSGiBundleState bundleState : unresolvedBundles) - { - getBundleCapabilities(bundleState); - getBundleRequirements(bundleState); - } + int resolved = 1; + int resolveRounds = 0; - // Get the list of all capabilities for all resolved and unresolved bundles + // Get the list of all capabilities List<BundleCapability> allCapabilities = new ArrayList<BundleCapability>(); for (List<BundleCapability> list : bundleCapabilitiesMap.values()) { allCapabilities.addAll(list); } - // Reduce the capabilities for bundles that cannot be resolved - for (OSGiBundleState bundleState : unresolvedBundles) - { - if (reduceCapabilities(allCapabilities, bundleState) == false) - { - bundleCapabilitiesMap.remove(bundleState); - bundleRequirementsMap.remove(bundleState); - } - } - - log.debug("START****************************************************************"); - log.debug("Unresolved bundles: " + unresolvedBundles); - List<OSGiBundleState> resolvedBundles = new ArrayList<OSGiBundleState>(); - Iterator<OSGiBundleState> itUnresolved = unresolvedBundles.iterator(); - while (itUnresolved.hasNext()) + while (resolved > 0 && unresolvedBundles.isEmpty() == false) { - OSGiBundleState bundleState = itUnresolved.next(); + resolveRounds++; - log.debug("Resolving: " + bundleState); - if (resolveBundle(allCapabilities, bundleState)) - { - logResolvedBundleInfo(bundleState); + log.debug("#" + resolveRounds + " *****************************************************************"); + log.debug("Unresolved bundles: " + unresolvedBundles); - resolvedBundles.add(bundleState); - itUnresolved.remove(); + resolved = 0; + Iterator<OSGiBundleState> it = unresolvedBundles.iterator(); + while (it.hasNext()) + { + OSGiBundleState bundleState = it.next(); + log.debug("Resolving: " + bundleState); + if (resolveBundle(allCapabilities, bundleState)) + { + resolvedBundles.add(bundleState); + it.remove(); + resolved++; + } } } @@ -231,46 +221,19 @@ return result; } - private boolean reduceCapabilities(List<BundleCapability> allCapabilities, OSGiBundleState bundleState) + private boolean resolveBundle(List<BundleCapability> allCapabilities, OSGiBundleState bundle) { - boolean canResolve = true; + List<BundleCapability> bundleCapabilities = getBundleCapabilities(bundle); + List<BundleRequirement> bundleRequirements = getBundleRequirements(bundle); - List<BundleRequirement> bundleRequirements = getBundleRequirements(bundleState); - for (BundleRequirement requirement : bundleRequirements) - { - PackageRequirement packreq = requirement.getPackageRequirement(); - BundleCapability bestMatch = findBestMatch(allCapabilities, requirement); - if (bestMatch == null && packreq.isOptional() == false && packreq.isDynamic() == false) - { - log.debug("Cannot resolve: " + packreq); - canResolve = false; - break; - } - } + List<BundleCapability> futureCapabilities = new ArrayList<BundleCapability>(allCapabilities); + futureCapabilities.addAll(bundleCapabilities); - canResolve &= processRequiredBundle(bundleState, bundleRequirements); - if (canResolve == false) - { - Iterator<BundleCapability> iterator = allCapabilities.iterator(); - while (iterator.hasNext()) - { - BundleCapability next = iterator.next(); - OSGiBundleState exportingBundle = next.getExportingBundle(); - if (exportingBundle == bundleState) - iterator.remove(); - } - } - - return canResolve; - } - - private boolean resolveBundle(List<BundleCapability> allCapabilities, OSGiBundleState bundleState) - { - List<BundleRequirement> bundleRequirements = getBundleRequirements(bundleState); for (BundleRequirement requirement : bundleRequirements) { PackageRequirement packreq = requirement.getPackageRequirement(); - BundleCapability bestMatch = findBestMatch(allCapabilities, requirement); + + BundleCapability bestMatch = findBestMatch(futureCapabilities, requirement); if (bestMatch == null && packreq.isOptional() == false && packreq.isDynamic() == false) return false; @@ -281,28 +244,29 @@ Iterator<BundleRequirement> it = bundleRequirements.iterator(); while (it.hasNext()) { - BundleRequirement requirement = it.next(); - PackageRequirement packreq = requirement.getPackageRequirement(); - if ((packreq.isOptional() || packreq.isDynamic()) && requirement.getWiredCapability() == null) + if (it.next().getWiredCapability() == null) it.remove(); } - if (processRequiredBundle(bundleState, bundleRequirements) == false) + if (processRequiredBundle(bundle, bundleCapabilities, bundleRequirements) == false) return false; + allCapabilities.addAll(bundleCapabilities); + bundleCapabilitiesMap.put(bundle, bundleCapabilities); + bundleRequirementsMap.put(bundle, bundleRequirements); + + logResolvedBundleInfo(bundle, bundleCapabilities, bundleRequirements); + return true; } /** * Logs information about a resolved bundle */ - private void logResolvedBundleInfo(OSGiBundleState bundleState) + private void logResolvedBundleInfo(OSGiBundleState bundle, List<BundleCapability> bundleCapabilities, List<BundleRequirement> bundleRequirements) { - List<BundleCapability> bundleCapabilities = getBundleCapabilities(bundleState); - List<BundleRequirement> bundleRequirements = getBundleRequirements(bundleState); - // Log the package wiring information - StringBuffer message = new StringBuffer("Resolved: " + bundleState); + StringBuffer message = new StringBuffer("Resolved: " + bundle); // Log the exports int nameLengthMax = 0; @@ -372,38 +336,24 @@ { BundleCapability bestCapability = null; OSGiBundleState bestExporter = null; - int bestState = 0; for (BundleCapability capability : capabilities) { if (capability.matches(requirement)) { OSGiBundleState capExporter = capability.getExportingBundle(); - int capState = capExporter.getState(); - boolean updateMatch = false; if (bestCapability == null) { - updateMatch = true; + bestCapability = capability; + bestExporter = bestCapability.getExportingBundle(); } - // Update if we can wire to an already resolved bundle - else if (bestState == Bundle.INSTALLED && (capState == Bundle.RESOLVED || capState == Bundle.ACTIVE)) - { - updateMatch = true; - } - // Update if we can wire to a bundle with lower id else if (bestExporter.getBundleId() > capExporter.getBundleId()) { - updateMatch = true; - } - - if (updateMatch == true) - { bestCapability = capability; bestExporter = bestCapability.getExportingBundle(); - bestState = bestExporter.getState(); } } } @@ -415,25 +365,21 @@ */ private List<BundleCapability> getBundleCapabilities(OSGiBundleState bundle) { - List<BundleCapability> result = bundleCapabilitiesMap.get(bundle); - if (result == null) - { - bundleCapabilitiesMap.put(bundle, result = new ArrayList<BundleCapability>()); + List<BundleCapability> result = new ArrayList<BundleCapability>(); - OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); - DeploymentUnit unit = bundleState.getDeploymentUnit(); - ClassLoadingMetaData metadata = unit.getAttachment(ClassLoadingMetaData.class); + OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); + DeploymentUnit unit = bundleState.getDeploymentUnit(); + ClassLoadingMetaData metadata = unit.getAttachment(ClassLoadingMetaData.class); - List<Capability> capabilities = metadata.getCapabilities().getCapabilities(); - if (capabilities != null) + List<Capability> capabilities = metadata.getCapabilities().getCapabilities(); + if (capabilities != null) + { + for (Capability capability : capabilities) { - for (Capability capability : capabilities) + if (capability instanceof PackageCapability) { - if (capability instanceof PackageCapability) - { - PackageCapability packageCapability = (PackageCapability)capability; - result.add(new BundleCapability(bundle, packageCapability)); - } + PackageCapability packageCapability = (PackageCapability)capability; + result.add(new BundleCapability(bundle, packageCapability)); } } } @@ -445,32 +391,29 @@ */ private List<BundleRequirement> getBundleRequirements(OSGiBundleState bundle) { - List<BundleRequirement> result = bundleRequirementsMap.get(bundle); - if (result == null) - { - bundleRequirementsMap.put(bundle, result = new ArrayList<BundleRequirement>()); + List<BundleRequirement> result = new ArrayList<BundleRequirement>(); - OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); - DeploymentUnit unit = bundleState.getDeploymentUnit(); - ClassLoadingMetaData classloadingMetaData = unit.getAttachment(ClassLoadingMetaData.class); + OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); + DeploymentUnit unit = bundleState.getDeploymentUnit(); + ClassLoadingMetaData classloadingMetaData = unit.getAttachment(ClassLoadingMetaData.class); - List<Requirement> requirements = classloadingMetaData.getRequirements().getRequirements(); - if (requirements != null) + List<Requirement> requirements = classloadingMetaData.getRequirements().getRequirements(); + if (requirements != null) + { + for (Requirement requirement : requirements) { - for (Requirement requirement : requirements) + if (requirement instanceof PackageRequirement) { - if (requirement instanceof PackageRequirement) - { - PackageRequirement packageRequirement = (PackageRequirement)requirement; - result.add(new BundleRequirement(bundle, packageRequirement)); - } + PackageRequirement packageRequirement = (PackageRequirement)requirement; + result.add(new BundleRequirement(bundle, packageRequirement)); } } } + return result; } - private boolean processRequiredBundle(OSGiBundleState bundle, List<BundleRequirement> bundleRequirements) + private boolean processRequiredBundle(OSGiBundleState bundle, List<BundleCapability> bundleCapabilities, List<BundleRequirement> bundleRequirements) { // The Require-Bundle header specifies that all exported packages from // another bundle must be imported, effectively requiring the public interface @@ -516,7 +459,8 @@ if (Constants.VISIBILITY_REEXPORT.equals(visibility)) { - // [TODO] vivibility=reexport + BundleCapability newBundleCapability = new BundleCapability(bundle, otherPackage); + bundleCapabilities.add(newBundleCapability); } } } 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-04 14:04:16 UTC (rev 100416) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-04 14:41:34 UTC (rev 100417) @@ -76,9 +76,6 @@ <parameter><inject bean="DeploymentRegistry" /></parameter> </constructor> </bean> - <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> 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-04 14:04:16 UTC (rev 100416) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-04 14:41:34 UTC (rev 100417) @@ -61,9 +61,6 @@ <parameter><inject bean="DeploymentRegistry" /></parameter> </constructor> </bean> - <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100414 - in projects/jboss-osgi: projects/runtime/framework/trunk and 10 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 08:59:17 -0500 (Thu, 04 Feb 2010) New Revision: 100414 Removed: projects/jboss-osgi/trunk/testsuite/functional/tree.text Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-bundles.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Update to jbossxb-2.0.2.Beta4 Add support for circular deps in BasicResolver Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -21,7 +21,7 @@ <artifactId>jboss-osgi-xml-binding</artifactId> <packaging>bundle</packaging> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2.Beta4-SNAPSHOT</version>  <parent> @@ -40,7 +40,7 @@  <properties> <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix> - <version.jboss.xb>2.0.2.Beta3</version.jboss.xb> + <version.jboss.xb>2.0.2.Beta4</version.jboss.xb> <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> <version.jboss.osgi.husky>1.0.2</version.jboss.osgi.husky> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -59,9 +59,10 @@ <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> <version.jboss.osgi.jmx>1.0.3-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect> <version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.xml.binding>2.0.2.Beta3</version.jboss.osgi.xml.binding> + <version.jboss.osgi.xml.binding>2.0.2.Beta4-SNAPSHOT</version.jboss.osgi.xml.binding> <version.jboss.test>1.1.4.GA</version.jboss.test> <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi> @@ -292,6 +293,12 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-reflect</artifactId> + <version>${version.jboss.osgi.reflect}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-xml-binding</artifactId> <version>${version.jboss.osgi.xml.binding}</version> <scope>test</scope> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-bundles.xml 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-bundles.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -33,6 +33,7 @@ <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> + <include>*:jboss-osgi-reflect:jar</include> <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.log:jar</include> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 13:59:17 UTC (rev 100414) @@ -37,7 +37,6 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.logging.Logger; import org.jboss.osgi.framework.bundle.AbstractBundleState; -import org.jboss.osgi.framework.bundle.AbstractDeployedBundleState; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.bundle.OSGiBundleState; import org.jboss.osgi.framework.classloading.OSGiPackageRequirement; @@ -55,7 +54,7 @@ * @author thomas.diesler(a)jboss.com * @since 10-Sep-2009 */ -public class BasicResolverImpl extends AbstractResolver +public class BasicResolverImpl extends AbstractResolver { /** The log */ private static final Logger log = Logger.getLogger(BasicResolverImpl.class); @@ -75,7 +74,7 @@ AbstractBundleState bundleState = AbstractBundleState.assertBundleState(bundle); if (bundleState instanceof OSGiBundleState == false) return null; - + return super.addBundle(bundle); } @@ -85,7 +84,7 @@ AbstractBundleState bundleState = AbstractBundleState.assertBundleState(bundle); if (bundleState instanceof OSGiBundleState == false) return null; - + ResolverBundle removedBundle = super.removeBundle(bundle); bundleCapabilitiesMap.remove(bundleState); @@ -103,7 +102,7 @@ public List<ResolverBundle> resolve(List<Bundle> bundles) { List<ResolverBundle> resolvedBundles = new ArrayList<ResolverBundle>(); - for (AbstractDeployedBundleState aux : resolveBundles(bundles)) + for (OSGiBundleState aux : resolveBundles(bundles)) { ResolverBundle resBundle = getBundle(aux); if (resBundle == null) @@ -134,43 +133,53 @@ unresolvedBundles.add(OSGiBundleState.assertBundleState(aux)); } - int resolved = 1; - int resolveRounds = 0; + // Add the capabilities and requirements of the unresolved bundles + for (OSGiBundleState bundleState : unresolvedBundles) + { + getBundleCapabilities(bundleState); + getBundleRequirements(bundleState); + } - // Get the list of all capabilities + // Get the list of all capabilities for all resolved and unresolved bundles List<BundleCapability> allCapabilities = new ArrayList<BundleCapability>(); for (List<BundleCapability> list : bundleCapabilitiesMap.values()) { allCapabilities.addAll(list); } + // Reduce the capabilities for bundles that cannot be resolved + for (OSGiBundleState bundleState : unresolvedBundles) + { + if (reduceCapabilities(allCapabilities, bundleState) == false) + { + bundleCapabilitiesMap.remove(bundleState); + bundleRequirementsMap.remove(bundleState); + } + } + + log.debug("START****************************************************************"); + log.debug("Unresolved bundles: " + unresolvedBundles); + List<OSGiBundleState> resolvedBundles = new ArrayList<OSGiBundleState>(); - while (resolved > 0 && unresolvedBundles.isEmpty() == false) + Iterator<OSGiBundleState> itUnresolved = unresolvedBundles.iterator(); + while (itUnresolved.hasNext()) { - resolveRounds++; + OSGiBundleState bundleState = itUnresolved.next(); - log.debug("#" + resolveRounds + " *****************************************************************"); - log.debug("Unresolved bundles: " + unresolvedBundles); + log.debug("Resolving: " + bundleState); + if (resolveBundle(allCapabilities, bundleState)) + { + logResolvedBundleInfo(bundleState); - resolved = 0; - Iterator<OSGiBundleState> it = unresolvedBundles.iterator(); - while (it.hasNext()) - { - OSGiBundleState bundleState = it.next(); - log.debug("Resolving: " + bundleState); - if (resolveBundle(allCapabilities, bundleState)) - { - resolvedBundles.add(bundleState); - it.remove(); - resolved++; - } + resolvedBundles.add(bundleState); + itUnresolved.remove(); } } log.debug("END *****************************************************************"); // Log the unresolved bundles - for (AbstractDeployedBundleState bundle : unresolvedBundles) + for (OSGiBundleState bundle : unresolvedBundles) { StringBuffer message = new StringBuffer("Unresolved bundle: " + bundle); message.append("\n Cannot find exporter for"); @@ -192,17 +201,17 @@ public ExportPackage getExporter(Bundle bundle, String importPackage) { - AbstractDeployedBundleState bundleState = OSGiBundleState.assertBundleState(bundle); + OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); BundleCapability match = getMatchingCapability(bundleState, importPackage); if (match == null) return null; - AbstractDeployedBundleState exportingBundle = match.getExportingBundle(); + OSGiBundleState exportingBundle = match.getExportingBundle(); ResolverBundle resolverBundle = getBundle(exportingBundle); return resolverBundle.getExportPackage(importPackage); } - private BundleCapability getMatchingCapability(AbstractDeployedBundleState bundle, String importPackage) + private BundleCapability getMatchingCapability(OSGiBundleState bundle, String importPackage) { List<BundleRequirement> requirements = bundleRequirementsMap.get(bundle); if (requirements == null) @@ -222,19 +231,46 @@ return result; } - private boolean resolveBundle(List<BundleCapability> allCapabilities, OSGiBundleState bundle) + private boolean reduceCapabilities(List<BundleCapability> allCapabilities, OSGiBundleState bundleState) { - List<BundleCapability> bundleCapabilities = getBundleCapabilities(bundle); - List<BundleRequirement> bundleRequirements = getBundleRequirements(bundle); + boolean canResolve = true; - List<BundleCapability> futureCapabilities = new ArrayList<BundleCapability>(allCapabilities); - futureCapabilities.addAll(bundleCapabilities); + List<BundleRequirement> bundleRequirements = getBundleRequirements(bundleState); + for (BundleRequirement requirement : bundleRequirements) + { + PackageRequirement packreq = requirement.getPackageRequirement(); + BundleCapability bestMatch = findBestMatch(allCapabilities, requirement); + if (bestMatch == null && packreq.isOptional() == false && packreq.isDynamic() == false) + { + log.debug("Cannot resolve: " + packreq); + canResolve = false; + break; + } + } + canResolve &= processRequiredBundle(bundleState, bundleRequirements); + if (canResolve == false) + { + Iterator<BundleCapability> iterator = allCapabilities.iterator(); + while (iterator.hasNext()) + { + BundleCapability next = iterator.next(); + OSGiBundleState exportingBundle = next.getExportingBundle(); + if (exportingBundle == bundleState) + iterator.remove(); + } + } + + return canResolve; + } + + private boolean resolveBundle(List<BundleCapability> allCapabilities, OSGiBundleState bundleState) + { + List<BundleRequirement> bundleRequirements = getBundleRequirements(bundleState); for (BundleRequirement requirement : bundleRequirements) { PackageRequirement packreq = requirement.getPackageRequirement(); - - BundleCapability bestMatch = findBestMatch(futureCapabilities, requirement); + BundleCapability bestMatch = findBestMatch(allCapabilities, requirement); if (bestMatch == null && packreq.isOptional() == false && packreq.isDynamic() == false) return false; @@ -245,29 +281,28 @@ Iterator<BundleRequirement> it = bundleRequirements.iterator(); while (it.hasNext()) { - if (it.next().getWiredCapability() == null) + BundleRequirement requirement = it.next(); + PackageRequirement packreq = requirement.getPackageRequirement(); + if ((packreq.isOptional() || packreq.isDynamic()) && requirement.getWiredCapability() == null) it.remove(); } - if (processRequiredBundle(bundle, bundleCapabilities, bundleRequirements) == false) + if (processRequiredBundle(bundleState, bundleRequirements) == false) return false; - allCapabilities.addAll(bundleCapabilities); - bundleCapabilitiesMap.put(bundle, bundleCapabilities); - bundleRequirementsMap.put(bundle, bundleRequirements); - - logResolvedBundleInfo(bundle, bundleCapabilities, bundleRequirements); - return true; } /** * Logs information about a resolved bundle */ - private void logResolvedBundleInfo(AbstractDeployedBundleState bundle, List<BundleCapability> bundleCapabilities, List<BundleRequirement> bundleRequirements) + private void logResolvedBundleInfo(OSGiBundleState bundleState) { + List<BundleCapability> bundleCapabilities = getBundleCapabilities(bundleState); + List<BundleRequirement> bundleRequirements = getBundleRequirements(bundleState); + // Log the package wiring information - StringBuffer message = new StringBuffer("Resolved: " + bundle); + StringBuffer message = new StringBuffer("Resolved: " + bundleState); // Log the exports int nameLengthMax = 0; @@ -335,44 +370,70 @@ private BundleCapability findBestMatch(List<BundleCapability> capabilities, BundleRequirement requirement) { - BundleCapability result = null; + BundleCapability bestCapability = null; + OSGiBundleState bestExporter = null; + int bestState = 0; + for (BundleCapability capability : capabilities) { if (capability.matches(requirement)) { - if (result == null) + OSGiBundleState capExporter = capability.getExportingBundle(); + int capState = capExporter.getState(); + boolean updateMatch = false; + + if (bestCapability == null) { - result = capability; + updateMatch = true; } - else + + // Update if we can wire to an already resolved bundle + else if (bestState == Bundle.INSTALLED && (capState == Bundle.RESOLVED || capState == Bundle.ACTIVE)) { - // [TODO] handle multiple matches + updateMatch = true; } + + // Update if we can wire to a bundle with lower id + else if (bestExporter.getBundleId() > capExporter.getBundleId()) + { + updateMatch = true; + } + + if (updateMatch == true) + { + bestCapability = capability; + bestExporter = bestCapability.getExportingBundle(); + bestState = bestExporter.getState(); + } } } - return result; + return bestCapability; } /** * Get the set of bundle capabilities */ - private List<BundleCapability> getBundleCapabilities(AbstractDeployedBundleState bundle) + private List<BundleCapability> getBundleCapabilities(OSGiBundleState bundle) { - List<BundleCapability> result = new ArrayList<BundleCapability>(); + List<BundleCapability> result = bundleCapabilitiesMap.get(bundle); + if (result == null) + { + bundleCapabilitiesMap.put(bundle, result = new ArrayList<BundleCapability>()); - AbstractDeployedBundleState bundleState = OSGiBundleState.assertBundleState(bundle); - DeploymentUnit unit = bundleState.getDeploymentUnit(); - ClassLoadingMetaData metadata = unit.getAttachment(ClassLoadingMetaData.class); + OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); + DeploymentUnit unit = bundleState.getDeploymentUnit(); + ClassLoadingMetaData metadata = unit.getAttachment(ClassLoadingMetaData.class); - List<Capability> capabilities = metadata.getCapabilities().getCapabilities(); - if (capabilities != null) - { - for (Capability capability : capabilities) + List<Capability> capabilities = metadata.getCapabilities().getCapabilities(); + if (capabilities != null) { - if (capability instanceof PackageCapability) + for (Capability capability : capabilities) { - PackageCapability packageCapability = (PackageCapability)capability; - result.add(new BundleCapability(bundle, packageCapability)); + if (capability instanceof PackageCapability) + { + PackageCapability packageCapability = (PackageCapability)capability; + result.add(new BundleCapability(bundle, packageCapability)); + } } } } @@ -382,31 +443,34 @@ /** * Get the set of bundle requirements */ - private List<BundleRequirement> getBundleRequirements(AbstractDeployedBundleState bundle) + private List<BundleRequirement> getBundleRequirements(OSGiBundleState bundle) { - List<BundleRequirement> result = new ArrayList<BundleRequirement>(); + List<BundleRequirement> result = bundleRequirementsMap.get(bundle); + if (result == null) + { + bundleRequirementsMap.put(bundle, result = new ArrayList<BundleRequirement>()); - AbstractDeployedBundleState bundleState = OSGiBundleState.assertBundleState(bundle); - DeploymentUnit unit = bundleState.getDeploymentUnit(); - ClassLoadingMetaData classloadingMetaData = unit.getAttachment(ClassLoadingMetaData.class); + OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); + DeploymentUnit unit = bundleState.getDeploymentUnit(); + ClassLoadingMetaData classloadingMetaData = unit.getAttachment(ClassLoadingMetaData.class); - List<Requirement> requirements = classloadingMetaData.getRequirements().getRequirements(); - if (requirements != null) - { - for (Requirement requirement : requirements) + List<Requirement> requirements = classloadingMetaData.getRequirements().getRequirements(); + if (requirements != null) { - if (requirement instanceof PackageRequirement) + for (Requirement requirement : requirements) { - PackageRequirement packageRequirement = (PackageRequirement)requirement; - result.add(new BundleRequirement(bundle, packageRequirement)); + if (requirement instanceof PackageRequirement) + { + PackageRequirement packageRequirement = (PackageRequirement)requirement; + result.add(new BundleRequirement(bundle, packageRequirement)); + } } } } - return result; } - private boolean processRequiredBundle(AbstractDeployedBundleState bundle, List<BundleCapability> bundleCapabilities, List<BundleRequirement> bundleRequirements) + private boolean processRequiredBundle(OSGiBundleState bundle, List<BundleRequirement> bundleRequirements) { // The Require-Bundle header specifies that all exported packages from // another bundle must be imported, effectively requiring the public interface @@ -452,8 +516,7 @@ if (Constants.VISIBILITY_REEXPORT.equals(visibility)) { - BundleCapability newBundleCapability = new BundleCapability(bundle, otherPackage); - bundleCapabilities.add(newBundleCapability); + // [TODO] vivibility=reexport } } } Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java 2010-02-04 13:59:17 UTC (rev 100414) @@ -21,6 +21,7 @@ */ package org.jboss.osgi.framework.resolver.internal.basic; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -41,11 +42,11 @@ */ class BundleCapability { - private AbstractDeployedBundleState bundle; + private OSGiBundleState bundle; private PackageCapability packageCapability; private List<BundleRequirement> wires; - BundleCapability(AbstractDeployedBundleState bundle, PackageCapability packageCapability) + BundleCapability(OSGiBundleState bundle, PackageCapability packageCapability) { if (bundle == null) throw new IllegalArgumentException("Null bundle"); @@ -56,7 +57,7 @@ this.packageCapability = packageCapability; } - AbstractDeployedBundleState getExportingBundle() + OSGiBundleState getExportingBundle() { return bundle; } @@ -102,6 +103,19 @@ wires.remove(bundleRequirement); } + void unwireRequirements() + { + if (wires != null) + { + ArrayList<BundleRequirement> wiresCopy = new ArrayList<BundleRequirement>(wires); + for (BundleRequirement aux : wiresCopy) + { + aux.unwireCapability(); + } + wires = null; + } + } + @Override public boolean equals(Object obj) { Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-02-04 13:59:17 UTC (rev 100414) @@ -68,6 +68,7 @@ bundlePaths.add("bundles/jboss-osgi-jaxb.jar"); bundlePaths.add("bundles/jboss-osgi-jmx.jar"); bundlePaths.add("bundles/jboss-osgi-jndi.jar"); + bundlePaths.add("bundles/jboss-osgi-reflect.jar"); bundlePaths.add("bundles/jboss-osgi-xml-binding.jar"); bundlePaths.add("bundles/org.apache.felix.configadmin.jar"); bundlePaths.add("bundles/org.apache.felix.log.jar"); @@ -100,7 +101,7 @@ packageAdmin.resolveBundles(null); System.out.println("FIXME [JBOSGI-151] Cannot resolve circular dependencies"); - //assertTrue("All bundles resolved", allResoved); + // assertTrue("All bundles resolved", allResolved); } finally { Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -52,6 +52,11 @@ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter> </constructor> </bean> +  <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/trunk/pom.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -73,7 +73,7 @@ <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.webapp>0.7.2.SP1-SNAPSHOT</version.jboss.osgi.webapp> <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> - <version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding> + <version.jboss.osgi.xml.binding>2.0.2.Beta4-SNAPSHOT</version.jboss.osgi.xml.binding> <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi> 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-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -76,6 +76,9 @@ <parameter><inject bean="DeploymentRegistry" /></parameter> </constructor> </bean> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> 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-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java 2010-02-04 13:59:17 UTC (rev 100414) @@ -28,8 +28,8 @@ import org.jboss.osgi.testing.OSGiTest; import org.jboss.test.osgi.jbosgi151.bundleA.BeanA; import org.jboss.test.osgi.jbosgi151.bundleB.BeanB; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.After; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.Bundle; @@ -62,18 +62,18 @@ */ public class OSGi151TestCase extends OSGiTest { - private static Framework framework; + private Framework framework; - @BeforeClass - public static void beforeClass() throws Exception + @Before + public void setUp() throws Exception { OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); framework = bootProvider.getFramework(); framework.start(); } - @AfterClass - public static void afterClass() throws Exception + @After + public void tearDown() throws Exception { if (framework != null) { @@ -84,9 +84,14 @@ } @Test - @Ignore public void testCircularNoSelfDependency() throws Exception { + if ("jbossmc".equals(getFramework())) + { + System.out.println("FIXME [JBOSGI-151] Cannot resolve circular dependencies"); + return; + } + BundleContext sysContext = framework.getBundleContext(); Bundle bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleA.jar").toExternalForm()); @@ -112,6 +117,7 @@ } @Test + @Ignore public void testCircularInstallCbeforeD() throws Exception { BundleContext sysContext = framework.getBundleContext(); @@ -139,6 +145,7 @@ } @Test + @Ignore public void testCircularInstallDbeforeC() throws Exception { BundleContext sysContext = framework.getBundleContext(); 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-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -61,6 +61,9 @@ <parameter><inject bean="DeploymentRegistry" /></parameter> </constructor> </bean> + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> Deleted: projects/jboss-osgi/trunk/testsuite/functional/tree.text =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/tree.text 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/trunk/testsuite/functional/tree.text 2010-02-04 13:59:17 UTC (rev 100414) @@ -1,267 +0,0 @@ -[INFO] Scanning for projects... -[INFO] Searching repository for plugin with prefix: 'dependency'. -[INFO] ------------------------------------------------------------------------ -[INFO] Building JBossOSGi Testsuite - Functional -[INFO] task-segment: [dependency:tree] -[INFO] ------------------------------------------------------------------------ -[INFO] [dependency:tree {execution: default-cli}] -[INFO] org.jboss.osgi.testsuite:jboss-osgi-testsuite-functional:jar:1.0.0.Beta6 -[INFO] +- org.jboss.kernel:jboss-aop-mc-int:jar:2.2.0.Alpha2:compile -[INFO] | +- org.jboss.aop:jboss-aop:jar:2.1.0.CR3:compile -[INFO] | | +- org.apache.ant:ant:jar:1.7.0:compile -[INFO] | | | \- org.apache.ant:ant-launcher:jar:1.7.0:compile -[INFO] | | +- org.jboss:jboss-reflect:jar:2.2.0.Alpha2:compile -[INFO] | | +- qdox:qdox:jar:1.6.1:compile -[INFO] | | \- trove:trove:jar:2.1.1:compile -[INFO] | +- org.jboss.kernel:jboss-kernel:jar:2.2.0.Alpha2:compile -[INFO] | | +- org.jboss:jbossxb:jar:2.0.2.Beta3:compile -[INFO] | | | +- apache-xerces:xml-apis:jar:2.9.1:compile -[INFO] | | | +- apache-xerces:xercesImpl:jar:2.9.1:compile -[INFO] | | | +- wutka-dtdparser:dtdparser121:jar:1.2.1:compile -[INFO] | | | +- javax.activation:activation:jar:1.1.1:compile -[INFO] | | | \- sun-jaxb:jaxb-api:jar:2.1.9-brew:compile -[INFO] | | \- javax.inject:javax.inject:jar:1:compile -[INFO] | \- javassist:javassist:jar:3.11.0.GA:compile -[INFO] +- javax.ejb:ejb-api:jar:3.0:compile -[INFO] +- org.jboss.ejb3:jboss-ejb3-ext-api:jar:1.0.0:compile -[INFO] | \- org.jboss.javaee:jboss-ejb-api:jar:3.0.0.CR1:compile -[INFO] | +- org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:compile -[INFO] | \- jboss.jbossws:jboss-jaxrpc:jar:1.0.4.GA:compile -[INFO] +- biz.aQute:bnd:jar:0.0.356:compile -[INFO] +- org.jboss.osgi:jboss-osgi-spi:jar:1.0.4-SNAPSHOT:compile -[INFO] | +- args4j:args4j:jar:2.0.12:compile -[INFO] | +- org.slf4j:slf4j-api:jar:1.5.8:compile -[INFO] | \- org.jboss:jboss-vfs:jar:2.1.3.SP1:compile -[INFO] | \- org.jboss:jboss-common-core:jar:2.2.16.GA:compile -[INFO] +- org.jboss.osgi.runtime:jboss-osgi-deployment:jar:1.0.1-SNAPSHOT:compile -[INFO] +- org.apache.aries.blueprint:org.apache.aries.blueprint:jar:1.0.0.20100120:provided -[INFO] | \- org.apache.aries:org.apache.aries.util:jar:1.0.0.20100120:provided -[INFO] +- org.apache.felix:org.apache.felix.log:jar:1.0.0:provided -[INFO] +- org.apache.felix:org.apache.felix.eventadmin:jar:1.0.0:provided -[INFO] +- org.apache.felix:org.apache.felix.metatype:jar:1.0.2:provided -[INFO] | \- net.sf.kxml:kxml2:jar:2.2.2:provided -[INFO] | \- xmlpull:xmlpull:jar:1.1.3.1:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-apache-xerces:jar:2.9.1.SP3:provided -[INFO] | \- xml-resolver:xml-resolver:jar:1.2:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-blueprint:jar:1.0.0.Beta1-SNAPSHOT:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-common:jar:1.0.3:provided -[INFO] | \- org.slf4j:jcl-over-slf4j:jar:1.5.8:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-husky:jar:1.0.3-SNAPSHOT:provided -[INFO] | \- junit:junit:jar:4.6:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jaxb:jar:2.1.10.SP3:provided -[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.1.10:provided -[INFO] | \- javax.xml.bind:jaxb-api:jar:2.1:provided -[INFO] | \- javax.xml.stream:stax-api:jar:1.0-2:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jmx:jar:1.0.3-SNAPSHOT:provided -[INFO] | \- org.jboss.osgi.bundles:jboss-osgi-common-core:jar:2.2.13.GA:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jndi:jar:1.0.2:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jta:jar:1.0.0:provided -[INFO] | +- jboss.jbossts:jbossjts:jar:4.6.1.GA:provided -[INFO] | \- jboss.jbossts:jbossts-common:jar:4.6.1.GA:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-reflect:jar:2.2.0-SNAPSHOT:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-serviceloader:jar:1.0.0-SNAPSHOT:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-webapp:jar:0.7.2.SP1-SNAPSHOT:provided -[INFO] | \- org.ops4j.pax.web:pax-web-api:jar:0.7.2:provided -[INFO] +- org.jboss.osgi.bundles:jboss-osgi-xml-binding:jar:2.0.2-SNAPSHOT:provided -[INFO] +- org.ops4j.pax.web:pax-web-extender-war:jar:0.7.2:provided -[INFO] | +- org.ops4j.base:ops4j-base-lang:jar:1.2.1:provided -[INFO] | +- org.ops4j.base:ops4j-base-util-xml:jar:1.2.1:provided -[INFO] | | \- org.ops4j.base:ops4j-base-util-collections:jar:1.2.1:provided -[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-core:jar:1.1.0:provided -[INFO] | | \- org.ops4j.pax.swissbox:pax-swissbox-lifecycle:jar:1.1.0:provided -[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-extender:jar:1.1.0:provided -[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-optional-jcl:jar:1.1.0:provided -[INFO] | \- org.ops4j.pax.swissbox:pax-swissbox-tracker:jar:1.1.0:provided -[INFO] +- org.ops4j.pax.web:pax-web-jetty-bundle:jar:0.7.2:provided -[INFO] +- org.jboss.naming:jnp-client:jar:5.0.1.GA:test -[INFO] +- org.slf4j:slf4j-log4j12:jar:1.5.8:test -[INFO] +- org.jboss.osgi.runtime:jboss-osgi-framework:jar:1.0.0.Alpha3-SNAPSHOT:compile -[INFO] | +- org.drools:drools-compiler:jar:5.0.1:compile -[INFO] | | +- org.drools:drools-core:jar:5.0.1:compile -[INFO] | | | +- org.drools:drools-api:jar:5.0.1:compile -[INFO] | | | \- joda-time:joda-time:jar:1.6:compile -[INFO] | | +- org.antlr:antlr-runtime:jar:3.1.1:compile -[INFO] | | +- org.eclipse.jdt:core:jar:3.4.2.v_883_R34x:compile -[INFO] | | +- janino:janino:jar:2.5.15:compile -[INFO] | | \- org.mvel:mvel2:jar:2.0.10:compile -[INFO] | +- org.jboss.cl:jboss-classloader:jar:2.2.0.Alpha1:compile -[INFO] | | \- org.jboss.integration:jboss-classloading-spi:jar:5.1.0.SP1:compile -[INFO] | +- org.jboss.cl:jboss-classloading:jar:2.2.0.Alpha1:compile -[INFO] | +- org.jboss.cl:jboss-classloading-vfs:jar:2.2.0.Alpha1:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-client:jar:2.2.0.Alpha1:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-client-spi:jar:2.2.0.Alpha1:compile -[INFO] | | \- org.jboss.man:jboss-managed:jar:2.1.1.SP1:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-core:jar:2.2.0.Alpha1:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-core-spi:jar:2.2.0.Alpha1:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-impl:jar:2.2.0.Alpha1:compile -[INFO] | | +- org.jboss.deployers:jboss-deployers-spi:jar:2.2.0.Alpha1:compile -[INFO] | | \- org.jboss.mcann:mcann-core:jar:1.0.0.Alpha1:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-structure-spi:jar:2.2.0.Alpha1:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-vfs-spi:jar:2.2.0.Alpha1:compile -[INFO] | | \- stax:stax-api:jar:1.0:compile -[INFO] | +- org.jboss.deployers:jboss-deployers-vfs:jar:2.2.0.Alpha1:compile -[INFO] | | \- org.jboss.man:jboss-metatype:jar:2.1.1.SP1:compile -[INFO] | +- org.jboss.kernel:jboss-dependency:jar:2.2.0.Alpha2:compile -[INFO] | +- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile -[INFO] | +- org.jboss:jboss-mdr:jar:2.2.0.Alpha1:compile -[INFO] | +- org.jboss.osgi.runtime:jboss-osgi-deployers:jar:1.0.4-SNAPSHOT:compile -[INFO] | +- org.osgi:org.osgi.core:jar:4.2.0:compile -[INFO] | \- org.osgi:org.osgi.compendium:jar:4.2.0:compile -[INFO] +- org.jboss.logging:jboss-logging-log4j:jar:2.1.0.GA:compile -[INFO] | \- log4j:log4j:jar:1.2.14:compile -[INFO] +- org.apache.felix:org.apache.felix.configadmin:jar:1.2.4:provided -[INFO] \- org.jboss.jbossas:jboss-as-client:pom:6.0.0.M1:provided -[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided -[INFO] +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided -[INFO] +- org.hibernate.java-persistence:jpa-api:jar:2.0-cr-1:provided -[INFO] +- org.hibernate:hibernate-annotations:jar:3.5.0-Beta-2:provided -[INFO] | +- org.hibernate:hibernate-core:jar:3.5.0-Beta-2:provided -[INFO] | | +- antlr:antlr:jar:2.7.6:provided -[INFO] | | +- commons-collections:commons-collections:jar:3.1:provided -[INFO] | | +- dom4j:dom4j:jar:1.6.1:provided -[INFO] | | | \- xml-apis:xml-apis:jar:1.0.b2:provided -[INFO] | | \- javax.transaction:jta:jar:1.1:provided -[INFO] | +- org.hibernate:hibernate-commons-annotations:jar:3.2.0.Beta1:provided -[INFO] | \- hsqldb:hsqldb:jar:1.8.0.2:provided -[INFO] +- org.jboss.aop:jboss-aop:jar:client:2.1.6.GA:provided -[INFO] +- org.jboss.jbossas:jboss-as-ejb3:jar:client:6.0.0.M1:provided -[INFO] | +- cglib:cglib:jar:2.1.3:provided -[INFO] | +- jacorb:jacorb:jar:2.3.1jboss.patch01-brew:provided -[INFO] | +- org.hibernate:hibernate-entitymanager:jar:3.5.0-Beta-2:provided -[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-as-int:jar:1.1.21:provided -[INFO] | | +- org.jboss.ejb3:jboss-ejb3:pom:1.1.21:provided -[INFO] | | | +- org.jboss.ejb3:jboss-ejb3-core:jar:1.1.21:provided -[INFO] | | | \- org.jboss.ejb3:jboss-ejb3-deployers:jar:1.0.0:provided -[INFO] | | +- org.jboss.ejb3:jboss-ejb3-mc-int:jar:1.0.1:provided -[INFO] | | \- org.jboss.ejb3:jboss-ejb3-metrics-deployer:jar:1.0.1:provided -[INFO] | | \- org.jboss.microcontainer:jboss-jmx-mc-int:jar:2.2.0.M2:provided -[INFO] | | +- org.jboss.mx:jboss-jmx:jar:6.0.0.Beta2:provided -[INFO] | | | +- org.jboss.mx:jboss-j2se:jar:6.0.0.Beta2:provided -[INFO] | | | \- org.jboss.mx:jboss-mbeans:jar:6.0.0.Beta2:provided -[INFO] | | \- org.jboss.mx:jboss-mbeanserver:jar:6.0.0.Beta2:provided -[INFO] | +- org.jboss.javaee:jboss-jms-api:jar:1.1.0.GA:provided -[INFO] | +- org.jboss.jbossas:jboss-as-connector:jar:6.0.0.M1:provided -[INFO] | | +- org.jboss.jbossas:jboss-as-profileservice:jar:6.0.0.M1:provided -[INFO] | | \- javax.mail:mail:jar:1.4.2:provided -[INFO] | +- org.jboss.jbossas:jboss-as-iiop:jar:6.0.0.M1:provided -[INFO] | +- org.jboss.jbossas:jboss-as-server:jar:6.0.0.M1:provided -[INFO] | +- org.jboss.microcontainer:jboss-kernel:jar:2.0.9.GA:provided -[INFO] | \- org.jboss.integration:jboss-corba-ots-spi:jar:5.1.0.SP1:provided -[INFO] +- org.jboss.jbossas:jboss-as-server:jar:client:6.0.0.M1:provided -[INFO] | +- org.jboss.bootstrap:jboss-bootstrap-impl-as:jar:2.0.0-alpha-4:provided -[INFO] | | +- org.jboss.bootstrap:jboss-bootstrap-impl-mc:jar:2.0.0-alpha-3:provided -[INFO] | | | +- org.mortbay.jetty:jetty:jar:6.1.16:provided -[INFO] | | | | +- org.mortbay.jetty:jetty-util:jar:6.1.16:provided -[INFO] | | | | \- org.mortbay.jetty:servlet-api:jar:2.5-20081211:provided -[INFO] | | | +- org.jboss.bootstrap:jboss-bootstrap-impl-base:jar:2.0.0-alpha-4:provided -[INFO] | | | | \- org.jboss.bootstrap:jboss-bootstrap-spi:jar:2.0.0-alpha-3:provided -[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar:2.0.0-alpha-2:provided -[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-api-mc:jar:2.0.0-alpha-1:provided -[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-spi-as:jar:2.0.0-alpha-4:provided -[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api-as:jar:2.0.0-alpha-1:provided -[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api:jar:2.0.0-alpha-1:provided -[INFO] | +- org.jboss.integration:jboss-deployment-spi:jar:5.1.0.SP1:provided -[INFO] | +- org.jboss.jpa:jboss-jpa-deployers:jar:1.0.1:provided -[INFO] | | +- org.jboss.jpa:jboss-jpa-impl:jar:1.0.0:provided -[INFO] | | \- org.jboss.jpa:jboss-jpa-spi:jar:1.0.0:provided -[INFO] | +- org.jboss.security:jbosssx:jar:2.0.4.SP2:provided -[INFO] | +- org.jboss.metadata:jboss-metadata:jar:1.0.2.Beta2:provided -[INFO] | | +- org.hibernate:ejb3-persistence:jar:1.0.2.GA:provided -[INFO] | | \- jboss.jbossws:jboss-jaxws:jar:3.0.1-native-2.0.4.GA:provided -[INFO] | +- org.jboss.jbossas:jboss-as-system-jmx:jar:6.0.0.M1:provided -[INFO] | +- org.jboss.jbossas:jboss-as-jmx:jar:6.0.0.M1:provided -[INFO] | | \- org.jboss.jbossas:jboss-as-mbeans:jar:6.0.0.M1:provided -[INFO] | +- org.jboss.jbossas:jboss-as-system:jar:6.0.0.M1:provided -[INFO] | +- org.jboss.interceptor:jboss-interceptor-api:jar:1.0.1-CR1:provided -[INFO] | +- org.jboss.jbossas:jboss-as-security:jar:6.0.0.M1:provided -[INFO] | | +- org.jboss.javaee:jboss-jaspi-api:jar:1.0.0.GA:provided -[INFO] | | \- org.jboss.security:jbossxacml:jar:2.0.4:provided -[INFO] | +- org.jboss.integration:jboss-transaction-spi:jar:5.1.0.SP1:provided -[INFO] | +- org.jboss.javaee:jboss-jacc-api:jar:1.1.0.GA_SP1:provided -[INFO] | | \- jboss.web:servlet-api:jar:2.1.1.GA:provided -[INFO] | +- org.jboss.ws.native:jbossws-native-saaj:jar:3.2.1.GA:provided -[INFO] | +- javax.xml.ws:jaxws-api:jar:2.1:provided -[INFO] | +- org.jboss.javaee:jboss-jca-api:jar:1.5.0.GA:provided -[INFO] | +- bcel:bcel:jar:5.1:provided -[INFO] | +- org.jboss.naming:jnpserver:jar:5.0.4.GA:provided -[INFO] | \- gnu-getopt:getopt:jar:1.0.12-brew:provided -[INFO] +- org.jboss.jbossas:jboss-as-deployment:jar:6.0.0.M1:provided -[INFO] | \- org.jboss.javaee:jboss-jad-api:jar:1.2.0.GA:provided -[INFO] +- org.jboss.ejb3:jboss-ejb3-common:jar:client:1.0.1:provided -[INFO] +- org.jboss.ejb3:jboss-ejb3-core:jar:client:1.1.21:provided -[INFO] | +- org.jboss.integration:jboss-jca-spi:jar:5.0.3.GA:provided -[INFO] | +- org.jboss.cache:jbosscache-core:jar:3.1.0.GA:provided -[INFO] | +- org.jboss.aspects:jboss-remoting-aspects:jar:1.0.2:provided -[INFO] | | +- org.jboss.aspects:jboss-transaction-aspects:jar:1.0.0.GA:provided -[INFO] | | \- org.jboss.aspects:jboss-security-aspects:jar:1.0.0.GA:provided -[INFO] | | \- javax.security:jacc:jar:1.0:provided -[INFO] | +- org.jboss.cluster:jboss-ha-server-api:jar:1.1.1.GA:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-cache:jar:1.0.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-common:jar:1.0.1:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-endpoint:jar:0.1.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-jpa-int:jar:1.0.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-security:jar:1.0.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar:1.0.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar:1.0.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-interceptors:jar:1.0.5:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-metadata:jar:1.0.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:1.0.6:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:1.0.2:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:1.0.0:provided -[INFO] | +- org.jboss.ejb3:jboss-ejb3-transactions:jar:1.0.2:provided -[INFO] | +- org.jboss.ws:jbossws-spi:jar:1.0.3.GA:provided -[INFO] | +- quartz:quartz:jar:1.6.0:provided -[INFO] | +- sun-jaxws:jaxws-api:jar:2.1.1:provided -[INFO] | \- sun-jaxws:jsr181-api:jar:2.1.1:provided -[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client:1.0.2:provided -[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client:1.0.6:provided -[INFO] | \- org.jboss.microcontainer:jboss-aop-mc-int:jar:2.0.8.GA:provided -[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client:1.0.0:provided -[INFO] +- org.jboss.ejb3:jboss-ejb3-security:jar:client:1.0.0:provided -[INFO] | \- org.jboss.aspects:jboss-current-invocation-aspects:jar:1.0.0.CR1:provided -[INFO] +- org.jboss.cluster:jboss-ha-client:jar:1.1.1.GA:provided -[INFO] +- org.jboss.jbossas:jboss-as-cluster:jar:jboss-ha-legacy-client:6.0.0.M1:provided -[INFO] | +- jgroups:jgroups:jar:2.6.13.GA:provided -[INFO] | +- org.jboss.cluster:jboss-ha-server-cache-spi:jar:2.0.0.GA:provided -[INFO] | \- org.jboss.cluster:jboss-ha-server-cache-jbc:jar:2.1.0.GA:provided -[INFO] +- org.jboss.jbossas:jboss-as-iiop:jar:client:6.0.0.M1:provided -[INFO] | +- jboss.jbossts:jbossjts-jacorb:jar:4.6.1.GA:provided -[INFO] | \- org.jboss.jbossas:jboss-as-main:jar:6.0.0.M1:provided -[INFO] | \- org.jboss.logbridge:jboss-logbridge:jar:1.0.0.GA:provided -[INFO] | \- org.jboss.logmanager:jboss-logmanager:jar:1.0.0.GA:provided -[INFO] +- org.jboss.integration:jboss-integration:jar:5.1.0.SP1:provided -[INFO] +- org.jboss.jbossas:jboss-as-j2se:jar:6.0.0.M1:provided -[INFO] +- org.jboss.javaee:jboss-javaee:jar:5.2.0.Beta1:provided -[INFO] +- org.jboss.jbossas:jboss-as-management:jar:jsr77-client:6.0.0.M1:provided -[INFO] | \- org.jboss.jbossas:jboss-as-cluster:jar:6.0.0.M1:provided -[INFO] +- org.jboss.logging:jboss-logging-jdk:jar:2.1.1.GA:provided -[INFO] +- jboss.messaging:jboss-messaging:jar:1.4.3.GA:provided -[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.2:provided -[INFO] +- org.jboss.security:jboss-security-spi:jar:2.0.4.SP2:provided -[INFO] +- jboss:jboss-serialization:jar:1.0.3.GA:provided -[INFO] +- org.jboss.jbossas:jboss-as-system:jar:client:6.0.0.M1:provided -[INFO] | +- org.jboss.integration:jboss-profileservice-spi:jar:5.1.0.SP1:provided -[INFO] | \- org.jboss.microcontainer:jboss-dependency:jar:2.0.9.GA:provided -[INFO] +- org.jboss.jbossas:jboss-as-system-jmx:jar:client:6.0.0.M1:provided -[INFO] +- org.jboss.jbossas:jboss-as-profileservice:jar:client:6.0.0.M1:provided -[INFO] | \- org.jboss.jbossas:jboss-as-aspects:jar:6.0.0.M1:provided -[INFO] | +- org.jboss.aop:jboss-aop-aspects:jar:2.1.6.GA:provided -[INFO] | | \- org.beanshell:bsh:jar:1.3.0:provided -[INFO] | +- org.jboss.aop:jboss-aop-asintegration-core:jar:2.1.6.GA:provided -[INFO] | | \- org.jboss.aop:pluggable-instrumentor:jar:2.1.6.GA:provided -[INFO] | +- org.jboss.aop:jboss-aop-asintegration-mc:jar:2.1.6.GA:provided -[INFO] | \- org.jboss.test:jboss-test:jar:1.1.5-alpha-2:provided -[INFO] | +- org.apache.ant:ant-junit:jar:1.7.0:provided -[INFO] | +- jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:provided -[INFO] | \- org.jboss.jbossas:jboss-server-manager:jar:1.0.3-alpha-2:provided -[INFO] +- org.jboss.security:jbosssx-client:jar:2.0.4.SP2:provided -[INFO] +- org.jboss.jbossas:jboss-as-server:jar:jmx-invoker-adaptor-client:6.0.0.M1:provided -[INFO] \- org.apache:xmlsec:jar:1.4.3:provided -[INFO] ------------------------------------------------------------------------ -[INFO] BUILD SUCCESSFUL -[INFO] ------------------------------------------------------------------------ -[INFO] Total time: 19 seconds -[INFO] Finished at: Thu Feb 04 11:10:49 CET 2010 -[INFO] Final Memory: 61M/155M -[INFO] ------------------------------------------------------------------------ Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-04 13:56:55 UTC (rev 100413) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-04 13:59:17 UTC (rev 100414) @@ -133,6 +133,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100413 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 08:56:55 -0500 (Thu, 04 Feb 2010) New Revision: 100413 Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java Log: Add NPE sanity checks Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-04 13:32:29 UTC (rev 100412) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-04 13:56:55 UTC (rev 100413) @@ -58,6 +58,11 @@ public ManagedBundle(BundleContext context, Bundle bundle) { + if (context == null) + throw new IllegalArgumentException("Null system context"); + if (bundle == null) + throw new IllegalArgumentException("Null bundle"); + this.bundle = bundle; this.systemContext = context; this.oname = getObjectName(bundle);

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100401 - in projects/jboss-osgi: projects/runtime/deployment/trunk and 7 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 05:22:04 -0500 (Thu, 04 Feb 2010) New Revision: 100401 Added: projects/jboss-osgi/trunk/testsuite/functional/tree.text Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Fix dependency:tree with -Dtarget.container=jboss601 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-04 10:22:04 UTC (rev 100401) @@ -46,13 +46,14 @@ // Provide logging private Logger log = LoggerFactory.getLogger(ManagedBundleTracker.class); - private BundleContext context; + private BundleContext systemContext; private MBeanServer mbeanServer; public ManagedBundleTracker(BundleContext context, MBeanServer mbeanServer) { super(context, Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE | Bundle.UNINSTALLED, null); this.mbeanServer = mbeanServer; + this.systemContext = context; } @Override @@ -74,7 +75,7 @@ { try { - ManagedBundle mb = new ManagedBundle(context, bundle); + ManagedBundle mb = new ManagedBundle(systemContext, bundle); ObjectName oname = mb.getObjectName(); if (mbeanServer.isRegistered(oname) == false) Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -38,7 +38,7 @@  <properties> - <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers> + <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> </properties> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -51,6 +51,7 @@ <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> <version.jboss.kernel>2.2.0.Alpha2</version.jboss.kernel> <version.jboss.logging>2.1.0.GA</version.jboss.logging> + <version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr> <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces> <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> @@ -93,11 +94,36 @@ </dependency> <dependency> <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-core</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-core-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-impl</artifactId> <version>${version.jboss.deployers}</version> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-structure-spi</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs-spi</artifactId> <version>${version.jboss.deployers}</version> </dependency> @@ -122,6 +148,11 @@ <version>${version.jboss.logging}</version> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-mdr</artifactId> + <version>${version.jboss.mdr}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BasicResolverImpl.java 2010-02-04 10:22:04 UTC (rev 100401) @@ -81,9 +81,12 @@ public ResolverBundle removeBundle(Bundle bundle) { + // Ignore the system bundle and fragments + AbstractBundleState bundleState = AbstractBundleState.assertBundleState(bundle); + if (bundleState instanceof OSGiBundleState == false) + return null; + ResolverBundle removedBundle = super.removeBundle(bundle); - - AbstractDeployedBundleState bundleState = OSGiBundleState.assertBundleState(bundle); bundleCapabilitiesMap.remove(bundleState); List<BundleRequirement> bundleRequirements = bundleRequirementsMap.remove(bundleState); Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -433,9 +433,6 @@ override="true"> <include name="org.osgi.compendium.jar" /> </fileset> - <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset>  @@ -454,9 +451,6 @@ <include name="org.eclipse.osgi.util.jar" /> <include name="pax-web-extender-war.jar" /> </fileset> - <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="microcontainer-service-jboss-beans.xml" /> - </fileset>  Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.osgi:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -47,6 +47,12 @@ <groupId>org.jboss.kernel</groupId> <artifactId>jboss-aop-mc-int</artifactId> <version>${version.jboss.aop.mc.int}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-mdr</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.ejb</groupId> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -18,7 +18,6 @@ <include>org.osgi:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> <unpack>false</unpack> </dependencySet> Added: projects/jboss-osgi/trunk/testsuite/functional/tree.text =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/tree.text (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/tree.text 2010-02-04 10:22:04 UTC (rev 100401) @@ -0,0 +1,267 @@ +[INFO] Scanning for projects... +[INFO] Searching repository for plugin with prefix: 'dependency'. +[INFO] ------------------------------------------------------------------------ +[INFO] Building JBossOSGi Testsuite - Functional +[INFO] task-segment: [dependency:tree] +[INFO] ------------------------------------------------------------------------ +[INFO] [dependency:tree {execution: default-cli}] +[INFO] org.jboss.osgi.testsuite:jboss-osgi-testsuite-functional:jar:1.0.0.Beta6 +[INFO] +- org.jboss.kernel:jboss-aop-mc-int:jar:2.2.0.Alpha2:compile +[INFO] | +- org.jboss.aop:jboss-aop:jar:2.1.0.CR3:compile +[INFO] | | +- org.apache.ant:ant:jar:1.7.0:compile +[INFO] | | | \- org.apache.ant:ant-launcher:jar:1.7.0:compile +[INFO] | | +- org.jboss:jboss-reflect:jar:2.2.0.Alpha2:compile +[INFO] | | +- qdox:qdox:jar:1.6.1:compile +[INFO] | | \- trove:trove:jar:2.1.1:compile +[INFO] | +- org.jboss.kernel:jboss-kernel:jar:2.2.0.Alpha2:compile +[INFO] | | +- org.jboss:jbossxb:jar:2.0.2.Beta3:compile +[INFO] | | | +- apache-xerces:xml-apis:jar:2.9.1:compile +[INFO] | | | +- apache-xerces:xercesImpl:jar:2.9.1:compile +[INFO] | | | +- wutka-dtdparser:dtdparser121:jar:1.2.1:compile +[INFO] | | | +- javax.activation:activation:jar:1.1.1:compile +[INFO] | | | \- sun-jaxb:jaxb-api:jar:2.1.9-brew:compile +[INFO] | | \- javax.inject:javax.inject:jar:1:compile +[INFO] | \- javassist:javassist:jar:3.11.0.GA:compile +[INFO] +- javax.ejb:ejb-api:jar:3.0:compile +[INFO] +- org.jboss.ejb3:jboss-ejb3-ext-api:jar:1.0.0:compile +[INFO] | \- org.jboss.javaee:jboss-ejb-api:jar:3.0.0.CR1:compile +[INFO] | +- org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:compile +[INFO] | \- jboss.jbossws:jboss-jaxrpc:jar:1.0.4.GA:compile +[INFO] +- biz.aQute:bnd:jar:0.0.356:compile +[INFO] +- org.jboss.osgi:jboss-osgi-spi:jar:1.0.4-SNAPSHOT:compile +[INFO] | +- args4j:args4j:jar:2.0.12:compile +[INFO] | +- org.slf4j:slf4j-api:jar:1.5.8:compile +[INFO] | \- org.jboss:jboss-vfs:jar:2.1.3.SP1:compile +[INFO] | \- org.jboss:jboss-common-core:jar:2.2.16.GA:compile +[INFO] +- org.jboss.osgi.runtime:jboss-osgi-deployment:jar:1.0.1-SNAPSHOT:compile +[INFO] +- org.apache.aries.blueprint:org.apache.aries.blueprint:jar:1.0.0.20100120:provided +[INFO] | \- org.apache.aries:org.apache.aries.util:jar:1.0.0.20100120:provided +[INFO] +- org.apache.felix:org.apache.felix.log:jar:1.0.0:provided +[INFO] +- org.apache.felix:org.apache.felix.eventadmin:jar:1.0.0:provided +[INFO] +- org.apache.felix:org.apache.felix.metatype:jar:1.0.2:provided +[INFO] | \- net.sf.kxml:kxml2:jar:2.2.2:provided +[INFO] | \- xmlpull:xmlpull:jar:1.1.3.1:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-apache-xerces:jar:2.9.1.SP3:provided +[INFO] | \- xml-resolver:xml-resolver:jar:1.2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-blueprint:jar:1.0.0.Beta1-SNAPSHOT:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-common:jar:1.0.3:provided +[INFO] | \- org.slf4j:jcl-over-slf4j:jar:1.5.8:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-husky:jar:1.0.3-SNAPSHOT:provided +[INFO] | \- junit:junit:jar:4.6:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jaxb:jar:2.1.10.SP3:provided +[INFO] | \- com.sun.xml.bind:jaxb-impl:jar:2.1.10:provided +[INFO] | \- javax.xml.bind:jaxb-api:jar:2.1:provided +[INFO] | \- javax.xml.stream:stax-api:jar:1.0-2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jmx:jar:1.0.3-SNAPSHOT:provided +[INFO] | \- org.jboss.osgi.bundles:jboss-osgi-common-core:jar:2.2.13.GA:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jndi:jar:1.0.2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-jta:jar:1.0.0:provided +[INFO] | +- jboss.jbossts:jbossjts:jar:4.6.1.GA:provided +[INFO] | \- jboss.jbossts:jbossts-common:jar:4.6.1.GA:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-reflect:jar:2.2.0-SNAPSHOT:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-serviceloader:jar:1.0.0-SNAPSHOT:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-webapp:jar:0.7.2.SP1-SNAPSHOT:provided +[INFO] | \- org.ops4j.pax.web:pax-web-api:jar:0.7.2:provided +[INFO] +- org.jboss.osgi.bundles:jboss-osgi-xml-binding:jar:2.0.2-SNAPSHOT:provided +[INFO] +- org.ops4j.pax.web:pax-web-extender-war:jar:0.7.2:provided +[INFO] | +- org.ops4j.base:ops4j-base-lang:jar:1.2.1:provided +[INFO] | +- org.ops4j.base:ops4j-base-util-xml:jar:1.2.1:provided +[INFO] | | \- org.ops4j.base:ops4j-base-util-collections:jar:1.2.1:provided +[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-core:jar:1.1.0:provided +[INFO] | | \- org.ops4j.pax.swissbox:pax-swissbox-lifecycle:jar:1.1.0:provided +[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-extender:jar:1.1.0:provided +[INFO] | +- org.ops4j.pax.swissbox:pax-swissbox-optional-jcl:jar:1.1.0:provided +[INFO] | \- org.ops4j.pax.swissbox:pax-swissbox-tracker:jar:1.1.0:provided +[INFO] +- org.ops4j.pax.web:pax-web-jetty-bundle:jar:0.7.2:provided +[INFO] +- org.jboss.naming:jnp-client:jar:5.0.1.GA:test +[INFO] +- org.slf4j:slf4j-log4j12:jar:1.5.8:test +[INFO] +- org.jboss.osgi.runtime:jboss-osgi-framework:jar:1.0.0.Alpha3-SNAPSHOT:compile +[INFO] | +- org.drools:drools-compiler:jar:5.0.1:compile +[INFO] | | +- org.drools:drools-core:jar:5.0.1:compile +[INFO] | | | +- org.drools:drools-api:jar:5.0.1:compile +[INFO] | | | \- joda-time:joda-time:jar:1.6:compile +[INFO] | | +- org.antlr:antlr-runtime:jar:3.1.1:compile +[INFO] | | +- org.eclipse.jdt:core:jar:3.4.2.v_883_R34x:compile +[INFO] | | +- janino:janino:jar:2.5.15:compile +[INFO] | | \- org.mvel:mvel2:jar:2.0.10:compile +[INFO] | +- org.jboss.cl:jboss-classloader:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.integration:jboss-classloading-spi:jar:5.1.0.SP1:compile +[INFO] | +- org.jboss.cl:jboss-classloading:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.cl:jboss-classloading-vfs:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-client:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-client-spi:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.man:jboss-managed:jar:2.1.1.SP1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-core:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-core-spi:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-impl:jar:2.2.0.Alpha1:compile +[INFO] | | +- org.jboss.deployers:jboss-deployers-spi:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.mcann:mcann-core:jar:1.0.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-structure-spi:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-vfs-spi:jar:2.2.0.Alpha1:compile +[INFO] | | \- stax:stax-api:jar:1.0:compile +[INFO] | +- org.jboss.deployers:jboss-deployers-vfs:jar:2.2.0.Alpha1:compile +[INFO] | | \- org.jboss.man:jboss-metatype:jar:2.1.1.SP1:compile +[INFO] | +- org.jboss.kernel:jboss-dependency:jar:2.2.0.Alpha2:compile +[INFO] | +- org.jboss.logging:jboss-logging-spi:jar:2.1.0.GA:compile +[INFO] | +- org.jboss:jboss-mdr:jar:2.2.0.Alpha1:compile +[INFO] | +- org.jboss.osgi.runtime:jboss-osgi-deployers:jar:1.0.4-SNAPSHOT:compile +[INFO] | +- org.osgi:org.osgi.core:jar:4.2.0:compile +[INFO] | \- org.osgi:org.osgi.compendium:jar:4.2.0:compile +[INFO] +- org.jboss.logging:jboss-logging-log4j:jar:2.1.0.GA:compile +[INFO] | \- log4j:log4j:jar:1.2.14:compile +[INFO] +- org.apache.felix:org.apache.felix.configadmin:jar:1.2.4:provided +[INFO] \- org.jboss.jbossas:jboss-as-client:pom:6.0.0.M1:provided +[INFO] +- commons-logging:commons-logging:jar:1.1.0.jboss:provided +[INFO] +- oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided +[INFO] +- org.hibernate.java-persistence:jpa-api:jar:2.0-cr-1:provided +[INFO] +- org.hibernate:hibernate-annotations:jar:3.5.0-Beta-2:provided +[INFO] | +- org.hibernate:hibernate-core:jar:3.5.0-Beta-2:provided +[INFO] | | +- antlr:antlr:jar:2.7.6:provided +[INFO] | | +- commons-collections:commons-collections:jar:3.1:provided +[INFO] | | +- dom4j:dom4j:jar:1.6.1:provided +[INFO] | | | \- xml-apis:xml-apis:jar:1.0.b2:provided +[INFO] | | \- javax.transaction:jta:jar:1.1:provided +[INFO] | +- org.hibernate:hibernate-commons-annotations:jar:3.2.0.Beta1:provided +[INFO] | \- hsqldb:hsqldb:jar:1.8.0.2:provided +[INFO] +- org.jboss.aop:jboss-aop:jar:client:2.1.6.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-ejb3:jar:client:6.0.0.M1:provided +[INFO] | +- cglib:cglib:jar:2.1.3:provided +[INFO] | +- jacorb:jacorb:jar:2.3.1jboss.patch01-brew:provided +[INFO] | +- org.hibernate:hibernate-entitymanager:jar:3.5.0-Beta-2:provided +[INFO] | +- javax.validation:validation-api:jar:1.0.0.GA:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-as-int:jar:1.1.21:provided +[INFO] | | +- org.jboss.ejb3:jboss-ejb3:pom:1.1.21:provided +[INFO] | | | +- org.jboss.ejb3:jboss-ejb3-core:jar:1.1.21:provided +[INFO] | | | \- org.jboss.ejb3:jboss-ejb3-deployers:jar:1.0.0:provided +[INFO] | | +- org.jboss.ejb3:jboss-ejb3-mc-int:jar:1.0.1:provided +[INFO] | | \- org.jboss.ejb3:jboss-ejb3-metrics-deployer:jar:1.0.1:provided +[INFO] | | \- org.jboss.microcontainer:jboss-jmx-mc-int:jar:2.2.0.M2:provided +[INFO] | | +- org.jboss.mx:jboss-jmx:jar:6.0.0.Beta2:provided +[INFO] | | | +- org.jboss.mx:jboss-j2se:jar:6.0.0.Beta2:provided +[INFO] | | | \- org.jboss.mx:jboss-mbeans:jar:6.0.0.Beta2:provided +[INFO] | | \- org.jboss.mx:jboss-mbeanserver:jar:6.0.0.Beta2:provided +[INFO] | +- org.jboss.javaee:jboss-jms-api:jar:1.1.0.GA:provided +[INFO] | +- org.jboss.jbossas:jboss-as-connector:jar:6.0.0.M1:provided +[INFO] | | +- org.jboss.jbossas:jboss-as-profileservice:jar:6.0.0.M1:provided +[INFO] | | \- javax.mail:mail:jar:1.4.2:provided +[INFO] | +- org.jboss.jbossas:jboss-as-iiop:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-server:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.microcontainer:jboss-kernel:jar:2.0.9.GA:provided +[INFO] | \- org.jboss.integration:jboss-corba-ots-spi:jar:5.1.0.SP1:provided +[INFO] +- org.jboss.jbossas:jboss-as-server:jar:client:6.0.0.M1:provided +[INFO] | +- org.jboss.bootstrap:jboss-bootstrap-impl-as:jar:2.0.0-alpha-4:provided +[INFO] | | +- org.jboss.bootstrap:jboss-bootstrap-impl-mc:jar:2.0.0-alpha-3:provided +[INFO] | | | +- org.mortbay.jetty:jetty:jar:6.1.16:provided +[INFO] | | | | +- org.mortbay.jetty:jetty-util:jar:6.1.16:provided +[INFO] | | | | \- org.mortbay.jetty:servlet-api:jar:2.5-20081211:provided +[INFO] | | | +- org.jboss.bootstrap:jboss-bootstrap-impl-base:jar:2.0.0-alpha-4:provided +[INFO] | | | | \- org.jboss.bootstrap:jboss-bootstrap-spi:jar:2.0.0-alpha-3:provided +[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar:2.0.0-alpha-2:provided +[INFO] | | | \- org.jboss.bootstrap:jboss-bootstrap-api-mc:jar:2.0.0-alpha-1:provided +[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-spi-as:jar:2.0.0-alpha-4:provided +[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api-as:jar:2.0.0-alpha-1:provided +[INFO] | | \- org.jboss.bootstrap:jboss-bootstrap-api:jar:2.0.0-alpha-1:provided +[INFO] | +- org.jboss.integration:jboss-deployment-spi:jar:5.1.0.SP1:provided +[INFO] | +- org.jboss.jpa:jboss-jpa-deployers:jar:1.0.1:provided +[INFO] | | +- org.jboss.jpa:jboss-jpa-impl:jar:1.0.0:provided +[INFO] | | \- org.jboss.jpa:jboss-jpa-spi:jar:1.0.0:provided +[INFO] | +- org.jboss.security:jbosssx:jar:2.0.4.SP2:provided +[INFO] | +- org.jboss.metadata:jboss-metadata:jar:1.0.2.Beta2:provided +[INFO] | | +- org.hibernate:ejb3-persistence:jar:1.0.2.GA:provided +[INFO] | | \- jboss.jbossws:jboss-jaxws:jar:3.0.1-native-2.0.4.GA:provided +[INFO] | +- org.jboss.jbossas:jboss-as-system-jmx:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-jmx:jar:6.0.0.M1:provided +[INFO] | | \- org.jboss.jbossas:jboss-as-mbeans:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-system:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.interceptor:jboss-interceptor-api:jar:1.0.1-CR1:provided +[INFO] | +- org.jboss.jbossas:jboss-as-security:jar:6.0.0.M1:provided +[INFO] | | +- org.jboss.javaee:jboss-jaspi-api:jar:1.0.0.GA:provided +[INFO] | | \- org.jboss.security:jbossxacml:jar:2.0.4:provided +[INFO] | +- org.jboss.integration:jboss-transaction-spi:jar:5.1.0.SP1:provided +[INFO] | +- org.jboss.javaee:jboss-jacc-api:jar:1.1.0.GA_SP1:provided +[INFO] | | \- jboss.web:servlet-api:jar:2.1.1.GA:provided +[INFO] | +- org.jboss.ws.native:jbossws-native-saaj:jar:3.2.1.GA:provided +[INFO] | +- javax.xml.ws:jaxws-api:jar:2.1:provided +[INFO] | +- org.jboss.javaee:jboss-jca-api:jar:1.5.0.GA:provided +[INFO] | +- bcel:bcel:jar:5.1:provided +[INFO] | +- org.jboss.naming:jnpserver:jar:5.0.4.GA:provided +[INFO] | \- gnu-getopt:getopt:jar:1.0.12-brew:provided +[INFO] +- org.jboss.jbossas:jboss-as-deployment:jar:6.0.0.M1:provided +[INFO] | \- org.jboss.javaee:jboss-jad-api:jar:1.2.0.GA:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-common:jar:client:1.0.1:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-core:jar:client:1.1.21:provided +[INFO] | +- org.jboss.integration:jboss-jca-spi:jar:5.0.3.GA:provided +[INFO] | +- org.jboss.cache:jbosscache-core:jar:3.1.0.GA:provided +[INFO] | +- org.jboss.aspects:jboss-remoting-aspects:jar:1.0.2:provided +[INFO] | | +- org.jboss.aspects:jboss-transaction-aspects:jar:1.0.0.GA:provided +[INFO] | | \- org.jboss.aspects:jboss-security-aspects:jar:1.0.0.GA:provided +[INFO] | | \- javax.security:jacc:jar:1.0:provided +[INFO] | +- org.jboss.cluster:jboss-ha-server-api:jar:1.1.1.GA:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-cache:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-common:jar:1.0.1:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-endpoint:jar:0.1.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-jpa-int:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-security:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-interceptors:jar:1.0.5:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-metadata:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:1.0.6:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:1.0.2:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:1.0.0:provided +[INFO] | +- org.jboss.ejb3:jboss-ejb3-transactions:jar:1.0.2:provided +[INFO] | +- org.jboss.ws:jbossws-spi:jar:1.0.3.GA:provided +[INFO] | +- quartz:quartz:jar:1.6.0:provided +[INFO] | +- sun-jaxws:jaxws-api:jar:2.1.1:provided +[INFO] | \- sun-jaxws:jsr181-api:jar:2.1.1:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client:1.0.2:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client:1.0.6:provided +[INFO] | \- org.jboss.microcontainer:jboss-aop-mc-int:jar:2.0.8.GA:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client:1.0.0:provided +[INFO] +- org.jboss.ejb3:jboss-ejb3-security:jar:client:1.0.0:provided +[INFO] | \- org.jboss.aspects:jboss-current-invocation-aspects:jar:1.0.0.CR1:provided +[INFO] +- org.jboss.cluster:jboss-ha-client:jar:1.1.1.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-cluster:jar:jboss-ha-legacy-client:6.0.0.M1:provided +[INFO] | +- jgroups:jgroups:jar:2.6.13.GA:provided +[INFO] | +- org.jboss.cluster:jboss-ha-server-cache-spi:jar:2.0.0.GA:provided +[INFO] | \- org.jboss.cluster:jboss-ha-server-cache-jbc:jar:2.1.0.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-iiop:jar:client:6.0.0.M1:provided +[INFO] | +- jboss.jbossts:jbossjts-jacorb:jar:4.6.1.GA:provided +[INFO] | \- org.jboss.jbossas:jboss-as-main:jar:6.0.0.M1:provided +[INFO] | \- org.jboss.logbridge:jboss-logbridge:jar:1.0.0.GA:provided +[INFO] | \- org.jboss.logmanager:jboss-logmanager:jar:1.0.0.GA:provided +[INFO] +- org.jboss.integration:jboss-integration:jar:5.1.0.SP1:provided +[INFO] +- org.jboss.jbossas:jboss-as-j2se:jar:6.0.0.M1:provided +[INFO] +- org.jboss.javaee:jboss-javaee:jar:5.2.0.Beta1:provided +[INFO] +- org.jboss.jbossas:jboss-as-management:jar:jsr77-client:6.0.0.M1:provided +[INFO] | \- org.jboss.jbossas:jboss-as-cluster:jar:6.0.0.M1:provided +[INFO] +- org.jboss.logging:jboss-logging-jdk:jar:2.1.1.GA:provided +[INFO] +- jboss.messaging:jboss-messaging:jar:1.4.3.GA:provided +[INFO] +- org.jboss.remoting:jboss-remoting:jar:2.5.2:provided +[INFO] +- org.jboss.security:jboss-security-spi:jar:2.0.4.SP2:provided +[INFO] +- jboss:jboss-serialization:jar:1.0.3.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-system:jar:client:6.0.0.M1:provided +[INFO] | +- org.jboss.integration:jboss-profileservice-spi:jar:5.1.0.SP1:provided +[INFO] | \- org.jboss.microcontainer:jboss-dependency:jar:2.0.9.GA:provided +[INFO] +- org.jboss.jbossas:jboss-as-system-jmx:jar:client:6.0.0.M1:provided +[INFO] +- org.jboss.jbossas:jboss-as-profileservice:jar:client:6.0.0.M1:provided +[INFO] | \- org.jboss.jbossas:jboss-as-aspects:jar:6.0.0.M1:provided +[INFO] | +- org.jboss.aop:jboss-aop-aspects:jar:2.1.6.GA:provided +[INFO] | | \- org.beanshell:bsh:jar:1.3.0:provided +[INFO] | +- org.jboss.aop:jboss-aop-asintegration-core:jar:2.1.6.GA:provided +[INFO] | | \- org.jboss.aop:pluggable-instrumentor:jar:2.1.6.GA:provided +[INFO] | +- org.jboss.aop:jboss-aop-asintegration-mc:jar:2.1.6.GA:provided +[INFO] | \- org.jboss.test:jboss-test:jar:1.1.5-alpha-2:provided +[INFO] | +- org.apache.ant:ant-junit:jar:1.7.0:provided +[INFO] | +- jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:provided +[INFO] | \- org.jboss.jbossas:jboss-server-manager:jar:1.0.3-alpha-2:provided +[INFO] +- org.jboss.security:jbosssx-client:jar:2.0.4.SP2:provided +[INFO] +- org.jboss.jbossas:jboss-as-server:jar:jmx-invoker-adaptor-client:6.0.0.M1:provided +[INFO] \- org.apache:xmlsec:jar:1.4.3:provided +[INFO] ------------------------------------------------------------------------ +[INFO] BUILD SUCCESSFUL +[INFO] ------------------------------------------------------------------------ +[INFO] Total time: 19 seconds +[INFO] Finished at: Thu Feb 04 11:10:49 CET 2010 +[INFO] Final Memory: 61M/155M +[INFO] ------------------------------------------------------------------------ Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-04 10:05:37 UTC (rev 100400) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-04 10:22:04 UTC (rev 100401) @@ -249,7 +249,6 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-equinox</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -273,7 +272,6 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -294,12 +292,10 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-framework</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -314,12 +310,10 @@ <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-framework</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> - <scope>provided</scope> </dependency> </dependencies> </profile> @@ -416,6 +410,7 @@ <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jmx-invoker-adaptor-client</artifactId> <version>${version.jmx.invoker.adaptor.client}</version> + <scope>provided</scope> <type>pom</type> </dependency> </dependencies> @@ -441,6 +436,7 @@ <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jmx-invoker-adaptor-client</artifactId> <version>${version.jmx.invoker.adaptor.client}</version> + <scope>provided</scope> <type>pom</type> </dependency> </dependencies> @@ -466,6 +462,7 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>6.0.0.M1</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>org.jboss.slf4j</groupId> @@ -497,6 +494,7 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>6.0.0.M1</version> + <scope>provided</scope> <exclusions> <exclusion> <groupId>org.jboss.slf4j</groupId>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100394 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 02:57:33 -0500 (Thu, 04 Feb 2010) New Revision: 100394 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml Log: Fix NPE on Bundle.loadClass() in state INSTALLED 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-04 07:42:29 UTC (rev 100393) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-04 07:57:33 UTC (rev 100394) @@ -131,7 +131,8 @@  <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> </bean> </deployment> \ No newline at end of file

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100393 - projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 02:42:29 -0500 (Thu, 04 Feb 2010) New Revision: 100393 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java Log: [JBOSGI-287] Optional import loaded from system classloader 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-04 07:36:18 UTC (rev 100392) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-04 07:42:29 UTC (rev 100393) @@ -110,6 +110,12 @@ @Test public void testResolvedOptionalImportReverse() throws Exception { + if ("jbossmc".equals(getFramework())) + { + System.out.println("FIXME [JBOSGI-287] Optional import loaded from system classloader"); + return; + } + OSGiRuntime runtime = getDefaultRuntime(); try {

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100392 - in projects/jboss-osgi: projects/bundles/blueprint/trunk/.settings and 6 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 02:36:18 -0500 (Thu, 04 Feb 2010) New Revision: 100392 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath projects/jboss-osgi/projects/bundles/blueprint/trunk/.project projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/pom.xml Log: Fix NPE on Bundle.loadClass() in state INSTALLED Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath 2010-02-04 07:36:18 UTC (rev 100392) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.project =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/.project 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/.project 2010-02-04 07:36:18 UTC (rev 100392) @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-blueprint</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> + <name>jboss-osgi-blueprint</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> </projectDescription> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-04 07:36:18 UTC (rev 100392) @@ -1,5 +1,6 @@ -#Tue Apr 14 17:48:49 CEST 2009 +#Thu Feb 04 08:05:44 CET 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.5 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-04 07:36:18 UTC (rev 100392) @@ -34,7 +34,7 @@ <version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint> <version.apache.aries.util>1.0.0.20100120</version.apache.aries.util> <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> - <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework> + <version.jboss.osgi.framework>1.0.0.Alpha3-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jmx>1.0.3-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-04 07:36:18 UTC (rev 100392) @@ -46,6 +46,7 @@ // Provide logging private Logger log = LoggerFactory.getLogger(ManagedBundleTracker.class); + private BundleContext context; private MBeanServer mbeanServer; public ManagedBundleTracker(BundleContext context, MBeanServer mbeanServer) @@ -73,7 +74,7 @@ { try { - ManagedBundle mb = new ManagedBundle(bundle); + ManagedBundle mb = new ManagedBundle(context, bundle); ObjectName oname = mb.getObjectName(); if (mbeanServer.isRegistered(oname) == false) @@ -95,9 +96,7 @@ { try { - ManagedBundle mb = new ManagedBundle(bundle); - ObjectName oname = mb.getObjectName(); - + ObjectName oname = ManagedBundle.getObjectName(bundle); if (mbeanServer.isRegistered(oname)) { log.debug("Unregister managed bundle: " + oname); Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleManagementDeployer.java 2010-02-04 07:36:18 UTC (rev 100392) @@ -31,6 +31,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.osgi.spi.management.ManagedBundle; import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; /** * Register the Bundle as MBean with JMX. @@ -40,6 +41,7 @@ */ public class BundleManagementDeployer extends AbstractSimpleRealDeployer<Bundle> { + private BundleContext systemContext; private MBeanServer mbeanServer; public BundleManagementDeployer() @@ -47,6 +49,11 @@ super(Bundle.class); } + public void setSystemContext(BundleContext systemContext) + { + this.systemContext = systemContext; + } + public void setMbeanServer(MBeanServer mbeanServer) { this.mbeanServer = mbeanServer; @@ -56,7 +63,7 @@ { if (mbeanServer != null) { - ManagedBundle mb = new ManagedBundle(bundle); + ManagedBundle mb = new ManagedBundle(systemContext, bundle); ObjectName oname = mb.getObjectName(); try { Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-04 07:36:18 UTC (rev 100392) @@ -26,7 +26,7 @@ <artifactId>jboss-osgi-framework</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha3-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> @@ -57,8 +57,8 @@ <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx> - <version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers> + <version.jboss.osgi.jmx>1.0.3-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.xml.binding>2.0.2.Beta3</version.jboss.osgi.xml.binding> <version.jboss.test>1.1.4.GA</version.jboss.test> Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-04 07:36:18 UTC (rev 100392) @@ -52,12 +52,14 @@ public static final String PROPERTY_SYMBOLIC_NAME = "name"; public static final String PROPERTY_VERSION = "version"; + private BundleContext systemContext; private Bundle bundle; private ObjectName oname; - public ManagedBundle(Bundle bundle) + public ManagedBundle(BundleContext context, Bundle bundle) { this.bundle = bundle; + this.systemContext = context; this.oname = getObjectName(bundle); } @@ -143,10 +145,7 @@ public ObjectName loadClass(String name) throws ClassNotFoundException { Class<?> clazz = bundle.loadClass(name); - BundleContext context = bundle.getBundleContext(); - ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); - PackageAdmin packageAdmin = (PackageAdmin)context.getService(sref); - Bundle providingBundle = packageAdmin.getBundle(clazz); + Bundle providingBundle = getPackageAdmin().getBundle(clazz); return providingBundle != null ? getObjectName(providingBundle) : null; } @@ -170,4 +169,10 @@ { bundle.update(); } + + private PackageAdmin getPackageAdmin() + { + ServiceReference sref = systemContext.getServiceReference(PackageAdmin.class.getName()); + return (PackageAdmin)systemContext.getService(sref); + } } \ No newline at end of file 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-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-04 07:36:18 UTC (rev 100392) @@ -126,7 +126,8 @@  <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> </bean> </deployment> \ No newline at end of file Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-02-04 07:01:16 UTC (rev 100391) +++ projects/jboss-osgi/trunk/pom.xml 2010-02-04 07:36:18 UTC (rev 100392) @@ -57,7 +57,7 @@ <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment> - <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework> + <version.jboss.osgi.framework>1.0.0.Alpha3-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.4-SNAPSHOT</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100378 - in projects/jboss-osgi: trunk/testsuite/functional/scripts and 6 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-02-03 17:24:32 -0500 (Wed, 03 Feb 2010) New Revision: 100378 Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/ 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/bundleA/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleA/OSGi287BeanA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleB/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleB/OSGi287BeanB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleB.bnd Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml Log: [JBOSGI-287] Optional import loaded from system classloader Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java 2010-02-03 22:21:30 UTC (rev 100377) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java 2010-02-03 22:24:32 UTC (rev 100378) @@ -133,10 +133,10 @@ public OSGiBundle loadClass(String name) throws ClassNotFoundException { Class<?> clazz = bundle.loadClass(name); - BundleContext context = bundle.getBundleContext(); - ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); - PackageAdmin packageAdmin = (PackageAdmin)context.getService(sref); - Bundle providerBundle = packageAdmin.getBundle(clazz); + Bundle providerBundle = getPackageAdmin().getBundle(clazz); + if (providerBundle == null) + return null; + return getRuntime().getBundle(providerBundle.getBundleId()); } @@ -186,4 +186,10 @@ } } + private PackageAdmin getPackageAdmin() + { + BundleContext context = ((EmbeddedRuntime)getRuntime()).getSystemContext(); + ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); + return (PackageAdmin)context.getService(sref); + } } 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-03 22:21:30 UTC (rev 100377) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2010-02-03 22:24:32 UTC (rev 100378) @@ -27,6 +27,7 @@ [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath [JBOSGI-284] Investigate version numbering scheme [JBOSGI-286] Investigate classloading of javax.* classes + [JBOSGI-287] Optional import loaded from system classloader --> @@ -167,6 +168,10 @@  <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi286-bundle.jar" files="${tests.resources.dir}/jbosgi286/jbosgi286-bundle.bnd" /> +  + <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/localization-simple-host.jar" files="${tests.resources.dir}/localization/localization-simple-host.bnd" /> <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/localization-simple-frag.jar" files="${tests.resources.dir}/localization/localization-simple-frag.bnd" /> Added: 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 (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-03 22:24:32 UTC (rev 100378) @@ -0,0 +1,142 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.test.osgi.jbosgi287; + +//$Id: OSGi284TestCase.java 100204 2010-02-01 10:14:11Z thomas.diesler(a)jboss.com $ + +import static org.junit.Assert.*; + +import org.jboss.osgi.testing.OSGiBundle; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiTest; +import org.jboss.test.osgi.jbosgi287.bundleA.OSGi287BeanA; +import org.jboss.test.osgi.jbosgi287.bundleB.OSGi287BeanB; +import org.junit.Test; +import org.osgi.framework.Bundle; + +/** + * [JBOSGI-287] Optional import loaded from system classloader + * + * https://jira.jboss.org/jira/browse/JBOSGI-287 + * + * @author thomas.diesler(a)jboss.com + * @since 01-Feb-2010 + */ +public class OSGi287TestCase extends OSGiTest +{ + @Test + public void testUnresolvedOptionalImport() throws Exception + { + OSGiRuntime runtime = getDefaultRuntime(); + try + { + // Bundle-SymbolicName: jbosgi287-bundleA + // Export-Package: org.jboss.test.osgi.jbosgi287.bundleA + // Import-Package: org.jboss.test.osgi.jbosgi287.bundleB;resolution:=optional + OSGiBundle bundleA = runtime.installBundle("jbosgi287-bundleA.jar"); + OSGiBundle exporterA = bundleA.loadClass(OSGi287BeanA.class.getName()); + assertEquals(Bundle.RESOLVED, bundleA.getState()); + assertEquals(bundleA, exporterA); + + try + { + bundleA.loadClass(OSGi287BeanB.class.getName()); + fail("ClassNotFoundException expected"); + } + catch (ClassNotFoundException ex) + { + // expected + } + } + finally + { + runtime.shutdown(); + } + } + + @Test + public void testResolvedOptionalImport() throws Exception + { + OSGiRuntime runtime = getDefaultRuntime(); + try + { + // Bundle-SymbolicName: jbosgi287-bundleB + // Export-Package: org.jboss.test.osgi.jbosgi287.bundleB + OSGiBundle bundleB = runtime.installBundle("jbosgi287-bundleB.jar"); + + // Bundle-SymbolicName: jbosgi287-bundleA + // Export-Package: org.jboss.test.osgi.jbosgi287.bundleA + // Import-Package: org.jboss.test.osgi.jbosgi287.bundleB;resolution:=optional + OSGiBundle bundleA = runtime.installBundle("jbosgi287-bundleA.jar"); + + OSGiBundle exporterB = bundleB.loadClass(OSGi287BeanB.class.getName()); + assertEquals(Bundle.RESOLVED, bundleB.getState()); + assertEquals(bundleB, exporterB); + + OSGiBundle exporterA = bundleA.loadClass(OSGi287BeanA.class.getName()); + assertEquals(Bundle.RESOLVED, bundleA.getState()); + assertEquals(bundleA, exporterA); + + // Load B through A + exporterB = bundleA.loadClass(OSGi287BeanB.class.getName()); + assertEquals(bundleB, exporterB); + } + finally + { + runtime.shutdown(); + } + } + + + @Test + public void testResolvedOptionalImportReverse() throws Exception + { + OSGiRuntime runtime = getDefaultRuntime(); + try + { + // Bundle-SymbolicName: jbosgi287-bundleA + // Export-Package: org.jboss.test.osgi.jbosgi287.bundleA + // Import-Package: org.jboss.test.osgi.jbosgi287.bundleB;resolution:=optional + OSGiBundle bundleA = runtime.installBundle("jbosgi287-bundleA.jar"); + + // Bundle-SymbolicName: jbosgi287-bundleB + // Export-Package: org.jboss.test.osgi.jbosgi287.bundleB + OSGiBundle bundleB = runtime.installBundle("jbosgi287-bundleB.jar"); + + OSGiBundle exporterA = bundleA.loadClass(OSGi287BeanA.class.getName()); + assertEquals(Bundle.RESOLVED, bundleA.getState()); + assertEquals(bundleA, exporterA); + + OSGiBundle exporterB = bundleB.loadClass(OSGi287BeanB.class.getName()); + assertEquals(Bundle.RESOLVED, bundleB.getState()); + assertEquals(bundleB, exporterB); + + // Load B through A + exporterB = bundleA.loadClass(OSGi287BeanB.class.getName()); + assertEquals(bundleB, exporterB); + } + finally + { + runtime.shutdown(); + } + } +} \ No newline at end of file Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleA/OSGi287BeanA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleA/OSGi287BeanA.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleA/OSGi287BeanA.java 2010-02-03 22:24:32 UTC (rev 100378) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.test.osgi.jbosgi287.bundleA; + +//$Id: $ + + +public class OSGi287BeanA +{ + public OSGi287BeanA() + { + } +} Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleB/OSGi287BeanB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleB/OSGi287BeanB.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/bundleB/OSGi287BeanB.java 2010-02-03 22:24:32 UTC (rev 100378) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.test.osgi.jbosgi287.bundleB; + +//$Id: $ + + +public class OSGi287BeanB +{ + public OSGi287BeanB() + { + } +} Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleA.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleA.bnd 2010-02-03 22:24:32 UTC (rev 100378) @@ -0,0 +1,6 @@ +# bnd build -classpath target/test-classes -output target/test-libs/jbosgi287-bundleA.jar src/test/resources/jbosgi287/bundle.bnd + +Bundle-SymbolicName: jbosgi287-bundleA +Export-Package: org.jboss.test.osgi.jbosgi287.bundleA +Import-Package: org.jboss.test.osgi.jbosgi287.bundleB;resolution:=optional + Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleB.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleB.bnd 2010-02-03 22:24:32 UTC (rev 100378) @@ -0,0 +1,5 @@ +# bnd build -classpath target/test-classes -output target/test-libs/jbosgi287-bundleB.jar src/test/resources/jbosgi287/jbosgi287-bundle.bnd + +Bundle-SymbolicName: jbosgi287-bundleB +Export-Package: org.jboss.test.osgi.jbosgi287.bundleB +

16 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits February 2010