0.8 fix comment in jetty.xml

- Port to Jetty 6
  - Replace QForwardHandler with RewriteHandler

README.txt

@@ -1,7 +1,7 @@
 This is a very simple in-memory open tracker, wrapped into an I2P plugin.
 
 The plugin starts a new http serer tunnel, eepsite, and Jetty server running at port 7662.
-The tracker status is available at http://127.0.0.1:7661/tracker/ .
+The tracker status is available at http://127.0.0.1:7662/tracker/ .
 If other files are desired on the eepsite, they can be added at eepsite/docroot .
 
 The open tracker code and jsps were written from scratch, but depend on some code

build.xml

@@ -11,7 +11,7 @@
         <delete file="plugin/i2ptunnel.config" />
         <!-- get version number -->
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="0.4" />
+        <property name="release.number" value="0.8" />
 
         <!-- make the update xpi2p -->
         <!-- this contains everything except i2ptunnel.config -->

plugin/templates/contexts/base-context.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!--
+Configure a custom context for the eepsite.
+
+This context contains only a Context with a default servlet
+to serve static html files and images.
+-->
+
+<Configure class="org.mortbay.jetty.servlet.Context">
+  <Set name="contextPath">/</Set>
+  <Set name="resourceBase">$PLUGIN/eepsite/docroot/</Set>
+  <Call name="addServlet">
+    <Arg>org.mortbay.jetty.servlet.DefaultServlet</Arg>
+    <Arg>/</Arg>
+  </Call>
+</Configure>
+

plugin/templates/contexts/cgi-context.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!--
+Configure a custom context for the eepsite.
+
+ * CGI Servlet.
+ * 
+ * The cgi bin directory can be set with the "cgibinResourceBase" init parameter
+ * or it will default to the resource base of the context.
+ * 
+ * The "commandPrefix" init parameter may be used to set a prefix to all
+ * commands passed to exec. This can be used on systems that need assistance to
+ * execute a particular file type. For example on windows this can be set to
+ * "perl" so that perl scripts are executed.
+ * 
+ * The "Path" init param is passed to the exec environment as PATH. Note: Must
+ * be run unpacked somewhere in the filesystem.
+ * 
+ * Any initParameter that starts with ENV_ is used to set an environment
+ * variable with the name stripped of the leading ENV_ and using the init
+ * parameter value.
+-->
+
+<Configure class="org.mortbay.jetty.servlet.Context">
+  <Set name="contextPath">/cgi-bin</Set>
+  <Set name="resourceBase">$PLUGIN/eepsite/cgi-bin/</Set>
+  <Call name="setInitParams">
+    <Arg>
+      <Map>
+        <Entry>
+          <Item>Path</Item>
+          <Item>/usr/local/bin:/bin:/usr/bin</Item>
+        </Entry>
+      </Map>
+    </Arg>
+  </Call>
+  <Call name="addServlet">
+    <Arg>org.mortbay.servlet.CGI</Arg>
+    <Arg>/</Arg>
+  </Call>
+</Configure>

plugin/templates/etc/realm.properties

@@ -0,0 +1,21 @@
+#
+# This file defines users passwords and roles for a HashUserRealm
+#
+# The format is
+#  <username>: <password>[,<rolename> ...]
+#
+# Passwords may be clear text, obfuscated or checksummed.  The class 
+# org.mortbay.util.Password should be used to generate obfuscated
+# passwords or password checksums
+#
+# If DIGEST Authentication is used, the password must be in a recoverable
+# format, either plain text or OBF:.
+#
+jetty: MD5:164c88b302622e17050af52c89945d44,user
+admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin
+other: OBF:1xmk1w261u9r1w1c1xmq
+plain: plain
+user: password
+
+# This entry is for digest auth.  The credential is a MD5 hash of username:realmname:password
+digest: MD5:6e120743ad67abfbc385bc2bb754e297

plugin/templates/etc/webdefault.xml

@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- ===================================================================== -->
+<!-- This file contains the default descriptor for web applications.       -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- The intent of this descriptor is to include jetty specific or common  -->
+<!-- configuration for all webapps.   If a context has a webdefault.xml    -->
+<!-- descriptor, it is applied before the contexts own web.xml file        -->
+<!--                                                                       -->
+<!-- A context may be assigned a default descriptor by:                    -->
+<!--  + Calling WebApplicationContext.setDefaultsDescriptor                -->
+<!--  + Passed an arg to addWebApplications                                -->
+<!--                                                                       -->
+<!-- This file is used both as the resource within the jetty.jar (which is -->
+<!-- used as the default if no explicit defaults descriptor is set) and it -->
+<!-- is copied to the etc directory of the Jetty distro and explicitly     -->
+<!-- by the jetty.xml file.                                                -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+<web-app 
+   xmlns="http://java.sun.com/xml/ns/javaee" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
+   metadata-complete="true"
+   version="2.5"> 
+
+  <description>
+    Default web.xml file.  
+    This file is applied to a Web application before it's own WEB_INF/web.xml file
+  </description>
+
+
+  <!-- ==================================================================== -->
+  <!-- Context params to control Session Cookies                            -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <!-- UNCOMMENT TO ACTIVATE
+  <context-param>
+    <param-name>org.mortbay.jetty.servlet.SessionDomain</param-name>
+    <param-value>127.0.0.1</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
+    <param-value>/</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>org.mortbay.jetty.servlet.MaxAge</param-name>
+    <param-value>-1</param-value>
+  </context-param>
+  -->
+
+  <context-param>
+    <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
+    <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
+  </context-param>
+            
+
+
+  <!-- ==================================================================== -->
+  <!-- The default servlet.                                                 -->
+  <!-- This servlet, normally mapped to /, provides the handling for static -->
+  <!-- content, OPTIONS and TRACE methods for the context.                  -->
+  <!-- The following initParameters are supported:                          -->
+  <!--                                                                      -->
+  <!--   acceptRanges     If true, range requests and responses are         -->
+  <!--                    supported                                         -->
+  <!--                                                                      -->
+  <!--   dirAllowed       If true, directory listings are returned if no    -->
+  <!--                    welcome file is found. Else 403 Forbidden.        -->
+  <!--                                                                      -->
+  <!--   welcomeServlets  If true, attempt to dispatch to welcome files     -->
+  <!--                    that are servlets, if no matching static          --> 
+  <!--                    resources can be found.                           -->
+  <!--                                                                      -->
+  <!--   redirectWelcome  If true, redirect welcome file requests           -->
+  <!--                    else use request dispatcher forwards              -->
+  <!--                                                                      -->
+  <!--   gzip             If set to true, then static content will be served--> 
+  <!--                    as gzip content encoded if a matching resource is -->
+  <!--                    found ending with ".gz"                           -->
+  <!--                                                                      -->
+  <!--   resoureBase      Can be set to replace the context resource base   -->
+  <!--                                                                      -->
+  <!--   relativeResourceBase                                               -->
+  <!--                    Set with a pathname relative to the base of the   -->
+  <!--                    servlet context root. Useful for only serving     -->
+  <!--                    static content from only specific subdirectories. -->
+  <!--                                                                      -->
+  <!--   useFileMappedBuffer                                                -->
+  <!--                    If set to true (the default), a  memory mapped    -->
+  <!--                    file buffer will be used to serve static content  -->
+  <!--                    when using an NIO connector. Setting this value   -->
+  <!--                    to false means that a direct buffer will be used  -->
+  <!--                    instead. If you are having trouble with Windows   -->
+  <!--                    file locking, set this to false.                  -->
+  <!--                                                                      -->
+  <!--  cacheControl      If set, all static content will have this value   -->
+  <!--                    set as the cache-control header.                  -->
+  <!--                                                                      -->
+  <!--  maxCacheSize      Maximum size of the static resource cache         -->
+  <!--                                                                      -->
+  <!--  maxCachedFileSize Maximum size of any single file in the cache      -->
+  <!--                                                                      -->
+  <!--  maxCachedFiles    Maximum number of files in the cache              -->
+  <!--                                                                      -->
+  <!--  cacheType         "nio", "bio" or "both" to determine the type(s)   -->
+  <!--                    of resource cache. A bio cached buffer may be used-->
+  <!--                    by nio but is not as efficient as a nio buffer.   -->
+  <!--                    An nio cached buffer may not be used by bio.      -->
+  <!--                                                                      -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <servlet>
+    <servlet-name>default</servlet-name>
+    <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
+    <init-param>
+      <param-name>acceptRanges</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>dirAllowed</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>welcomeServlets</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>redirectWelcome</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCacheSize</param-name>
+      <param-value>256000000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCachedFileSize</param-name>
+      <param-value>10000000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCachedFiles</param-name>
+      <param-value>1000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>cacheType</param-name>
+      <param-value>both</param-value>
+    </init-param>
+    <init-param>
+      <param-name>gzip</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>useFileMappedBuffer</param-name>
+      <param-value>true</param-value>
+    </init-param>  
+    <!--
+    <init-param>
+      <param-name>cacheControl</param-name>
+      <param-value>max-age=3600,public</param-value>
+    </init-param>
+    -->
+    <load-on-startup>0</load-on-startup>
+  </servlet> 
+
+  <servlet-mapping> <servlet-name>default</servlet-name> <url-pattern>/</url-pattern> </servlet-mapping>
+  
+
+  <!-- ==================================================================== -->
+  <!-- JSP Servlet                                                          -->
+  <!-- This is the jasper JSP servlet from the jakarta project              -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
+  <!-- used by Glassfish to support JSP pages.  Traditionally, this servlet -->
+  <!-- is mapped to URL patterh "*.jsp".  This servlet supports the         -->
+  <!-- following initialization parameters (default values are in square    -->
+  <!-- brackets):                                                           -->
+  <!--                                                                      -->
+  <!--   checkInterval       If development is false and reloading is true, -->
+  <!--                       background compiles are enabled. checkInterval -->
+  <!--                       is the time in seconds between checks to see   -->
+  <!--                       if a JSP page needs to be recompiled. [300]    -->
+  <!--                                                                      -->
+  <!--   compiler            Which compiler Ant should use to compile JSP   -->
+  <!--                       pages.  See the Ant documenation for more      -->
+  <!--                       information. [javac]                           -->
+  <!--                                                                      -->
+  <!--   classdebuginfo      Should the class file be compiled with         -->
+  <!--                       debugging information?  [true]                 -->
+  <!--                                                                      -->
+  <!--   classpath           What class path should I use while compiling   -->
+  <!--                       generated servlets?  [Created dynamically      -->
+  <!--                       based on the current web application]          -->
+  <!--                       Set to ? to make the container explicitly set  -->
+  <!--                       this parameter.                                -->
+  <!--                                                                      -->
+  <!--   development         Is Jasper used in development mode (will check -->
+  <!--                       for JSP modification on every access)?  [true] -->
+  <!--                                                                      -->
+  <!--   enablePooling       Determines whether tag handler pooling is      -->
+  <!--                       enabled  [true]                                -->
+  <!--                                                                      -->
+  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
+  <!--                       a separate JVM is used for JSP page compiles   -->
+  <!--                       from the one Tomcat is running in. [true]      -->
+  <!--                                                                      -->
+  <!--   ieClassId           The class-id value to be sent to Internet      -->
+  <!--                       Explorer when using <jsp:plugin> tags.         -->
+  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
+  <!--                                                                      -->
+  <!--   javaEncoding        Java file encoding to use for generating java  -->
+  <!--                       source files. [UTF-8]                          -->
+  <!--                                                                      -->
+  <!--   keepgenerated       Should we keep the generated Java source code  -->
+  <!--                       for each page instead of deleting it? [true]   -->
+  <!--                                                                      -->
+  <!--   logVerbosityLevel   The level of detailed messages to be produced  -->
+  <!--                       by this servlet.  Increasing levels cause the  -->
+  <!--                       generation of more messages.  Valid values are -->
+  <!--                       FATAL, ERROR, WARNING, INFORMATION, and DEBUG. -->
+  <!--                       [WARNING]                                      -->
+  <!--                                                                      -->
+  <!--   mappedfile          Should we generate static content with one     -->
+  <!--                       print statement per input line, to ease        -->
+  <!--                       debugging?  [false]                            -->
+  <!--                                                                      -->
+  <!--                                                                      -->
+  <!--   reloading           Should Jasper check for modified JSPs?  [true] -->
+  <!--                                                                      -->
+  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
+  <!--                       debugging be suppressed?  [false]              -->
+  <!--                                                                      -->
+  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
+  <!--                       dumped to a file? [false]                      -->
+  <!--                       False if suppressSmap is true                  -->
+  <!--                                                                      -->
+  <!--   scratchdir          What scratch directory should we use when      -->
+  <!--                       compiling JSP pages?  [default work directory  -->
+  <!--                       for the current web application]               -->
+  <!--                                                                      -->
+  <!--   tagpoolMaxSize      The maximum tag handler pool size  [5]         -->
+  <!--                                                                      -->
+  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
+  <!--                       header is added by generated servlet  [false]  -->
+  <!--                                                                      -->
+  <!-- If you wish to use Jikes to compile JSP pages:                       -->
+  <!--   Set the init parameter "compiler" to "jikes".  Define              -->
+  <!--   the property "-Dbuild.compiler.emacs=true" when starting Jetty     -->
+  <!--   to cause Jikes to emit error messages in a format compatible with  -->
+  <!--   Jasper.                                                            -->
+  <!--   If you get an error reporting that jikes can't use UTF-8 encoding, -->
+  <!--   try setting the init parameter "javaEncoding" to "ISO-8859-1".     -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <servlet id="jsp">
+    <servlet-name>jsp</servlet-name>
+    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+    <init-param>
+        <param-name>logVerbosityLevel</param-name>
+        <param-value>DEBUG</param-value>
+    </init-param>
+    <init-param>
+        <param-name>fork</param-name>
+        <param-value>false</param-value>
+    </init-param>
+    <init-param>
+        <param-name>xpoweredBy</param-name>
+        <param-value>false</param-value>
+    </init-param>
+    <!--  
+    <init-param>
+        <param-name>classpath</param-name>
+        <param-value>?</param-value>
+    </init-param>
+    -->
+    <load-on-startup>0</load-on-startup>
+  </servlet>
+
+  <servlet-mapping> 
+    <servlet-name>jsp</servlet-name> 
+    <url-pattern>*.jsp</url-pattern> 
+    <url-pattern>*.jspf</url-pattern>
+    <url-pattern>*.jspx</url-pattern>
+    <url-pattern>*.xsp</url-pattern>
+    <url-pattern>*.JSP</url-pattern> 
+    <url-pattern>*.JSPF</url-pattern>
+    <url-pattern>*.JSPX</url-pattern>
+    <url-pattern>*.XSP</url-pattern>
+  </servlet-mapping>
+  
+  <!-- ==================================================================== -->
+  <!-- Dynamic Servlet Invoker.                                             -->
+  <!-- This servlet invokes anonymous servlets that have not been defined   -->
+  <!-- in the web.xml or by other means. The first element of the pathInfo  -->
+  <!-- of a request passed to the envoker is treated as a servlet name for  -->
+  <!-- an existing servlet, or as a class name of a new servlet.            -->
+  <!-- This servlet is normally mapped to /servlet/*                        -->
+  <!-- This servlet support the following initParams:                       -->
+  <!--                                                                      -->
+  <!--  nonContextServlets       If false, the invoker can only load        -->
+  <!--                           servlets from the contexts classloader.    -->
+  <!--                           This is false by default and setting this  -->
+  <!--                           to true may have security implications.    -->
+  <!--                                                                      -->
+  <!--  verbose                  If true, log dynamic loads                 -->
+  <!--                                                                      -->
+  <!--  *                        All other parameters are copied to the     -->
+  <!--                           each dynamic servlet as init parameters    -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <!-- Uncomment for dynamic invocation
+  <servlet>
+    <servlet-name>invoker</servlet-name>
+    <servlet-class>org.mortbay.jetty.servlet.Invoker</servlet-class>
+    <init-param>
+      <param-name>verbose</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>nonContextServlets</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>dynamicParam</param-name>
+      <param-value>anyValue</param-value>
+    </init-param>
+    <load-on-startup>0</load-on-startup>
+  </servlet>
+
+  <servlet-mapping> <servlet-name>invoker</servlet-name> <url-pattern>/servlet/*</url-pattern> </servlet-mapping>
+  -->
+
+
+
+  <!-- ==================================================================== -->
+  <session-config>
+    <session-timeout>30</session-timeout>
+  </session-config>
+
+  <!-- ==================================================================== -->
+  <!-- Default MIME mappings                                                -->
+  <!-- The default MIME mappings are provided by the mime.properties        -->
+  <!-- resource in the org.mortbay.jetty.jar file.  Additional or modified  -->
+  <!-- mappings may be specified here                                       -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <!-- UNCOMMENT TO ACTIVATE
+  <mime-mapping>
+    <extension>mysuffix</extension>
+    <mime-type>mymime/type</mime-type>
+  </mime-mapping>
+  -->
+
+  <!-- ==================================================================== -->
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+  <!-- ==================================================================== -->
+  <locale-encoding-mapping-list>
+    <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>     
+    <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>   
+  </locale-encoding-mapping-list>
+  
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Disable TRACE</web-resource-name>
+      <url-pattern>/</url-pattern>
+      <http-method>TRACE</http-method>
+    </web-resource-collection>
+    <auth-constraint/>
+  </security-constraint>
+  
+</web-app>
+

plugin/templates/help.html

@@ -20,7 +20,7 @@ This link is also at the top of your router console when ZzzOT is running.
     <br>You will need this key to register a hostname at <a href="http://stats.i2p/i2p/addkey.html">stats.i2p</a>.
 <p>Your private key file is $PLUGIN/eepPriv.dat - back it up!!!
 <p>Your eepsite document root is $PLUGIN/eepsite/docroot,
-   you may put other files there is you wish to have additional content on your eepsite.
+   you may put other files there if you wish to have additional content on your eepsite.
 <p>The supported announce URLs are:
    <ul>
    <li><a href="http://$B32/a">http://$B32/a</a>

plugin/templates/jetty.xml

@@ -8,183 +8,305 @@
 <!-- Commonly changed settings:                                                -->
 <!--   * host: Change 127.0.0.1 to 0.0.0.0 in the addListener section          -->
 <!--           to access the server directly (bypassing i2p)                   -->
-<!--           from other computers. The included version of Jetty has         -->
-<!--           been patched to allow IPv6 addresses as well,                   -->
-<!--           enclosed in brackets e.g. [::1]                                 -->
-<!--   * port: Default 7662 in the addListener section                         -->
-<!--   * threads: Raise MaxThreads in the addListener section                  -->
+<!--           from other computers.                                           -->
+<!--   * port: Default 7662 in the addConnector section                        -->
+<!--   * docroot: Change the ResourceBase in the addContext section            -->
+<!--           to serve files from a different location.                       -->
+<!--   * threads: Raise MinThreads and/or MaxThreads in the addListener section -->
 <!--           if you have a high-traffic site and get a lot of warnings.      -->
 <!--                                                                           -->
-<!-- I2P uses Jetty 5.1.15. We have no plans to upgrade to Jetty 6, due to     -->
-<!-- the significant changes in the API. If you need web server features not   -->
-<!-- found in Jetty 5, you may install and run Jetty 6 in a different JVM,     -->
-<!-- or run any other web server such as Apache. If you do run another         -->
-<!-- web server instead, be sure and disable the Jetty 5 server for your       -->
-<!-- eepsite on http://127.0.0.1/configclients.jsp .                           -->
+<!-- I2P uses Jetty 6.1.26. If you need web server features not found          -->
+<!-- in Jetty 6, you may install and run Jetty 7 or 8 in a different JVM       -->
+<!-- or run any other web server such as Apache. If you do run another web     -->
+<!-- server instead, be sure and disable the Jetty 6 server for your           -->
+<!-- eepsite on http://127.0.0.1:7657/configclients.jsp .                      -->
+<!--                                                                           -->
+<!-- Jetty now uses the I2P logging system rather than wrapper.log.            -->
+<!-- Use the log override org.mortbay.jetty.Server to adjust the log level.    -->
+<!--                                                                           -->
+<!-- Note that the XML encoding for this file is UTF-8.                        -->
 <!--                                                                           -->
-<!-- Jetty errors and warnings will appear in wrapper.log, check there         -->
-<!-- to diagnose problems.                                                     -->
 <!-- ========================================================================= -->
 
 <!-- =============================================================== -->
 <!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!--                                                                 -->
 <!-- =============================================================== -->
-<Configure class="org.mortbay.jetty.Server">
 
-  <!-- =============================================================== -->
-  <!-- Configure the Request Listeners                                 -->
-  <!-- =============================================================== -->
 
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add and configure a HTTP listener to port 8080                  -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SocketListener">
-        <Arg>
-          <New class="org.mortbay.util.InetAddrPort">
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+    <!-- =========================================================== -->
+    <!-- Server Thread Pool                                          -->
+    <!-- =========================================================== -->
+    <Set name="ThreadPool">
+
+      <!-- PICK ONE -->
+
+      <!-- If you don't have or want threadpool
+           Requests above the max will be queued
+       -->
+     <!--
+      <New class="org.mortbay.thread.QueuedThreadPool">
+        <Set name="minThreads">1</Set>
+        <Set name="maxThreads">16</Set>
+        <Set name="lowThreads">2</Set>
+      </New>
+     -->
+
+      <!-- Optional Java 5 bounded threadpool with job queue 
+           Requests above the max will be rejected
+           TODO: would be nice to use the 5-arg constructor but
+                 how do you use an Enum as the TimeUnit argument?
+           Alternatively, make a custom class where we can
+           set the thread name, set daemon, etc.
+           See RouterConsoleRunner.
+       -->
+      <New class="org.mortbay.thread.concurrent.ThreadPool">
+        <Arg type="int">0</Arg>
+        <Set name="corePoolSize">1</Set>
+        <Set name="maximumPoolSize">16</Set>
+      </New>
+    </Set>
+
+
+
+    <!-- =========================================================== -->
+    <!-- Set connectors                                              -->
+    <!-- =========================================================== -->
+    <!-- One of each type!                                           -->
+    <!-- =========================================================== -->
+
+    <!-- Use this connector for many frequently idle connections
+         and for threadless continuations.
+    -->    
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.mortbay.jetty.nio.SelectChannelConnector">
             <Set name="host">127.0.0.1</Set>
             <Set name="port">7662</Set>
+            <Set name="maxIdleTime">60000</Set>
+            <Set name="Acceptors">1</Set>
+            <Set name="statsOn">false</Set>
+            <Set name="confidentialPort">8443</Set>
+	    <Set name="lowResourcesConnections">5000</Set>
+	    <Set name="lowResourcesMaxIdleTime">5000</Set>
           </New>
-        </Arg>
-        <Set name="MinThreads">3</Set>
-        <Set name="MaxThreads">10</Set>
-        <Set name="MaxIdleTimeMs">60000</Set>
-        <Set name="LowResourcePersistTimeMs">1000</Set>
-        <Set name="ConfidentialPort">8443</Set>
-        <Set name="IntegralPort">8443</Set>
-        <Set name="PoolName">main</Set>
-      </New>
-    </Arg>
-  </Call>
-
-
-  <!-- =============================================================== -->
-  <!-- Configure the Contexts                                          -->
-  <!-- =============================================================== -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a all web application within the webapps directory.         -->
-  <!-- + No virtual host specified                                     -->
-  <!-- + Look in the webapps directory relative to jetty.home or .     -->
-  <!-- + Use the default webdefault.xml in jetty's install             -->
-  <!-- + Upack the war file                                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="rootWebApp">root</Set>
-  <Call name="addWebApplications">
-    <Arg></Arg>
-    <Arg>$PLUGIN/eepsite/webapps/</Arg>
-    <Arg></Arg>
-    <Arg type="boolean">true</Arg>
-  </Call>
-
-  <Call name="addContext">
-    <Arg>
-      <New class="org.mortbay.http.HttpContext">
-        <Set name="contextPath">/</Set>
-        <Set name="resourceBase">$PLUGIN/eepsite/docroot</Set>
-        <Call name="addHandler">
-          <Arg>
-            <New class="org.mortbay.http.handler.ResourceHandler">
-              <Set name="redirectWelcome">FALSE</Set>
-	    </New>
-          </Arg>
-        </Call>
-        <!-- This custom handler is like Jetty's ForwardHandler,
-          -  but it passes CGI query parameters through.
-          -  Note that it is somewhat misnamed - it does NOT
-          -  return a 301/302, it handles the request directly.
-          -->
-        <Call name="addHandler">
-          <Arg>
-            <New class="net.i2p.zzzot.QForwardHandler">
-              <Call name="setHandleQueries">
-                <Arg type="boolean">true</Arg>
-              </Call>
-              <!-- Forward announce requests to /tracker/announce.jsp -->
-              <Call name="addForward">
-                <Arg>/a</Arg>
-                <Arg>/tracker/announce.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/announce</Arg>
-                <Arg>/tracker/announce.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/announce.jsp</Arg>
-                <Arg>/tracker/announce.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/announce.php</Arg>
-                <Arg>/tracker/announce.jsp</Arg>
-              </Call>
-              <!-- Forward scrape requests to /tracker/scrape.jsp -->
-              <Call name="addForward">
-                <Arg>/scrape</Arg>
-                <Arg>/tracker/scrape.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/scrape.jsp</Arg>
-                <Arg>/tracker/scrape.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/scrape.php</Arg>
-                <Arg>/tracker/scrape.jsp</Arg>
-              </Call>
-              <!-- Forward Seedless requests to /tracker/seedless.jsp -->
-              <Call name="addForward">
-                <Arg>/Seedless</Arg>
-                <Arg>/tracker/seedless.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/Seedless/</Arg>
-                <Arg>/tracker/seedless.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/Seedless/index.jsp</Arg>
-                <Arg>/tracker/seedless.jsp</Arg>
-              </Call>
-              <Call name="addForward">
-                <Arg>/Seedless/seedless</Arg>
-                <Arg>/tracker/seedless.jsp</Arg>
-              </Call>
-	    </New>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
-  
-  <Call name="addContext">
-    <Arg>/cgi-bin/*</Arg>
-    <Set name="ResourceBase">$PLUGIN/eepsite/cgi-bin</Set>
-    <Call name="addServlet">
-      <Arg>Common Gateway Interface</Arg>
-      <Arg>/</Arg>
-      <Arg>org.mortbay.servlet.CGI</Arg>
-     <Put name="Path">/usr/local/bin:/usr/ucb:/bin:/usr/bin</Put>
+      </Arg>
     </Call>
-  </Call>
 
-  <!-- =============================================================== -->
-  <!-- Configure the Request Log                                       -->
-  <!-- =============================================================== -->
-  <Set name="RequestLog">
-    <New class="org.mortbay.http.I2PRequestLog">
-      <Arg>$PLUGIN/eepsite/logs/yyyy_mm_dd.request.log</Arg>
-      <Set name="retainDays">30</Set>
-      <Set name="append">true</Set>
-      <Set name="extended">false</Set>
-      <Set name="buffered">false</Set>
-      <Set name="LogTimeZone">GMT</Set>
-    </New>
-  </Set>
+    <!-- =========================================================== -->
+    <!-- Set up global session ID manager                            -->
+    <!-- =========================================================== -->
+    <!--
+    <Set name="sessionIdManager">
+      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+        <Set name="workerName">node1</Set>
+      </New>
+    </Set>
+    -->
 
-  <!-- =============================================================== -->
-  <!-- Configure the Other Server Options                              -->
-  <!-- =============================================================== -->
-  <Set name="requestsPerGC">2000</Set>
-  <Set name="statsOn">false</Set>
+    <!-- =========================================================== -->
+    <!-- Set handler Collection Structure                            --> 
+    <!--                                                             --> 
+    <!-- We use a RewriteHandler at the top level so that we may     --> 
+    <!-- convert any top-level URLs for the tracker down into the    --> 
+    <!-- tracker servlet, without interfering with anything else     --> 
+    <!-- that is hosted on the same eepsite.                         --> 
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Rewrite" class="org.mortbay.jetty.handler.rewrite.RewriteHandler">
+        <Set name="rewriteRequestURI">true</Set>
+        <Set name="rewritePathInfo">false</Set>
+        <Set name="originalPathAttribute">requestedPath</Set>
+        <Set name="rules">
+          <Array type="org.mortbay.jetty.handler.rewrite.Rule">
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/a</Set>
+                <Set name="replacement">/tracker/announce.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/announce</Set>
+                <Set name="replacement">/tracker/announce.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/announce.jsp</Set>
+                <Set name="replacement">/tracker/announce.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/announce.php</Set>
+                <Set name="replacement">/tracker/announce.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/scrape</Set>
+                <Set name="replacement">/tracker/scrape.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/scrape.jsp</Set>
+                <Set name="replacement">/tracker/scrape.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/scrape.php</Set>
+                <Set name="replacement">/tracker/scrape.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/Seedless</Set>
+                <Set name="replacement">/tracker/seedless.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/Seedless/</Set>
+                <Set name="replacement">/tracker/seedless.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/Seedless/index.jsp</Set>
+                <Set name="replacement">/tracker/seedless.jsp</Set>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.mortbay.jetty.handler.rewrite.RewritePatternRule">
+                <Set name="pattern">/Seedless/seedless</Set>
+                <Set name="replacement">/tracker/seedless.jsp</Set>
+              </New>
+            </Item>
+          </Array>
+        </Set>
+        <Set name="handler">
+          <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+            <Set name="handlers">
+             <Array type="org.mortbay.jetty.Handler">
+               <Item>
+                 <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+               </Item>
+               <Item>
+                 <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+               </Item>
+               <Item>
+                 <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+               </Item>
+             </Array>
+            </Set>
+          </New>
+        </Set>
+      </New>
+    </Set>
+    
+    <!-- =========================================================== -->
+    <!-- Configure the context deployer                              -->
+    <!-- A context deployer will deploy contexts described in        -->
+    <!-- configuration files discovered in a directory.              -->
+    <!-- The configuration directory can be scanned for hot          -->
+    <!-- deployments at the configured scanInterval.                 -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy contexts configured   -->
+    <!-- in the $JETTY_HOME/contexts directory                       -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.mortbay.jetty.deployer.ContextDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="configurationDir">$PLUGIN/contexts</Set>
+          <Set name="scanInterval">0</Set>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure the webapp deployer.                              -->
+    <!-- A webapp  deployer will deploy standard webapps discovered  -->
+    <!-- in a directory at startup, without the need for additional  -->
+    <!-- configuration files.    It does not support hot deploy or   -->
+    <!-- non standard contexts (see ContextDeployer above).          -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy webapps from the      -->
+    <!-- $JETTY_HOME/webapps directory                               -->
+    <!--                                                             -->
+    <!-- Normally only one type of deployer need be used.            -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="webAppDir">$PLUGIN/eepsite/webapps</Set>
+	  <Set name="parentLoaderPriority">false</Set>
+	  <Set name="extract">true</Set>
+	  <Set name="allowDuplicates">false</Set>
+          <Set name="defaultsDescriptor">$PLUGIN/etc/webdefault.xml</Set>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure Authentication Realms                             -->
+    <!-- Realms may be configured for the entire server here, or     -->
+    <!-- they can be configured for a specific web app in a context  -->
+    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+    <!-- example).                                                   -->
+    <!-- =========================================================== -->
+  <!-- UNCOMMENT TO ACTIVATE
+    <Set name="UserRealms">
+      <Array type="org.mortbay.jetty.security.UserRealm">
+        <Item>
+          <New class="org.mortbay.jetty.security.HashUserRealm">
+            <Set name="name">Test Realm</Set>
+            <Set name="config">$PLUGIN/etc/realm.properties</Set>
+            <Set name="refreshInterval">0</Set>
+          </New>
+        </Item>
+      </Array>
+    </Set>
+  -->
+
+    <!-- =========================================================== -->
+    <!-- Configure Request Log                                       -->
+    <!-- Request logs  may be configured for the entire server here, -->
+    <!-- or they can be configured for a specific web app in a       -->
+    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+    <!-- for an example).                                            -->
+    <!-- =========================================================== -->
+    <Ref id="RequestLog">
+      <Set name="requestLog">
+        <New id="RequestLogImpl" class="net.i2p.jetty.I2PRequestLog">
+          <Set name="filename">$PLUGIN/eepsite/logs/yyyy_mm_dd.request.log</Set>
+          <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+          <Set name="retainDays">90</Set>
+          <Set name="append">true</Set>
+          <Set name="extended">false</Set>
+          <Set name="logCookies">false</Set>
+          <Set name="LogTimeZone">GMT</Set>
+        </New>
+      </Set>
+    </Ref>
+
+    <!-- =========================================================== -->
+    <!-- extra options                                               -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown">true</Set>
+    <Set name="sendServerVersion">false</Set>
+    <Set name="sendDateHeader">true</Set>
+    <Set name="gracefulShutdown">1000</Set>
 
 </Configure>

scripts/i2ptunnel.config

@@ -8,6 +8,11 @@ tunnel.0.option.i2cp.reduceIdleTime=1200000
 tunnel.0.option.i2cp.reduceOnIdle=true
 tunnel.0.option.i2cp.reduceQuantity=1
 tunnel.0.option.i2p.streaming.connectDelay=0
+tunnel.0.option.i2p.streaming.maxConcurrentStreams=40
+tunnel.0.option.i2p.streaming.maxConnsPerHour=100
+tunnel.0.option.i2p.streaming.maxConnsPerMinute=10
+tunnel.0.option.i2p.streaming.maxTotalConnsPerHour=2500
+tunnel.0.option.i2p.streaming.maxTotalConnsPerMinute=60
 tunnel.0.option.inbound.backupQuantity=0
 tunnel.0.option.inbound.length=3
 tunnel.0.option.inbound.lengthVariance=0

scripts/plugin.config

@@ -5,4 +5,6 @@ consoleLinkURL=http://127.0.0.1:7662/tracker/index.jsp
 description=Open tracker
 author=zzz
 updateURL=http://stats.i2p/i2p/plugins/zzzot-update.xpi2p
+websiteURL=http://zzz.i2p/forums/16
 license=Apache 2.0
+min-jetty-version=6

src/build.xml

@@ -3,18 +3,18 @@
     <property name="i2pbase" value="../../i2p.i2p"/>
     <property name="i2plib" value="${i2pbase}/build"/>
     <property name="jettylib" value="${i2pbase}/apps/jetty/jettylib"/>
-    <property name="war" value="../plugin/eepsite/webapps/blog"/>
-    <property name="lib" value="${war}/WEB-INF/lib"/>
     <path id="cp">
         <pathelement path="${java.class.path}" />
         <pathelement location="${i2plib}/i2p.jar" />
         <pathelement location="${i2plib}/i2ptunnel.jar" />
         <pathelement location="${i2plib}/i2psnark.jar" />
-        <pathelement location="${jettylib}/ant.jar"/>
+        <pathelement location="${i2plib}/mstreaming.jar" />
+        <pathelement location="${ant.home}/lib/ant.jar"/>
         <pathelement location="${jettylib}/org.mortbay.jetty.jar"/>
         <pathelement location="${jettylib}/jasper-compiler.jar" />
         <pathelement location="${jettylib}/jasper-runtime.jar" />
         <pathelement location="${jettylib}/javax.servlet.jar" />
+        <pathelement location="${jettylib}/jetty-util.jar" />
         <pathelement location="${jettylib}/commons-logging.jar" />
         <pathelement location="${jettylib}/commons-el.jar" />
     </path>
@@ -33,7 +33,8 @@
             srcdir="./java" 
             debug="true" deprecation="on" source="1.5" target="1.5" 
             destdir="./build/obj" 
-            classpath="${i2plib}/i2p.jar:${i2plib}/i2ptunnel.jar:${i2plib}/i2psnark.jar:${i2plib}/systray.jar:${i2plib}/org.mortbay.jetty.jar" >
+            includeAntRuntime="false"
+            classpath="${i2plib}/i2p.jar:${i2plib}/i2ptunnel.jar:${i2plib}/i2psnark.jar:${i2plib}/mstreaming.jar:${i2plib}/systray.jar:${jettylib}/org.mortbay.jetty.jar:${jettylib}/jetty-util.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>
@@ -69,6 +70,7 @@
             destdir="build/war/WEB-INF/classes"
             srcdir="./build/jspjava"
             includes="**/*.java"
+            includeAntRuntime="false"
             classpathref="jspcp"
             failonerror="true" />
 

src/java/net/i2p/zzzot/QForwardHandler.java

@@ -1,158 +0,0 @@
-// ========================================================================
-// $Id: ForwardHandler.java,v 1.16 2005/08/13 00:01:26 gregwilkins Exp $
-// Copyright 199-2004 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at 
-// http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ========================================================================
-
-package net.i2p.zzzot;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.mortbay.http.HttpException;
-import org.mortbay.http.HttpMessage;
-import org.mortbay.http.HttpRequest;
-import org.mortbay.http.HttpResponse;
-import org.mortbay.http.PathMap;
-import org.mortbay.http.handler.AbstractHttpHandler;
-import org.mortbay.util.URI;
-import org.mortbay.util.UrlEncoded;
-
-
-/* ------------------------------------------------------------ */
-/** Forward Request Handler.
- * Forwards a request to a new URI. Experimental - use with caution.
- * @version $Revision: 1.16 $
- * @author Greg Wilkins (gregw)
- *
- * Just like ForwardHandler but forwards query parameters too
- * And took out the dependency on apache logging
- * @author zzz
- */
-public class QForwardHandler extends AbstractHttpHandler
-{
-    PathMap _forward = new PathMap();
-    String _root;
-    boolean _handleQueries = false;
-    
-    /* ------------------------------------------------------------ */
-    /** Constructor. 
-     */
-    public QForwardHandler()
-    {}
-    
-    /* ------------------------------------------------------------ */
-    /** Constructor. 
-     * @param rootForward 
-     */
-    public QForwardHandler(String rootForward)
-    {
-        _root=rootForward;
-    }
-    
-    /* ------------------------------------------------------------ */
-    /** Add a forward mapping.
-     * @param pathSpecInContext The path to forward from 
-     * @param newPath The path to forward to.
-     */
-    public void addForward(String pathSpecInContext,
-                           String newPath)
-    {
-        _forward.put(pathSpecInContext,newPath);
-    }
-    
-    /* ------------------------------------------------------------ */
-    /** Add a forward mapping for root path.
-     * This allows a forward for exactly / which is the default
-     * path in a pathSpec.
-     * @param newPath The path to forward to.
-     */
-    public void setRootForward(String newPath)
-    {
-        _root=newPath;
-    }
-    
-    /* ------------------------------------------------------------ */
-    /** Set the Handler up to cope with forwards to paths that contain query
-     * elements (e.g. "/blah"->"/foo?a=b").
-     *  AND (I2P) pass params through (e.g. "/blah?c=d? -> "/foo?c=d? ).
-     * @param b 
-     */
-    public void setHandleQueries(boolean b)
-    {
-        _handleQueries = b;
-    }
-    
-    /* ------------------------------------------------------------ */
-    public void handle(String pathInContext,
-                       String pathParams,
-                       HttpRequest request,
-                       HttpResponse response)
-        throws HttpException, IOException
-    {
-        String newPath=null;
-        String query=null;
-        if (_root!=null && ("/".equals(pathInContext) || pathInContext.startsWith("/;")))
-            newPath=_root;
-        else
-        {
-            Map.Entry entry = _forward.getMatch(pathInContext);
-            if (entry!=null)
-            {
-                String match = (String)entry.getValue();
-                if (_handleQueries)
-                {
-                    int hook = match.indexOf('?');
-                    if (hook != -1){
-                        query = match.substring(hook+1);
-                        match = match.substring(0, hook);
-                    }
-                }
-                String info=PathMap.pathInfo((String)entry.getKey(),pathInContext);
-                newPath=info==null?match:(URI.addPaths(match,info));
-            }
-        }
-        
-        if (newPath!=null)
-        {
-            // this is the new part for i2p
-            // setPath() changes the request URI and loses the parameters
-            // so save them and add them back
-            Map saved = null;
-            if (_handleQueries){
-                request.setCharacterEncoding("ISO-8859-1", false);
-                saved = request.getParameters();
-            }
-
-            int last=request.setState(HttpMessage.__MSG_EDITABLE);
-            String context=getHttpContext().getContextPath();
-            if (context.length()==1)
-                request.setPath(newPath);
-            else
-                request.setPath(URI.addPaths(context,newPath));
-            if (_handleQueries && query != null){
-                // add forwarded to query string to parameters
-                UrlEncoded.decodeTo(query, request.getParameters());
-            }
-
-            // this is the new part for i2p
-            if (_handleQueries){
-                // add them back
-                request.getParameters().putAll(saved);
-            }
-
-            request.setState(last);
-            getHttpContext().getHttpServer().service(request,response);
-            return;
-        }
-    }
-}

src/java/net/i2p/zzzot/SeedlessAnnouncer.java

@@ -0,0 +1,60 @@
+package net.i2p.zzzot;
+/*
+ *  Copyright 2010 zzz (zzz@mail.i2p)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.streaming.I2PSocketEepGet;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.data.Base64;
+import net.i2p.i2ptunnel.TunnelController;
+import net.i2p.util.EepGet;
+
+/**
+ *  Announce to seedless
+ *  @since 0.6
+ */
+public class SeedlessAnnouncer {
+
+	private static final String SPONGE =
+		"VG4Bd~q1RA3BdoF3z5fSR7p0xe1CTVgDMWVGyFchA9Wm2iXUkIR35G45XE31Uc9~IOt-ktNLL2~TYQZ13Vl8udosngDn8RJG1NtVASH4khsbgkkoFLWd6UuvuOjQKBFKjaEPJgxOzh0kxolRPPNHhFuuAGzNLKvz~LI2MTf0P6nwmRg1lBoRIUpSVocEHY4X306nT2VtY07FixbJcPCU~EeRin24yNoiZop-C3Wi1SGwJJK-NS7mnkNzd8ngDJXDJtR-wLP1vNyyBY6NySgqPiIhENHoVeXd5krlR42HORCxEDb4jhoqlbyJq-PrhTJ5HdH4-~gEq09B~~NIHzy7X02XgmBXhTYRtl6HbLMXs6SI5fq9OFgVp5YZWYUklJjMDI7jOrGrEZGSHhnJK9kT6D3CqVIM0cYEhe4ttmTegbZvC~J6DrRTIAX422qRQJBPsTUnv4iFyuJE-8SodP6ikTjRH21Qx73SxqOvmrOiu7Bsp0lvVDa84aoaYLdiGv87AAAA";
+
+	private static final String ANNOUNCE = "announce " + Base64.encode("seedless,eepsite,torrent");
+
+	public void announce(TunnelController controller) {
+		// get the I2PTunnel from the controller (no method now)
+
+		// get the I2PTunnelTask from I2PTunnel
+
+		// cast to an I2PTunnelServer
+
+		// get the SocketManager from the server (no method now)
+		I2PSocketManager mgr = null;
+
+		I2PAppContext ctx = I2PAppContext.getGlobalContext();
+		String url = "http://" + SPONGE + "/Seedless/seedless";
+		EepGet get = new I2PSocketEepGet(ctx, mgr, 1, -1, 1024, null, new DummyOutputStream(), url);
+		get.addHeader("X-Seedless", ANNOUNCE);
+		get.fetch();
+	}
+
+	private static class DummyOutputStream extends OutputStream {
+		public void write(int b) {}
+	}
+}

src/java/net/i2p/zzzot/ZzzOTController.java

@@ -33,8 +33,8 @@ import net.i2p.util.Log;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.apps.systray.UrlLauncher;
 
-import org.mortbay.http.HttpContext;
 import org.mortbay.jetty.Server;
+import org.mortbay.xml.XmlConfiguration;
 
 /**
  * This handles the starting and stopping of an eepsite tunnel and jetty
@@ -54,6 +54,11 @@ public class ZzzOTController {
     private static ZzzOT _zzzot;
     private static Object _lock = new Object();
 
+    private static final String BACKUP = "jetty5.xml";
+    private static final String[] xmlFiles = {
+        "jetty.xml", "contexts/base-context.xml", "contexts/cgi-context.xml",
+        "etc/realm.properties", "etc/webdefault.xml" };
+
     public static void main(String args[]) {
         if (args.length != 3 || (!"-d".equals(args[0])))
             throw new IllegalArgumentException("Usage: PluginController -d $PLUGIN [start|stop]");
@@ -100,6 +105,7 @@ public class ZzzOTController {
         }
         startJetty(pluginDir, dest);
         startI2PTunnel(pluginDir, dest);
+        // SeedlessAnnouncer.announce(_tunnel);
     }
 
 
@@ -134,10 +140,11 @@ public class ZzzOTController {
         tmpdir.mkdir();
         File jettyXml = new File(pluginDir, "jetty.xml");
         try {
-            Server serv = new Server(jettyXml.getAbsolutePath());
-            HttpContext[] hcs = serv.getContexts();
-            for (int i = 0; i < hcs.length; i++)
-                 hcs[i].setTempDirectory(tmpdir);
+            XmlConfiguration xmlc = new XmlConfiguration(jettyXml.toURI().toURL());
+            Server serv = (Server) xmlc.configure();
+            //HttpContext[] hcs = serv.getContexts();
+            //for (int i = 0; i < hcs.length; i++)
+            //     hcs[i].setTempDirectory(tmpdir);
             serv.start();
             _server = serv;
         } catch (Throwable t) {
@@ -179,22 +186,54 @@ public class ZzzOTController {
         _server = null;
     }
 
-    /** put the directory in the jetty.xml file */
+    /**
+     *  Migate the jetty configuration files.
+     *  Save old jetty.xml if moving from jetty 5 to jetty 6
+     */
     private static void migrateJettyXML(File pluginDir) {
-        File outFile = new File(pluginDir, "jetty.xml");
-        if (outFile.exists())
+        // contexts dir does not exist in Jetty 5
+        File file = new File(pluginDir, "contexts");
+        if (file.exists())
             return;
-        File fileTmpl = new File(pluginDir, "templates/jetty.xml");
+        file.mkdir();
+        file = new File(pluginDir, "etc");
+        file.mkdir();
+        file = new File(pluginDir, "jetty.xml");
+        if (file.exists()) {
+            File backup = new File(pluginDir, BACKUP);
+            if (backup.exists()) {
+                I2PAppContext ctx = I2PAppContext.getGlobalContext();
+                backup = new File(pluginDir, BACKUP + ctx.random().nextInt());
+            }
+            boolean ok = FileUtil.copy(file, backup, false, true);
+            if (!ok) {
+                _log.error("WARNING: Failed to back up " + file + " to " + backup);
+            }
+        }
+        for (int i = 0; i < xmlFiles.length; i++) {
+            migrateJettyFile(pluginDir, xmlFiles[i]);
+        }
+    }
+
+    /**
+     *  Migate a single jetty config file, replacing $PLUGIN as we copy it.
+     */
+    private static void migrateJettyFile(File pluginDir, String name) {
+        File templateDir = new File(pluginDir, "templates");
+        File fileTmpl = new File(templateDir, name);
+        File outFile = new File(pluginDir, name);
+        FileOutputStream os = null;
         try {
-            String props = FileUtil.readTextFile(fileTmpl.getAbsolutePath(), 250, true);
+            String props = FileUtil.readTextFile(fileTmpl.getAbsolutePath(), 600, true);
             if (props == null)
                 throw new IOException(fileTmpl.getAbsolutePath() + " open failed");
             props = props.replace("$PLUGIN", pluginDir.getAbsolutePath());
-            FileOutputStream os = new FileOutputStream(outFile);
+            os = new FileOutputStream(outFile);
             os.write(props.getBytes("UTF-8"));
-            os.close();
         } catch (IOException ioe) {
-            _log.error("jetty.xml migrate failed", ioe);
+            _log.error(outFile + " migrate failed", ioe);
+        } finally {
+            if (os != null) try { os.close(); } catch (IOException ioe) {}
         }
     }
 

src/jsp/announce.jsp

@@ -204,10 +204,15 @@
 				peerlist = peerlist.subList(0, want);
 			}
 			if (compact) {
-				List<String> peerhashes = new ArrayList(peerlist.size());
-				for (Peer pe : peerlist) {
-					peerhashes.add(pe.getHash());
-				}
+				// old experimental way - list of hashes
+				//List<String> peerhashes = new ArrayList(peerlist.size());
+				//for (Peer pe : peerlist) {
+				//	peerhashes.add(pe.getHash());
+				//}
+				// new way - one big string
+				byte[] peerhashes = new byte[32 * peerlist.size()];
+				for (int i = 0; i < peerlist.size(); i++)
+					System.arraycopy(peerlist.get(i).getHash().getBytes("ISO-8859-1"), 0, peerhashes, i * 32, 32);
 				m.put("peers", peerhashes);
 			} else {
 				m.put("peers", peerlist);

src/jsp/seedless.jsp

@@ -27,11 +27,13 @@
 		me = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.b32.i2p";
 	// unused, we don't accept announces
 	String him = request.getHeader("X-I2P-DestB32");
+	if (him == null)
+		him = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.b32.i2p";
         String xff = request.getHeader("X-Forwarded-For");
         String xfs = request.getHeader("X-Forwarded-Server");
 
 	response.setContentType("text/plain");
-	response.setHeader("X-Seedless", me);
+	response.setHeader("X-Seedless", him);
 
 	final int US_MINUTES = 360;
 	final int PEER_MINUTES = 60;
@@ -47,12 +49,17 @@
 		out.println("seedless " + US_MINUTES);
 	} else if (req.startsWith("announce")) {
 		out.println("thanks");
-	} else if (req.startsWith("locate")) {
+	} else if (req.startsWith("locate c2VlZGxlc")) {  // locate b64(seedless)
 		// ignore the search string, if any, in the request
 		// us
 		out.println(Base64.encode(me + ' ' + US_MINUTES + " tracker"));
 		out.println(Base64.encode(me + ' ' + US_MINUTES + " seedless"));
 		out.println(Base64.encode(me + ' ' + US_MINUTES + " eepsite"));
+	} else if (req.startsWith("locate ZWVwc2l0Z")) {  // locate b64(eepsite)
+		// ignore the search string, if any, in the request
+		// us
+		out.println(Base64.encode(me + ' ' + US_MINUTES + " zzzot"));
+	} else if (req.startsWith("locate dG9ycmVud")) {  // locate b64(torrent)
 		// all the peers
 		Torrents torrents = ZzzOTController.getTorrents();
 		for (InfoHash ihash : torrents.keySet()) {
@@ -68,19 +75,20 @@
 				// service type
 				String role;
 				if (p.isSeed())
-					role = " bt-seed";
+					role = "seed";
 				else
-					role = " bt-leech";
+					role = "leech";
 				// spg wants UTF-8 but all we have is binary data, so hex it
 				String ihs = DataHelper.toHexString(ihash.getData());
 				String ids = DataHelper.toHexString((byte[])p.get("peer id"));
-				out.println(Base64.encode(b32 + PEER_MINUTES + role +
-				                          " info_hash=" + ihs +
-				                          ";peer_id=" + ids));
+				out.println(Base64.encode(b32 + PEER_MINUTES + ihs + '\n' +
+				                          ids + '\n' +
+				                          role));
 			}
 		}
 	} else {
 		// error code
+		response.setStatus(406, "Bad request");
 		out.println("SC_NOT_ACCEPTABLE");
 	}