struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r396336 - in /struts/action/trunk/assembly: pom.xml src/main/assembly/dist.xml
Date Sun, 23 Apr 2006 23:20:13 GMT
Author: wsmoak
Date: Sun Apr 23 16:20:09 2006
New Revision: 396336

URL: http://svn.apache.org/viewcvs?rev=396336&view=rev
Log:
First pass at an assembly that includes the source code and website docs.

Added:
    struts/action/trunk/assembly/src/main/assembly/dist.xml   (with props)
Modified:
    struts/action/trunk/assembly/pom.xml

Modified: struts/action/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=396336&r1=396335&r2=396336&view=diff
==============================================================================
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Sun Apr 23 16:20:09 2006
@@ -19,18 +19,6 @@
  */
 -->
 
-<!-- 
-             Experimental Maven 2 Build for Apache Struts
-             ============================================
-
-To create the assembly:
-
-   $ mvn assembly:assembly
-   
-For more information, see:  http://wiki.apache.org/struts/StrutsMaven2Plan
-
--->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -63,7 +51,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
         <executions>
-          <execution>
+          <!--execution>
             <id>copy-javadoc</id>
             <phase>package</phase>
             <goals>
@@ -116,7 +104,7 @@
               </artifactItems>
               <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
             </configuration>
-          </execution>
+          </execution-->
           <execution>
             <id>copy-war</id>
             <phase>package</phase>
@@ -183,7 +171,7 @@
               <outputDirectory>${project.build.directory}/webapps</outputDirectory>
             </configuration>
           </execution>
-          <execution>
+          <!--execution>
             <id>copy-sources</id>
             <phase>package</phase>
             <goals>
@@ -236,7 +224,7 @@
               </artifactItems>
               <outputDirectory>${project.build.directory}/sources</outputDirectory>
             </configuration>
-          </execution>
+          </execution-->
         </executions>
       </plugin>
     </plugins>
@@ -251,7 +239,8 @@
         <version>2.0.1</version>
         <configuration>
           <descriptors>
-            <descriptor>src/main/assembly/all.xml</descriptor>
+            <descriptor>src/main/assembly/dist.xml</descriptor>
+            <!-- descriptor>src/main/assembly/all.xml</descriptor -->
             <!-- descriptor>src/main/assembly/dep.xml</descriptor -->
             <!-- descriptor>src/main/assembly/src.xml</descriptor -->
           </descriptors>

Added: struts/action/trunk/assembly/src/main/assembly/dist.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=396336&view=auto
==============================================================================
--- struts/action/trunk/assembly/src/main/assembly/dist.xml (added)
+++ struts/action/trunk/assembly/src/main/assembly/dist.xml Sun Apr 23 16:20:09 2006
@@ -0,0 +1,87 @@
+<assembly>
+  <id>all</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+    	<directory>src/main/resources</directory>
+    	<outputDirectory></outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/webapps</directory>
+      <outputDirectory>webapps</outputDirectory>
+      <includes>
+        <include>*.war</include>
+      </includes>
+    </fileSet>
+    
+    <!-- Include the source code in the assembly -->
+    <fileSet>
+      <directory>../</directory>
+      <outputDirectory>src/</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../core</directory>
+      <outputDirectory>src/core</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+        <include>src/</include>
+      </includes>
+   </fileSet>
+   <fileSet>
+     <directory>../el</directory>
+     <outputDirectory>src/el</outputDirectory>
+     <includes>
+        <include>pom.xml</include>
+        <include>src/</include>
+      </includes>
+   </fileSet>
+   <fileSet>
+     <directory>../taglib</directory>
+     <outputDirectory>src/taglib</outputDirectory>
+     <includes>
+        <include>pom.xml</include>
+        <include>src/</include>
+      </includes>
+   </fileSet>
+
+   
+   <!-- Include the website docs in the assembly -->
+   <fileSet>
+     <directory>../target/site</directory>
+     <outputDirectory>docs/</outputDirectory>
+   </fileSet>
+   <fileSet>
+     <directory>../apps/target/site</directory>
+     <outputDirectory>docs/struts-apps</outputDirectory>
+   </fileSet>
+   <fileSet>
+     <directory>../core/target/site</directory>
+     <outputDirectory>docs/struts-core</outputDirectory>
+   </fileSet>
+   <fileSet>
+     <directory>../el/target/site</directory>
+     <outputDirectory>docs/struts-el</outputDirectory>
+   </fileSet>
+   <fileSet>
+     <directory>../taglib/target/site</directory>
+     <outputDirectory>docs/struts-taglib</outputDirectory>
+   </fileSet>
+   
+  </fileSets>
+</assembly>

Propchange: struts/action/trunk/assembly/src/main/assembly/dist.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/action/trunk/assembly/src/main/assembly/dist.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message