You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/01/20 17:22:46 UTC
svn commit: r1233986 - in /httpcomponents/httpcore/branches/4.1.x: pom.xml
src/main/assembly/bin.xml src/main/assembly/osgi-bin.xml
Author: olegk
Date: Fri Jan 20 16:22:46 2012
New Revision: 1233986
URL: http://svn.apache.org/viewvc?rev=1233986&view=rev
Log:
Simplified site content and assembly generation
Modified:
httpcomponents/httpcore/branches/4.1.x/pom.xml
httpcomponents/httpcore/branches/4.1.x/src/main/assembly/bin.xml
httpcomponents/httpcore/branches/4.1.x/src/main/assembly/osgi-bin.xml
Modified: httpcomponents/httpcore/branches/4.1.x/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.1.x/pom.xml?rev=1233986&r1=1233985&r2=1233986&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.1.x/pom.xml (original)
+++ httpcomponents/httpcore/branches/4.1.x/pom.xml Fri Jan 20 16:22:46 2012
@@ -135,6 +135,15 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc-aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>pre-site</phase>
+ </execution>
+ </executions>
<configuration>
<!-- reduce console output. Can override with -Dquiet=false -->
<quiet>true</quiet>
@@ -189,6 +198,16 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>tutorial-site</id>
+ <goals>
+ <goal>generate-html</goal>
+ <goal>generate-pdf</goal>
+ </goals>
+ <phase>pre-site</phase>
+ </execution>
+ </executions>
<configuration>
<includes>index.xml</includes>
<chunkedOutput>true</chunkedOutput>
@@ -203,13 +222,14 @@
</entity>
</entities>
<postProcess>
- <copy todir="target/site/tutorial">
- <fileset dir="target/docbkx">
+ <copy todir="target/site/tutorial/html"
+ failonerror="false">
+ <fileset dir="target/docbkx/html/index">
<include name="**/*.html" />
- <include name="**/*.pdf" />
</fileset>
</copy>
- <copy todir="target/site/tutorial/html">
+ <copy todir="target/site/tutorial/html"
+ failonerror="false">
<fileset dir="src/docbkx/resources">
<include name="**/*.css" />
<include name="**/*.png" />
@@ -217,7 +237,9 @@
<include name="**/*.jpg" />
</fileset>
</copy>
- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpcore-tutorial.pdf" failonerror="false" />
+ <copy file="target/docbkx/pdf/index.pdf"
+ tofile="target/site/tutorial/pdf/httpcore-tutorial.pdf"
+ failonerror="false"/>
</postProcess>
</configuration>
</plugin>
Modified: httpcomponents/httpcore/branches/4.1.x/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.1.x/src/main/assembly/bin.xml?rev=1233986&r1=1233985&r2=1233986&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.1.x/src/main/assembly/bin.xml (original)
+++ httpcomponents/httpcore/branches/4.1.x/src/main/assembly/bin.xml Fri Jan 20 16:22:46 2012
@@ -61,18 +61,10 @@
<directory>target/site/apidocs</directory>
<outputDirectory>javadoc</outputDirectory>
</fileSet>
- <!-- Tutorial (HTML) -->
+ <!-- Tutorial -->
<fileSet>
- <directory>target/docbkx/html</directory>
- <outputDirectory>tutorial/html</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/css</directory>
- <outputDirectory>tutorial/html/css</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/images</directory>
- <outputDirectory>tutorial/html/images</outputDirectory>
+ <directory>target/site/tutorial</directory>
+ <outputDirectory>tutorial</outputDirectory>
</fileSet>
<!-- Examples: base module -->
<fileSet>
@@ -91,12 +83,4 @@
</includes>
</fileSet>
</fileSets>
- <files>
- <!-- Tutorial (PDF) -->
- <file>
- <source>target/docbkx/pdf/index.pdf</source>
- <outputDirectory>tutorial/pdf</outputDirectory>
- <destName>httpcore-tutorial.pdf</destName>
- </file>
- </files>
</assembly>
Modified: httpcomponents/httpcore/branches/4.1.x/src/main/assembly/osgi-bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.1.x/src/main/assembly/osgi-bin.xml?rev=1233986&r1=1233985&r2=1233986&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.1.x/src/main/assembly/osgi-bin.xml (original)
+++ httpcomponents/httpcore/branches/4.1.x/src/main/assembly/osgi-bin.xml Fri Jan 20 16:22:46 2012
@@ -55,18 +55,10 @@
<directory>target/site/apidocs</directory>
<outputDirectory>javadoc</outputDirectory>
</fileSet>
- <!-- Tutorial (HTML) -->
+ <!-- Tutorial -->
<fileSet>
- <directory>target/docbkx/html</directory>
- <outputDirectory>tutorial/html</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/css</directory>
- <outputDirectory>tutorial/html/css</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/images</directory>
- <outputDirectory>tutorial/html/images</outputDirectory>
+ <directory>target/site/tutorial</directory>
+ <outputDirectory>tutorial</outputDirectory>
</fileSet>
<!-- Examples: base module -->
<fileSet>
@@ -85,12 +77,4 @@
</includes>
</fileSet>
</fileSets>
- <files>
- <!-- Tutorial (PDF) -->
- <file>
- <source>target/docbkx/pdf/index.pdf</source>
- <outputDirectory>tutorial/pdf</outputDirectory>
- <destName>httpcore-tutorial.pdf</destName>
- </file>
- </files>
</assembly>