Changeset dd9cae5


Ignore:
Timestamp:
Jan 2, 2012 12:59:33 AM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
0ad4789
Parents:
84e4558 (diff), 33b25b57 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '83079d347b764886d77d9d9de902011f09f5dcce'

and 'c76215859aa3b76a04c4a83a1ded20548a8773a6'

Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r84e4558 rdd9cae5  
    7676      <!-- We copy everything to names without the version numbers so we
    7777           can update them later. Where there was something similar in Jetty 5,
    78            we use the same names.
     78           we use the same names so they will overwrite the Jetty 5 jar on upgrade.
     79           Otherwise we use the same name as the symlink in Ubuntu /usr/share/java.
    7980           Reasons for inclusion:
    8081              start.jar: Needed for clients.config startup of eepsites
     
    8283              jetty-sslengine-xxx.jar: SSL NIO Connector for console
    8384              jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
    84               commons-logging.jar: JspC compiler
     85              jasper*, commons-logging.jar: JspC compiler, webapp runtime
     86              jetty-rewrite-handler: Not used by I2P, but only 20KB and could be useful for eepsites
     87              All of these are available in the Ubuntu packages libjetty-java and libjetty-extra-java
    8588        -->
     89        <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
    8690        <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
    8791        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
    88         <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
     92        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-java5-threadpool.jar" />
     93        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
    8994        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
    90         <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-threadpool.jar" />
    9195        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
    9296        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
     
    9498        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
    9599        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
    96         <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
     100        <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
    97101        <delete file="jetty.tar" />
    98102        <delete dir="${jetty.base}" />
  • apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java

    r84e4558 rdd9cae5  
    503503    /* ------------------------------------------------------------ */
    504504    /** Set the log file date format.
    505      * @see {@link RolloverFileOutputStream#RolloverFileOutputStream(String, boolean, int, TimeZone, String, String)}
    506      * @param logFileDateFormat the logFileDateFormat to pass to {@link RolloverFileOutputStream}
     505     * see RolloverFileOutputStream(String, boolean, int, TimeZone, String, String)
     506     * @param logFileDateFormat the logFileDateFormat to pass to RolloverFileOutputStream
    507507     */
    508508    public void setFilenameDateFormat(String logFileDateFormat)
  • apps/routerconsole/java/build.xml

    r84e4558 rdd9cae5  
    2424                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    2525                <pathelement location="../../jetty/jettylib/jetty-sslengine.jar" />
    26                 <pathelement location="../../jetty/jettylib/jetty-threadpool.jar" />
     26                <pathelement location="../../jetty/jettylib/jetty-java5-threadpool.jar" />
    2727                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    2828                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     
    6161                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    6262                <pathelement location="../../jetty/jettylib/jetty-sslengine.jar" />
    63                 <pathelement location="../../jetty/jettylib/jetty-threadpool.jar" />
     63                <pathelement location="../../jetty/jettylib/jetty-java5-threadpool.jar" />
    6464                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    6565                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     
    281281                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    282282                <pathelement location="../../jetty/jettylib/jetty-sslengine.jar" />
    283                 <pathelement location="../../jetty/jettylib/jetty-threadpool.jar" />
     283                <pathelement location="../../jetty/jettylib/jetty-java5-threadpool.jar" />
    284284                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    285285                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
  • build.xml

    r84e4558 rdd9cae5  
    421421                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
    422422                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
    423                 <pathelement location="apps/jetty/jettylib/jetty-threadpool.jar" />
     423                <pathelement location="apps/jetty/jettylib/jetty-java5-threadpool.jar" />
    424424                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
    425425                <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
     
    944944          -->
    945945        <copy todir="pkg-temp/eepsite-jetty6" >
    946             <fileset dir="installer/resources/eepsite" includes="jetty.xml jetty-ssl.xml contexts/* etc/*" />
     946            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
    947947        </copy>
    948948    </target>
  • installer/resources/clients.config

    r84e4558 rdd9cae5  
    4343clientApp.3.main=org.mortbay.start.Main
    4444clientApp.3.name=I2P webserver (eepsite)
     45## To use the rewrite handler, edit jetty-rewrite.xml and use:
     46#clientApp.3.args="/path/to/jetty.xml" "/path/to/jetty-rewrite.xml"
     47## To use local SSL, edit jetty-ssl.xml and use:
     48#clientApp.3.args="/path/to/jetty.xml" "/path/to/jetty-ssl.xml"
    4549clientApp.3.args="eepsite/jetty.xml"
    4650clientApp.3.delay=30
  • router/java/src/net/i2p/router/startup/MigrateJetty.java

    r84e4558 rdd9cae5  
    2121 *  Copies $I2P/eepsite-jetty6/jetty.xml to $D/jetty.xml, edited for $D
    2222 *  Copies $I2P/eepsite-jetty6/jetty-ssl.xml to $D/jetty-ssl.xml, edited for $D
     23 *  Copies $I2P/eepsite-jetty6/jetty-rewrite.xml to $D/jetty-rewrite.xml
    2324 *  Copies $I2P/eepsite-jetty6/context/base-context.xml to $D/jetty.xml, edited for $D
    2425 *  Copies $I2P/eepsite-jetty6/context/cgi-context.xml to $D/jetty.xml, edited for $D
     
    5758                continue;
    5859            }
    59             String xml = app.args;
    60             if (xml == null)
     60            if (app.args == null)
    6161                continue;
     62            // remove quotes
     63            String args[] = LoadClientAppsJob.parseArgs(app.args);
     64            if (args.length == 0)
     65                continue;
     66            String xml = args[0];
    6267            File xmlFile = new File(xml);
    6368            if (!xmlFile.isAbsolute())
     
    99104            WorkingDir.migrateJettyXml(baseEep, eepsite, BASE_CONTEXT, "./eepsite/", newPath);
    100105            WorkingDir.migrateJettyXml(baseEep, eepsite, CGI_CONTEXT, "./eepsite/", newPath);
     106            WorkingDir.copyFile(new File(baseEep, "jetty-rewrite.xml"), new File(eepsite, "jetty-rewrite.xml"));
    101107            (new File(eepsite, "etc")).mkdir();
    102108            File to = new File(eepsite, "etc/realm.properties");
Note: See TracChangeset for help on using the changeset viewer.