From a39dd7d1453ca581f8e3ed42af1d837580f97439 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Wed, 15 Apr 2009 14:07:56 +0000
Subject: [PATCH] add OVal plugin to assembly

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@765206 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                   | 10 ++++++++--
 assembly/src/main/assembly/all.xml | 12 ++++++++++++
 assembly/src/main/assembly/lib.xml |  8 ++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index a8505184a..75fedf5a1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
 
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index fe6bbfd9d..99d344106 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -86,6 +86,14 @@
         <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>
     <fileSet>
       <directory>target/apps</directory>
       <outputDirectory>apps</outputDirectory>
@@ -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>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index 2c9536cc4..7b6d1d1d6 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -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>