[seam-commits] Seam SVN: r12540 - in modules/jms/trunk: dist and 1 other directories.

Author: jganoff Date: 2010-04-20 21:06:48 -0400 (Tue, 20 Apr 2010) New Revision: 12540 Added: modules/jms/trunk/dist/ modules/jms/trunk/dist/assembly.xml modules/jms/trunk/dist/pom.xml Removed: modules/jms/trunk/assembly.xml Modified: modules/jms/trunk/impl/pom.xml modules/jms/trunk/pom.xml Log: Restructured assembly building to new seam-jms-dist module Deleted: modules/jms/trunk/assembly.xml =================================================================== --- modules/jms/trunk/assembly.xml 2010-04-21 00:06:54 UTC (rev 12539) +++ modules/jms/trunk/assembly.xml 2010-04-21 01:06:48 UTC (rev 12540) @@ -1,79 +0,0 @@ -<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>bin</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <fileSet> - <directory>.</directory> - <outputDirectory>seam-jms</outputDirectory> - <includes> - <include>readme.txt</include> - <include>lgpl.txt</include> - </includes> - </fileSet> - - <fileSet> - <directory>api/src/main/java</directory> - <outputDirectory>seam-jms/source</outputDirectory> - <includes> - <include>**</include> - </includes> - </fileSet> - - <fileSet> - <directory>impl/src/main/java</directory> - <outputDirectory>seam-jms/source</outputDirectory> - <includes> - <include>**</include> - </includes> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <outputDirectory>seam-jms/lib</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.weld:weld-extensions</include> - </includes> - </dependencySet> - </dependencySets> - - <moduleSets> - <moduleSet> - <includes> - <include>org.jboss.seam:seam-jms:jar</include> - </includes> - <binaries> - <outputDirectory>seam-jms/lib</outputDirectory> - <unpack>false</unpack> - </binaries> - </moduleSet> - - <moduleSet> - <includes> - <include>org.jboss.seam:seam-jms-impl:jar</include> - </includes> - <binaries> - <outputDirectory>seam-jms/lib</outputDirectory> - <unpack>false</unpack> - </binaries> - </moduleSet> - - <moduleSet> - <includes> - <include>org.jboss.seam:seam-jms-reference-guide</include> - </includes> - <binaries> - <outputDirectory>seam-jms/doc/reference</outputDirectory> - <unpack>true</unpack> - </binaries> - </moduleSet> - </moduleSets> -</assembly> \ No newline at end of file Property changes on: modules/jms/trunk/dist ___________________________________________________________________ Name: svn:ignore + target Copied: modules/jms/trunk/dist/assembly.xml (from rev 12521, modules/jms/trunk/assembly.xml) =================================================================== --- modules/jms/trunk/dist/assembly.xml (rev 0) +++ modules/jms/trunk/dist/assembly.xml 2010-04-21 01:06:48 UTC (rev 12540) @@ -0,0 +1,59 @@ +<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>distribution</id> + + <formats> + <format>zip</format> + </formats> + + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>..</directory> + <outputDirectory>seam-jms</outputDirectory> + <includes> + <include>readme.txt</include> + <include>lgpl.txt</include> + </includes> + </fileSet> + + <!-- Pull in docbook artifacts --> + <fileSet> + <directory>../docs/reference/target/docbook/publish</directory> + <outputDirectory>seam-jms/doc/reference</outputDirectory> + </fileSet> + + <!-- Layer sources from API and IMPL projects --> + <fileSet> + <directory>../api/src/main/java</directory> + <outputDirectory>seam-jms/source</outputDirectory> + <includes> + <include>**</include> + </includes> + </fileSet> + + <fileSet> + <directory>../impl/src/main/java</directory> + <outputDirectory>seam-jms/source</outputDirectory> + <includes> + <include>**</include> + </includes> + </fileSet> + </fileSets> + + <!-- Add necessary binaries --> + <dependencySets> + <dependencySet> + <outputDirectory>seam-jms/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.jboss.seam:seam-jms</include> + <include>org.jboss.seam:seam-jms-impl</include> + <include>org.jboss.weld:weld-extensions</include> + </includes> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file Added: modules/jms/trunk/dist/pom.xml =================================================================== --- modules/jms/trunk/dist/pom.xml (rev 0) +++ modules/jms/trunk/dist/pom.xml 2010-04-21 01:06:48 UTC (rev 12540) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project 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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms-parent</artifactId> + <version>3.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>seam-jms-dist</artifactId> + <name>Seam JMS Distribution</name> + <description>Builds a proper Seam JMS release distribution</description> + <packaging>pom</packaging> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>distribution</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Modified: modules/jms/trunk/impl/pom.xml =================================================================== --- modules/jms/trunk/impl/pom.xml 2010-04-21 00:06:54 UTC (rev 12539) +++ modules/jms/trunk/impl/pom.xml 2010-04-21 01:06:48 UTC (rev 12540) @@ -63,12 +63,4 @@ <scope>test</scope> </dependency> </dependencies> - - <!-- - No JBoss SVN yet <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/jms/tru... - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/j... - <url>http://fisheye.jboss.org/browse/Seam/modules/jms/trunk</url> - </scm> - --> </project> Modified: modules/jms/trunk/pom.xml =================================================================== --- modules/jms/trunk/pom.xml 2010-04-21 00:06:54 UTC (rev 12539) +++ modules/jms/trunk/pom.xml 2010-04-21 01:06:48 UTC (rev 12540) @@ -15,6 +15,10 @@ <name>Seam JMS Parent</name> <version>3.0.0-SNAPSHOT</version> + <properties> + <seamJmsVersion>3.0.0-SNAPSHOT</seamJmsVersion> + </properties> + <modules> <module>api</module> <module>impl</module> @@ -22,6 +26,7 @@ <!-- <module>examples</module> --> + <module>dist</module> </modules> <developers> @@ -34,20 +39,6 @@ </developer> </developers> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <descriptors> - <descriptor>assembly.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - <dependencyManagement> <dependencies> <dependency> @@ -61,6 +52,19 @@ <artifactId>weld-extensions</artifactId> <version>1.0.0.Alpha1</version> </dependency> + + <!-- Modules defined again here to prevent need to explicitly specify version where used --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms</artifactId> + <version>${seamJmsVersion}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms-impl</artifactId> + <version>${seamJmsVersion}</version> + </dependency> </dependencies> </dependencyManagement>