Changeset 5ab17da7


Ignore:
Timestamp:
Mar 9, 2012 8:00:18 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
528ef4d
Parents:
0c55af26
Message:
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • history.txt

    r0c55af26 r5ab17da7  
    33    instead of ResourceHandler, to provide resume, directory
    44    indexes, caching, etc.
     5  * Simplify default eepsite base and CGI contexts to use a Context
     6    instead of a ContextHolder, ServletHandler, and ServletHolder
    57
    682012-03-08 zzz

  • installer/resources/eepsite/contexts/base-context.xml

    r0c55af26 r5ab17da7  
    55Configure a custom context for the eepsite.
    66
    7 This context contains only a ServletHandler with a default servlet
     7This context contains only a Context with a default servlet
    88to serve static html files and images.
    99-->
    1010
    11 <Configure class="org.mortbay.jetty.handler.ContextHandler">
     11<Configure class="org.mortbay.jetty.servlet.Context">
    1212  <Set name="contextPath">/</Set>
    1313  <Set name="resourceBase">./eepsite/docroot/</Set>
    14   <Set name="handler">
    15     <New class="org.mortbay.jetty.servlet.ServletHandler" >
    16       <Call name="addServletWithMapping">
    17         <Arg>
    18           <New class="org.mortbay.jetty.servlet.ServletHolder">
    19             <Arg>
    20               <New class="org.mortbay.jetty.servlet.DefaultServlet" />
    21             </Arg>
    22           </New>
    23         </Arg>
    24         <Arg>/</Arg>
    25       </Call>
    26     </New>
    27   </Set>
     14  <Call name="addServlet">
     15    <Arg>org.mortbay.jetty.servlet.DefaultServlet</Arg>
     16    <Arg>/</Arg>
     17  </Call>
    2818</Configure>
    2919

  • installer/resources/eepsite/contexts/cgi-context.xml

    r0c55af26 r5ab17da7  
    2323-->
    2424
    25 <Configure class="org.mortbay.jetty.handler.ContextHandler">
     25<Configure class="org.mortbay.jetty.servlet.Context">
    2626  <Set name="contextPath">/cgi-bin</Set>
    2727  <Set name="resourceBase">./eepsite/cgi-bin/</Set>
    28   <Set name="handler">
    29     <New class="org.mortbay.jetty.servlet.ServletHandler" >
    30       <Call name="addServletWithMapping">
    31         <Arg>
    32           <New class="org.mortbay.jetty.servlet.ServletHolder">
    33             <Arg>
    34               <New class="org.mortbay.servlet.CGI" />
    35             </Arg>
    36             <Call name="setInitParameter">
    37               <Arg>Path</Arg>
    38               <Arg>/usr/local/bin:/bin:/usr/bin</Arg>
    39             </Call>
    40           </New>
    41         </Arg>
    42         <Arg>/</Arg>
    43       </Call>
    44     </New>
    45   </Set>
     28  <Call name="setInitParams">
     29    <Arg>
     30      <Map>
     31        <Entry>
     32          <Item>Path</Item>
     33          <Item>/usr/local/bin:/bin:/usr/bin</Item>
     34        </Entry>
     35      </Map>
     36    </Arg>
     37  </Call>
     38  <Call name="addServlet">
     39    <Arg>org.mortbay.servlet.CGI</Arg>
     40    <Arg>/</Arg>
     41  </Call>
    4642</Configure>

  • router/java/src/net/i2p/router/RouterVersion.java

    r0c55af26 r5ab17da7  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 8;
     21    public final static long BUILD = 9;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.