Author: thomas.diesler(a)jboss.com Date: 2009-06-04 09:00:43 -0400 (Thu, 04 Jun 2009) New Revision: 89819 Added: projects/jboss-osgi/projects/husky/ projects/jboss-osgi/projects/husky/trunk/ projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties Removed: projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties Modified: projects/jboss-osgi/projects/husky/trunk/harness/pom.xml projects/jboss-osgi/projects/husky/trunk/pom.xml projects/jboss-osgi/projects/husky/trunk/testsuite/pom.xml projects/jboss-osgi/projects/husky/trunk/testsuite/scripts/assembly-bundles.xml Log: Extract husky Copied: projects/jboss-osgi/projects/husky/trunk (from rev 89750, projects/jboss-osgi/trunk/husky) Property changes on: projects/jboss-osgi/projects/husky/trunk ___________________________________________________________________ Name: svn:ignore + target Name: svn:mergeinfo + Modified: projects/jboss-osgi/projects/husky/trunk/harness/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-06-03 16:27:45 UTC (rev 89750) +++ projects/jboss-osgi/projects/husky/trunk/harness/pom.xml 2009-06-04 13:00:43 UTC (rev 89819) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-SNAPSHOT</version> </parent> <!-- Dependencies --> Modified: projects/jboss-osgi/projects/husky/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/pom.xml 2009-06-03 16:27:45 UTC (rev 89750) +++ projects/jboss-osgi/projects/husky/trunk/pom.xml 2009-06-04 13:00:43 UTC (rev 89819) @@ -22,19 +22,72 @@ <artifactId>jboss-osgi-husky-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0.Beta2</version> - - <!-- Parent --> + <version>1.0.0-SNAPSHOT</version> + <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta2</version> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> + <!-- Properties --> + <properties> + <version.felix.log>1.0.0</version.felix.log> + <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common> + <version.jboss.osgi.jmx>1.0.0.Beta2</version.jboss.osgi.jmx> + <version.jboss.osgi.runtime.felix>1.0.0.Beta2</version.jboss.osgi.runtime.felix> + <version.junit>4.6</version.junit> + <version.osgi>r4v41</version.osgi> + </properties> + <!-- Modules --> <modules> <module>harness</module> <module>testsuite</module> </modules> + <!-- DependencyManagement --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> + + <!-- Bundle Dependencies --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${version.felix.log}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + </dependency> + + <!-- OSGi Dependencies --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + </dependency> + </dependencies> + </dependencyManagement> </project> Modified: projects/jboss-osgi/projects/husky/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-06-03 16:27:45 UTC (rev 89750) +++ projects/jboss-osgi/projects/husky/trunk/testsuite/pom.xml 2009-06-04 13:00:43 UTC (rev 89819) @@ -25,12 +25,19 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-SNAPSHOT</version> </parent> <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-husky</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>biz.aQute</groupId> <artifactId>bnd</artifactId> </dependency> @@ -60,16 +67,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jmx</artifactId> <scope>provided</scope> </dependency> @@ -116,59 +113,30 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + </systemProperties> + </configuration> + </plugin> </plugins> </build> <!-- Profiles --> <profiles> - - <!-- - Name: framework-equinox - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: framework-knopflerfish - Descr: Setup for Knopflerfish framework integration testing - --> - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>framework</name> - <value>knopflerfish</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> Modified: projects/jboss-osgi/projects/husky/trunk/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml 2009-06-03 16:27:45 UTC (rev 89750) +++ projects/jboss-osgi/projects/husky/trunk/testsuite/scripts/assembly-bundles.xml 2009-06-04 13:00:43 UTC (rev 89819) @@ -16,7 +16,6 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:jboss-osgi-common:jar</include> - <include>*:jboss-osgi-common-core:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-husky:jar</include> <include>*:org.apache.felix.log:jar</include> Deleted: projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-03 16:27:45 UTC (rev 89750) +++ projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-04 13:00:43 UTC (rev 89819) @@ -1,38 +0,0 @@ -# -# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider -# -# $Id$ -# - -# The OSGiFramework implementation -org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration - -# Properties to configure the Framework -org.osgi.framework.storage=${basedir}/target/osgi-store -org.osgi.framework.storage.clean=onFirstInit - -# Husky socket connector properties -org.jboss.osgi.husky.runtime.connector.host=localhost -org.jboss.osgi.husky.runtime.connector.port=5401 - -# Framework bootdelegation -# org.osgi.framework.bootdelegation=org.osgi.service.log - -# Extra System Packages -org.osgi.framework.system.packages.extra=\ - org.jboss.logging, \ - org.jboss.osgi.spi;version=1.0, \ - org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.management;version=1.0, \ - org.jboss.osgi.spi.service;version=1.0, \ - org.jboss.osgi.spi.testing;version=1.0, \ - org.osgi.framework;version=1.4 - -# Bundles that need to be installed with the Framework automatically -org.jboss.osgi.spi.framework.autoInstall=\ - file://${test.archive.directory}/bundles/org.osgi.compendium.jar - -# Bundles that need to be started automatically -org.jboss.osgi.spi.framework.autoStart=\ - file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ - file://${test.archive.directory}/bundles/jboss-osgi-common.jar Copied: projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties (from rev 89750, projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties) =================================================================== --- projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties (rev 0) +++ projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-06-04 13:00:43 UTC (rev 89819) @@ -0,0 +1,38 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id$ +# + +# The OSGiFramework implementation +org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration + +# Properties to configure the Framework +org.osgi.framework.storage=${basedir}/target/osgi-store +org.osgi.framework.storage.clean=onFirstInit + +# Husky socket connector properties +org.jboss.osgi.husky.runtime.connector.host=localhost +org.jboss.osgi.husky.runtime.connector.port=5401 + +# Framework bootdelegation +# org.osgi.framework.bootdelegation=org.osgi.service.log + +# Extra System Packages +org.osgi.framework.system.packages.extra=\ + org.jboss.logging, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.management;version=1.0, \ + org.jboss.osgi.spi.service;version=1.0, \ + org.jboss.osgi.spi.testing;version=1.0, \ + org.osgi.framework;version=1.4 + +# Bundles that need to be installed with the Framework automatically +org.jboss.osgi.spi.framework.autoInstall=\ + file://${test.archive.directory}/bundles/org.osgi.compendium.jar + +# Bundles that need to be started automatically +org.jboss.osgi.spi.framework.autoStart=\ + file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-common.jar