[jboss-osgi-commits] JBoss-OSGI SVN: r86949 - in projects/jboss-osgi/trunk: build/hudson/hudson-home/jobs/jbossosgi-embedded and 10 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-08 05:57:31 -0400 (Wed, 08 Apr 2009) New Revision: 86949 Added: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml Removed: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Add embedded testing Added: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml (rev 0) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -0,0 +1,50 @@ +<?xml version='1.0' encoding='UTF-8'?> +<maven2-moduleset> + <actions/> + <description>Build and test embedded JBossOSGi @version.id@</description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@hudson.osgi.url(a)&lt;/remote&gt; + <local>jboss-osgi</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + </scm> + <assignedNode>master</assignedNode> + <canRoam>false</canRoam> + <disabled>false</disabled> + <jdk>jdk1.6</jdk> + <triggers class="vector"/> + <rootModule> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + </rootModule> + <goals>clean package</goals> + <aggregatorStyleBuild>true</aggregatorStyleBuild> + <usePrivateRepository>false</usePrivateRepository> + <ignoreUpstremChanges>true</ignoreUpstremChanges> + <reporters/> + <publishers class="vector"> + <hudson.tasks.JavadocArchiver> + <javadocDir>jboss-osgi/runtime/spi/target/apidocs</javadocDir> + <keepAll>false</keepAll> + </hudson.tasks.JavadocArchiver> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers/> +</maven2-moduleset> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -43,12 +43,6 @@ <!-- Test Dependencies --> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testsuite</artifactId> - <version>${version}</version> - <type>zip</type> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -143,6 +137,14 @@ <value>equinox</value> </property> </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <version>${version}</version> + <type>zip</type> + </dependency> + </dependencies> <build> <plugins> <plugin> Modified: 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 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -12,23 +12,4 @@ </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> Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -1,15 +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.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> - -</deployment> Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -38,12 +38,6 @@ <!-- Test Dependencies --> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testsuite</artifactId> - <version>${version}</version> - <type>zip</type> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -126,7 +120,7 @@ <!-- Profiles --> <profiles> - + <!-- Name: framework-felix Descr: Setup for Felix integration testing @@ -139,6 +133,14 @@ <value>felix</value> </property> </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <version>${version}</version> + <type>zip</type> + </dependency> + </dependencies> <build> <plugins> <plugin> Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -19,23 +19,4 @@ </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> Deleted: 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-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -1,20 +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="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> - - <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="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> - </bean> - -</deployment> Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -43,12 +43,6 @@ <!-- Test Dependencies --> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-testsuite</artifactId> - <version>${version}</version> - <type>zip</type> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -143,6 +137,14 @@ <value>knopflerfish</value> </property> </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <version>${version}</version> + <type>zip</type> + </dependency> + </dependencies> <build> <plugins> <plugin> Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -12,23 +12,4 @@ </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> Deleted: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -1,15 +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.knopflerfish.KnopflerfishIntegration"> - <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> - -</deployment> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-08 09:18:03 UTC (rev 86948) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-08 09:57:31 UTC (rev 86949) @@ -3,12 +3,9 @@ <modelVersion>4.0.0</modelVersion> <!-- + *************************************************************************************** * * * The Testsuite module provides the test artifacts that can be reused by + the various * * supported OSGi Frameworks. The tests are not run as part of the Testsuite module. * * * *************************************************************************************** - * * - * The Testsuite module provides the test artifacts that can be reused by the various * - * supported OSGi Frameworks. The tests are not run as part of the Testsuite module. * - * * - *************************************************************************************** --> <name>JBossOSGi - Testsuite</name> <description>JBossOSGi - Testsuite</description> @@ -133,5 +130,112 @@ </plugin> </plugins> </build> - + + <profiles> + <!-- + Name: framework-default + Descr: Setup for default framework integration 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> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: embedded-tesing + Descr: Setup for embedded integration testing + --> + <profile> + <id>embedded-tesing</id> + <activation> + <property> + <name>!jboss.bind.address</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <!-- Exclude tests that require remote access --> + <exclude>org/jboss/test/osgi/**/*DeployerTestCase.java</exclude> + <exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude> + <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude> + <!-- [JBOSGI-36] Bundle classes leak into system classloader --> + <exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude> + <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle --> + <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: remote-tesing + Descr: Setup for remote integration testing + --> + <profile> + <id>remote-tesing</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <scope>test</scope> + <type>pom</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.security.args}</argLine> + <excludes> + <!-- [JBOSGI-40] Cannot run embedded tests with SecurityManager --> + <exclude>org/jboss/test/osgi/**/*EmbeddedTestCase.java</exclude> + <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle --> + <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>