Author: lukaszlenart
Date: Wed May 5 16:45:20 2010
New Revision: 941378
URL: http://svn.apache.org/viewvc?rev=941378&view=rev
Log:
Clean up Assembly to include Xwork Core
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/apps.xml
struts/struts2/trunk/assembly/src/main/assembly/docs.xml
struts/struts2/trunk/assembly/src/main/assembly/lib.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=941378&r1=941377&r2=941378&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Wed May 5 16:45:20 2010
@@ -72,7 +72,7 @@
<dependency>
<groupId>com.opensymphony</groupId>
<artifactId>xwork-core</artifactId>
- <version>2.1.6</version>
+ <version>${version}</version>
<type>jar</type>
<classifier>jdk14</classifier>
<scope>runtime</scope>
@@ -247,26 +247,9 @@
<outputDirectory>${project.build.directory}/apps</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>xwork-core-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.opensymphony</groupId>
- <artifactId>xwork-core</artifactId>
- <classifier>javadoc</classifier>
- <version>${version}</version>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -276,19 +259,17 @@
<configuration>
<tasks>
<mkdir dir="${project.build.directory}/cwiki"
/>
-<!--
<exec executable="ssh" failonerror="true" >
<arg line="${userna...@people.apache.org
/www/struts.apache.org/2.x/docs-zip2.sh" />
</exec>
<unzip
src="${project.build.directory}/docs.zip"
dest="${project.build.directory}/cwiki" />
--->
<exec executable="wget">
<arg value="-erobots=off" />
<arg value="-nH" />
<arg value="-nv" />
<arg value="-E" />
<arg value="-L" />
- <arg
value="--directory-prefix=${project.build.directory}/cwiki" />
+ <arg value="-
-directory-prefix=${project.build.directory}/cwiki" />
<arg value="-r" />
<arg value="http://cwiki.apache.org/WW/"; />
</exec>
@@ -300,6 +281,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
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=941378&r1=941377&r2=941378&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Wed May 5 16:45:20
2010
@@ -54,7 +54,6 @@
<includes>
<include>FREEMARKER-LICENSE.txt</include>
<include>OGNL-LICENSE.txt</include>
- <include>XWORK-LICENSE.txt</include>
</includes>
</fileSet>
<fileSet>
@@ -104,7 +103,7 @@
<!-- Include the XWork Javadoc in the assembly -->
<fileSet>
- <directory>target/xwork-apidocs</directory>
+ <directory>../xwork-core/target/site/apidocs</directory>
<outputDirectory>docs/xwork-apidocs</outputDirectory>
</fileSet>
@@ -313,6 +312,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../xwork-core</directory>
+ <outputDirectory>src/xwork-core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../plugins</directory>
<outputDirectory>src/plugins</outputDirectory>
<excludes>
Modified: struts/struts2/trunk/assembly/src/main/assembly/apps.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/apps.xml?rev=941378&r1=941377&r2=941378&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/apps.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/apps.xml Wed May 5
16:45:20 2010
@@ -48,7 +48,6 @@
<includes>
<include>FREEMARKER-LICENSE.txt</include>
<include>OGNL-LICENSE.txt</include>
- <include>XWORK-LICENSE.txt</include>
</includes>
</fileSet>
<fileSet>
Modified: struts/struts2/trunk/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/docs.xml?rev=941378&r1=941377&r2=941378&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/docs.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/docs.xml Wed May 5
16:45:20 2010
@@ -30,7 +30,7 @@
<!-- Include the XWork Javadoc in the assembly -->
<fileSet>
- <directory>target/xwork-apidocs</directory>
+ <directory>../xwork-core/target/site/apidocs</directory>
<outputDirectory>docs/xwork-apidocs</outputDirectory>
</fileSet>
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=941378&r1=941377&r2=941378&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Wed May 5 16:45:20
2010
@@ -54,7 +54,6 @@
<includes>
<include>FREEMARKER-LICENSE.txt</include>
<include>OGNL-LICENSE.txt</include>
- <include>XWORK-LICENSE.txt</include>
</includes>
</fileSet>
<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=941378&r1=941377&r2=941378&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/src.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/src.xml Wed May 5 16:45:20
2010
@@ -121,11 +121,22 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../xwork-core</directory>
+ <outputDirectory>src/xwork-core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../plugins</directory>
<outputDirectory>src/plugins</outputDirectory>
<excludes>
<exclude>*/target/**</exclude>
<exclude>target/**</exclude>
+ <exclude>*.iml</exclude>
+ <exclude>*.ipr</exclude>
+ <exclude>*.iws</exclude>
</excludes>
</fileSet>
<fileSet>
