[seam-commits] Seam SVN: r12840 - in modules/security/trunk: src and 2 other directories.

[seam-commits at lists.jboss.org]

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

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

Deleted: modules/security/trunk/assembly.xml
===================================================================
--- modules/security/trunk/assembly.xml	2010-05-26 22:50:41 UTC (rev 12839)
+++ modules/security/trunk/assembly.xml	2010-05-26 22:54:52 UTC (rev 12840)
@@ -1,69 +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>bin</id>
-   <formats>
-      <format>zip</format>
-   </formats>
-   <includeBaseDirectory>false</includeBaseDirectory>
-   
-   <fileSets>
-      <fileSet>
-         <directory>core/target/site/apidocs</directory>
-         <outputDirectory>seam-security/doc/api</outputDirectory>
-         <includes>
-            <include>**</include>
-         </includes>
-      </fileSet>
-      
-      <fileSet>
-         <directory>examples</directory>
-         <outputDirectory>seam-security/examples</outputDirectory>
-         <useDefaultExcludes>true</useDefaultExcludes>
-         <includes>
-            <include>seamspace/pom.xml</include>
-            <include>seamspace/src/**</include>
-         </includes>
-      </fileSet>
-      
-      <fileSet>
-        <directory>.</directory>
-        <outputDirectory>seam-security</outputDirectory>
-        <includes>
-           <include>readme.txt</include>
-           <include>lgpl.txt</include>
-        </includes>
-      </fileSet>
-
-      <fileSet>
-         <directory>core/src/main/java</directory>
-         <outputDirectory>seam-security/source</outputDirectory>
-         <includes>
-            <include>**</include>
-         </includes>
-      </fileSet>
-   </fileSets>
-
-   <moduleSets>
-      <moduleSet>
-         <includes>
-            <include>org.jboss.seam.security:seam-security-core:jar</include>
-         </includes>
-         <binaries>
-            <outputDirectory>seam-security/lib</outputDirectory>
-            <unpack>false</unpack>
-         </binaries>         
-      </moduleSet>
-
-      <moduleSet>
-        <includes>
-          <include>org.jboss.seam.security:seam-security-reference-guide</include>
-        </includes>
-        <binaries>
-          <outputDirectory>seam-security/doc/reference</outputDirectory>
-          <unpack>true</unpack>
-        </binaries>
-      </moduleSet>
-
-   </moduleSets>
-</assembly>

Modified: modules/security/trunk/pom.xml
===================================================================
--- modules/security/trunk/pom.xml	2010-05-26 22:50:41 UTC (rev 12839)
+++ modules/security/trunk/pom.xml	2010-05-26 22:54:52 UTC (rev 12840)
@@ -26,10 +26,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>
          </plugin>

Copied: modules/security/trunk/src/main/assembly/assembly.xml (from rev 12830, modules/security/trunk/assembly.xml)
===================================================================
--- modules/security/trunk/src/main/assembly/assembly.xml	                        (rev 0)
+++ modules/security/trunk/src/main/assembly/assembly.xml	2010-05-26 22:54:52 UTC (rev 12840)
@@ -0,0 +1,69 @@
+<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>bin</id>
+   <formats>
+      <format>zip</format>
+   </formats>
+   <includeBaseDirectory>false</includeBaseDirectory>
+   
+   <fileSets>
+      <fileSet>
+         <directory>core/target/site/apidocs</directory>
+         <outputDirectory>seam-security/doc/api</outputDirectory>
+         <includes>
+            <include>**</include>
+         </includes>
+      </fileSet>
+      
+      <fileSet>
+         <directory>examples</directory>
+         <outputDirectory>seam-security/examples</outputDirectory>
+         <useDefaultExcludes>true</useDefaultExcludes>
+         <includes>
+            <include>seamspace/pom.xml</include>
+            <include>seamspace/src/**</include>
+         </includes>
+      </fileSet>
+      
+      <fileSet>
+        <directory>.</directory>
+        <outputDirectory>seam-security</outputDirectory>
+        <includes>
+           <include>readme.txt</include>
+           <include>lgpl.txt</include>
+        </includes>
+      </fileSet>
+
+      <fileSet>
+         <directory>core/src/main/java</directory>
+         <outputDirectory>seam-security/source</outputDirectory>
+         <includes>
+            <include>**</include>
+         </includes>
+      </fileSet>
+   </fileSets>
+
+   <moduleSets>
+      <moduleSet>
+         <includes>
+            <include>org.jboss.seam.security:seam-security-core:jar</include>
+         </includes>
+         <binaries>
+            <outputDirectory>seam-security/lib</outputDirectory>
+            <unpack>false</unpack>
+         </binaries>         
+      </moduleSet>
+
+      <moduleSet>
+        <includes>
+          <include>org.jboss.seam.security:seam-security-reference-guide</include>
+        </includes>
+        <binaries>
+          <outputDirectory>seam-security/doc/reference</outputDirectory>
+          <unpack>true</unpack>
+        </binaries>
+      </moduleSet>
+
+   </moduleSets>
+</assembly>