Return-Path: 
 <commits-return-4824-apmail-hc-commits-archive=hc.apache.org@hc.apache.org>
X-Original-To: apmail-hc-commits-archive@www.apache.org
Delivered-To: apmail-hc-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5C397B130
	for <apmail-hc-commits-archive@www.apache.org>;
 Fri, 20 Jan 2012 16:23:09 +0000 (UTC)
Received: (qmail 34493 invoked by uid 500); 20 Jan 2012 16:23:09 -0000
Delivered-To: apmail-hc-commits-archive@hc.apache.org
Received: (qmail 34459 invoked by uid 500); 20 Jan 2012 16:23:08 -0000
Mailing-List: contact commits-help@hc.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hc.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hc.apache.org>
List-Post: <mailto:commits@hc.apache.org>
List-Id: <commits.hc.apache.org>
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Delivered-To: mailing list commits@hc.apache.org
Received: (qmail 34452 invoked by uid 99); 20 Jan 2012 16:23:08 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jan 2012 16:23:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jan 2012 16:23:07 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2103A23889E0
	for <commits@hc.apache.org>; Fri, 20 Jan 2012 16:22:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1233986 - in /httpcomponents/httpcore/branches/4.1.x:
 pom.xml
 src/main/assembly/bin.xml src/main/assembly/osgi-bin.xml
Date: Fri, 20 Jan 2012 16:22:46 -0000
To: commits@hc.apache.org
From: olegk@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120120162247.2103A23889E0@eris.apache.org>

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>