zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Simplify default eepsite base and CGI contexts to use a Context

Browse Source 
instead of a ContextHolder, ServletHandler, and ServletHolder.
    This also fixes / which returned a zero-length file,
    broken in the last checkin.
This commit is contained in:
zzz
2012-03-09 20:00:18 +00:00
parent 0c55af2622
commit 5ab17da73d
4 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
history.txt
View File

@@ -2,6 +2,8 @@
* Update default eepsite base context to use DefaultServlet * Update default eepsite base context to use DefaultServlet
instead of ResourceHandler, to provide resume, directory instead of ResourceHandler, to provide resume, directory
indexes, caching, etc. indexes, caching, etc.
* Simplify default eepsite base and CGI contexts to use a Context
instead of a ContextHolder, ServletHandler, and ServletHolder
2012-03-08 zzz 2012-03-08 zzz
* GarlicConfig: Remove unused reply block methods * GarlicConfig: Remove unused reply block methods

22
installer/resources/eepsite/contexts/base-context.xml
View File

@@ -4,26 +4,16 @@
<!-- <!--
Configure a custom context for the eepsite. Configure a custom context for the eepsite.
This context contains only a ServletHandler with a default servlet This context contains only a Context with a default servlet
to serve static html files and images. to serve static html files and images.
--> -->
<Configure class="org.mortbay.jetty.handler.ContextHandler"> <Configure class="org.mortbay.jetty.servlet.Context">
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
<Set name="resourceBase">./eepsite/docroot/</Set> <Set name="resourceBase">./eepsite/docroot/</Set>
<Set name="handler"> <Call name="addServlet">
<New class="org.mortbay.jetty.servlet.ServletHandler" > <Arg>org.mortbay.jetty.servlet.DefaultServlet</Arg>
<Call name="addServletWithMapping"> <Arg>/</Arg>
<Arg> </Call>
<New class="org.mortbay.jetty.servlet.ServletHolder">
<Arg>
<New class="org.mortbay.jetty.servlet.DefaultServlet" />
</Arg>
</New>
</Arg>
<Arg>/</Arg>
</Call>
</New>
</Set>
</Configure> </Configure>

34
installer/resources/eepsite/contexts/cgi-context.xml
View File

@@ -22,25 +22,21 @@ Configure a custom context for the eepsite.
* parameter value. * parameter value.
--> -->
<Configure class="org.mortbay.jetty.handler.ContextHandler"> <Configure class="org.mortbay.jetty.servlet.Context">
<Set name="contextPath">/cgi-bin</Set> <Set name="contextPath">/cgi-bin</Set>
<Set name="resourceBase">./eepsite/cgi-bin/</Set> <Set name="resourceBase">./eepsite/cgi-bin/</Set>
<Set name="handler"> <Call name="setInitParams">
<New class="org.mortbay.jetty.servlet.ServletHandler" > <Arg>
<Call name="addServletWithMapping"> <Map>
<Arg> <Entry>
<New class="org.mortbay.jetty.servlet.ServletHolder"> <Item>Path</Item>
<Arg> <Item>/usr/local/bin:/bin:/usr/bin</Item>
<New class="org.mortbay.servlet.CGI" /> </Entry>
</Arg> </Map>
<Call name="setInitParameter"> </Arg>
<Arg>Path</Arg> </Call>
<Arg>/usr/local/bin:/bin:/usr/bin</Arg> <Call name="addServlet">
</Call> <Arg>org.mortbay.servlet.CGI</Arg>
</New> <Arg>/</Arg>
</Arg> </Call>
<Arg>/</Arg>
</Call>
</New>
</Set>
</Configure> </Configure>

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 8; public final static long BUILD = 9;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";