From b5a4d4df29dc6976c4ce1761d4324f5910e593fa Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Fri, 17 Apr 2009 16:24:46 +0000
Subject: [PATCH] add bundles to assembly

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@766074 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                   | 14 +++++++++++++-
 assembly/src/main/assembly/all.xml | 11 +++++++++++
 assembly/src/main/assembly/src.xml |  8 ++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 73be540e7..43a166893 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -276,7 +276,7 @@
                                     <arg value="-L" />
                                     <arg value="-r" />
                                     <arg value="http://struts.apache.org/2.x/docs/" />
-                                </exec>    
+                                </exec>
                                 <move todir="${project.build.directory}/cwiki">
                                     <fileset dir="2.x/docs"/>
                                 </move>
@@ -448,6 +448,18 @@
             <artifactId>struts2-osgi-plugin</artifactId>
             <version>${version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-osgi-admin-bundle</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-osgi-demo-bundle</artifactId>
+            <version>${version}</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index ea75ca2c1..fc3f38c13 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -219,6 +219,17 @@
         <directory>../plugins/osgi/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin</outputDirectory>
       </fileSet>
+      
+    <!-- bundles -->
+    <fileSet>
+       <directory>../bundles/admin/target/site</directory>
+       <outputDirectory>docs/struts2-bundles/admin</outputDirectory>
+    </fileSet>  
+    
+    <fileSet>
+       <directory>../bundles/demo/target/site</directory>
+       <outputDirectory>docs/struts2-bundles/demo</outputDirectory>
+    </fileSet>  
 
     <!-- Include the source code in the assembly -->
     <fileSet>
diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml
index 0e6af85c5..91e56fc8f 100644
--- a/assembly/src/main/assembly/src.xml
+++ b/assembly/src/main/assembly/src.xml
@@ -128,6 +128,14 @@
           <exclude>target/**</exclude>
         </excludes>
       </fileSet>
+      <fileSet>
+        <directory>../bundles</directory>
+        <outputDirectory>src/bundles</outputDirectory>
+        <excludes>
+          <exclude>*/target/**</exclude>
+          <exclude>target/**</exclude>
+        </excludes>
+      </fileSet>
 
   </fileSets>
 </assembly>