You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2007/03/02 11:27:48 UTC

svn commit: r513693 - in /struts/struts1/trunk/assembly: pom.xml src/main/assembly/all.xml src/main/assembly/docs.xml src/main/assembly/src.xml

Author: apetrelli
Date: Fri Mar  2 02:27:47 2007
New Revision: 513693

URL: http://svn.apache.org/viewvc?view=rev&rev=513693
Log:
Added inclusion of Struts 1 - Tiles 2 integration module in assemblies.

Modified:
    struts/struts1/trunk/assembly/pom.xml
    struts/struts1/trunk/assembly/src/main/assembly/all.xml
    struts/struts1/trunk/assembly/src/main/assembly/docs.xml
    struts/struts1/trunk/assembly/src/main/assembly/src.xml

Modified: struts/struts1/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/pom.xml?view=diff&rev=513693&r1=513692&r2=513693
==============================================================================
--- struts/struts1/trunk/assembly/pom.xml (original)
+++ struts/struts1/trunk/assembly/pom.xml Fri Mar  2 02:27:47 2007
@@ -167,6 +167,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
+      <artifactId>struts-tiles2</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.struts</groupId>
       <artifactId>struts-mailreader-dao</artifactId>
       <version>${version}</version>
     </dependency>

Modified: struts/struts1/trunk/assembly/src/main/assembly/all.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/all.xml?view=diff&rev=513693&r1=513692&r2=513693
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/all.xml Fri Mar  2 02:27:47 2007
@@ -215,6 +215,14 @@
         <include>src/</include>
       </includes>
    </fileSet>
+   <fileSet>
+     <directory>../tiles2</directory>
+     <outputDirectory>src/tiles2</outputDirectory>
+     <includes>
+        <include>pom.xml</include>
+        <include>src/</include>
+      </includes>
+   </fileSet>
 
    
    <!-- Include the website docs in the assembly -->
@@ -285,6 +293,10 @@
    <fileSet>
      <directory>../tiles/target/site</directory>
      <outputDirectory>docs/struts-tiles</outputDirectory>
+   </fileSet>
+   <fileSet>
+     <directory>../tiles2/target/site</directory>
+     <outputDirectory>docs/struts-tiles2</outputDirectory>
    </fileSet>
    
   </fileSets>

Modified: struts/struts1/trunk/assembly/src/main/assembly/docs.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/docs.xml?view=diff&rev=513693&r1=513692&r2=513693
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/docs.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/docs.xml Fri Mar  2 02:27:47 2007
@@ -101,6 +101,10 @@
      <directory>../tiles/target/site</directory>
      <outputDirectory>docs/struts-tiles</outputDirectory>
    </fileSet>
+   <fileSet>
+     <directory>../tiles2/target/site</directory>
+     <outputDirectory>docs/struts-tiles2</outputDirectory>
+   </fileSet>
    
   </fileSets>
 </assembly>

Modified: struts/struts1/trunk/assembly/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/src.xml?view=diff&rev=513693&r1=513692&r2=513693
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/src.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/src.xml Fri Mar  2 02:27:47 2007
@@ -203,5 +203,13 @@
         <include>src/</include>
       </includes>
    </fileSet>
+   <fileSet>
+     <directory>../tiles2</directory>
+     <outputDirectory>src/tiles2</outputDirectory>
+     <includes>
+        <include>pom.xml</include>
+        <include>src/</include>
+      </includes>
+   </fileSet>
   </fileSets>
 </assembly>