From ff828e64174c9a2a23f7de611d433ec95aa2e9a2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 27 Nov 2010 13:50:33 +0000
Subject: [PATCH]     * Build:       - Add man pages to package       - New
 updaterWithJavadoc target     * Console:       - Add link to javadocs if
 installed

---
 apps/routerconsole/java/build.xml                     |  4 ----
 .../src/net/i2p/router/web/SummaryBarRenderer.java    |  6 +++++-
 apps/routerconsole/jsp/web.xml                        |  5 +++++
 build.xml                                             | 11 +++++++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 22eadd52a..8b08c0de8 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -93,10 +93,6 @@
         <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class" update="true" />
     </target>
 
-    <target name="jarWithJavadoc" depends="jar">
-        <jar destfile="build/routerconsole.war" basedir="../../../build/" includes="javadoc/**/*" update="true" />
-    </target>
-
     <target name="poupdate" depends="build">
         <ant target="war" />
         <!-- Update the messages_*.po files.
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index edae6da13..1ed18e5b4 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -147,8 +147,12 @@ public class SummaryBarRenderer {
                .append(_("Local Destinations"))
                .append("\">")
                .append(_("I2PTunnel"))
+               .append("</a>\n");
 
-               .append("</a></td></tr></table>\n");
+            File javadoc = new File(_context.getBaseDir(), "docs/javadoc/index.html");
+            if (javadoc.exists())
+                buf.append("<a href=\"/javadoc/index.html\" target=\"_blank\">Javadoc</a>\n");
+            buf.append("</td></tr></table>\n");
 
             out.write(buf.toString());
             buf.setLength(0);
diff --git a/apps/routerconsole/jsp/web.xml b/apps/routerconsole/jsp/web.xml
index a0436d305..8679abcb7 100644
--- a/apps/routerconsole/jsp/web.xml
+++ b/apps/routerconsole/jsp/web.xml
@@ -12,6 +12,11 @@
       <url-pattern>/themes/*</url-pattern>
     </servlet-mapping>
     
+    <servlet-mapping> 
+      <servlet-name>net.i2p.router.web.jsp.viewtheme_jsp</servlet-name>
+      <url-pattern>/javadoc/*</url-pattern>
+    </servlet-mapping>
+    
     <session-config>
         <session-timeout>
             30
diff --git a/build.xml b/build.xml
index 4ad940297..de3525191 100644
--- a/build.xml
+++ b/build.xml
@@ -24,6 +24,7 @@
         <echo message="  installer: build the GUI installer" />
         <echo message="  tarball:   tar the full install into i2p.tar.bz2 (extracts to build a new clean install)" />
         <echo message="  updater:   tar the built i2p specific files into an i2pupdate.zip (extracts safely over existing installs)" />
+        <echo message="  updaterWithJavadoc: updater including the javadocs, for display in the console" />
         <echo message="  updaterWithJetty:   tar the built i2p specific files and jetty into an i2pupdate.zip (extracts safely over existing installs)" />
         <echo message="  updaterWithJettyFixes: updater including local jetty patches" />
         <echo message="  updaterWithGeoIP: updater including GeoIP Files" />
@@ -360,6 +361,9 @@
         <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
         <copy file="installer/resources/osid" todir="pkg-temp/" />
         <copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
+        <copy todir="pkg-temp/man/">
+            <fileset dir="installer/resources/man/" />
+        </copy>
         <copy todir="pkg-temp/lib/wrapper/linux/">
             <fileset dir="installer/lib/wrapper/linux/" />
         </copy>
@@ -493,9 +497,16 @@
         <zip destfile="docs.zip" basedir="pkg-temp" whenempty="fail" />
     </target>
 
+    <target name="copyJavadoc" depends="javadoc">
+        <copy todir="pkg-temp/docs/javadoc" >
+          <fileset dir="build/javadoc/" />
+        </copy>
+    </target>
+
     <target name="updater200" depends="prepupdate, preplicenses, pack200, zipit200" />
     <target name="updater200WithJettyFixes" depends="prepjupdatefixes, preplicenses, pack200, zipit200" />
     <target name="updater" depends="prepupdate, preplicenses, zipit" />
+    <target name="updaterWithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, zipit" />
     <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
     <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
     <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />