[jboss-osgi-commits] JBoss-OSGI SVN: r102762 - in projects/jboss-osgi/projects: deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-23 02:34:09 -0400 (Tue, 23 Mar 2010) New Revision: 102762 Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium-equinox.xml projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium.xml projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/equinox-debug.properties projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-felix.properties Modified: projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/antrun-test-jars.xml projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-bundles.xml projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/support/c/CA.java projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bundles/classloader/bundleclasspath/MANIFEST.MF projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml Log: Expand Bundle-ClassPath test case. Allow sigle framework tests to run on felix/equinox Modified: projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-23 06:34:09 UTC (rev 102762) @@ -53,13 +53,7 @@ setRelativeOrder(500); } - /** - * Determine the structure of a bundle deployment - * - * @param context the structure context - * @return true when it recognised the context - * @throws DeploymentException for an error - */ + @Override public boolean determineStructure(StructureContext structureContext) throws DeploymentException { ContextInfo context = null; @@ -91,33 +85,35 @@ } else { - String[] classPathArr = classPath.split("[,\\s]"); + String[] classPathArr = classPath.split(","); for (String path : classPathArr) { - if (path.equals(".")) + path = path.trim(); + if (path.length() > 0) { - // Add the root - addClassPath(structureContext, root, true, false, context); - } - else - { - // [TODO] publish a Framework Event of type INFO - // [TODO] locate the class path entry in attached fragments - try + // The Framework must ignore any unrecognized parameters + int semicolon = path.indexOf(';'); + if (semicolon > 0) + path = path.substring(0, semicolon); + + if (path.equals(".")) { + // Add the root + addClassPath(structureContext, root, true, false, context); + } + else + { + // [TODO] publish a Framework Event of type INFO + // [TODO] locate the class path entry in attached fragments VirtualFile child = root.getChild(path); addClassPath(structureContext, child, true, false, context); } - catch (IOException ex) - { - log.info("Cannot find class path '" + path + "' in: " + root); - } } } } - + // We don't process children as potential subdeployments - + return true; } catch (Exception e) Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-23 06:34:09 UTC (rev 102762) @@ -85,21 +85,30 @@ } else { - String[] classPathArr = classPath.split("[,\\s]"); + String[] classPathArr = classPath.split(","); for (String path : classPathArr) { - if (path.equals(".")) + path = path.trim(); + if (path.length() > 0) { - // Add the root - addClassPath(structureContext, root, true, false, context); + // The Framework must ignore any unrecognized parameters + int semicolon = path.indexOf(';'); + if (semicolon > 0) + path = path.substring(0, semicolon); + + if (path.equals(".")) + { + // Add the root + addClassPath(structureContext, root, true, false, context); + } + else + { + // [TODO] publish a Framework Event of type INFO + // [TODO] locate the class path entry in attached fragments + VirtualFile child = root.getChild(path); + addClassPath(structureContext, child, true, false, context); + } } - else - { - // [TODO] publish a Framework Event of type INFO - // [TODO] locate the class path entry in attached fragments - VirtualFile child = root.getChild(path); - addClassPath(structureContext, child, true, false, context); - } } } Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-23 06:34:09 UTC (rev 102762) @@ -32,16 +32,18 @@ <version>1.0.0.Alpha4-SNAPSHOT</version> </parent> + <!-- Properties --> + <properties> + <surefire.jpda.args></surefire.jpda.args> + <surefire.system.args>-Xmx512m ${surefire.jpda.args}</surefire.system.args> + </properties> + + <!-- Dependencies --> <dependencies> <dependency> <groupId>biz.aQute</groupId> <artifactId>bnd</artifactId> </dependency> - <dependency> - <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-core</artifactId> - <version>${version}</version> - </dependency> <!-- Test bundles dependencies --> <dependency> @@ -167,12 +169,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs30</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope> @@ -237,7 +233,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Xmx512m</argLine> + <argLine>${surefire.system.args}</argLine> <systemProperties> <property> <name>log4j.output.dir</name> @@ -266,6 +262,7 @@ </build> <profiles> + <!-- Name: all Desc: Build the aggregated framework jar @@ -298,5 +295,179 @@ </plugins> </build> </profile> + + <!-- + Name: framework-equinox + Descr: Setup for Equinox framework integration testing + --> + <profile> + <id>framework-equinox</id> + <activation> + <property> + <name>fmwk</name> + <value>equinox</value> + </property> + </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.equinox</groupId> + <artifactId>jboss-osgi-equinox</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.vfs</groupId> + <artifactId>jboss-osgi-vfs30</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-compendium-equinox.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: framework-felix + Descr: Setup for Felix framework integration testing + --> + <profile> + <id>framework-felix</id> + <activation> + <property> + <name>fmwk</name> + <value>felix</value> + </property> + </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.felix</groupId> + <artifactId>jboss-osgi-felix</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.vfs</groupId> + <artifactId>jboss-osgi-vfs30</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: framework-native + Descr: Setup for Native Framework integration testing + --> + <profile> + <id>framework-jbossmc-default</id> + <activation> + <property> + <name>!fmwk</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-core</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: jpda + Descr: Enable JPDA remote debuging + --> + <profile> + <id>jpda</id> + <activation> + <property> + <name>jpda</name> + </property> + </activation> + <properties> + <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args> + </properties> + </profile> + </profiles> </project> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/antrun-test-jars.xml 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/antrun-test-jars.xml 2010-03-23 06:34:09 UTC (rev 102762) @@ -43,15 +43,31 @@ <!-- Please add alphabetically --> <!-- bundle-classpath --> + <jar destfile="${tests.output.dir}/test-libs/bundle-classpath-b.jar"> + <fileset dir="${tests.classes.dir}"> + <include name="**/classloader/support/b/B.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/test-libs/bundle-classpath-c.jar"> + <fileset dir="${tests.classes.dir}"> + <include name="**/classloader/support/c/CA.class"/> + </fileset> + </jar> <war destfile="${tests.output.dir}/test-libs/bundle-classpath.war" manifest="${tests.resources.dir}/bundles/classloader/bundleclasspath/MANIFEST.MF" webxml="${tests.resources.dir}/bundles/classloader/bundleclasspath/web.xml"> <classes dir="${tests.classes.dir}"> <include name="**/classloader/support/a/A.class"/> </classes> + <lib dir="${tests.output.dir}/test-libs"> + <include name="bundle-classpath-b.jar"/> + </lib> <fileset dir="${tests.resources.dir}/bundles/classloader/bundleclasspath"> <include name="message.txt"/> </fileset> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="bundle-classpath-c.jar"/> + </fileset> </war> <!-- fragments/simple --> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-bundles.xml 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-bundles.xml 2010-03-23 06:34:09 UTC (rev 102762) @@ -15,17 +15,6 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:org.osgi.compendium:jar</include> - <include>*:org.osgi.core:jar</include> - </includes> - <useStrictFiltering>true</useStrictFiltering> - <scope>compile</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium-equinox.xml (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium-equinox.xml 2010-03-23 06:34:09 UTC (rev 102762) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- bundles --> + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.eclipse.equinox:org.eclipse.osgi.services:jar</include> + <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium.xml (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-compendium.xml 2010-03-23 06:34:09 UTC (rev 102762) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- bundles --> + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.osgi:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTestCase.java 2010-03-23 06:34:09 UTC (rev 102762) @@ -22,13 +22,15 @@ package org.jboss.test.osgi.classloader; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import java.net.URL; + import org.jboss.osgi.testing.OSGiFrameworkTest; import org.jboss.test.osgi.classloader.support.a.A; +import org.jboss.test.osgi.classloader.support.b.B; +import org.jboss.test.osgi.classloader.support.c.CA; import org.junit.Test; import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; /** * BundleClassPathTest. @@ -41,14 +43,15 @@ @Test public void testBundleClassPath() throws Exception { - BundleContext sysContext = framework.getBundleContext(); - Bundle bundle = sysContext.installBundle(getTestArchivePath("bundle-classpath.war")); + URL bundleURL = getTestArchiveURL("bundle-classpath.war"); + Bundle bundle = context.installBundle(bundleURL.toExternalForm()); bundle.start(); assertEquals("Bundle state", Bundle.ACTIVE, bundle.getState()); - Class<?> clazz = bundle.loadClass(A.class.getName()); - assertNotNull("Loaded class", clazz); + assertLoadClass(bundle, A.class.getName(), bundle); + assertLoadClass(bundle, B.class.getName(), bundle); + assertLoadClass(bundle, CA.class.getName(), bundle); bundle.uninstall(); assertEquals("Bundle state", Bundle.UNINSTALLED, bundle.getState()); Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/support/c/CA.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/support/c/CA.java 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/classloader/support/c/CA.java 2010-03-23 06:34:09 UTC (rev 102762) @@ -26,7 +26,7 @@ /** * CA. * - * @authorthomas.diesler(a)jboss.com + * @author thomas.diesler(a)jboss.com * @version $Revision$ */ public class CA Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bundles/classloader/bundleclasspath/MANIFEST.MF =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bundles/classloader/bundleclasspath/MANIFEST.MF 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/bundles/classloader/bundleclasspath/MANIFEST.MF 2010-03-23 06:34:09 UTC (rev 102762) @@ -1,5 +1,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: bundle-classpath -Bundle-ClassPath: .,WEB-INF/classes - +Bundle-ClassPath: .,bundle-classpath-c.jar,WEB-INF/classes,WEB-INF/lib/bundle-classpath-b.jar \ No newline at end of file Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/equinox-debug.properties =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/equinox-debug.properties (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/equinox-debug.properties 2010-03-23 06:34:09 UTC (rev 102762) @@ -0,0 +1,9 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id: equinox-debug.properties 96951 2009-11-25 14:28:07Z thomas.diesler(a)jboss.com $ +# + +# Equinox debug properties +org.eclipse.osgi/debug=true +org.eclipse.osgi/debug/loader=true Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-equinox.properties 2010-03-23 06:34:09 UTC (rev 102762) @@ -0,0 +1,32 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id: jboss-osgi-equinox.properties 102237 2010-03-10 17:16:48Z thomas.diesler(a)jboss.com $ +# + +# Equinox properties +osgi.debug=target/test-classes/equinox-debug.properties + +# 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.apache.log4j;version=1.2, \ + org.jboss.logging;version=2.1, \ + org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.interceptor;version=1.0, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ + org.jboss.osgi.spi.management;version=1.0, \ + org.jboss.osgi.spi.service;version=1.0, \ + org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.osgi.testing;version=1.0, \ + org.jboss.osgi.vfs;version=1.0, \ + org.jboss.vfs;version=3.0, \ + org.osgi.framework;version=1.5 + Added: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-felix.properties (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/resources/jboss-osgi-felix.properties 2010-03-23 06:34:09 UTC (rev 102762) @@ -0,0 +1,35 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id: jboss-osgi-felix.properties 102237 2010-03-10 17:16:48Z thomas.diesler(a)jboss.com $ +# + +# Felix config properties +felix.bootdelegation.implicit=false + +# Properties to configure the Framework +org.osgi.framework.storage=${basedir}/target/osgi-store +org.osgi.framework.storage.clean=onFirstInit + +# Framework bootdelegation +org.osgi.framework.bootdelegation=sun.reflect + +# Extra System Packages +org.osgi.framework.system.packages.extra=\ + org.apache.log4j;version=1.2, \ + org.jboss.logging;version=2.1, \ + org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.interceptor;version=1.0, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;version=1.0, \ + org.jboss.osgi.spi.management;version=1.0, \ + org.jboss.osgi.spi.service;version=1.0, \ + org.jboss.osgi.spi.util;version=1.0, \ + org.jboss.osgi.testing;version=1.0, \ + org.jboss.osgi.vfs;version=1.0, \ + org.jboss.vfs;version=3.0, \ + org.osgi.framework;version=1.5 + \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-23 06:05:22 UTC (rev 102761) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-23 06:34:09 UTC (rev 102762) @@ -65,6 +65,8 @@ <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> <version.jboss.osgi.deployers>1.0.5-SNAPSHOT</version.jboss.osgi.deployers> <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment> + <version.jboss.osgi.equinox>3.5.2-SNAPSHOT</version.jboss.osgi.equinox> + <version.jboss.osgi.felix>2.0.4-SNAPSHOT</version.jboss.osgi.felix> <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx> @@ -148,6 +150,16 @@ <artifactId>jboss-osgi-deployment</artifactId> <version>${version.jboss.osgi.deployment}</version> </dependency> + <dependency> + <groupId>org.jboss.osgi.equinox</groupId> + <artifactId>jboss-osgi-equinox</artifactId> + <version>${version.jboss.osgi.equinox}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.felix</groupId> + <artifactId>jboss-osgi-felix</artifactId> + <version>${version.jboss.osgi.felix}</version> + </dependency> <!-- OSGi Dependencies --> <dependency>