From b1134f653357d52de48398f2bbefd46cc93c4ac0 Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Wed, 1 Feb 2012 17:38:12 +0000
Subject: [PATCH] Simplified site content and assembly generation

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1239226 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                        | 34 +++++++++++++++++++++++++++++-----
 src/main/assembly/bin.xml      | 22 +++-------------------
 src/main/assembly/osgi-bin.xml | 22 +++-------------------
 3 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1fc9e6f5d..756f2cf6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,7 +219,18 @@
       </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>
           <source>1.5</source>
           <links>
             <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
@@ -272,6 +283,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>
@@ -286,13 +307,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" />
@@ -300,7 +322,9 @@
                 <include name="**/*.jpg" />
               </fileset>
             </copy>
-            <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
+            <copy file="target/docbkx/pdf/index.pdf" 
+                  tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" 
+                  failonerror="false"/>
           </postProcess>
         </configuration>
       </plugin>
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index e500a5f9e..e97771c4d 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -69,18 +69,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>
         <!-- Base module -->
         <fileSet>
@@ -99,12 +91,4 @@
           </includes>
         </fileSet>
     </fileSets>
-    <files>
-        <!-- Tutorial (PDF) -->
-        <file>
-          <source>target/docbkx/pdf/index.pdf</source>
-          <outputDirectory>tutorial/pdf</outputDirectory>
-          <destName>httpclient-tutorial.pdf</destName>
-        </file>
-    </files>
 </assembly>
diff --git a/src/main/assembly/osgi-bin.xml b/src/main/assembly/osgi-bin.xml
index 9ff0f8ca9..36c0cea44 100644
--- a/src/main/assembly/osgi-bin.xml
+++ b/src/main/assembly/osgi-bin.xml
@@ -56,18 +56,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>
         <!-- Base module -->
         <fileSet>
@@ -86,12 +78,4 @@
           </includes>
         </fileSet>
     </fileSets>
-    <files>
-        <!-- Tutorial (PDF) -->
-        <file>
-          <source>target/docbkx/pdf/index.pdf</source>
-          <outputDirectory>tutorial/pdf</outputDirectory>
-          <destName>httpclient-tutorial.pdf</destName>
-        </file>
-    </files>
 </assembly>