Author: thomas.diesler(a)jboss.com Date: 2009-08-28 11:33:48 -0400 (Fri, 28 Aug 2009) New Revision: 92968 Added: projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/impl/.project projects/jboss-osgi/trunk/reactor/blueprint/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml 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/capabilities/CapabilityTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Update versions Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -42,15 +42,15 @@ <version.apache.felix.log>1.1.0-SNAPSHOT</version.apache.felix.log> <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype> <version.izpack>4.3.1</version.izpack> - <version.jboss.osgi.apache.xerces>2.9.1.SP1</version.jboss.osgi.apache.xerces> + <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces> <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.1-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core> <version.jboss.osgi.hotdeploy>1.0.0</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP1</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.0</version.jboss.osgi.jmx> - <version.jboss.osgi.jndi>1.0.0</version.jboss.osgi.jndi> + <version.jboss.osgi.jmx>1.0.1-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.jndi>1.0.1-SNAPSHOT</version.jboss.osgi.jndi> <version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer> <version.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox> @@ -63,6 +63,149 @@ <version.osgi>r4v42-20090728</version.osgi> </properties> + <!-- DependencyManagement --> + <dependencyManagement> + <dependencies> + + <!-- jboss.osgi --> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + </dependency> + + <!-- jboss.osgi.bundles --> + <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-blueprint</artifactId> + <version>${version.jboss.osgi.blueprint}</version> + </dependency> + <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-common-core</artifactId> + <version>${version.jboss.osgi.common.core}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-hotdeploy</artifactId> + <version>${version.jboss.osgi.hotdeploy}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-husky</artifactId> + <version>${version.jboss.osgi.husky}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jaxb</artifactId> + <version>${version.jboss.osgi.jaxb}</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-jndi</artifactId> + <version>${version.jboss.osgi.jndi}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-microcontainer</artifactId> + <version>${version.jboss.osgi.microcontainer}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-webconsole</artifactId> + <version>${version.jboss.osgi.webconsole}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-xml-binding</artifactId> + <version>${version.jboss.osgi.xml.binding}</version> + </dependency> + + <!-- jboss.osgi.runtime --> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployers</artifactId> + <version>${version.jboss.osgi.runtime.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <version>${version.jboss.osgi.runtime.jbossas}</version> + </dependency> + + <!-- Equinox Dependencies --> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version.jboss.osgi.runtime.equinox}</version> + </dependency> + + <!-- Felix Dependencies --> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <version>${version.apache.felix.configadmin}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.jetty</artifactId> + <version>${version.apache.felix.http.jetty}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${version.apache.felix.log}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.metatype</artifactId> + <version>${version.apache.felix.metatype}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.apache.felix.core}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.apache.felix.core}</version> + </dependency> + + <!-- org.osgi --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + </dependency> + </dependencies> + </dependencyManagement> + <!-- Repositories --> <repositories> <repository> Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/.project =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/impl/.project 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/reactor/blueprint/impl/.project 2009-08-28 15:33:48 UTC (rev 92968) @@ -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/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -25,75 +25,14 @@ <!-- Parent --> <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.2-SNAPSHOT</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta4</version> </parent> - <!-- Properties --> - <properties> - <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core> - <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> - <version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer> - <version.jboss.osgi.runtime.felix>1.9.0-SNAPSHOT</version.jboss.osgi.runtime.felix> - <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi> - <version.osgi>r4v42-20090728</version.osgi> - </properties> - <!-- Modules --> <modules> <module>impl</module> <module>testsuite</module> </modules> - <!-- DependencyManagement --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>${version.apache.felix.log}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common-core</artifactId> - <version>${version.jboss.osgi.common.core}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>${version.jboss.osgi.husky}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${version.osgi}</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <!-- Profiles --> - <profiles> - </profiles> - </project> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -73,6 +73,11 @@ </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-common-core</artifactId> <scope>provided</scope> </dependency> @@ -81,6 +86,11 @@ <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <scope>provided</scope> + </dependency> <!-- Test Dependencies --> <dependency> Added: projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/.settings/org.maven.ide.eclipse.prefs 2009-08-28 15:33:48 UTC (rev 92968) @@ -0,0 +1,9 @@ +#Fri Aug 28 15:55:21 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -162,7 +162,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jboss/test/osgi/**</exclude> + <exclude>org/jboss/test/osgi/foo/**</exclude> </excludes> </configuration> </plugin> 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-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleHuskyTestCase.java 2009-08-28 15:33:48 UTC (rev 92968) @@ -58,7 +58,7 @@ private OSGiBundle bundle; @Before - public void setUp() throws BundleException + public void setUp() throws Exception { // Only do this if we are not within the OSGi Runtime if (context == null) Added: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-08-28 15:33:48 UTC (rev 92968) @@ -0,0 +1,44 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id$ +# + +# The OSGiFramework implementation +org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration + +# Properties to configure the Framework +org.osgi.framework.storage=${basedir}/target/osgi-store +org.osgi.framework.storage.clean=onFirstInit + +# Extra System Packages +org.osgi.framework.system.packages.extra=\ + org.jboss.logging, \ + org.jboss.net.protocol, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ + org.jboss.osgi.spi.logging;version=1.0, \ + org.jboss.osgi.spi.management;version=1.0, \ + org.jboss.osgi.spi.service;version=1.0, \ + org.jboss.osgi.spi.testing;version=1.0, \ + org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.virtual, \ + org.jboss.virtual.plugins.registry, \ + org.jboss.virtual.plugins.context.jar, \ + org.jboss.virtual.plugins.vfs.helpers, \ + org.jboss.virtual.protocol, \ + org.jboss.util, \ + org.jboss.util.id, \ + org.jboss.util.threadpool, \ + org.jboss.util.propertyeditor, \ + org.osgi.framework;version\=1.4 + +# Bundles that need to be installed with the Framework automatically +org.jboss.osgi.spi.framework.autoInstall=\ + file://${test.archive.directory}/bundles/org.osgi.compendium.jar + +# Bundles that need to be started automatically +org.jboss.osgi.spi.framework.autoStart=\ + file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-common.jar Property changes on: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-08-28 15:33:48 UTC (rev 92968) @@ -45,7 +45,6 @@ import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.xml.XMLParserCapability; import org.junit.Test; -import org.osgi.framework.BundleException; /** * Test OSGi runtime capabilities @@ -56,7 +55,7 @@ public class CapabilityTestCase extends OSGiTest { @Test - public void testXMLParserCapability() throws BundleException + public void testXMLParserCapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try @@ -85,7 +84,7 @@ } @Test - public void testJAXBCapability() throws BundleException + public void testJAXBCapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try @@ -105,7 +104,7 @@ } @Test - public void testXMLBindingCapability() throws BundleException + public void testXMLBindingCapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try @@ -125,7 +124,7 @@ } @Test - public void testJNDICapability() throws BundleException + public void testJNDICapability() throws Exception { OSGiRuntime runtime = getEmbeddedRuntime(); try 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-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGI108TestCase.java 2009-08-28 15:33:48 UTC (rev 92968) @@ -53,7 +53,7 @@ private static OSGiRuntime runtime; @BeforeClass - public static void beforeClass() throws BundleException + public static void beforeClass() throws Exception { runtime = new OSGiTestHelper().getDefaultRuntime(); runtime.addCapability(new JMXCapability()); Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-28 15:32:05 UTC (rev 92967) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-28 15:33:48 UTC (rev 92968) @@ -46,14 +46,12 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> </dependency> <!-- Bundle Dependencies --> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>${version.apache.felix.configadmin}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -69,7 +67,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> - <version>${version.apache.felix.http.jetty}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -85,7 +82,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> - <version>${version.apache.felix.log}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -101,7 +97,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.metatype</artifactId> - <version>${version.apache.felix.metatype}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -116,20 +111,22 @@ </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-blueprint</artifactId> - <version>${version.jboss.osgi.blueprint}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky</artifactId> - <version>${version.jboss.osgi.husky}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> <scope>provided</scope> </dependency>