[jboss-osgi-commits] JBoss-OSGI SVN: r97050 - in projects/jboss-osgi: projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml and 28 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-11-26 17:32:23 -0500 (Thu, 26 Nov 2009) New Revision: 97050 Added: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingCapability.java projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingService.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/log4j.xml Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java projects/jboss-osgi/projects/bundles/common/trunk/pom.xml projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java projects/jboss-osgi/projects/bundles/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/.classpath projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/assembly-bundles.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/jboss-osgi-framework.properties Log: Add integration tests to microcontainer bundle Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -32,6 +32,7 @@ <properties> <version.apache.xerces>2.9.1</version.apache.xerces> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.wutka.dtdparser>1.2.1</version.wutka.dtdparser> <version.xml.resolver>1.2</version.xml.resolver> @@ -65,6 +66,14 @@ <version>${version.xml.resolver}</version> </dependency> + <!-- Provided Capability --> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + <scope>provided</scope> + </dependency> + <!-- OSGi Dependencies --> <dependency> <groupId>org.osgi</groupId> @@ -107,6 +116,7 @@ org.xml.sax*, <!-- import --> + org.jboss.osgi.common.log;version=1.0, org.jboss.osgi.spi.capability;version=1.0, org.osgi.framework, org.osgi.service.log, Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -25,6 +25,7 @@ import javax.xml.parsers.SAXParserFactory; +import org.jboss.osgi.common.log.LoggingCapability; import org.jboss.osgi.spi.capability.Capability; /** @@ -58,6 +59,8 @@ { super(SAXParserFactory.class.getName()); setFilter("(" + PARSER_PROVIDER + "=" + PROVIDER_JBOSS_OSGI + ")"); + + addDependency(new LoggingCapability()); addBundle("bundles/jboss-osgi-apache-xerces.jar"); } Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -95,6 +95,7 @@ <Import-Package> javax.management, org.apache.log4j;version=1.2;resolution:=optional, + org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.util;version=1.0, org.osgi.framework;version=1.4, org.osgi.service.log;version=1.3, Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -25,6 +25,7 @@ import org.jboss.osgi.common.log.LogServiceTracker; +import org.jboss.osgi.common.log.LoggingService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -49,6 +50,9 @@ // Track LogReaderService and add/remove LogListener logReaderTracker = trackLogReaderService(context); logReaderTracker.open(); + + // Register the logging marker service + context.registerService(LoggingService.class.getName(), new LoggingService(){}, null); } public void stop(BundleContext context) Added: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingCapability.java (rev 0) +++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingCapability.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,47 @@ +/* + * 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.osgi.common.log; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.capability.CompendiumCapability; + +/** + * Adds the logging capability. + * + * It is ignored if the {@link LoggingService} is already registered. + * + * Installed bundles: jboss-osgi-common.jar + * + * @author thomas.diesler(a)jboss.com + * @since 14-Sep-2009 + */ +public class LoggingCapability extends Capability +{ + public LoggingCapability() + { + super(LoggingService.class.getName()); + + addDependency(new CompendiumCapability()); + + addBundle("bundles/jboss-osgi-common.jar"); + } +} \ No newline at end of file Added: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingService.java =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingService.java (rev 0) +++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/log/LoggingService.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,34 @@ +/* + * 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.osgi.common.log; + +//$Id: $ + +/** + * A marker service that is registered by jboss-osgi-common + * + * @author thomas.diesler(a)jboss.com + * @since 29-May-2009 + */ +public interface LoggingService +{ +} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -45,6 +45,7 @@ super(JAXBService.class.getName()); addDependency(new XMLParserCapability()); + addBundle("bundles/jboss-osgi-jaxb.jar"); } } \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -42,6 +42,7 @@ <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix> <version.jboss.xb>2.0.2.Beta3</version.jboss.xb> <version.javassist>3.9.0.GA</version.javassist> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</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-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb> @@ -85,6 +86,12 @@ <!-- Provided Dependencies --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <version>${version.jboss.osgi.common.core}</version> <scope>provided</scope> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -21,7 +21,7 @@ <artifactId>jboss-osgi-jmx</artifactId> <packaging>bundle</packaging> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <!-- Parent --> <parent> @@ -40,8 +40,8 @@ <!-- Properties --> <properties> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> - <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi> - <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi> + <version.jboss.osgi.jndi>1.0.2-SNAPSHOT</version.jboss.osgi.jndi> + <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> </properties> @@ -99,7 +99,6 @@ javax.naming.spi, <!-- jboss-osgi --> - org.jboss.osgi.common.log;version=1.0, org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.management;version=1.0, Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -27,25 +27,26 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </parent> <!-- Properties --> <properties> <version.jboss.naming>5.0.1.GA</version.jboss.naming> - <version.jboss.osgi.common>1.0.1</version.jboss.osgi.common> - <version.osgi>r4v42</version.osgi> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> + <version.osgi>4.2.0</version.osgi> </properties> <!-- Dependencies --> <dependencies> + + <!-- Provided Dependencies --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> <version>${version.jboss.osgi.common}</version> + <scope>provided</scope> </dependency> - - <!-- Provided Dependencies --> <dependency> <groupId>org.jboss.naming</groupId> <artifactId>jnpserver</artifactId> @@ -84,9 +85,10 @@ <Import-Package> javax.naming*, javax.net, + org.slf4j, org.jboss.logging, org.jboss.net.sockets, - org.jboss.osgi.common.log;version="1.0", + org.jboss.osgi.common.log;version=1.0, org.jboss.osgi.spi.capability;version="1.0", org.jboss.osgi.spi.util;version="1.0", org.jboss.util.naming, @@ -99,7 +101,7 @@ jnpserver;inline=false, </Embed-Dependency> <_exportcontents> - org.jnp.interfaces;version=${version.jboss.naming}, + org.jnp.interfaces;version=5.0.1, </_exportcontents> </instructions> </configuration> Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -25,9 +25,8 @@ import javax.naming.InitialContext; +import org.jboss.osgi.common.log.LoggingCapability; import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.capability.LogServiceCapability; -import org.jboss.osgi.spi.testing.OSGiRuntime; /** * Adds the JNDI capability to the {@link OSGiRuntime} @@ -59,7 +58,7 @@ addSystemProperty("org.jboss.osgi.jndi.rmi.port", "1198"); addSystemProperty("org.jboss.osgi.jndi.port", "1199"); - addDependency(new LogServiceCapability()); + addDependency(new LoggingCapability()); addBundle("bundles/jboss-osgi-common-core.jar"); addBundle("bundles/jboss-osgi-jndi.jar"); Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -33,13 +33,13 @@ import javax.naming.NamingException; import org.jboss.net.sockets.DefaultSocketFactory; -import org.jboss.osgi.common.log.LogServiceTracker; import org.jnp.interfaces.Naming; import org.jnp.server.Main; import org.jnp.server.NamingBean; import org.jnp.server.NamingServer; import org.osgi.framework.BundleContext; -import org.osgi.service.log.LogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Start/Stop the {@link NamingServer} @@ -49,7 +49,9 @@ */ public class JNPServer { - private LogService log; + // Provide logging + final Logger log = LoggerFactory.getLogger(JNPServer.class); + private String host; private int jndiPort; private int rmiPort; @@ -62,7 +64,6 @@ public JNPServer(BundleContext context, String host, int jndiPort, int rmiPort) { - this.log = new LogServiceTracker(context); this.host = host; this.jndiPort = jndiPort; this.rmiPort = rmiPort; @@ -77,11 +78,11 @@ try { rmiRegistry.list(); - log.log(LogService.LOG_DEBUG, "RMI registry running at host=" + host + ",port=" + rmiPort); + log.debug("RMI registry running at host=" + host + ",port=" + rmiPort); } catch (RemoteException e) { - log.log(LogService.LOG_DEBUG, "No RMI registry running at host=" + host + ",port=" + rmiPort + ". Will create one."); + log.debug("No RMI registry running at host=" + host + ",port=" + rmiPort + ". Will create one."); rmiRegistry = LocateRegistry.createRegistry(rmiPort, null, new DefaultSocketFactory(InetAddress.getByName(host))); shutdownRegistry = true; } @@ -96,11 +97,11 @@ namingMain.setRmiPort(rmiPort); namingMain.start(); - log.log(LogService.LOG_INFO, "JNDI started: JNP=" + host + ":" + jndiPort + ", RMI=" + host + ":" + rmiPort); + log.info("JNDI started: JNP=" + host + ":" + jndiPort + ", RMI=" + host + ":" + rmiPort); } catch (Exception ex) { - log.log(LogService.LOG_ERROR, "Cannot start Naming server", ex); + log.error("Cannot start Naming server", ex); } } @@ -111,7 +112,7 @@ namingMain.stop(); namingMain = null; namingServer = null; - log.log(LogService.LOG_DEBUG, "Naming server stopped"); + log.debug("Naming server stopped"); } // Shutdown the registry if this service created it @@ -119,12 +120,12 @@ { try { - log.log(LogService.LOG_DEBUG, "Shutdown RMI registry"); + log.debug("Shutdown RMI registry"); UnicastRemoteObject.unexportObject(rmiRegistry, true); } catch (NoSuchObjectException ex) { - log.log(LogService.LOG_WARNING, "Cannot shutdown RMI registry", ex); + log.warn("Cannot shutdown RMI registry", ex); } } } Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/.classpath 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/.classpath 2009-11-26 22:32:23 UTC (rev 97050) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/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"/> Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -39,13 +39,19 @@ <!-- Properties --> <properties> + <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix> <version.javassist>3.9.0.GA</version.javassist> <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> + <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> + <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment> + <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky> + <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb> + <version.jboss.osgi.jmx>1.0.2-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers> - <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment> - <version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx> - <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding> <version.jboss.reflect>2.0.2.GA</version.jboss.reflect> <version.jboss.xb>2.0.2.Beta3</version.jboss.xb> <version.osgi>4.2.0</version.osgi> @@ -62,11 +68,23 @@ <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs</artifactId> <version>${version.jboss.deployers}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <version>${version.jboss.microcontainer}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss</groupId> @@ -85,11 +103,6 @@ <version>${version.jboss.osgi.spi}</version> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - </dependency> - <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployers</artifactId> <version>${version.jboss.osgi.runtime.deployers}</version> @@ -102,6 +115,44 @@ <!-- Provided Dependencies --> <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common-core</artifactId> + <version>${version.jboss.osgi.common.core}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-husky</artifactId> + <version>${version.jboss.osgi.husky}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jaxb</artifactId> + <version>${version.jboss.osgi.jaxb}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-xml-binding</artifactId> + <version>${version.jboss.osgi.xml.binding}</version> + <scope>provided</scope> + </dependency> + + <!-- OSGi Dependencies --> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <version>${version.osgi}</version> @@ -113,6 +164,19 @@ <version>${version.osgi}</version> <scope>provided</scope> </dependency> + + <!-- Test Dependencies --> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -136,7 +200,7 @@ <!-- system --> javax.management, javax.naming*, - javax.xml.*, + javax.xml.bind;version=2.1, org.w3c.dom, org.xml.sax, @@ -194,6 +258,84 @@ </instructions> </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bundles</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-bundles.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-test-jars</id> + <phase>integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="artifactId" value="${artifactId}" /> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="build.artifact" value="${project.build.finalName}" /> + <ant antfile="scripts/antrun-test-jars.xml" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>surefire-integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <argLine>${surefire.jpda.args}</argLine> + <systemProperties> + <property> + <name>java.protocol.handler.pkgs</name> + <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Copied: projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts (from rev 97041, projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts) Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/scripts/assembly-bundles.xml 2009-11-26 16:47:57 UTC (rev 97041) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/scripts/assembly-bundles.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -16,9 +16,13 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:jboss-osgi-apache-xerces:jar</include> + <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> + <include>*:jboss-osgi-jndi:jar</include> + <include>*:jboss-osgi-jmx:jar</include> + <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -23,6 +23,7 @@ //$Id$ +import org.jboss.osgi.jbossxb.XMLBindingCapability; import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.capability.Capability; import org.jboss.osgi.spi.service.MicrocontainerService; @@ -45,6 +46,7 @@ super(MicrocontainerService.class.getName()); addDependency(new JMXCapability()); + addDependency(new XMLBindingCapability()); addBundle("bundles/jboss-osgi-microcontainer.jar"); } Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/BasicMicrocontainerTestCase.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,72 @@ +/* + * 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.microcontainer; + +//$Id: BasicXMLBindingTestCase.java 97031 2009-11-26 14:54:08Z thomas.diesler(a)jboss.com $ + +import static org.junit.Assert.assertNotNull; + +import org.jboss.osgi.husky.HuskyCapability; +import org.jboss.osgi.microcontainer.MicrocontainerCapability; +import org.jboss.osgi.spi.service.MicrocontainerService; +import org.jboss.osgi.testing.OSGiRuntime; +import org.jboss.osgi.testing.OSGiServiceReference; +import org.jboss.osgi.testing.OSGiTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.osgi.framework.BundleException; + +/** + * Test MicrocontainerService + * + * @author thomas.diesler(a)jboss.com + * @since 26-Nov-2009 + */ +public class BasicMicrocontainerTestCase extends OSGiTest +{ + private OSGiRuntime runtime; + + @Before + public void setUp() throws Exception + { + runtime = getDefaultRuntime(); + runtime.addCapability(new HuskyCapability()); + runtime.addCapability(new MicrocontainerCapability()); + + //OSGiBundle bundle = runtime.installBundle("simple-unmarshaller.jar"); + //bundle.start(); + } + + @After + public void tearDown() throws BundleException + { + runtime.shutdown(); + } + + @Test + public void testMicrocontainerService() throws Exception + { + OSGiServiceReference sref = runtime.getServiceReference(MicrocontainerService.class.getName()); + assertNotNull("MicrocontainerService available", sref); + } +} \ No newline at end of file Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SimpleActivator.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,45 @@ +/* + * 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.microcontainer.simple; + +//$Id: SomeServiceActivator.java 89664 2009-06-02 12:55:10Z thomas.diesler(a)jboss.com $ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * A Service Activator + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class SimpleActivator implements BundleActivator +{ + public void start(BundleContext context) + { + context.registerService(SomeService.class.getName(), new SomeService(context), null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeBean.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,28 @@ +/* + * 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.microcontainer.simple; + +//$Id: SomeBean.java 93025 2009-08-31 13:10:16Z thomas.diesler(a)jboss.com $ + +public class SomeBean +{ +} Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/java/org/jboss/test/osgi/microcontainer/simple/SomeService.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,54 @@ +/* + * 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.microcontainer.simple; + +//$Id: SomeService.java 93025 2009-08-31 13:10:16Z thomas.diesler(a)jboss.com $ + +import org.jboss.osgi.spi.service.MicrocontainerService; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A service that accesses the MicrocontainerService + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class SomeService +{ + // Provide logging + private static Logger log = LoggerFactory.getLogger(SomeService.class); + + public SomeService(BundleContext context) + { + ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); + MicrocontainerService service = (MicrocontainerService)context.getService(sref); + + SomeBean bean = (SomeBean)service.getRegisteredBean("SomeBean"); + if (bean == null) + throw new IllegalStateException("No MC bean"); + + log.info("MC bean available"); + } +} Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/jboss-osgi-framework.properties 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,40 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id: jboss-osgi-framework.properties 97021 2009-11-26 12:40:11Z thomas.diesler(a)jboss.com $ +# + +# Properties to configure the Framework +org.osgi.framework.storage=${test.archive.directory}/../osgi-store +org.osgi.framework.storage.clean=onFirstInit + +# Framework bootdelegation +# org.osgi.framework.bootdelegation= + +# Extra System Packages +org.osgi.framework.system.packages.extra=\ + org.apache.log4j;version=1.2, \ + org.jboss.logging, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.interceptor;version=1.0, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.management;version=1.0, \ + org.jboss.osgi.spi.service;version=1.0, \ + org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.virtual;version=2.1, \ + org.jboss.virtual.plugins.registry;version=2.1, \ + org.jboss.virtual.plugins.context.jar;version=2.1, \ + org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ + org.jboss.virtual.protocol;version=2.1, \ + org.osgi.framework;version=1.5, \ + org.slf4j;version=1.5 + +# Bundles that need to be installed with the Framework automatically +org.jboss.osgi.spi.framework.autoInstall=\ + file://${test.archive.directory}/bundles/org.osgi.compendium.jar + +# Bundles that need to be started automatically +#org.jboss.osgi.spi.framework.autoStart=\ +# file://${test.archive.directory}/bundles/jboss-osgi-common.jar Added: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/log4j.xml (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/test/resources/log4j.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <appender name="FILE" class="org.apache.log4j.FileAppender"> + <param name="File" value="${log4j.output.dir}/test.log"/> + <param name="Append" value="false"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out" /> + <param name="Threshold" value="INFO" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" /> + </layout> + </appender> + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <!-- Show jboss deployer traces + <category name="org.jboss.deployers"> + <priority value="TRACE" /> + </category> + --> + + <!-- Show jboss deployer traces --> + <category name="org.jboss.xb"> + <priority value="TRACE" /> + </category> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> + <!--appender-ref ref="CONSOLE"/--> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java 2009-11-26 22:32:23 UTC (rev 97050) @@ -24,6 +24,7 @@ //$Id$ import java.net.URL; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -45,8 +46,8 @@ // Provide logging final Logger log = Logger.getLogger(AutoInstallPluginImpl.class); - private List<URL> autoInstall; - private List<URL> autoStart; + private List<URL> autoInstall = Collections.emptyList(); + private List<URL> autoStart = Collections.emptyList(); private Map<URL, Bundle> autoBundles = new ConcurrentHashMap<URL, Bundle>(); @@ -55,7 +56,6 @@ super(bundleManager); } - public void setAutoInstall(List<URL> autoInstall) { this.autoInstall = autoInstall; Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/trunk/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -51,15 +51,15 @@ <version.izpack>4.3.1</version.izpack> <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces> <version.jboss.osgi.blueprint>1.0.0.Alpha3</version.jboss.osgi.blueprint> - <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment> <version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.3</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx> - <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi> + <version.jboss.osgi.jmx>1.0.2-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.jndi>1.0.2-SNAPSHOT</version.jboss.osgi.jndi> <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta> <version.jboss.osgi.microcontainer>2.0.9-SNAPSHOT</version.jboss.osgi.microcontainer> <version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers> Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -64,6 +64,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <scope>provided</scope> </dependency> Modified: projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -24,7 +24,6 @@ <include>*:jboss-osgi-jndi:jar</include> <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-xml-binding:jar</include> - <include>*:org.apache.felix.log:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> Modified: projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-26 22:32:23 UTC (rev 97050) @@ -68,7 +68,6 @@ </property> <property name="autoStart"> <list elementClass="java.net.URL"> - <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value> <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value> </list> </property> Modified: projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-11-26 21:48:31 UTC (rev 97049) +++ projects/jboss-osgi/trunk/reactor/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-11-26 22:32:23 UTC (rev 97050) @@ -38,6 +38,5 @@ # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ - file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \ No newline at end of file