Ignore:
Timestamp:
Jun 12, 2013 1:42:38 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
87d142b
Parents:
9d52ef5
Message:
  • Console: Add missing jetty jars to classpath (ticket #952) (tested with classpath from 0.7.4 wrapper.config)
  • JettyStart?: ditto
  • Remove references to now-unused jars in build.xml files
File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/build.xml

    r9d52ef5 r933ad52  
    2626                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
    2727                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    28                 <pathelement location="../../jetty/jettylib/jetty-sslengine.jar" />
    29                 <pathelement location="../../jetty/jettylib/jetty-java5-threadpool.jar" />
    3028                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    31                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    3229                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    3330                <pathelement location="../../systray/java/build/obj" />
     
    7269                <pathelement location="../../jetty/jettylib/jetty-webapp.jar" />
    7370                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    74                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    7571                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    7672                <pathelement location="../../systray/java/build/systray.jar" />
     
    110106                <!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
    111107                <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
    112                 <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar" />
     108                <!-- All new jetty 7 jars should have been in 0.9.6, added in 0.9.7 -->
     109                <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-webapp.jar" />
    113110                <attribute name="Implementation-Version" value="${full.version}" />
    114111                <attribute name="Built-By" value="${build.built-by}" />
     
    253250        <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
    254251            <classpath>
    255                 <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
    256252                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    257253                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    258254                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    259255                <pathelement location="../../jetty/jettylib/commons-el.jar" />
    260                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    261256                <pathelement location="${ant.home}/lib/ant.jar" />
    262257                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
     
    294289                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
    295290                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    296                 <pathelement location="../../jetty/jettylib/jetty-sslengine.jar" />
    297                 <pathelement location="../../jetty/jettylib/jetty-java5-threadpool.jar" />
    298                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    299291                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    300292                <pathelement location="../../systray/java/build/obj" />
Note: See TracChangeset for help on using the changeset viewer.