[jboss-osgi-commits] JBoss-OSGI SVN: r91000 - in projects/jboss-osgi: projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi and 42 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-07-09 09:19:56 -0400 (Thu, 09 Jul 2009) New Revision: 91000 Added: projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/ projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogCapability.java projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogListener.java projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogService.java projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintService.java projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java Removed: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/internal/ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HuskyCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JAXBCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JMXCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JNDICapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLBindingCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/JAXBService.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java Modified: projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogEntry.java projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogReaderServiceImpl.java projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogServiceActivator.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java projects/jboss-osgi/trunk/blueprint/impl/pom.xml projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd projects/jboss-osgi/trunk/husky/harness/.project projects/jboss-osgi/trunk/husky/harness/pom.xml projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: [JBOSGI-105] Lazy bundle activation for runtime bundles Move capabilities and services to respective projects Modified: projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -19,7 +19,7 @@ <properties> <version.apache.xerces>2.9.1</version.apache.xerces> - <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> <version.wutka.dtdparser>1.2.1</version.wutka.dtdparser> <version.xml.resolver>1.2</version.xml.resolver> <version.osgi>r4v41</version.osgi> @@ -27,6 +27,12 @@ <dependencies> <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + </dependency> + + <dependency> <groupId>apache-xerces</groupId> <artifactId>xml-apis</artifactId> <version>${version.apache.xerces}</version> @@ -47,14 +53,6 @@ <version>${version.xml.resolver}</version> </dependency> - <!-- Bundle Dependencies --> - <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> @@ -82,6 +80,9 @@ <Private-Package> org.jboss.osgi.apache.xerces.internal </Private-Package> + <Export-Package> + org.jboss.osgi.xml;version=${version} + </Export-Package> <Import-Package> javax.xml.datatype, javax.xml.namespace, @@ -93,6 +94,7 @@ <!-- import --> org.jboss.osgi.common.log;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, org.osgi.framework, org.osgi.service.log, org.osgi.util.xml, Copied: projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java) =================================================================== --- projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java (rev 0) +++ projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,50 @@ +/* + * 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.xml; + +//$Id$ + +import javax.xml.parsers.SAXParserFactory; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the XML parser capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link SAXParserFactory} is already registered. + * + * Installed bundles: jboss-osgi-apache-xerces.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class XMLParserCapability extends Capability +{ + public XMLParserCapability() + { + super(SAXParserFactory.class.getName()); + + addBundle("bundles/jboss-osgi-apache-xerces.jar"); + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -18,17 +18,16 @@ </parent> <properties> - <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> - <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi> + <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces> <version.xml.bind>2.1.10</version.xml.bind> <version.osgi>r4v41</version.osgi> </properties> <dependencies> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-apache-xerces</artifactId> + <version>${version.jboss.osgi.apache.xerces}</version> </dependency> <dependency> @@ -50,14 +49,6 @@ <version>${version.osgi}</version> <scope>provided</scope> </dependency> - - <!-- Bundles --> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> - <scope>provided</scope> - </dependency> </dependencies> <build> @@ -72,6 +63,9 @@ <Private-Package> org.jboss.osgi.jaxb.internal </Private-Package> + <Export-Package> + org.jboss.osgi.jaxb;version=${version} + </Export-Package> <Import-Package> <!-- system --> javax.imageio*, @@ -85,7 +79,8 @@ <!-- import --> org.jboss.osgi.common.log;version=1.0, - org.jboss.osgi.spi.service;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.xml, org.osgi.framework, org.osgi.service.log, Copied: projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JAXBCapability.java) =================================================================== --- projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java (rev 0) +++ projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,52 @@ +/* + * 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.jaxb; + +//$Id$ + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.xml.XMLParserCapability; + +/** + * Adds the JAXB capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link JAXBService} is already registered. + * + * Dependent capabilities: {@link XMLParserCapability}. + * + * Installed bundles: jboss-osgi-jaxb.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class JAXBCapability extends Capability +{ + public JAXBCapability() + { + super(JAXBService.class.getName()); + + addDependency(new XMLParserCapability()); + addBundle("bundles/jboss-osgi-jaxb.jar"); + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/JAXBService.java) =================================================================== --- projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java (rev 0) +++ projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/JAXBService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -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.jaxb; + +//$Id$ + +/** + * A marker service that is registered by jboss-osgi-jaxb + * + * @author thomas.diesler(a)jboss.com + * @since 29-May-2009 + */ +public interface JAXBService +{ +} \ No newline at end of file Modified: projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java =================================================================== --- projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/3rdparty/jaxb/trunk/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.osgi.common.log.LogServiceTracker; -import org.jboss.osgi.spi.service.JAXBService; +import org.jboss.osgi.jaxb.JAXBService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -20,14 +20,19 @@ <properties> <version.jboss.xb>2.0.1.GA</version.jboss.xb> <version.javassist>3.9.0.GA</version.javassist> - <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> - <version.jboss.osgi.jaxb>2.1.10</version.jboss.osgi.jaxb> + <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb> <version.jboss.reflect>2.0.0.GA</version.jboss.reflect> <version.osgi>r4v41</version.osgi> </properties> <dependencies> <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jaxb</artifactId> + <version>${version.jboss.osgi.jaxb}</version> + </dependency> + + <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> <version>${version.jboss.xb}</version> @@ -38,20 +43,6 @@ <version>${version.javassist}</version> </dependency> - <!-- Bundle 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-jaxb</artifactId> - <version>${version.jboss.osgi.jaxb}</version> - <scope>provided</scope> - </dependency> - <!-- Provided Dependencies --> <dependency> <groupId>org.osgi</groupId> @@ -91,6 +82,8 @@ org.apache.xerces.*, org.jboss.logging, org.jboss.osgi.common.log;version=1.0, + org.jboss.osgi.jaxb;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.util*, org.osgi.framework, Copied: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLBindingCapability.java) =================================================================== --- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java (rev 0) +++ projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,53 @@ +/* + * 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.jbossxb; + +//$Id$ + +import org.jboss.osgi.jaxb.JAXBCapability; +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the JBossXB capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link XMLBindingService} is already registered. + * + * Dependent capabilities: {@link JAXBCapability}. + * + * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-xml-binding.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class XMLBindingCapability extends Capability +{ + public XMLBindingCapability() + { + super (XMLBindingService.class.getName()); + + addDependency(new JAXBCapability()); + addBundle("bundles/jboss-osgi-common-core.jar"); + addBundle("bundles/jboss-osgi-xml-binding.jar"); + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java) =================================================================== --- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java (rev 0) +++ projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/XMLBindingService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -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.jbossxb; + +//$Id$ + +/** + * A marker service that is registered by jboss-osgi-xml-binding + * + * @author thomas.diesler(a)jboss.com + * @since 29-May-2009 + */ +public interface XMLBindingService +{ +} \ No newline at end of file Modified: projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java =================================================================== --- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -26,7 +26,7 @@ import javax.xml.parsers.SAXParserFactory; import org.jboss.osgi.common.log.LogServiceTracker; -import org.jboss.osgi.spi.service.XMLBindingService; +import org.jboss.osgi.jbossxb.XMLBindingService; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.parser.sax.SaxJBossXBParser; import org.osgi.framework.BundleActivator; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -18,9 +18,7 @@ <!-- Properties --> <properties> - <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> - <version.jboss.osgi.jndi>1.0.0.Beta2</version.jboss.osgi.jndi> - <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi> + <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi> <version.osgi>r4v41</version.osgi> </properties> @@ -28,23 +26,9 @@ <dependencies> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - - <!-- Bundles --> - <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-jndi</artifactId> <version>${version.jboss.osgi.jndi}</version> - <scope>provided</scope> </dependency> <!-- OSGi Dependencies --> @@ -72,6 +56,9 @@ <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Bundle-Activator>org.jboss.osgi.jmx.internal.JMXServiceActivator</Bundle-Activator> + <Export-Package> + org.jboss.osgi.jmx;version=${version} + </Export-Package> <Import-Package> <!-- system --> @@ -81,6 +68,7 @@ <!-- 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", <!-- osgi --> Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JMXCapability.java) =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java (rev 0) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,64 @@ +/* + * 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.jmx; + +//$Id$ + +import java.util.Properties; + +import javax.management.MBeanServer; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the JMX capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link MBeanServer} is already registered. + * + * Installed bundles: jboss-osgi-jmx.jar + * + * Default properties set by this capability + * + * <table> + * <tr><th>Property</th><th>Value</th></tr> + * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr> + * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr> + * </table> + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class JMXCapability extends Capability +{ + public JMXCapability() + { + super(MBeanServer.class.getName()); + + Properties props = getProperties(); + props.setProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); + props.setProperty("org.jboss.osgi.jmx.rmi.port", "1198"); + + addBundle("bundles/jboss-osgi-jmx.jar"); + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -19,12 +19,18 @@ <!-- Properties --> <properties> <version.jboss.naming>5.0.1.GA</version.jboss.naming> - <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> + <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> <version.osgi>r4v41</version.osgi> </properties> <!-- Dependencies --> <dependencies> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + </dependency> + <!-- Provided Dependencies --> <dependency> <groupId>org.jboss.naming</groupId> @@ -33,14 +39,6 @@ <scope>provided</scope> </dependency> - <!-- Bundle dependencies --> - <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> @@ -66,12 +64,16 @@ <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Bundle-Activator>org.jboss.osgi.jndi.internal.JNDIServiceActivator</Bundle-Activator> + <Export-Package> + org.jboss.osgi.jndi;version=${version} + </Export-Package> <Import-Package> javax.naming*, javax.net, org.jboss.logging, org.jboss.net.sockets, org.jboss.osgi.common.log;version="1.0", + org.jboss.osgi.spi.capability;version="1.0", org.jboss.util.naming, org.jboss.util.threadpool, org.osgi.framework, Copied: projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JNDICapability.java) =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java (rev 0) +++ projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,67 @@ +/* + * 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.jndi; + +//$Id$ + +import java.util.Properties; + +import javax.naming.InitialContext; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the JNDI capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link InitialContext} is already registered. + * + * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar + * + * Default properties set by this capability + * + * <table> + * <tr><th>Property</th><th>Value</th></tr> + * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr> + * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr> + * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr> + * </table> + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class JNDICapability extends Capability +{ + public JNDICapability() + { + super(InitialContext.class.getName()); + + Properties props = getProperties(); + props.setProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost")); + props.setProperty("org.jboss.osgi.jndi.rmi.port", "1198"); + props.setProperty("org.jboss.osgi.jndi.port", "1199"); + + addBundle("bundles/jboss-osgi-common-core.jar"); + addBundle("bundles/jboss-osgi-jndi.jar"); + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -21,12 +21,9 @@ <properties> <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> - <version.jboss.osgi.apache.xerces>2.9.1</version.jboss.osgi.apache.xerces> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers> <version.jboss.osgi.jbossas>1.0.0-SNAPSHOT</version.jboss.osgi.jbossas> - <version.jboss.osgi.jmx>1.0.0.Beta2</version.jboss.osgi.jmx> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding> <version.osgi>r4v41</version.osgi> </properties> @@ -34,6 +31,17 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-xml-binding</artifactId> + <version>${version.jboss.osgi.xml.binding}</version> + </dependency> + + <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs</artifactId> <version>${version.jboss.deployers}</version> @@ -50,37 +58,10 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-integration-jbossas</artifactId> <version>${version.jboss.osgi.jbossas}</version> </dependency> - <!-- Bundle Dependencies --> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</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.bundles</groupId> - <artifactId>jboss-osgi-apache-xerces</artifactId> - <version>${version.jboss.osgi.apache.xerces}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-xml-binding</artifactId> - <version>${version.jboss.osgi.xml.binding}</version> - </dependency> - <!-- Provided Dependencies --> <dependency> <groupId>org.osgi</groupId> @@ -107,6 +88,7 @@ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Bundle-Activator>org.jboss.osgi.microcontainer.internal.MicrocontainerServiceActivator</Bundle-Activator> <Export-Package> + org.jboss.osgi.microcontainer;version=${version} </Export-Package> <Private-Package> org.jboss.osgi.microcontainer.internal Copied: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java) =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java (rev 0) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,55 @@ +/* + * 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.microcontainer; + +//$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; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the Microcontainer capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link MicrocontainerService} is already registered. + * + * Dependent capabilities: {@link JMXCapability}, {@link XMLBindingCapability}. + * + * Installed bundles: jboss-osgi-microcontainer.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class MicrocontainerCapability extends Capability +{ + public MicrocontainerCapability() + { + super(MicrocontainerService.class.getName()); + + addDependency(new JMXCapability()); + addDependency(new XMLBindingCapability()); + addBundle("bundles/jboss-osgi-microcontainer.jar"); + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -36,10 +36,10 @@ import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.integration.jbossas.AbstractMicrocontainerService; +import org.jboss.osgi.jbossxb.XMLBindingService; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.DeployerService; import org.jboss.osgi.spi.service.MicrocontainerService; -import org.jboss.osgi.spi.service.XMLBindingService; import org.jboss.virtual.VFS; import org.osgi.framework.BundleContext; import org.osgi.framework.Filter; Modified: projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -19,25 +19,16 @@ <!-- Properties --> <properties> - <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> - <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi> + <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> <version.osgi>r4v41</version.osgi> </properties> <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - - <!-- Bundle Dependencies --> - <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> <version>${version.jboss.osgi.common}</version> - <scope>provided</scope> </dependency> <!-- OSGi Dependencies --> @@ -64,11 +55,14 @@ <configuration> <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.service.remotelog.internal.RemoteLogServiceActivator</Bundle-Activator> - <Export-Package>org.jboss.osgi.service.remotelog;version=${version}</Export-Package> + <Bundle-Activator>org.jboss.osgi.remotelog.internal.RemoteLogServiceActivator</Bundle-Activator> + <Export-Package> + org.jboss.osgi.remotelog;version=${version} + </Export-Package> <Import-Package> org.jboss.osgi.common.log;version=1.0, org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.service;version=1.0, Copied: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java) =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogCapability.java (rev 0) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,65 @@ +/* + * 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.remotelog; + +//$Id$ + +import java.util.Properties; + +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the RemoteLog capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link RemoteLogService} is already registered. + * + * Installed bundles: jboss-osgi-remotelog.jar + * + * Default properties set by this capability + * + * <table> + * <tr><th>Property</th><th>Value</th></tr> + * <tr><td>org.jboss.osgi.service.remote.log.reader</td><td>true</td></tr> + * <tr><td>org.jboss.osgi.service.remote.log.host</td><td>${jboss.bind.address}</td></tr> + * <tr><td>org.jboss.osgi.service.remote.log.port</td><td>5400</td></tr> + * </table> + * + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class RemoteLogCapability extends Capability +{ + public RemoteLogCapability() + { + super(RemoteLogService.class.getName()); + + Properties props = getProperties(); + props.setProperty("org.jboss.osgi.service.remote.log.reader", "true"); + props.setProperty("org.jboss.osgi.service.remote.log.host", System.getProperty("jboss.bind.address", "localhost")); + props.setProperty("org.jboss.osgi.service.remote.log.port", "5400"); + + addBundle("bundles/jboss-osgi-remotelog.jar"); + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogListener.java (from rev 90985, projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java) =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogListener.java (rev 0) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogListener.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,130 @@ +/* + * 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.remotelog; + +//$Id$ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.Socket; +import java.util.Properties; + +import org.jboss.osgi.common.log.LogServiceTracker; +import org.jboss.osgi.remotelog.internal.RemoteLogEntry; +import org.jboss.osgi.spi.logging.RemoteLogReaderService; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.log.LogEntry; +import org.osgi.service.log.LogListener; +import org.osgi.service.log.LogReaderService; +import org.osgi.service.log.LogService; +import org.osgi.util.tracker.ServiceTracker; + +/** + * A server side {@link LogListener} that sends {@link LogEntry} objects + * via a socket connection + * + * @author thomas.diesler(a)jboss.com + * @since 12-Apr-2009 + */ +public class RemoteLogListener implements LogListener +{ + private LogService log; + + private BundleContext context; + private ServiceTracker tracker; + private String host; + private Integer port; + + public RemoteLogListener(BundleContext context, Properties props) + { + this.log = new LogServiceTracker(context); + this.context = context; + + this.host = props.getProperty(RemoteLogReaderService.REMOTE_LOG_HOST); + this.port = new Integer(props.getProperty(RemoteLogReaderService.REMOTE_LOG_PORT)); + + log.log(LogService.LOG_DEBUG, "RemoteLogListener: [host=" + host + ",port=" + port + "]"); + } + + public void start() + { + final LogListener logListener = this; + tracker = new ServiceTracker(context, LogReaderService.class.getName(), null) + { + @Override + public Object addingService(ServiceReference reference) + { + LogReaderService logReader = (LogReaderService)super.addingService(reference); + logReader.addLogListener(logListener); + return logReader; + } + }; + tracker.open(); + } + + public void stop() + { + LogReaderService logReader = (LogReaderService)tracker.getService(); + if (logReader != null) + logReader.removeLogListener(this); + } + + public void logged(LogEntry entry) + { + RemoteLogEntry remoteEntry = new RemoteLogEntry(entry); + try + { + Socket socket = new Socket(InetAddress.getByName(host), new Integer(port)); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(remoteEntry); + oos.close(); + + InputStream reqBytes = new ByteArrayInputStream(baos.toByteArray()); + OutputStream socketOut = socket.getOutputStream(); + copyStream(reqBytes, socketOut); + socketOut.close(); + } + catch (Exception ex) + { + System.err.println(ex); + } + } + + public static void copyStream(InputStream in, OutputStream out) throws IOException + { + byte[] bytes = new byte[1024]; + int read = in.read(bytes); + while (read > 0) + { + out.write(bytes, 0, read); + read = in.read(bytes); + } + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogService.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java) =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogService.java (rev 0) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/RemoteLogService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -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.remotelog; + +//$Id$ + +/** + * A marker service that is registered by jboss-osgi-remotelog + * + * @author thomas.diesler(a)jboss.com + * @since 29-May-2009 + */ +public interface RemoteLogService +{ +} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal (from rev 90985, projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/internal) Modified: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogEntry.java =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogEntry.java 2009-07-09 05:49:26 UTC (rev 90985) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogEntry.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -19,7 +19,7 @@ * 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.service.remotelog.internal; +package org.jboss.osgi.remotelog.internal; // $Id$ Modified: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogReaderServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java 2009-07-09 05:49:26 UTC (rev 90985) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogReaderServiceImpl.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -19,7 +19,7 @@ * 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.service.remotelog.internal; +package org.jboss.osgi.remotelog.internal; //$Id$ Modified: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogServiceActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogServiceActivator.java 2009-07-09 05:49:26 UTC (rev 90985) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/remotelog/internal/RemoteLogServiceActivator.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -19,7 +19,7 @@ * 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.service.remotelog.internal; +package org.jboss.osgi.remotelog.internal; //$Id$ @@ -30,9 +30,9 @@ import java.util.Properties; -import org.jboss.osgi.service.remotelog.RemoteLogListener; +import org.jboss.osgi.remotelog.RemoteLogListener; +import org.jboss.osgi.remotelog.RemoteLogService; import org.jboss.osgi.spi.logging.RemoteLogReaderService; -import org.jboss.osgi.spi.service.RemoteLogService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Deleted: projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/bundles/remotelog/trunk/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,130 +0,0 @@ -/* - * 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.service.remotelog; - -//$Id$ - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectOutputStream; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.Socket; -import java.util.Properties; - -import org.jboss.osgi.common.log.LogServiceTracker; -import org.jboss.osgi.service.remotelog.internal.RemoteLogEntry; -import org.jboss.osgi.spi.logging.RemoteLogReaderService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.log.LogEntry; -import org.osgi.service.log.LogListener; -import org.osgi.service.log.LogReaderService; -import org.osgi.service.log.LogService; -import org.osgi.util.tracker.ServiceTracker; - -/** - * A server side {@link LogListener} that sends {@link LogEntry} objects - * via a socket connection - * - * @author thomas.diesler(a)jboss.com - * @since 12-Apr-2009 - */ -public class RemoteLogListener implements LogListener -{ - private LogService log; - - private BundleContext context; - private ServiceTracker tracker; - private String host; - private Integer port; - - public RemoteLogListener(BundleContext context, Properties props) - { - this.log = new LogServiceTracker(context); - this.context = context; - - this.host = props.getProperty(RemoteLogReaderService.REMOTE_LOG_HOST); - this.port = new Integer(props.getProperty(RemoteLogReaderService.REMOTE_LOG_PORT)); - - log.log(LogService.LOG_DEBUG, "RemoteLogListener: [host=" + host + ",port=" + port + "]"); - } - - public void start() - { - final LogListener logListener = this; - tracker = new ServiceTracker(context, LogReaderService.class.getName(), null) - { - @Override - public Object addingService(ServiceReference reference) - { - LogReaderService logReader = (LogReaderService)super.addingService(reference); - logReader.addLogListener(logListener); - return logReader; - } - }; - tracker.open(); - } - - public void stop() - { - LogReaderService logReader = (LogReaderService)tracker.getService(); - if (logReader != null) - logReader.removeLogListener(this); - } - - public void logged(LogEntry entry) - { - RemoteLogEntry remoteEntry = new RemoteLogEntry(entry); - try - { - Socket socket = new Socket(InetAddress.getByName(host), new Integer(port)); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(remoteEntry); - oos.close(); - - InputStream reqBytes = new ByteArrayInputStream(baos.toByteArray()); - OutputStream socketOut = socket.getOutputStream(); - copyStream(reqBytes, socketOut); - socketOut.close(); - } - catch (Exception ex) - { - System.err.println(ex); - } - } - - public static void copyStream(InputStream in, OutputStream out) throws IOException - { - byte[] bytes = new byte[1024]; - int read = in.read(bytes); - while (read > 0) - { - out.write(bytes, 0, read); - read = in.read(bytes); - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,48 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import org.jboss.osgi.spi.service.BlueprintService; -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the Blueprint capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link BlueprintService} is already registered. - * - * Installed bundles: jboss-osgi-blueprint.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class BlueprintCapability extends Capability -{ - public BlueprintCapability() - { - super (BlueprintService.class.getName()); - - addBundle("bundles/jboss-osgi-blueprint.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HuskyCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HuskyCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HuskyCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,52 +0,0 @@ -/* - * 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.spi.capability; - -import org.jboss.osgi.spi.testing.OSGiRuntime; - - -//$Id$ - - -/** - * Adds the Husky testing capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if a Husky connector is already registered. - * - * Dependent capabilities: {@link JMXCapability}. - * - * Installed bundles: jboss-osgi-husky.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class HuskyCapability extends Capability -{ - public HuskyCapability() - { - super("org.jboss.osgi.husky.runtime.Connector"); - - addDependency(new JMXCapability()); - addBundle("bundles/jboss-osgi-husky-harness.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JAXBCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JAXBCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JAXBCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,51 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import org.jboss.osgi.spi.service.JAXBService; -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the JAXB capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link JAXBService} is already registered. - * - * Dependent capabilities: {@link XMLParserCapability}. - * - * Installed bundles: jboss-osgi-jaxb.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class JAXBCapability extends Capability -{ - public JAXBCapability() - { - super(JAXBService.class.getName()); - - addDependency(new XMLParserCapability()); - addBundle("bundles/jboss-osgi-jaxb.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JMXCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JMXCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JMXCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,63 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import java.util.Properties; - -import javax.management.MBeanServer; - -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the JMX capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link MBeanServer} is already registered. - * - * Installed bundles: jboss-osgi-jmx.jar - * - * Default properties set by this capability - * - * <table> - * <tr><th>Property</th><th>Value</th></tr> - * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr> - * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr> - * </table> - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class JMXCapability extends Capability -{ - public JMXCapability() - { - super(MBeanServer.class.getName()); - - Properties props = getProperties(); - props.setProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); - props.setProperty("org.jboss.osgi.jmx.rmi.port", "1198"); - - addBundle("bundles/jboss-osgi-jmx.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JNDICapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JNDICapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/JNDICapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,66 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import java.util.Properties; - -import javax.naming.InitialContext; - -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the JNDI capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link InitialContext} is already registered. - * - * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar - * - * Default properties set by this capability - * - * <table> - * <tr><th>Property</th><th>Value</th></tr> - * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr> - * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr> - * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr> - * </table> - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class JNDICapability extends Capability -{ - public JNDICapability() - { - super(InitialContext.class.getName()); - - Properties props = getProperties(); - props.setProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost")); - props.setProperty("org.jboss.osgi.jndi.rmi.port", "1198"); - props.setProperty("org.jboss.osgi.jndi.port", "1199"); - - addBundle("bundles/jboss-osgi-common-core.jar"); - addBundle("bundles/jboss-osgi-jndi.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,52 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the Microcontainer capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link MicrocontainerService} is already registered. - * - * Dependent capabilities: {@link JMXCapability}, {@link XMLBindingCapability}. - * - * Installed bundles: jboss-osgi-microcontainer.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class MicrocontainerCapability extends Capability -{ - public MicrocontainerCapability() - { - super(MicrocontainerService.class.getName()); - - addDependency(new JMXCapability()); - addDependency(new XMLBindingCapability()); - addBundle("bundles/jboss-osgi-microcontainer.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,65 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import java.util.Properties; - -import org.jboss.osgi.spi.service.RemoteLogService; -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the RemoteLog capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link RemoteLogService} is already registered. - * - * Installed bundles: jboss-osgi-remotelog.jar - * - * Default properties set by this capability - * - * <table> - * <tr><th>Property</th><th>Value</th></tr> - * <tr><td>org.jboss.osgi.service.remote.log.reader</td><td>true</td></tr> - * <tr><td>org.jboss.osgi.service.remote.log.host</td><td>${jboss.bind.address}</td></tr> - * <tr><td>org.jboss.osgi.service.remote.log.port</td><td>5400</td></tr> - * </table> - * - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class RemoteLogCapability extends Capability -{ - public RemoteLogCapability() - { - super(RemoteLogService.class.getName()); - - Properties props = getProperties(); - props.setProperty("org.jboss.osgi.service.remote.log.reader", "true"); - props.setProperty("org.jboss.osgi.service.remote.log.host", System.getProperty("jboss.bind.address", "localhost")); - props.setProperty("org.jboss.osgi.service.remote.log.port", "5400"); - - addBundle("bundles/jboss-osgi-remotelog.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLBindingCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLBindingCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLBindingCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,52 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import org.jboss.osgi.spi.service.XMLBindingService; -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the JBossXB capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link XMLBindingService} is already registered. - * - * Dependent capabilities: {@link JAXBCapability}. - * - * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-xml-binding.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class XMLBindingCapability extends Capability -{ - public XMLBindingCapability() - { - super (XMLBindingService.class.getName()); - - addDependency(new JAXBCapability()); - addBundle("bundles/jboss-osgi-common-core.jar"); - addBundle("bundles/jboss-osgi-xml-binding.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,49 +0,0 @@ -/* - * 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.spi.capability; - -//$Id$ - -import javax.xml.parsers.SAXParserFactory; - -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the XML parser capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link SAXParserFactory} is already registered. - * - * Installed bundles: jboss-osgi-apache-xerces.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class XMLParserCapability extends Capability -{ - public XMLParserCapability() - { - super(SAXParserFactory.class.getName()); - - addBundle("bundles/jboss-osgi-apache-xerces.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,34 +0,0 @@ -/* - * 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.spi.service; - -//$Id$ - -/** - * A marker service that is registered by jboss-osgi-blueprint - * - * @author thomas.diesler(a)jboss.com - * @since 29-May-2009 - */ -public interface BlueprintService -{ -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/JAXBService.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/JAXBService.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/JAXBService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,34 +0,0 @@ -/* - * 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.spi.service; - -//$Id$ - -/** - * A marker service that is registered by jboss-osgi-jaxb - * - * @author thomas.diesler(a)jboss.com - * @since 29-May-2009 - */ -public interface JAXBService -{ -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,34 +0,0 @@ -/* - * 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.spi.service; - -//$Id$ - -/** - * A marker service that is registered by jboss-osgi-remotelog - * - * @author thomas.diesler(a)jboss.com - * @since 29-May-2009 - */ -public interface RemoteLogService -{ -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -1,34 +0,0 @@ -/* - * 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.spi.service; - -//$Id$ - -/** - * A marker service that is registered by jboss-osgi-xml-binding - * - * @author thomas.diesler(a)jboss.com - * @since 29-May-2009 - */ -public interface XMLBindingService -{ -} \ No newline at end of file Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -26,7 +26,6 @@ import javax.naming.NamingException; import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.capability.RemoteLogCapability; import org.jboss.osgi.spi.logging.LogEntryCache; import org.osgi.framework.BundleException; import org.osgi.framework.InvalidSyntaxException; @@ -98,13 +97,11 @@ /** * Start log entry tracking for this {@link OSGiRuntime} - * @see {@link RemoteLogCapability} */ void startLogEntryTracking(LogEntryCache logEntryCache); /** * Stop log entry tracking for this {@link OSGiRuntime} - * @see {@link RemoteLogCapability} */ void stopLogEntryTracking(); Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -25,6 +25,7 @@ import java.net.URL; import java.util.HashSet; +import java.util.Properties; import java.util.Set; import javax.management.MBeanServerConnection; @@ -32,7 +33,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.jboss.osgi.spi.capability.RemoteLogCapability; +import org.jboss.osgi.spi.capability.Capability; import org.jboss.osgi.spi.logging.LogEntryCache; import org.jboss.osgi.spi.logging.RemoteLogReaderService; import org.jboss.osgi.spi.management.MBeanProxy; @@ -315,4 +316,23 @@ ObjectName oname = new ObjectName("jboss.system:service=MainDeployer"); getMBeanServer().invoke(oname, method, new Object[] { archiveURL }, new String[] { "java.net.URL" }); } -} + + /** + * A copy of the RemoteLogCapability from the + * jboss-osgi-remotelog bundle, on which the SPI + * should not have a dependency. + */ + class RemoteLogCapability extends Capability + { + public RemoteLogCapability() + { + super("org.jboss.osgi.remotelog.RemoteLogService"); + + Properties props = getProperties(); + props.setProperty("org.jboss.osgi.service.remote.log.reader", "true"); + props.setProperty("org.jboss.osgi.service.remote.log.host", System.getProperty("jboss.bind.address", "localhost")); + props.setProperty("org.jboss.osgi.service.remote.log.port", "5400"); + + addBundle("bundles/jboss-osgi-remotelog.jar"); + } + }} Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -17,8 +17,8 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-microcontainer</artifactId> </dependency> <!-- Provided Dependencies --> @@ -33,18 +33,6 @@ <scope>provided</scope> </dependency> - <!-- Bundle Dependencies --> - <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-xml-binding</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> <!-- Build --> @@ -61,7 +49,7 @@ org.jboss.osgi.blueprint.* </Private-Package> <Export-Package> - org.osgi.service.blueprint.* + org.osgi.service.blueprint.*;version=1.0 </Export-Package> <Import-Package> javax.xml.bind.annotation, @@ -70,7 +58,9 @@ org.jboss.dependency.spi*, org.jboss.kernel.spi*, org.jboss.osgi.common.log;version=1.0, + org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.util;version=1.0, org.jboss.reflect.spi, Copied: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java) =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java (rev 0) +++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -0,0 +1,51 @@ +/* + * 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.blueprint; + +//$Id$ + +import org.jboss.osgi.microcontainer.MicrocontainerCapability; +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + +/** + * Adds the Blueprint capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if the {@link BlueprintService} is already registered. + * + * Installed bundles: jboss-osgi-blueprint.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class BlueprintCapability extends Capability +{ + public BlueprintCapability() + { + super (BlueprintService.class.getName()); + + addDependency(new MicrocontainerCapability()); + + addBundle("bundles/jboss-osgi-blueprint.jar"); + } +} \ No newline at end of file Copied: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintService.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java) =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintService.java (rev 0) +++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/BlueprintService.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -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.blueprint; + +//$Id$ + +/** + * A marker service that is registered by jboss-osgi-blueprint + * + * @author thomas.diesler(a)jboss.com + * @since 29-May-2009 + */ +public interface BlueprintService +{ +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.spi.service.BlueprintService; +import org.jboss.osgi.blueprint.BlueprintService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleListener; Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -35,12 +35,11 @@ import javax.management.MBeanServer; +import org.jboss.osgi.blueprint.BlueprintCapability; import org.jboss.osgi.husky.Bridge; import org.jboss.osgi.husky.BridgeFactory; +import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.capability.BlueprintCapability; -import org.jboss.osgi.spi.capability.HuskyCapability; -import org.jboss.osgi.spi.capability.MicrocontainerCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; @@ -81,7 +80,6 @@ { runtime = new OSGiTestHelper().getDefaultRuntime(); runtime.addCapability(new HuskyCapability()); - runtime.addCapability(new MicrocontainerCapability()); runtime.addCapability(new BlueprintCapability()); huskyBridge = BridgeFactory.getBridge(); Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-07-09 13:19:56 UTC (rev 91000) @@ -8,6 +8,7 @@ Import-Package: \ javax.management, \ + org.jboss.osgi.blueprint, \ org.jboss.osgi.husky, \ org.jboss.osgi.husky.annotation, \ org.jboss.osgi.spi.capability, \ Modified: projects/jboss-osgi/trunk/husky/harness/.project =================================================================== --- projects/jboss-osgi/trunk/husky/harness/.project 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/husky/harness/.project 2009-07-09 13:19:56 UTC (rev 91000) @@ -17,7 +17,7 @@ </buildCommand> </buildSpec> <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: projects/jboss-osgi/trunk/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -34,6 +34,10 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + </dependency> <!-- Provided Dependencies --> <dependency> Copied: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java (from rev 90985, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HuskyCapability.java) =================================================================== --- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java (rev 0) +++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -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.osgi.husky; + +import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.spi.testing.OSGiRuntime; + + +//$Id$ + + +/** + * Adds the Husky testing capability to the {@link OSGiRuntime} + * under test. + * + * It is ignored if a Husky connector is already registered. + * + * Dependent capabilities: {@link JMXCapability}. + * + * Installed bundles: jboss-osgi-husky.jar + * + * @author thomas.diesler(a)jboss.com + * @since 05-May-2009 + */ +public class HuskyCapability extends Capability +{ + public HuskyCapability() + { + super("org.jboss.osgi.husky.runtime.Connector"); + + addDependency(new JMXCapability()); + addBundle("bundles/jboss-osgi-husky-harness.jar"); + } +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -27,9 +27,9 @@ import static org.junit.Assume.assumeNotNull; import org.jboss.osgi.husky.BridgeFactory; +import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.capability.HuskyCapability; -import org.jboss.osgi.spi.capability.JMXCapability; +import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -27,9 +27,9 @@ import static org.junit.Assume.assumeNotNull; import org.jboss.osgi.husky.BridgeFactory; +import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.capability.HuskyCapability; -import org.jboss.osgi.spi.capability.JMXCapability; +import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -27,9 +27,9 @@ import static org.junit.Assume.assumeNotNull; import org.jboss.osgi.husky.BridgeFactory; +import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.capability.HuskyCapability; -import org.jboss.osgi.spi.capability.JMXCapability; +import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd 2009-07-09 13:19:56 UTC (rev 91000) @@ -9,6 +9,7 @@ org.jboss.osgi.husky.annotation, \ org.jboss.osgi.spi.capability, \ org.jboss.osgi.spi.testing, \ + org.jboss.osgi.jmx, \ org.junit, \ org.osgi.framework Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -39,18 +39,18 @@ <version.jboss.logging>2.0.5.GA</version.jboss.logging> <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> <version.jboss.naming>5.0.1.GA</version.jboss.naming> - <version.jboss.osgi.apache.xerces>2.9.1</version.jboss.osgi.apache.xerces> + <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces> <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> <version.jboss.osgi.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers> <version.jboss.osgi.hotdeploy>1.0.0-SNAPSHOT</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.integration.jbossas>1.0.0-SNAPSHOT</version.jboss.osgi.integration.jbossas> - <version.jboss.osgi.jaxb>2.1.10</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.0.Beta2</version.jboss.osgi.jmx> - <version.jboss.osgi.jndi>1.0.0.Beta2</version.jboss.osgi.jndi> + <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb> + <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi> <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.jboss.osgi.remotelog>1.0.0.Beta2</version.jboss.osgi.remotelog> + <version.jboss.osgi.remotelog>1.0.0-SNAPSHOT</version.jboss.osgi.remotelog> <version.jboss.osgi.runtime.equinox>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.equinox> <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.knopflerfish>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.knopflerfish> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -21,13 +21,13 @@ */ package org.jboss.test.osgi.example.jmx; -//$Id: $ +//$Id$ import static org.jboss.test.osgi.example.jmx.bundle.FooMBean.MBEAN_NAME; import static org.junit.Assert.assertEquals; -import org.jboss.osgi.spi.capability.JMXCapability; -import org.jboss.osgi.spi.capability.JNDICapability; +import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.jndi.JNDICapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -29,7 +29,7 @@ import javax.naming.InitialContext; import javax.naming.NameNotFoundException; -import org.jboss.osgi.spi.capability.JNDICapability; +import org.jboss.osgi.jndi.JNDICapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -26,8 +26,8 @@ import static org.jboss.test.osgi.example.microcontainer.bundleB.SomeBeanMBean.MBEAN_NAME; import static org.junit.Assert.assertEquals; -import org.jboss.osgi.spi.capability.JNDICapability; -import org.jboss.osgi.spi.capability.MicrocontainerCapability; +import org.jboss.osgi.jndi.JNDICapability; +import org.jboss.osgi.microcontainer.MicrocontainerCapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -28,8 +28,8 @@ import static org.junit.Assume.assumeNotNull; import org.jboss.osgi.husky.BridgeFactory; +import org.jboss.osgi.husky.HuskyCapability; import org.jboss.osgi.husky.annotation.ProvideContext; -import org.jboss.osgi.spi.capability.HuskyCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiTestHelper; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -33,17 +33,17 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; -import org.jboss.osgi.spi.capability.JAXBCapability; -import org.jboss.osgi.spi.capability.JMXCapability; -import org.jboss.osgi.spi.capability.JNDICapability; -import org.jboss.osgi.spi.capability.XMLBindingCapability; -import org.jboss.osgi.spi.capability.XMLParserCapability; -import org.jboss.osgi.spi.service.JAXBService; -import org.jboss.osgi.spi.service.XMLBindingService; +import org.jboss.osgi.jaxb.JAXBCapability; +import org.jboss.osgi.jaxb.JAXBService; +import org.jboss.osgi.jbossxb.XMLBindingCapability; +import org.jboss.osgi.jbossxb.XMLBindingService; +import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.jndi.JNDICapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; import org.jboss.osgi.spi.testing.OSGiServiceReference; import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.xml.XMLParserCapability; import org.junit.Test; import org.osgi.framework.BundleException; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -27,7 +27,7 @@ import java.util.List; -import org.jboss.osgi.spi.capability.JMXCapability; +import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiPackageAdmin; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -26,9 +26,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.jboss.osgi.spi.capability.JMXCapability; -import org.jboss.osgi.spi.capability.JNDICapability; -import org.jboss.osgi.spi.capability.MicrocontainerCapability; +import org.jboss.osgi.jmx.JMXCapability; +import org.jboss.osgi.jndi.JNDICapability; +import org.jboss.osgi.microcontainer.MicrocontainerCapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.MBeanProxyException; import org.jboss.osgi.spi.testing.OSGiBundle; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-07-09 13:19:56 UTC (rev 91000) @@ -39,8 +39,8 @@ import javax.management.ObjectName; -import org.jboss.osgi.spi.capability.JNDICapability; -import org.jboss.osgi.spi.capability.MicrocontainerCapability; +import org.jboss.osgi.jndi.JNDICapability; +import org.jboss.osgi.microcontainer.MicrocontainerCapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.ManagedFrameworkMBean; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-09 12:17:28 UTC (rev 90999) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-09 13:19:56 UTC (rev 91000) @@ -83,6 +83,16 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-apache-xerces</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jaxb</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jmx</artifactId> <scope>provided</scope> </dependency>