[jboss-osgi-commits] JBoss-OSGI SVN: r86588 - in projects/jboss-osgi/trunk: build/distribution/scripts and 14 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-01 09:39:25 -0400 (Wed, 01 Apr 2009) New Revision: 86588 Added: projects/jboss-osgi/trunk/runtime/equinox/scripts/ projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/scripts/ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml Removed: projects/jboss-osgi/trunk/runtime/deployer/scripts/ projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/runtime/deployer/pom.xml projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java Log: Allow testsuite to run against multiple frameworks Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -59,6 +59,12 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> <classifier>sources</classifier> <version>${version}</version> </dependency> Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -30,10 +30,10 @@ <!-- resources --> <dependencySet> - <outputDirectory>resources/jboss-osgi-runtime-deployer-config</outputDirectory> + <outputDirectory>resources/jboss-osgi-runtime-felix</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jboss-osgi-runtime-deployer:jar:config</include> + <include>*:jboss-osgi-runtime-felix:jar:config</include> </includes> <unpack>true</unpack> </dependencySet> Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -149,7 +149,7 @@ <include name="org.apache.felix.framework.jar" /> <include name="org.osgi.core.jar" /> </fileset> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-deployer-config&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true"> <include name="osgi-deployers-jboss-beans.xml" /> </fileset> Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -41,32 +41,6 @@ <!-- Build --> <build> <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>${project.build.finalName}</finalName> - <appendAssemblyId>true</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-config.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>*beans.xml</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -48,6 +48,32 @@ <!-- Build --> <build> <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>*beans.xml</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> Property changes on: projects/jboss-osgi/trunk/runtime/equinox/scripts ___________________________________________________________________ Name: svn:mergeinfo + Added: projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -0,0 +1,17 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*beans.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -0,0 +1,34 @@ +<!-- + $Id$ +--> +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> + <property name="frameworkProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + + <!-- The OSGi MetaData Deployer --> + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + + <!-- The OSGi Bundle Deployer --> + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> + </bean> + + <!-- The Bundle ClassLoader Deployer --> + <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + + <!-- The Bundle Start/Stop Deployer --> + <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + +</deployment> Property changes on: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -47,6 +47,32 @@ <!-- Build --> <build> <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>*beans.xml</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> Added: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -0,0 +1,17 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*beans.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-01 13:39:25 UTC (rev 86588) @@ -48,20 +48,20 @@ // Provide logging final Logger log = Logger.getLogger(FelixIntegration.class); - private Map<String, Object> felixProperties = new HashMap<String, Object>(); + private Map<String, Object> frameworkProperties = new HashMap<String, Object>(); private List<URI> autoInstall = new ArrayList<URI>(); private List<URI> autoStart = new ArrayList<URI>(); - private Felix felix; + private Felix framework; - public Map<String, Object> getFelixProperties() + public Map<String, Object> getFrameworkProperties() { - return felixProperties; + return frameworkProperties; } - public void setFelixProperties(Map<String, Object> props) + public void setFrameworkProperties(Map<String, Object> props) { - this.felixProperties = props; + this.frameworkProperties = props; } public List<URI> getAutoInstall() @@ -86,7 +86,7 @@ public Bundle getSystemBundle() { - return felix; + return framework; } public BundleContext getSystemBundleContext() @@ -101,16 +101,16 @@ // When a Felix instance is embedded in a host application, // the host application must inform the Felix instance that it is embedded - felixProperties.put("felix.embedded.execution", "true"); + frameworkProperties.put("felix.embedded.execution", "true"); // An instance of Logger that the framework uses as its default logger - felixProperties.put("felix.log.logger", new FelixLogger()); + frameworkProperties.put("felix.log.logger", new FelixLogger()); // Init & Start the System Bundle try { - felix = new Felix(felixProperties); - felix.start(); + framework = new Felix(frameworkProperties); + framework.start(); } catch (BundleException ex) { @@ -121,7 +121,7 @@ public void start() { // Get system bundle context - BundleContext context = felix.getBundleContext(); + BundleContext context = framework.getBundleContext(); if (context == null) throw new FrameworkException("Cannot obtain system context"); @@ -166,11 +166,11 @@ public void stop() { - if (felix != null) + if (framework != null) { try { - felix.stop(); + framework.stop(); } catch (BundleException ex) { Copied: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml (from rev 86569, projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -0,0 +1,41 @@ +<!-- + $Id$ +--> +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="frameworkProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + org.osgi.framework; version=1.4, + org.osgi.util.tracker + </value> + </entry> + </map> + </property> + </bean> + + <!-- The OSGi MetaData Deployer --> + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + + <!-- The OSGi Bundle Deployer --> + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> + </bean> + + <!-- The Bundle ClassLoader Deployer --> + <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + + <!-- The Bundle Start/Stop Deployer --> + <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + +</deployment> Copied: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml (from rev 86569, projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="frameworkProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry><key>org.osgi.service.http.port</key><value>8090</value></entry> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + javax.management, + javax.xml.parsers, + org.jboss.logging, + org.jboss.osgi.service, + org.jboss.osgi.spi.management, + org.osgi.framework; version=1.4, + org.osgi.service.packageadmin; version=1.2, + org.osgi.service.startlevel; version=1.1, + org.xml.sax + </value> + </entry> + <!-- + If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved. + If set to 'false' bundles must be deployed in the order that is required to start them. + --> + <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry> + </map> + </property> + <property name="autoStart"> + <list elementClass="java.net.URI"> + <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value> + <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-service-logging.jar</value> + </list> + </property> + </bean> + + <!-- The Framework Management --> + <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + + <!-- A Service that gives access to the Microcontainer Kernel --> + <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> + </bean> + + <!-- The OSGi MetaData Deployer --> + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + + <!-- The OSGi Bundle Deployer --> + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> + </bean> + + <!-- The Bundle ClassLoader Deployer --> + <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + + <!-- The Bundle Start/Stop Deployer --> + <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + + <!-- The Bundle Management Deployer --> + <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + +</deployment> \ No newline at end of file Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -5,7 +5,7 @@ <!-- The OSGiFramework --> <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> - <property name="felixProperties"> + <property name="frameworkProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> </map> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -24,16 +24,15 @@ <dependencies> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-deployer</artifactId> <version>${version}</version> </dependency> <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + </dependency> + <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.compendium</artifactId> </dependency> @@ -41,10 +40,6 @@ <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-aop-mc-int</artifactId> </dependency> - <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - </dependency> <!-- Test Dependencies --> <dependency> @@ -99,11 +94,91 @@ <profiles> <!-- - Name: embedded-framework + Name: framework-default + Descr: Setup for default framework testing + --> + <profile> + <id>framework-default</id> + <activation> + <property> + <name>!framework</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + <classifier>config</classifier> + </dependency> + </dependencies> + </profile> + + <!-- + Name: framework-felix + Descr: Setup for Felix framework testing + --> + <profile> + <id>framework-felix</id> + <activation> + <property> + <name>framework</name> + <value>felix</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + <classifier>config</classifier> + </dependency> + </dependencies> + </profile> + + <!-- + Name: framework-equinox + Descr: Setup for Felix framework testing + --> + <profile> + <id>framework-equinox</id> + <activation> + <property> + <name>framework</name> + <value>equinox</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version}</version> + <classifier>config</classifier> + </dependency> + </dependencies> + </profile> + + <!-- + Name: embedded-tesing Descr: Setup for embedded integration testing --> <profile> - <id>embedded-framework</id> + <id>embedded-tesing</id> <activation> <property> <name>!jboss.bind.address</name> @@ -131,11 +206,11 @@ </profile> <!-- - Name: remote-framework + Name: remote-tesing Descr: Setup for remote integration testing --> <profile> - <id>remote-framework</id> + <id>remote-tesing</id> <activation> <property> <name>jboss.bind.address</name> Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-04-01 13:39:25 UTC (rev 86588) @@ -47,7 +47,7 @@ Bundle bundle = framework.getSystemBundle(); assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName()); + assertNotNull("SymbolicName not null", bundle.getSymbolicName()); MainDeployer mainDeployer = bootProvider.getInstance("MainDeployer", MainDeployer.class); assertNotNull("MainDeployer not null", mainDeployer); Deleted: projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-04-01 13:33:14 UTC (rev 86587) +++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588) @@ -1,41 +0,0 @@ -<!-- - $Id$ ---> -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- The OSGiFramework --> - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> - <property name="felixProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - <entry> - <key>org.osgi.framework.system.packages</key> - <value> - org.osgi.framework; version=1.4, - org.osgi.util.tracker - </value> - </entry> - </map> - </property> - </bean> - - <!-- The OSGi MetaData Deployer --> - <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> - - <!-- The OSGi Bundle Deployer --> - <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> - <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> - </bean> - - <!-- The Bundle ClassLoader Deployer --> - <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> - </bean> - - <!-- The Bundle Start/Stop Deployer --> - <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> - <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> - </bean> - -</deployment>