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

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 04:53:22 -0400 (Thu, 16 Apr 2009) New Revision: 87406 Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.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/equinox/scripts/assembly-config.xml projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml projects/jboss-osgi/trunk/runtime/knopflerfish/scripts/assembly-config.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml Log: Include examples in distribution Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -74,30 +74,51 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-webconsole</artifactId> + <artifactId>jboss-osgi-runtime-spi</artifactId> + <classifier>javadoc</classifier> <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-webconsole</artifactId> + <artifactId>jboss-osgi-runtime-testing</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-testing</artifactId> <classifier>sources</classifier> <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-testing</artifactId> + <classifier>javadoc</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite-example</artifactId> + <version>${version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-userguide</artifactId> <version>${version}</version> <type>jdocbook</type> </dependency> - - <!-- javadoc --> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-spi</artifactId> - <classifier>javadoc</classifier> + <artifactId>jboss-osgi-webconsole</artifactId> <version>${version}</version> </dependency> - + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-webconsole</artifactId> + <classifier>sources</classifier> + <version>${version}</version> + </dependency> + <!-- Equinox Dependencies --> <dependency> <groupId>org.jboss.osgi</groupId> 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-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -1,5 +1,5 @@ -<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"> +<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>deploy-artifacts</id> <formats> 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-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -111,6 +111,9 @@ <file src=&quot;(a){deploy.artifacts.dir}/lib/jboss-osgi-runtime-spi-javadoc.jar&quot; targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" /> <fileset dir=&quot;(a){deploy.artifacts.dir}/docs/userguide&quot; targetdir="$INSTALL_PATH/docs/userguide" override="true"/> + <!-- JBossOSGi Examples --> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jboss-osgi-testsuite-example.zip&quot; targetdir="$INSTALL_PATH" unpack="true" override="true" /> + <!-- JBossOSGi Lib --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> <include name="jboss-osgi-common.jar" /> Modified: projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -1,5 +1,6 @@ -<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"> +<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>config</id> <formats> <format>jar</format> Modified: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -1,5 +1,5 @@ -<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"> +<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>deploy-artifacts</id> <formats> Modified: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -1,5 +1,6 @@ -<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"> +<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>config</id> <formats> <format>jar</format> Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/scripts/assembly-config.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/scripts/assembly-config.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/scripts/assembly-config.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -1,5 +1,6 @@ -<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"> +<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>config</id> <formats> <format>jar</format> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -79,7 +79,7 @@ <version>${version}</version> <scope>provided</scope> </dependency> - + <!-- Test Dependencies --> <dependency> <groupId>junit</groupId> @@ -120,6 +120,19 @@ </descriptors> </configuration> </execution> + <execution> + <id>examples</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-examples.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -135,12 +148,33 @@ <tasks> <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> <property name="tests.output.dir" value="${project.build.directory}" /> - <ant antfile="scripts/antrun-example-jars.xml"/> + <ant antfile="scripts/antrun-example-jars.xml" /> </tasks> </configuration> </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/${project.artifactId}-${project.version}.zip</file> + <type>zip</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -1,5 +1,5 @@ -<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"> +<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>deploy-artifacts</id> <formats> Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -0,0 +1,19 @@ +<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>examples</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory></directory> + <outputDirectory>example</outputDirectory> + <includes> + <include>scripts/**</include> + <include>src/**</include> + <include>pom.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-04-16 08:19:53 UTC (rev 87405) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-04-16 08:53:22 UTC (rev 87406) @@ -1,5 +1,5 @@ -<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"> +<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>deploy-artifacts</id> <formats>