Author: rgielen
Date: Mon Jul 8 10:59:25 2013
New Revision: 1500651
URL: http://svn.apache.org/r1500651
Log:
Merged from trunk
WW-4130 Adds usage of SiteExporter instead of wget to export docs from
Confluence [from revision 1497786]
Added:
struts/struts2/branches/STRUTS_2_3_15_X/assembly/src/main/resources/docs.cfg
- copied unchanged from r1497786,
struts/struts2/trunk/assembly/src/main/resources/docs.cfg
struts/struts2/branches/STRUTS_2_3_15_X/assembly/src/main/resources/template.vm
- copied unchanged from r1497786,
struts/struts2/trunk/assembly/src/main/resources/template.vm
Modified:
struts/struts2/branches/STRUTS_2_3_15_X/ (props changed)
struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_3_15_X/assembly/src/main/assembly/docs.xml
Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
------------------------------------------------------------------------------
Merged /struts/struts2/trunk:r1497786
Modified: struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml?rev=1500651&r1=1500650&r2=1500651&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_3_15_X/assembly/pom.xml Mon Jul 8
10:59:25 2013
@@ -1,4 +1,5 @@
-<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";>
+<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>
<parent>
<groupId>org.apache.struts</groupId>
@@ -83,31 +84,29 @@
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>cwiki-docs</id>
<phase>prepare-package</phase>
<goals>
- <goal>run</goal>
+ <goal>java</goal>
</goals>
<configuration>
- <tasks>
- <mkdir dir="${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="-l 0" />
- <arg value="-np" />
- <arg
value="--directory-prefix=${project.build.directory}/cwiki" />
- <arg value="--no-check-certificate" />
- <arg value="-r" />
- <arg value="https://cwiki.apache.org/WW/";
/>
- </exec>
- </tasks>
+ <classpathScope>runtime</classpathScope>
+
<includeProjectDependencies>true</includeProjectDependencies>
+
<mainClass>org.apache.cxf.cwiki.SiteExporter</mainClass>
+ <arguments>
+ <argument>-d</argument>
+
<argument>${project.build.directory}/cwiki/WW</argument>
+ <argument>-password</argument>
+ <argument>${confluence.password}</argument>
+ <argument>-user</argument>
+ <argument>${confluence.user}</argument>
+
<argument>${basedir}/src/main/resources/docs.cfg</argument>
+ </arguments>
</configuration>
</execution>
</executions>
@@ -143,6 +142,13 @@
<dependencies>
<dependency>
+ <groupId>org.apache.cxf.site-export</groupId>
+ <artifactId>cxf-site-export</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-codebehind-plugin</artifactId>
</dependency>
Modified:
struts/struts2/branches/STRUTS_2_3_15_X/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_X/assembly/src/main/assembly/docs.xml?rev=1500651&r1=1500650&r2=1500651&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_3_15_X/assembly/src/main/assembly/docs.xml
(original)
+++ struts/struts2/branches/STRUTS_2_3_15_X/assembly/src/main/assembly/docs.xml
Mon Jul 8 10:59:25 2013
@@ -47,8 +47,8 @@
<!-- Include the Confluence docs in the assembly -->
<fileSet>
- <directory>target/cwiki/WW</directory>
- <outputDirectory>docs/docs</outputDirectory>
+ <directory>target/cwiki/WW/docs</directory>
+ <outputDirectory>docs</outputDirectory>
</fileSet>
<!-- Plugins -->
