Author: musachy
Date: Fri Apr 17 16:24:46 2009
New Revision: 766074
URL: http://svn.apache.org/viewvc?rev=766074&view=rev
Log:
add bundles 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/src.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=766074&r1=766073&r2=766074&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Fri Apr 17 16:24:46 2009
@@ -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>
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=766074&r1=766073&r2=766074&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Fri Apr 17 16:24:46
2009
@@ -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>
Modified: struts/struts2/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/src.xml?rev=766074&r1=766073&r2=766074&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/src.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/src.xml Fri Apr 17 16:24:46
2009
@@ -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>
