Changeset 933ad52


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
Files:
6 edited

Legend:

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

    r9d52ef5 r933ad52  
    176176        <copy file="../../jetty/jettylib/javax.servlet.jar" tofile="./dist/lib/javax.servlet.jar" />
    177177        <copy file="../../jetty/jettylib/org.mortbay.jetty.jar" tofile="./dist/lib/org.mortbay.jetty.jar" />
    178         <copy file="../../jetty/jettylib/jasper-compiler.jar" tofile="./dist/lib/jasper-compiler.jar" />
    179178        <copy file="../../jetty/jettylib/jasper-runtime.jar" tofile="./dist/lib/jasper-runtime.jar" />
    180179        <copy file="../../ministreaming/java/build/mstreaming.jar" tofile="./dist/lib/mstreaming.jar" />
  • apps/i2ptunnel/java/build.xml

    r9d52ef5 r933ad52  
    174174        <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
    175175            <classpath>
    176                 <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
    177176                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    178177                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    179178                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    180179                <pathelement location="../../jetty/jettylib/commons-el.jar" />
    181                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    182180                <pathelement location="${ant.home}/lib/ant.jar" />
    183181                <pathelement location="build/i2ptunnel.jar" />
     
    204202                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    205203                <pathelement location="../../jetty/jettylib/commons-el.jar" />
    206                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    207204                <pathelement location="build/i2ptunnel.jar" />
    208205                <pathelement location="build/temp-beans.jar" />
  • apps/jetty/build.xml

    r9d52ef5 r933ad52  
    251251                <attribute name="Build-Date" value="${build.timestamp}" />
    252252                <attribute name="Base-Revision" value="${workspace.version}" />
     253                <!-- needed by JettyStart for pre-0.7.5 wrapper.config -->
     254                <attribute name="Class-Path" value="jetty-deploy.jar jetty-xml.jar" />
    253255                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
    254256            </manifest>
  • 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" />
  • apps/susidns/src/build.xml

    r9d52ef5 r933ad52  
    1515        <pathelement location="WEB-INF/lib/jstl.jar" />
    1616        <pathelement location="WEB-INF/lib/standard.jar" />
    17         <pathelement location="${lib}/jasper-compiler.jar" />
    1817        <pathelement location="${lib}/jasper-runtime.jar" />
    1918        <pathelement location="${lib}/javax.servlet.jar" />
    20         <pathelement location="${lib}/jsp-api.jar" />
    2119        <pathelement location="${lib}/commons-logging.jar" />
    2220        <pathelement location="${lib}/commons-el.jar" />
  • build.xml

    r9d52ef5 r933ad52  
    277277            <manifest>
    278278                <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    279                 <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-java5-threadpool.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-sslengine.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
     279                <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
    280280                <attribute name="Built-By" value="${build.built-by}" />
    281281                <attribute name="Build-Date" value="${build.timestamp}" />
     
    509509                <pathelement location="apps/jetty/jettylib/jetty-webapp.jar" />
    510510                <pathelement location="apps/jetty/jettylib/jetty-xml.jar" />
    511                 <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
    512511                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    513512                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
     
    14071406            <arg value="i2p.fba"/>
    14081407            <arg value="-auxclasspath"/>
    1409             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
     1408            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    14101409            <arg value="-sourcepath"/>
    14111410            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/:installer/java/src"/>
Note: See TracChangeset for help on using the changeset viewer.