[jboss-osgi-commits] JBoss-OSGI SVN: r94499 - in projects/jboss-osgi/trunk: testsuite/example and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-10-08 01:08:57 -0400 (Thu, 08 Oct 2009) New Revision: 94499 Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml Log: Fix embedded equinox Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-08 04:11:40 UTC (rev 94498) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-08 05:08:57 UTC (rev 94499) @@ -332,6 +332,10 @@ <name>test.archive.directory</name> <value>${project.build.directory}/test-libs</value> </property> + <property> + <name>framework</name> + <value>${framework}</value> + </property> </systemProperties> </configuration> </plugin> @@ -393,6 +397,10 @@ <value>5401</value> </property> <property> + <name>framework</name> + <value>${framework}</value> + </property> + <property> <name>target.container</name> <value>${target.container}</value> </property> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-08 04:11:40 UTC (rev 94498) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-08 05:08:57 UTC (rev 94499) @@ -158,6 +158,26 @@ <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> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2009-10-08 05:08:57 UTC (rev 94499) @@ -0,0 +1,25 @@ +<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> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Property changes on: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-08 04:11:40 UTC (rev 94498) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-08 05:08:57 UTC (rev 94499) @@ -122,6 +122,26 @@ <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> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> Added: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2009-10-08 05:08:57 UTC (rev 94499) @@ -0,0 +1,25 @@ +<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> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Property changes on: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF