From 989674fac9cc6cc77b4cde5a920a3deb7027f7a5 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Tue, 16 Sep 2008 08:58:41 +0000
Subject: [PATCH] * More compact distribution files * JavaDoc is not deployed
 anymore (major bandwidth / space hog) * Renamed docbook/image to
 docbook/images to avoid having to image directories

---
 pom.xml                  | 144 ++++++++++++++++++++-------------------
 src/assembly/default.xml |   3 +
 src/docbook/master.xml   |  51 ++++++++------
 3 files changed, 107 insertions(+), 91 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98a9783964..866c7f68b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,17 +177,88 @@
             <goals>
               <goal>jar</goal>
             </goals>
+            <configuration>
+              <attach>true</attach>
+            </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>write-version</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo message="${project.version}" file="${project.build.directory}/version.txt" />
+              </tasks>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-license</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <taskdef resource="net/sf/antcontrib/antlib.xml" />
+                <if>
+                  <or>
+                    <equals arg2="jar" arg1="${project.packaging}" />
+                    <equals arg2="bundle" arg1="${project.packaging}" />
+                  </or>
+                  <then>
+                    <move file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${project.build.finalName}.orig.jar" />
+                    <zip destfile="${project.build.directory}/${project.build.finalName}.jar">
+                      <zipfileset dir="${basedir}" prefix="META-INF/">
+                        <include name="LICENSE.*" />
+                        <include name="NOTICE.*" />
+                        <include name="COPYRIGHT.*" />
+                      </zipfileset>
+                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}.orig.jar" dirmode="755">
+                        <exclude name="*/*/*/example/**" />
+                      </zipfileset>
+                    </zip>
+                    <delete file="${project.build.directory}/${project.build.finalName}.orig.jar" />
+                    <move file="${project.build.directory}/${project.build.finalName}-sources.jar" tofile="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
+                    <zip destfile="${project.build.directory}/${project.build.finalName}-sources.jar">
+                      <zipfileset dir="${basedir}" prefix="META-INF/">
+                        <include name="LICENSE.*" />
+                        <include name="NOTICE.*" />
+                        <include name="COPYRIGHT.*" />
+                      </zipfileset>
+                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-sources.orig.jar" dirmode="755">
+                        <exclude name="*/*/*/example/**" />
+                      </zipfileset>
+                    </zip>
+                    <delete file="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
+                  </then>
+                </if>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>ant-contrib</artifactId>
+            <version>1.0b2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <executions>
           <execution>
-            <id>attach-javadoc</id>
+            <id>generate-javadoc</id>
             <phase>package</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>javadoc</goal>
             </goals>
           </execution>
         </executions>
@@ -199,6 +270,7 @@
             <version>1.2.3.GA</version>
           </docletArtifact>
           <aggregate>true</aggregate>
+          <attach>false</attach>
           <additionalparam>
             -d ${project.build.directory}/apidocs
             -charset UTF-8
@@ -263,7 +335,7 @@
           <imageResource>
             <directory>${basedir}/src/docbook</directory>
             <includes>
-              <include>image/**/*</include>
+              <include>images/**/*</include>
             </includes>
           </imageResource>
           <formats>
@@ -285,72 +357,6 @@
           </options>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-license</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <taskdef resource="net/sf/antcontrib/antlib.xml" />
-                <if>
-                  <or>
-                    <equals arg2="jar" arg1="${project.packaging}" />
-                    <equals arg2="bundle" arg1="${project.packaging}" />
-                  </or>
-                  <then>
-                    <move file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${project.build.finalName}.orig.jar" />
-                    <zip destfile="${project.build.directory}/${project.build.finalName}.jar">
-                      <zipfileset dir="${basedir}" prefix="META-INF/">
-                        <include name="LICENSE.*" />
-                        <include name="NOTICE.*" />
-                        <include name="COPYRIGHT.*" />
-                      </zipfileset>
-                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}.orig.jar" dirmode="755">
-                        <exclude name="*/*/*/example/**" />
-                      </zipfileset>
-                    </zip>
-                    <delete file="${project.build.directory}/${project.build.finalName}.orig.jar" />
-                    <move file="${project.build.directory}/${project.build.finalName}-sources.jar" tofile="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
-                    <zip destfile="${project.build.directory}/${project.build.finalName}-sources.jar">
-                      <zipfileset dir="${basedir}" prefix="META-INF/">
-                        <include name="LICENSE.*" />
-                        <include name="NOTICE.*" />
-                        <include name="COPYRIGHT.*" />
-                      </zipfileset>
-                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-sources.orig.jar" dirmode="755">
-                        <exclude name="*/*/*/example/**" />
-                      </zipfileset>
-                    </zip>
-                    <delete file="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
-                    <move file="${project.build.directory}/${project.build.finalName}-javadoc.jar" tofile="${project.build.directory}/${project.build.finalName}-javadoc.orig.jar" />
-                    <zip destfile="${project.build.directory}/${project.build.finalName}-javadoc.jar">
-                      <zipfileset dir="${basedir}" prefix="META-INF/">
-                        <include name="LICENSE.*" />
-                        <include name="NOTICE.*" />
-                        <include name="COPYRIGHT.*" />
-                      </zipfileset>
-                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-javadoc.orig.jar" dirmode="755" />
-                    </zip>
-                    <delete file="${project.build.directory}/${project.build.finalName}-javadoc.orig.jar" />
-                  </then>
-                </if>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <version>1.0b2</version>
-          </dependency>
-        </dependencies>
-      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
diff --git a/src/assembly/default.xml b/src/assembly/default.xml
index 4d3267a456..0adcfd1bcf 100644
--- a/src/assembly/default.xml
+++ b/src/assembly/default.xml
@@ -54,6 +54,9 @@
       <includes>
         <include>${project.build.finalName}*.jar</include>
       </includes>
+      <excludes>
+        <exclude>${project.build.finalName}*-javadoc.jar</exclude>
+      </excludes>
     </fileSet>
 
     <!-- Documentation (API) -->
diff --git a/src/docbook/master.xml b/src/docbook/master.xml
index 80be1562f2..dddb306ecf 100644
--- a/src/docbook/master.xml
+++ b/src/docbook/master.xml
@@ -1,32 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd" [
-<!ENTITY introduction SYSTEM "module/introduction.xml">
-<!ENTITY architecture SYSTEM "module/architecture.xml">
-<!ENTITY codec        SYSTEM "module/codec.xml">
-<!ENTITY threading    SYSTEM "module/threading.xml">
-<!ENTITY security     SYSTEM "module/security.xml">
-<!ENTITY transport    SYSTEM "module/transport.xml">
-<!ENTITY appendix     SYSTEM "module/appendix.xml">
-]>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
 <book lang="en">
   <bookinfo>
     <title>The Netty Project 3.0 User Guide</title>
-    <subtitle>The proven approach for rapid network application development</subtitle>
-    <releaseinfo>$Rev$, $Date$</releaseinfo>
+    <subtitle>The Proven Approach for Rapid Network Application Development</subtitle>
+    <releaseinfo>
+      <xi:include href="../../target/version.txt" parse="text"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </releaseinfo>
   </bookinfo>
 
   <toc/>
 
-  <preface id="preface">
-    <title>Preface</title>
-    <para>To be written...</para>
-  </preface>
+  <xi:include href="module/preface.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+              
+  <xi:include href="module/introduction.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+              
+  <xi:include href="module/architecture.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+              
+  <xi:include href="module/codec.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+              
+  <xi:include href="module/threading.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+              
+  <xi:include href="module/security.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+              
+  <xi:include href="module/transport.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+              
+  <xi:include href="module/appendix.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  &introduction;
-  &architecture;
-  &codec;
-  &threading;
-  &security;
-  &transport;
-  &appendix;
 </book>