[jboss-cvs] Picketbox SVN: r158 - in trunk: security-jboss-sx/assembly/src/assembly and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2011-01-21 10:10:44 -0500 (Fri, 21 Jan 2011)
New Revision: 158

Modified:
   trunk/assembly/bin.xml
   trunk/assembly/sources.xml
   trunk/security-jboss-sx/assembly/src/assembly/bin.xml
   trunk/security-jboss-sx/assembly/src/assembly/sources.xml
   trunk/security-spi/assembly/sources.xml
Log:
SECURITY-557: creating picketbox.jar

Modified: trunk/assembly/bin.xml
===================================================================
--- trunk/assembly/bin.xml	2011-01-14 16:50:28 UTC (rev 157)
+++ trunk/assembly/bin.xml	2011-01-21 15:10:44 UTC (rev 158)
@@ -1,29 +1,40 @@
 <assembly>
   <formats>
-    <format>zip</format>
+    <format>jar</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
+  	<fileSet>
+  	  <directory>../picketbox/target/classes</directory>
+  	  <outputDirectory>/</outputDirectory>
+  	</fileSet>
+  	<fileSet>
+      <directory>../security-spi/acl/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>../security-spi/assembly/target/</directory>
+      <directory>../security-spi/identity/target/classes</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>jboss-security-spi-${project.version}.jar</include>
-      </includes>
     </fileSet>
     <fileSet>
-      <directory>../security-jboss-sx/assembly/target/</directory>
+      <directory>../security-spi/authorization/target/classes</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>jbosssx-${project.version}.jar</include>
-      </includes>
     </fileSet>
     <fileSet>
-      <directory>../picketbox/target/</directory>
+      <directory>../security-spi/spi/target/classes</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>picketbox-bare-${project.version}.jar</include>
-      </includes>
     </fileSet>
+    <fileSet>
+      <directory>../security-jboss-sx/identity/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../security-jboss-sx/jbosssx/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../security-jboss-sx/acl/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>

Modified: trunk/assembly/sources.xml
===================================================================
--- trunk/assembly/sources.xml	2011-01-14 16:50:28 UTC (rev 157)
+++ trunk/assembly/sources.xml	2011-01-21 15:10:44 UTC (rev 158)
@@ -1,30 +1,52 @@
 <assembly>
   <id>sources</id>
   <formats>
-    <format>zip</format>
+    <format>jar</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>../security-spi/assembly/target/</directory>
+      <directory>../picketbox/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>jboss-security-spi-${project.version}-sources.jar</include>
-      </includes>
     </fileSet>
     <fileSet>
-      <directory>../security-jboss-sx/assembly/target/</directory>
+      <directory>../picketbox/src/main/resources</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>jbosssx-${project.version}-sources.jar</include>
-      </includes>
     </fileSet>
     <fileSet>
-      <directory>../picketbox/target/</directory>
+      <directory>../security-spi/acl/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>picketbox-bare-${project.version}-sources.jar</include>
-      </includes>
     </fileSet>
+    <fileSet>
+      <directory>../security-spi/identity/src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../security-spi/authorization/src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../security-spi/spi/src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../security-jboss-sx/identity/src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../security-jboss-sx/jbosssx/src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../security-jboss-sx/jbosssx/src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>security-policies-service.xml</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../security-jboss-sx/acl/src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>

Modified: trunk/security-jboss-sx/assembly/src/assembly/bin.xml
===================================================================
--- trunk/security-jboss-sx/assembly/src/assembly/bin.xml	2011-01-14 16:50:28 UTC (rev 157)
+++ trunk/security-jboss-sx/assembly/src/assembly/bin.xml	2011-01-21 15:10:44 UTC (rev 158)
@@ -13,10 +13,6 @@
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>../jbosssx-mc-int/target/classes</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-    <fileSet>
       <directory>../acl/target/classes</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>

Modified: trunk/security-jboss-sx/assembly/src/assembly/sources.xml
===================================================================
--- trunk/security-jboss-sx/assembly/src/assembly/sources.xml	2011-01-14 16:50:28 UTC (rev 157)
+++ trunk/security-jboss-sx/assembly/src/assembly/sources.xml	2011-01-21 15:10:44 UTC (rev 158)
@@ -6,16 +6,19 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>../identity/src/main</directory>
+      <directory>../identity/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>../jbosssx/src/main</directory>
+      <directory>../jbosssx/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>../jbosssx-mc-int/src/main/java</directory>
+      <directory>../jbosssx/src/main/resources</directory>
       <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>security-policies-service.xml</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>../acl/src/main/java</directory>

Modified: trunk/security-spi/assembly/sources.xml
===================================================================
--- trunk/security-spi/assembly/sources.xml	2011-01-14 16:50:28 UTC (rev 157)
+++ trunk/security-spi/assembly/sources.xml	2011-01-21 15:10:44 UTC (rev 158)
@@ -6,19 +6,19 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>${basedir}/../acl/src/main</directory>
+      <directory>${basedir}/../acl/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/../identity/src/main</directory>
+      <directory>${basedir}/../identity/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/../authorization/src/main</directory>
+      <directory>${basedir}/../authorization/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/../spi/src/main</directory>
+      <directory>${basedir}/../spi/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
   </fileSets>