Changeset adb1c6f


Ignore:
Timestamp:
May 12, 2019 6:14:55 PM (11 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
04a985cd
Parents:
9eec357
Message:

Jetty: Fix webapps in eepsite (ticket #2477)

Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r9eec357 radb1c6f  
    367367                <pathelement location="../../../core/java/build/i2p.jar" />
    368368                <pathelement location="./jettylib/org.mortbay.jetty.jar" />
     369                <pathelement location="./jettylib/jasper-runtime.jar" />
    369370                <pathelement location="./jettylib/javax.servlet.jar" />
     371                <pathelement location="./jettylib/jetty-deploy.jar" />
    370372                <pathelement location="./jettylib/jetty-http.jar" />
    371373                <pathelement location="./jettylib/jetty-io.jar" />
     
    373375                <pathelement location="./jettylib/jetty-servlet.jar" />
    374376                <pathelement location="./jettylib/jetty-util.jar" />
     377                <pathelement location="./jettylib/jetty-webapp.jar" />
    375378                <pathelement location="./jettylib/jetty-xml.jar" />
    376379            </classpath>
     
    386389            destdir="./build/obj"
    387390            includeAntRuntime="false"
    388             classpath="../../core/java/build/i2p.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-servlet.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" >
     391            classpath="../../core/java/build/i2p.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-servlet.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar:./jettylib/jetty-deploy.jar:./jettylib/jasper-runtime.jar:./jettylib/jetty-webapp.jar" >
    389392            <compilerarg line="${javac.compilerargs}" />
    390393        </javac>
  • debian-alt/disco/i2p-router.links

    r9eec357 radb1c6f  
    4949# legacy name in lib/
    5050usr/share/java/tomcat9-el-api.jar usr/share/i2p/lib/commons-el.jar
     51# tomcat pulls in ecj, link to it for eepsite webapps needing a compiler
     52usr/share/java/ecj.jar usr/share/i2p/lib/ecj.jar
    5153
    5254
  • debian-alt/jessie/i2p-router.links

    r9eec357 radb1c6f  
    4949usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
    5050usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
     51# tomcat pulls in ecj, link to it for eepsite webapps needing a compiler
     52usr/share/java/ecj.jar usr/share/i2p/lib/ecj.jar
    5153
    5254
  • debian-alt/xenial/i2p-router.links

    r9eec357 radb1c6f  
    4949# legacy name in lib/
    5050usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     51# tomcat pulls in ecj, link to it for eepsite webapps needing a compiler
     52usr/share/java/ecj.jar usr/share/i2p/lib/ecj.jar
    5153
    5254
  • debian/i2p-router.links

    r9eec357 radb1c6f  
    4949# legacy name in lib/
    5050usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
    51 
     51# tomcat pulls in ecj, link to it for eepsite webapps needing a compiler
     52usr/share/java/ecj.jar usr/share/i2p/lib/ecj.jar
    5253
    5354# comment out if not building with libtaglibs-standard
  • installer/resources/eepsite/jetty.xml

    r9eec357 radb1c6f  
    236236      <Call id="webappprovider" name="addAppProvider">
    237237        <Arg>
    238           <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
     238          <New id="WebAppProvider" class="org.eclipse.jetty.deploy.providers.WebAppProvider">
    239239            <Set name="monitoredDirName">./eepsite/webapps</Set>
    240240            <Set name="parentLoaderPriority">false</Set>
    241             <Set name="extractWars">false</Set>
     241            <!-- this is required because Jetty can't handle jars inside wars,
     242                 for example in php-java-bridge's JavaBridgeTemplate.war
     243                 See https://bugs.eclipse.org/bugs/show_bug.cgi?id=433708
     244                 See our ticket 2477
     245              -->
     246            <Set name="extractWars">true</Set>
    242247            <Set name="defaultsDescriptor">./eepsite/etc/webdefault.xml</Set>
    243248          </New>
     
    245250      </Call>
    246251    </Ref>
     252
     253    <!-- Fixup for webapps to work, see our ticket 2477
     254         Note that for webapps with uncompiled jsps, you will also
     255         need a java compiler in the classpath;
     256         The easiest way (Debian/Ubuntu) is to put a symlink in $I2P/lib:
     257         sudo apt install libecj-java
     258         cd $I2P/lib
     259         ln -s /usr/share/java/ecj.jar
     260         stop and then start i2p (restart alone will not pick up the new jar in the classpath)
     261      -->
     262    <Call class="net.i2p.servlet.WebAppProviderConfiguration" name="configure">
     263      <Arg><Ref refid="WebAppProvider"/></Arg>
     264    </Call>
    247265
    248266    <!-- ===================== -->
Note: See TracChangeset for help on using the changeset viewer.