[jboss-osgi-commits] JBoss-OSGI SVN: r87966 - in projects/jboss-osgi/trunk: build/distribution and 14 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Tue Apr 28 19:11:46 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-04-28 19:11:46 -0400 (Tue, 28 Apr 2009)
New Revision: 87966
Added:
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/basic-felix-framework.properties
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
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/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/bundle/common/pom.xml
projects/jboss-osgi/trunk/bundle/deployment/pom.xml
projects/jboss-osgi/trunk/bundle/jmx/pom.xml
projects/jboss-osgi/trunk/bundle/logging/pom.xml
projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
projects/jboss-osgi/trunk/bundle/webconsole/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
WIP
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -34,23 +34,23 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
@@ -96,12 +96,12 @@
<type>jdocbook</type>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webconsole</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webconsole</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -2,6 +2,8 @@
<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>
@@ -33,31 +35,49 @@
<artifactId>org.apache.felix.log</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Bundle Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-microcontainer</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>apache-xerces-bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-common-core-bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jbossxb-bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -15,12 +15,15 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
+ <include>*:apache-xerces-bundle:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.osgi.compendium:jar</include>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
+ <include>*:jboss-common-core-bundle:jar</include>
+ <include>*:jbossxb-bundle:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
Added: 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 (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java 2009-04-28 23:11:46 UTC (rev 87966)
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+
+//$Id$
+package org.jboss.test.osgi.blueprint.bootstrap;
+
+import org.jboss.osgi.spi.framework.OSGiBootstrap;
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.junit.OSGiTest;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+/**
+ * Test OSGi System bundle access
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class BundleTestCase extends OSGiTest
+{
+ public void testApacheXercesBundle() 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/apache-xerces-bundle.jar", true);
+
+ assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+ }
+ finally
+ {
+ framework.stop();
+ }
+ }
+
+ public void testJBossCommonCoreBundle() 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/apache-xerces-bundle.jar", true);
+ bundle = installBundle(context, "bundles/jboss-common-core-bundle.jar", true);
+
+ assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+ }
+ finally
+ {
+ framework.stop();
+ }
+ }
+
+ public void testJBossXBBundle() 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/apache-xerces-bundle.jar", true);
+ bundle = installBundle(context, "bundles/jboss-common-core-bundle.jar", true);
+ bundle = installBundle(context, "bundles/jbossxb-bundle.jar", true);
+
+ assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+ }
+ finally
+ {
+ framework.stop();
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/basic-felix-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/basic-felix-framework.properties (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/basic-felix-framework.properties 2009-04-28 23:11:46 UTC (rev 87966)
@@ -0,0 +1,38 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+
+# The OSGiFramework implementation
+framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+
+# Properties to configure the Framework
+# All props start with 'framework.prop'
+framework.prop.org.osgi.framework.storage.clean=onFirstInit
+framework.prop.org.osgi.framework.system.packages=\
+ javax.activation, \
+ javax.management, \
+ javax.naming, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.xml.bind.annotation, \
+ javax.xml.bind.annotation.adapters, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.transform, \
+ javax.xml.transform.sax, \
+ org.jboss.logging, \
+ org.osgi.framework; version=1.4
+
+# Bundles that need to be installed with the Framework automatically
+framework.autoInstall=\
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+framework.autoStart=\
+ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar
+
\ No newline at end of file
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-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-28 23:11:46 UTC (rev 87966)
@@ -12,6 +12,8 @@
framework.prop.org.osgi.framework.storage.clean=onFirstInit
framework.prop.org.osgi.framework.system.packages=\
javax.management, \
+ javax.naming, \
+ javax.naming.spi, \
javax.xml.namespace, \
javax.xml.parsers, \
org.jboss.logging, \
@@ -26,8 +28,11 @@
# Bundles that need to be started automatically
framework.autoStart=\
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/jbossxb-bundle.jar \
file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \
file://${test.archive.directory}/bundles/jboss-osgi-microcontainer.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar
+ file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/common/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -2,6 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<name>JBossOSGi - Bundle Common</name>
+
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
<packaging>bundle</packaging>
Modified: projects/jboss-osgi/trunk/bundle/deployment/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/deployment/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/deployment/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -4,7 +4,7 @@
<name>JBossOSGi - Bundle Deployment</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<packaging>bundle</packaging>
Modified: projects/jboss-osgi/trunk/bundle/jmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/jmx/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/jmx/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -2,6 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<name>JBossOSGi - Bundle JMX</name>
+
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<packaging>bundle</packaging>
@@ -19,14 +21,16 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: projects/jboss-osgi/trunk/bundle/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -4,7 +4,7 @@
<name>JBossOSGi - Bundle Logging</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<packaging>bundle</packaging>
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -4,7 +4,7 @@
<name>JBossOSGi - Bundle Microcontainer</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-microcontainer</artifactId>
<packaging>bundle</packaging>
@@ -22,17 +22,12 @@
<artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</dependency>
@@ -40,11 +35,27 @@
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
</dependency>
+
+ <!-- Bundle Dependencies -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>apache-xerces-bundle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jbossxb-bundle</artifactId>
+ </dependency>
+
<!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
@@ -75,58 +86,43 @@
org.jboss.osgi.microcontainer.internal
</Private-Package>
<Import-Package>
- com.wutka.dtd*;resolution:=optional,
- com.sun.jdi*;resolution:=optional,
- javassist*;resolution:=optional,
- javax.activation;resolution:=optional,
- javax.naming*;resolution:=optional,
- javax.net*;resolution:=optional,
+ <!-- system -->
javax.management,
- javax.xml.*;resolution:=optional,
- org.apache.commons.httpclient;resolution:=optional,
- org.apache.webdav.lib;resolution:=optional,
- org.apache.xerces*,
- org.apache.xml.resolver*;resolution:=optional,
- org.jboss.annotation.*;resolution:=optional,
- org.jboss.beans.*;resolution:=optional,
- org.jboss.classadapter.spi;resolution:=optional,
- org.jboss.classloader.*;resolution:=optional,
- org.jboss.classloading.*;resolution:=optional,
- org.jboss.config.*,
- org.jboss.dependency.*;resolution:=optional,
- org.jboss.deployers.*;resolution:=optional,
- org.jboss.joinpoint.*;resolution:=optional,
- org.jboss.logging,
- org.jboss.managed.*;resolution:=optional,
- org.jboss.metadata.*;resolution:=optional,
- org.jboss.metatype.*;resolution:=optional,
- org.jboss.osgi.common.log,
- org.jboss.osgi.jmx,
- org.jboss.reflect.*;resolution:=optional,
- org.jboss.test;resolution:=optional,
- org.jboss.util*;resolution:=optional,
- org.jboss.virtual*;resolution:=optional,
- org.jboss.xb.*,
- org.osgi.framework;version=1.4,
- org.osgi.service.log,
+ javax.naming*,
+ javax.xml.bind.*,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ org.w3c.dom,
+
+ <!-- osgi -->
+ org.osgi.framework,
+ org.osgi.service.log,
org.osgi.util.tracker,
- org.w3c.dom*,
- org.xml.sax*,
- sun.io;resolution:=optional
+
+ <!-- import -->
+ org.jboss.osgi.common.log,
+ org.jboss.osgi.jmx,
+ org.jboss.util.*,
+ org.jboss.xb.*,
+
+ <!-- optional -->
+ org.apache.commons.httpclient;resolution=optional,
+ org.apache.webdav.lib;resolution=optional,
+
+ <!-- exclude -->
+ !com.sun.jdi*,
+ !org.jboss.test.*
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
- jboss-common-core,
- jboss-dependency,
- jboss-deployers-client-spi,
- jboss-deployers-vfs,
- jboss-mdr,
- jboss-kernel,
- jboss-reflect,
- jboss-vfs,
- jbossxb,
- xml-apis,
- xercesImpl,
+ javassist;scope=test;inline=false,
+ jboss-dependency;inline=false,
+ jboss-logging-spi;inline=false,
+ jboss-managed;inline=false,
+ jboss-metatype;inline=false,
+ jboss-mdr;inline=false,
+ jboss-kernel;inline=false,
+ jboss-reflect;inline=false,
</Embed-Dependency>
</instructions>
</configuration>
Modified: projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -4,7 +4,7 @@
<name>JBossOSGi - Bundle Remote Logging</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-remotelog</artifactId>
<packaging>bundle</packaging>
Modified: projects/jboss-osgi/trunk/bundle/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/webconsole/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/bundle/webconsole/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -3,7 +3,7 @@
<name>JBossOSGi - Bundle WebConsole</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webconsole</artifactId>
<packaging>bundle</packaging>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -19,7 +19,8 @@
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi
+ </developerConnection>
<url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
</scm>
@@ -34,7 +35,8 @@
<!-- Properties -->
<properties>
- <version.aqute.bnd>0.0.315</version.aqute.bnd>
+ <version.apache.xerces.bundle>2.9.1-SNAPSHOT</version.apache.xerces.bundle>
+ <version.aqute.bnd>0.0.323</version.aqute.bnd>
<version.equinox>3.4.2</version.equinox>
<version.felix.configadmin>1.0.10</version.felix.configadmin>
<version.felix.framework>1.6.0</version.felix.framework>
@@ -48,7 +50,7 @@
<version.javax.servlet>2.4</version.javax.servlet>
<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.GA</version.jboss.common.core>
+ <version.jboss.common.core>2.2.11-SNAPSHOT</version.jboss.common.core>
<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>
@@ -58,6 +60,7 @@
<version.jboss.metadata>1.0.0.CR11</version.jboss.metadata>
<version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
<version.jboss.test>1.0.5.GA</version.jboss.test>
+ <version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
<version.junit>4.4</version.junit>
<version.knopflerfish>2.2.0</version.knopflerfish>
<version.log4j>1.2.14</version.log4j>
@@ -93,11 +96,6 @@
<version>${version.izpack}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<version>${version.jboss.aop}</version>
@@ -173,7 +171,26 @@
<artifactId>jboss-aop-mc-int</artifactId>
<version>${version.jboss.microcontainer}</version>
</dependency>
+
+ <!-- Bundle Dependencies -->
<dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>apache-xerces-bundle</artifactId>
+ <version>${version.apache.xerces.bundle}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-common-core-bundle</artifactId>
+ <version>${version.jboss.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jbossxb-bundle</artifactId>
+ <version>${version.jbossxb.bundle}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${version.osgi}</version>
@@ -266,7 +283,7 @@
</dependencies>
</dependencyManagement>
- <!-- Dependencies -->
+ <!-- Dependencies -->
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -324,10 +341,16 @@
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2009-04-28 23:11:46 UTC (rev 87966)
@@ -117,6 +117,8 @@
// Init the the autoStart URLs
List<URL> startURLs = getBundleURLs(props, "framework.autoStart");
framework.setAutoStart(startURLs);
+
+ configured = true;
}
private List<URL> getBundleURLs(Properties props, String key)
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -55,19 +55,19 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-remotelog</artifactId>
<version>${version}</version>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-28 23:10:47 UTC (rev 87965)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-28 23:11:46 UTC (rev 87966)
@@ -55,19 +55,19 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-remotelog</artifactId>
<version>${version}</version>
<scope>provided</scope>
More information about the jboss-osgi-commits
mailing list