[seam-commits] Seam SVN: r12835 - in modules/jms/trunk/dist: src and 2 other directories.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-05-26 18:38:54 -0400 (Wed, 26 May 2010)
New Revision: 12835

Added:
   modules/jms/trunk/dist/src/
   modules/jms/trunk/dist/src/main/
   modules/jms/trunk/dist/src/main/assembly/
   modules/jms/trunk/dist/src/main/assembly/assembly.xml
Removed:
   modules/jms/trunk/dist/assembly.xml
Modified:
   modules/jms/trunk/dist/pom.xml
Log:
standard location for assembly.xml

Deleted: modules/jms/trunk/dist/assembly.xml
===================================================================
--- modules/jms/trunk/dist/assembly.xml	2010-05-26 22:35:00 UTC (rev 12834)
+++ modules/jms/trunk/dist/assembly.xml	2010-05-26 22:38:54 UTC (rev 12835)
@@ -1,65 +0,0 @@
-<assembly
-   xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 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>
-      
-      <!-- Pull in javadoc for api -->
-      <fileSet>
-         <directory>../api/target/site/apidocs</directory>
-         <outputDirectory>seam-jms/doc/apidocs</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.jms:seam-jms-api</include>
-            <include>org.jboss.seam.jms:seam-jms</include>
-            <include>org.jboss.weld:weld-extensions</include>
-         </includes>
-      </dependencySet>
-   </dependencySets>
-</assembly>

Modified: modules/jms/trunk/dist/pom.xml
===================================================================
--- modules/jms/trunk/dist/pom.xml	2010-05-26 22:35:00 UTC (rev 12834)
+++ modules/jms/trunk/dist/pom.xml	2010-05-26 22:38:54 UTC (rev 12835)
@@ -37,10 +37,9 @@
       <plugins>
          <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2-beta-5</version>
             <configuration>
                <descriptors>
-                  <descriptor>assembly.xml</descriptor>
+                  <descriptor>src/main/assembly/assembly.xml</descriptor>
                </descriptors>
             </configuration>
             <executions>

Copied: modules/jms/trunk/dist/src/main/assembly/assembly.xml (from rev 12830, modules/jms/trunk/dist/assembly.xml)
===================================================================
--- modules/jms/trunk/dist/src/main/assembly/assembly.xml	                        (rev 0)
+++ modules/jms/trunk/dist/src/main/assembly/assembly.xml	2010-05-26 22:38:54 UTC (rev 12835)
@@ -0,0 +1,65 @@
+<assembly
+   xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 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>
+      
+      <!-- Pull in javadoc for api -->
+      <fileSet>
+         <directory>../api/target/site/apidocs</directory>
+         <outputDirectory>seam-jms/doc/apidocs</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.jms:seam-jms-api</include>
+            <include>org.jboss.seam.jms:seam-jms</include>
+            <include>org.jboss.weld:weld-extensions</include>
+         </includes>
+      </dependencySet>
+   </dependencySets>
+</assembly>