* include prepWEB as part of buildWEB (prepWEB checks to see if we've already downloaded it)

* include buildWEB as part of build (so everyone builds everything by default)
* have clean include pkgclean
* new i2ptunnel.config and clients.config for the pkg

build.xml

@@ -10,8 +10,7 @@
         <echo message="  dist:      distclean, then build and javadoc (including the web app and associated libs)" />
         <echo message="  prepGUI:   pull the LGPL and APL code for JFreeChart that we use in the GUIs" />
         <echo message="  buildGUI:  build the heartbeat and netmonitor GUIs (must have run prepGUI already)" />
-        <echo message="  prepWEB:   pull down the Jetty libraries and whatever they depend on for the router console web application" />
-        <echo message="  buildWEB:  build the router console web application (depends upon prepWEB)" />
+        <echo message="  buildWEB:  build the router console web application" />
         <echo message="  pkg:       make the tarball and installer jar (depends upon preppkg)" />
         <echo message="  pkgclean:  delete the ./pkg-temp/ dir, tarball and installer jar" />
         <echo message="  preppkg:   gather built files for tarball and installer (depends upon prepWEB)" />
@@ -19,7 +18,7 @@
         <echo message="  installer: build the GUI installer (depends upon preppkg)" />
     </target>
     <target name="dist" depends="distclean, build, buildWEB, javadoc" />
-    <target name="build" depends="builddep, jar" />
+    <target name="build" depends="builddep, jar, buildWEB" />
     <target name="buildclean" depends="distclean, build" />
     <target name="builddep">
 	<!-- build *everything* here, but only once -->
@@ -63,7 +62,7 @@
             splitindex="true" 
             windowtitle="I2P" />
     </target>
-    <target name="clean">
+    <target name="clean" depends="pkgclean" >
         <delete dir="./build" />
     </target>
     <target name="distclean" depends="clean">
@@ -120,7 +119,7 @@
     <target name="prepWEB">
         <ant dir="apps/jetty" target="fetchJettylib" />
     </target>
-    <target name="buildWEB" >
+    <target name="buildWEB" depends="prepWEB" >
         <available property="jettylib.available" file="apps/jetty/jettylib" />
         <ant target="doBuildWEB" />
     </target>
@@ -171,7 +170,8 @@
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
         <copy file="hosts.txt" todir="pkg-temp/" />
-        <copy file="installer/java/src/i2ptunnel.config" todir="pkg-temp/" />
+        <copy file="installer/resources/i2ptunnel.config" todir="pkg-temp/" />
+        <copy file="installer/resources/clients.config" todir="pkg-temp/" />
         <copy file="readme.txt" todir="pkg-temp/" />
     </target>
     <target name="tarball" depends="preppkg">

installer/resources/clients.config

@@ -0,0 +1,15 @@
+# fire up the web console
+clientApp.0.args=7657 127.0.0.1 ./webapps/
+clientApp.0.main=net.i2p.router.web.RouterConsoleRunner
+clientApp.0.name=webConsole
+clientApp.0.onBoot=true
+
+# start up the SAM bridge so other client apps can connect
+clientApp.1.main=net.i2p.sam.SAMBridge
+clientApp.1.name=SAMBridge
+clientApp.1.args=sam.keys 127.0.0.1 7656 i2cp.tcp.host=localhost i2cp.tcp.port=7654
+
+# poke the i2ptunnels defined in i2ptunnel.config
+clientApp.2.main=net.i2p.i2ptunnel.TunnelControllerGroup
+clientApp.2.name=Tunnels
+clientApp.2.args=i2ptunnel.config

installer/resources/i2ptunnel.config

@@ -0,0 +1,38 @@
+# eepproxy
+tunnel.0.name=eepProxy
+tunnel.0.description=HTTP proxy for browsing eepsites and the web
+tunnel.0.type=httpclient
+tunnel.0.interface=0.0.0.0
+tunnel.0.listenPort=4444
+tunnel.0.proxyList=squid.i2p,www1.squid.i2p
+tunnel.0.i2cpHost=localhost
+tunnel.0.i2cpPort=7654
+tunnel.0.option.tunnel.depthInbound=2
+tunnel.0.option.tunnel.numTunnels=2
+tunnel.0.startOnLoad=true
+
+# irc
+tunnel.1.name=ircProxy
+tunnel.1.description=IRC proxy to access the anonymous irc net
+tunnel.1.type=client
+tunnel.1.interface=0.0.0.0
+tunnel.1.listenPort=6668
+tunnel.1.targetDestination=irc.duck.i2p
+tunnel.1.i2cpHost=localhost
+tunnel.1.i2cpPort=7654
+tunnel.1.option.tunnel.depthInbound=2
+tunnel.1.option.tunnel.numTunnels=2
+tunnel.1.startOnLoad=true
+
+# local eepserver
+#tunnel.2.name=eepsite
+#tunnel.2.description=My eepsite
+#tunnel.2.type=server
+#tunnel.2.targetHost=localhost
+#tunnel.2.targetPort=8000
+#tunnel.2.privKeyFile=eepPriv.dat
+#tunnel.2.i2cpHost=localhost
+#tunnel.2.i2cpPort=7654
+#tunnel.2.option.tunnel.depthInbound=2
+#tunnel.2.option.tunnel.numTunnels=2
+#tunnel.2.startOnLoad=true