[jboss-cvs] JBossAS SVN: r67369 - in projects/security/security-jboss-sx/trunk: acl and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 21 22:51:18 EST 2007


Author: anil.saldhana at jboss.com
Date: 2007-11-21 22:51:17 -0500 (Wed, 21 Nov 2007)
New Revision: 67369

Added:
   projects/security/security-jboss-sx/trunk/assembly/
   projects/security/security-jboss-sx/trunk/assembly/bin.xml
   projects/security/security-jboss-sx/trunk/assembly/sources.xml
Modified:
   projects/security/security-jboss-sx/trunk/acl/pom.xml
   projects/security/security-jboss-sx/trunk/identity/pom.xml
   projects/security/security-jboss-sx/trunk/jbosssx/pom.xml
   projects/security/security-jboss-sx/trunk/pom.xml
Log:
add assembly

Modified: projects/security/security-jboss-sx/trunk/acl/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/acl/pom.xml	2007-11-22 03:43:55 UTC (rev 67368)
+++ projects/security/security-jboss-sx/trunk/acl/pom.xml	2007-11-22 03:51:17 UTC (rev 67369)
@@ -2,10 +2,10 @@
    <parent>
       <groupId>org.jboss.security</groupId>
       <artifactId>jbosssx-aggregator</artifactId>
-      <version>2.0.2-SNAPSHOT</version>
+      <version>2.0.2.alpha1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>acl</artifactId>
+   <artifactId>jboss-security-acl</artifactId>
    <packaging>jar</packaging>
    <name>JBoss Security ACL Implementation</name>
    <url>http://labs.jboss.org/portal/jbosssecurity/</url>
@@ -88,82 +88,7 @@
             <directory>src/main</directory>
          </testResource>
       </testResources>
-      <plugins>
-         <!-- define that we wish to create src jars -->
-         <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.0</version>
-            <inherited>true</inherited>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <printSummary>true</printSummary>
-               <disableXmlReport>false</disableXmlReport>
-               <testFailureIgnore>true</testFailureIgnore>
-               <includes>
-                  <include>**/**TestCase.java</include>
-               </includes>
-               <forkMode>pertest</forkMode>
-               <argLine>${surefire.jvm.args}</argLine>
-               <useFile>false</useFile>
-               <trimStackTrace>false</trimStackTrace>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.jboss.maven.plugins</groupId>
-            <artifactId>maven-jboss-deploy-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jboss-deploy</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <groupId>jboss</groupId>
-               <license>lgpl</license>
-               <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>build-classpath</id>
-                  <phase>generate-sources</phase>
-                  <goals>
-                     <goal>build-classpath</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-      </plugins>
    </build>
-   <reporting>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-               <aggregate>true</aggregate>
-            </configuration>
-         </plugin>
-      </plugins>
-   </reporting>
    <dependencies> 
       <dependency>
          <groupId>org.jboss</groupId>
@@ -186,16 +111,10 @@
       <dependency>
          <groupId>org.jboss.security</groupId>
          <artifactId>jboss-security-spi</artifactId>
-         <version>2.0.2-SNAPSHOT</version>
+         <version>2.0.2.alpha1</version>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss</groupId>
-         <artifactId>jbossxb</artifactId>
-         <version>2.0.0.CR4</version>
-         <scope>compile</scope>
-      </dependency>
-      <dependency>
          <groupId>apache-log4j</groupId>
          <artifactId>log4j</artifactId>
          <version>1.2.14</version>

Added: projects/security/security-jboss-sx/trunk/assembly/bin.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/assembly/bin.xml	                        (rev 0)
+++ projects/security/security-jboss-sx/trunk/assembly/bin.xml	2007-11-22 03:51:17 UTC (rev 67369)
@@ -0,0 +1,16 @@
+<assembly>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}/identity/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/jbosssx/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>

Added: projects/security/security-jboss-sx/trunk/assembly/sources.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/assembly/sources.xml	                        (rev 0)
+++ projects/security/security-jboss-sx/trunk/assembly/sources.xml	2007-11-22 03:51:17 UTC (rev 67369)
@@ -0,0 +1,17 @@
+<assembly>
+  <id>sources</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}/identity/src/main</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/jbosssx/src/main</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>

Modified: projects/security/security-jboss-sx/trunk/identity/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/identity/pom.xml	2007-11-22 03:43:55 UTC (rev 67368)
+++ projects/security/security-jboss-sx/trunk/identity/pom.xml	2007-11-22 03:51:17 UTC (rev 67369)
@@ -73,12 +73,6 @@
                <include>**/*.xsd</include>
             </includes>
          </resource>
-         <resource>
-            <directory>target/generated-sources/javacc</directory>
-            <includes>
-               <include>**/*.class</include>
-            </includes>
-         </resource> 
       </resources> 
       <testResources>
          <testResource>
@@ -88,82 +82,7 @@
             <directory>src/main</directory>
          </testResource>
       </testResources>
-      <plugins>
-         <!-- define that we wish to create src jars -->
-         <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.0</version>
-            <inherited>true</inherited>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <printSummary>true</printSummary>
-               <disableXmlReport>false</disableXmlReport>
-               <testFailureIgnore>true</testFailureIgnore>
-               <includes>
-                  <include>**/**TestCase.java</include>
-               </includes>
-               <forkMode>pertest</forkMode>
-               <argLine>${surefire.jvm.args}</argLine>
-               <useFile>false</useFile>
-               <trimStackTrace>false</trimStackTrace>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.jboss.maven.plugins</groupId>
-            <artifactId>maven-jboss-deploy-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jboss-deploy</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <groupId>jboss</groupId>
-               <license>lgpl</license>
-               <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>build-classpath</id>
-                  <phase>generate-sources</phase>
-                  <goals>
-                     <goal>build-classpath</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-      </plugins>
    </build>
-   <reporting>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-               <aggregate>true</aggregate>
-            </configuration>
-         </plugin>
-      </plugins>
-   </reporting>
    <dependencies> 
       <dependency>
          <groupId>org.jboss</groupId>
@@ -186,7 +105,7 @@
       <dependency>
          <groupId>org.jboss.security</groupId>
          <artifactId>jboss-security-spi</artifactId>
-         <version>2.0.2-SNAPSHOT</version>
+         <version>2.0.2.alpha1</version>
          <scope>compile</scope>
       </dependency>
       <dependency>

Modified: projects/security/security-jboss-sx/trunk/jbosssx/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/pom.xml	2007-11-22 03:43:55 UTC (rev 67368)
+++ projects/security/security-jboss-sx/trunk/jbosssx/pom.xml	2007-11-22 03:51:17 UTC (rev 67369)
@@ -5,7 +5,7 @@
       <version>2.0.2.alpha1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>jbosssx</artifactId>
+   <artifactId>jbosssx-bare</artifactId>
    <packaging>jar</packaging>
    <name>JBoss Security Implementation for the JBAS</name>
    <url>http://labs.jboss.org/portal/jbosssecurity/</url>
@@ -108,36 +108,8 @@
                </execution>
             </executions>
          </plugin> 
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>build-classpath</id>
-                  <phase>generate-sources</phase>
-                  <goals>
-                     <goal>build-classpath</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
       </plugins>
    </build>
-   <reporting>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-               <aggregate>true</aggregate>
-            </configuration>
-         </plugin>
-      </plugins>
-   </reporting>
    <dependencies> 
       <dependency>
          <groupId>org.jboss.javaee</groupId>

Modified: projects/security/security-jboss-sx/trunk/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/pom.xml	2007-11-22 03:43:55 UTC (rev 67368)
+++ projects/security/security-jboss-sx/trunk/pom.xml	2007-11-22 03:51:17 UTC (rev 67369)
@@ -6,7 +6,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.security</groupId>
-   <artifactId>jbosssx-aggregator</artifactId>
+   <artifactId>jbosssx</artifactId>
    <packaging>pom</packaging>
    <version>2.0.2.alpha1</version>
    <name>JBoss Security Implementation for the JBAS - Aggregator</name>
@@ -93,6 +93,26 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>assembly/bin.xml</descriptor>
+            <descriptor>assembly/sources.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <inherited>false</inherited>
+      </plugin>
+      <plugin>
         <groupId>org.jboss.maven.plugins</groupId>
         <artifactId>maven-jboss-deploy-plugin</artifactId>
         <version>1.5-SNAPSHOT</version>




More information about the jboss-cvs-commits mailing list