[jboss-osgi-commits] JBoss-OSGI SVN: r88053 - in projects/jboss-osgi/trunk: bundle/blueprint and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-30 02:51:28 -0400 (Thu, 30 Apr 2009) New Revision: 88053 Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/trunk/pom.xml Log: Add jaxb-bundle Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-30 06:44:11 UTC (rev 88052) +++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-30 06:51:28 UTC (rev 88053) @@ -1,18 +1,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBossOSGi - Bundle Blueprint Service</name> - + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-blueprint</artifactId> <packaging>jar</packaging> - + <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-bundle</artifactId> <version>1.0.0.Beta2</version> </parent> - + <!-- Properties --> <properties> </properties> @@ -35,7 +35,7 @@ <artifactId>org.apache.felix.log</artifactId> <scope>provided</scope> </dependency> - + <!-- Bundle Dependencies --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> @@ -44,6 +44,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jaxb-bundle</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-common-core-bundle</artifactId> <scope>provided</scope> </dependency> @@ -82,7 +87,7 @@ <artifactId>jbossxb-bundle</artifactId> <scope>provided</scope> </dependency> - + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> @@ -93,7 +98,7 @@ <artifactId>org.osgi.compendium</artifactId> <scope>provided</scope> </dependency> - + <!-- Test Dependencies --> <dependency> <groupId>org.jboss.osgi</groupId> @@ -146,5 +151,5 @@ </plugin> </plugins> </build> - + </project> Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-30 06:44:11 UTC (rev 88052) +++ projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-30 06:51:28 UTC (rev 88053) @@ -18,6 +18,7 @@ <include>*:apache-xerces-bundle:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.osgi.compendium:jar</include> + <include>*:jaxb-bundle:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-deployment:jar</include> <include>*:jboss-osgi-logging:jar</include> Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java 2009-04-30 06:44:11 UTC (rev 88052) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java 2009-04-30 06:51:28 UTC (rev 88053) @@ -60,6 +60,26 @@ } } + public void testJAXBBundle() throws BundleException + { + OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider(); + configProvider.configure("basic-felix-framework.properties"); + + OSGiFramework framework = configProvider.getFramework(); + try + { + BundleContext context = framework.getSystemBundleContext(); + + Bundle bundle = installBundle(context, "bundles/jaxb-bundle.jar", true); + + assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); + } + finally + { + framework.stop(); + } + } + public void testJBossCommonCoreBundle() throws BundleException { OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider(); Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-30 06:44:11 UTC (rev 88052) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-30 06:51:28 UTC (rev 88053) @@ -24,6 +24,7 @@ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ file://${test.archive.directory}/bundles/apache-xerces-bundle.jar \ file://${test.archive.directory}/bundles/jboss-common-core-bundle.jar \ + file://${test.archive.directory}/bundles/jaxb-bundle.jar \ file://${test.archive.directory}/bundles/jbossxb-bundle.jar \ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \ Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-30 06:44:11 UTC (rev 88052) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-30 06:51:28 UTC (rev 88053) @@ -48,9 +48,10 @@ <version.felix.webconsole>1.2.8</version.felix.webconsole> <version.izpack>4.3.0</version.izpack> <version.javax.servlet>2.4</version.javax.servlet> + <version.jaxb.bundle>2.1.10-SNAPSHOT</version.jaxb.bundle> <version.jbossas>5.0.1.GA</version.jbossas> <version.jboss.aop>2.0.1.GA</version.jboss.aop> - <version.jboss.common.core>2.2.11-SNAPSHOT</version.jboss.common.core> + <version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle> <version.jboss.deployers>2.0.5.GA</version.jboss.deployers> <version.jboss.jacc>1.1.0.GA</version.jboss.jacc> <version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin> @@ -180,8 +181,13 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jaxb-bundle</artifactId> + <version>${version.jaxb.bundle}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-common-core-bundle</artifactId> - <version>${version.jboss.common.core}</version> + <version>${version.jboss.common.core.bundle}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId>