struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From musa...@apache.org
Subject svn commit: r765206 - in /struts/struts2/trunk/assembly: pom.xml src/main/assembly/all.xml src/main/assembly/lib.xml
Date Wed, 15 Apr 2009 14:07:57 GMT
Author: musachy
Date: Wed Apr 15 14:07:56 2009
New Revision: 765206

URL: http://svn.apache.org/viewvc?rev=765206&view=rev
Log:
add OVal plugin to assembly

Modified:
    struts/struts2/trunk/assembly/pom.xml
    struts/struts2/trunk/assembly/src/main/assembly/all.xml
    struts/struts2/trunk/assembly/src/main/assembly/lib.xml

Modified: struts/struts2/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=765206&r1=765205&r2=765206&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Wed Apr 15 14:07:56 2009
@@ -254,7 +254,7 @@
                                 </exec>
                                 <unzip src="${project.build.directory}/docs.zip" dest="${project.build.directory}/cwiki"
/>
 -->
-                                <exec executable="wget">
+                                <!-- <exec executable="wget">
                                     <arg value="-erobots=off" />
                                     <arg value="-nH" />
                                     <arg value="-nv" />
@@ -265,7 +265,7 @@
                                 </exec>    
                                 <move todir="${project.build.directory}/cwiki">
                                     <fileset dir="2.x/docs"/>
-                                </move>
+                                </move> -->
                             </tasks>
                         </configuration>
                         <goals>
@@ -422,6 +422,12 @@
             <artifactId>struts2-tiles-plugin</artifactId>
             <version>${version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-oval-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
 
     </dependencies>
 

Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=765206&r1=765205&r2=765206&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Wed Apr 15 14:07:56 2009
@@ -87,6 +87,14 @@
       </includes>
     </fileSet>
     <fileSet>
+      <directory>../plugins/oval/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>OVAL-LICENSE.txt</include>
+        <include>XSTREAM-LICENSE.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>target/apps</directory>
       <outputDirectory>apps</outputDirectory>
       <includes>
@@ -203,6 +211,10 @@
         <directory>../plugins/tiles/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
       </fileSet>
+      <fileSet>
+        <directory>../plugins/oval/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-oval-plugin</outputDirectory>
+      </fileSet>
 
     <!-- Include the source code in the assembly -->
     <fileSet>

Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=765206&r1=765205&r2=765206&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Wed Apr 15 14:07:56 2009
@@ -86,5 +86,13 @@
         <include>ANTLR-LICENSE.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../plugins/oval/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>OVAL-LICENSE.txt</include>
+        <include>XSTREAM-LICENSE.txt</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>



Mime
View raw message