Changeset b72085bc


Ignore:
Timestamp:
Mar 3, 2017 3:48:10 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
15915afe
Parents:
d3abbe8
Message:

Debian builds:

  • Remove with-libtomcat6-java and with-libtomcat7-java
  • Replace with-libjetty8-java with-libjetty9-java
  • Add libtomcat8-java dependency in debian builds
  • Change libservlet-3.0-java implicit dependency to libservlet-3.1-java
  • Initial mods for trusty build files, as it does not have jetty 9
  • Initial xenial build files
  • Add link to jetty9-apache-jsp.jar
  • Add necessary util jars to jsp classpath

Non-Debian builds:

  • Move tomcat runtime from javax.servlet.jar to jasper-runtime.jar, to be consistent with Jetty 8
  • Switch from jetty (glassfish) to apache (tomcat) jsp implementation, to be consistent with Debian builds
  • Drop checked-in Tomcat 6 and Jetty 8 jars

Code:

  • Force Jasper initialization in RouterConsoleRunner? since we don't use the Jetty annotation scanner
Files:
3 added
24 deleted
18 edited

Legend:

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

    rd3abbe8 rb72085bc  
    278278                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    279279                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    280                 <!-- jsp-api.jar only present for debian builds -->
     280
     281                <!-- following jars only present for debian builds -->
    281282                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    282                 <!-- tomcat-api.jar only present for debian builds -->
    283283                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
    284                 <!-- jasper-el.jar only present for debian builds -->
     284                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
     285                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
     286
    285287                <pathelement location="../../jetty/jettylib/jasper-el.jar" />
    286288                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    287289                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     290                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    288291                <pathelement location="${ant.home}/lib/ant.jar" />
    289292                <pathelement location="build/i2ptunnel.jar" />
     
    310313                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    311314                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    312                 <!-- jsp-api.jar only present for debian builds -->
     315
     316                <!-- following jars only present for debian builds -->
    313317                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    314                 <!-- tomcat-api.jar only present for debian builds -->
    315318                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
    316                 <!-- jasper-el.jar only present for debian builds -->
    317319                <pathelement location="../../jetty/jettylib/jasper-el.jar" />
     320                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
     321                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
     322
    318323                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    319324                <pathelement location="../../jetty/jettylib/commons-el.jar" />
  • apps/jetty/build.xml

    rd3abbe8 rb72085bc  
    44    <!-- This copies jars, with some modifications and renaming,
    55         from the jetty-distribution directory to the jettylib directory.
    6          This is disabled if the property with-libjetty8-java=true.
     6         This is disabled if the property with-libjetty9-java=true.
    77
    88         This copies jars, with some modifications and renaming,
     
    2626    <property name="javac.compilerargs" value="" />
    2727    <property name="javac.version" value="1.7" />
     28<!--
    2829    <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
    2930    <property name="tomcat.ver" value="6.0.48" />
    3031    <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
    3132    <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
     33-->
    3234
    3335    <target name="all" depends="build" />
     
    4547        <condition property="jetty.zip.extracted" >
    4648            <or>
    47                 <istrue value="${with-libjetty8-java}" />
     49                <istrue value="${with-libjetty9-java}" />
    4850                <available file="${jetty.base}" type="dir" />
    4951            </or>
     
    5759        <condition property="verified.already" >
    5860            <or>
    59                 <istrue value="${with-libjetty8-java}" />
     61                <istrue value="${with-libjetty9-java}" />
    6062                <istrue value="${jetty.zip.extracted}" />
    6163                <and>
     
    127129
    128130    <!-- Jetty files only -->
    129     <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty8-java}" >
     131    <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty9-java}" >
    130132      <!-- We copy everything to names without the version numbers so we
    131133           can update them later. Where there was something similar in Jetty 5/6,
     
    170172            </manifest>
    171173        </jar>
    172         <!-- TODO we may wish to put the compiler in jasper-runtime.jar instead -->
    173174        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    174175            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/servlet-api-3.1.jar" />
     176          <!--
     177            Jetty version - see below for why we don't use this one
    175178            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-api-2.3.1.jar" />
    176             <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar" />
    177 <!--
    178             <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
    179 -->
     179           -->
     180            <!-- Apache version -->
     181            <!-- Also includes org.apache.*, this is copied into jasper-runtime.jar below -->
     182            <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
    180183            <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
    181184            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
     
    207210         with the JspC compiler jasper-runtime.jar below.
    208211     -->
    209     <target name="buildTomcatUtilJar" unless="${with-libservlet2.5-java}" >
    210         <!-- take only what we need from the tomcat-coyote jar -->
     212
     213    <!-- take only what we need from the tomcat-coyote jar -->
     214<!--
     215    <target name="buildTomcatUtilJar" unless="${with-libjetty9-java}" >
    211216        <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
    212217            <zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
     
    214219        </jar>
    215220    </target>
     221-->
    216222
    217223    <!-- Tomcat.
     
    232238    <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
    233239
    234     <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
     240    <target name="copyTomcatLib1" unless="${with-libjetty9-java}" >
    235241        <condition property="with-libtomcat-java" >
    236242            <or>
     
    251257             2.2 is backwards-compatible with 2.1.
    252258         -->
    253         <copy preservelastmodified="true" file="${jetty.base}/lib/jsp/javax.el-3.0.0.jar" tofile="jettylib/commons-el.jar" />
    254 
     259        <!-- the javax.el API, AND the com.sun.el parser -->
     260        <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
     261        <jar destfile="jettylib/commons-el.jar" >
     262          <!--
     263            Jetty version
     264            <zipfileset src="${jetty.base}/lib/jsp/javax.el-3.0.0.jar"/>
     265           -->
     266            <!-- Apache version -->
     267            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar"/>
     268        </jar>
     269
     270        <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
    255271        <jar destfile="jettylib/jasper-runtime.jar" >
    256             <manifest>
    257                 <attribute name="Note" value="Intentionally empty" />
    258             </manifest>
    259         </jar>
     272          <!--
     273            Jetty version
     274            <zipfileset src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar"/>
     275            To be included in jasper-runtime.jar?
     276            Server complains "NO JSP Support for /, did not find org.eclipse.jetty.jsp.JettyJspServlet" even with this included (but it still works).
     277            The following file has the class, but /usr/share/java/jetty8-jsp.jar is empty
     278            We don't use this one, because we want to be consistent with Debian builds that
     279            must use Apache (aka libtomcat8).
     280            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
     281           -->
     282            <!-- Apache version -->
     283            <!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
     284            <zipfileset includes="org/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
     285            <!-- required Jetty initializer (see RouterConsoleRunner) -->
     286            <zipfileset src="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar"/>
     287        </jar>
     288
    260289<!--
    261290        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
     
    270299          -->
    271300        <jar destfile="jettylib/commons-logging.jar" update="true" >
     301<!--
    272302            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
     303-->
     304            <manifest>
     305                <attribute name="Note" value="Intentionally empty" />
     306            </manifest>
    273307        </jar>
    274308    </target>
  • apps/routerconsole/java/build.xml

    rd3abbe8 rb72085bc  
    366366                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    367367                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    368                 <!-- jsp-api.jar only present for debian builds -->
     368
     369                <!-- following jars only present for debian builds -->
    369370                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    370                 <!-- tomcat-api.jar only present for debian builds -->
    371371                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
    372                 <!-- jasper-el.jar only present for debian builds -->
    373372                <pathelement location="../../jetty/jettylib/jasper-el.jar" />
     373                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
     374                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
     375
    374376                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    375377                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     378                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    376379                <pathelement location="${ant.home}/lib/ant.jar" />
    377380                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
     
    404407                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    405408                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
    406                 <!-- jsp-api.jar only present for debian builds -->
     409
     410                <!-- following jars only present for debian builds -->
    407411                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    408                 <!-- tomcat-api.jar only present for debian builds -->
    409412                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
     413                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
     414                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
     415
    410416                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    411417                <pathelement location="../../jetty/jettylib/commons-el.jar" />
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    rd3abbe8 rb72085bc  
    642642                                                  "/", _webAppsDir + ROUTERCONSOLE + ".war",
    643643                                                 tmpdir, rootServletHandler);
     644            try {
     645                // Not sure who is supposed to call this, but unless we do,
     646                // all the jsps die NPE, because JspFactory.getDefaultContext() returns null.
     647                // We probably have to do this because we don't bundle the Jetty annotations jar and scanner.
     648                // This is only with Tomcat 8, not with the Jetty (Eclipse) jsp impl.
     649                // Got a clue from this ancient post for Tomcat 6:
     650                // https://bz.apache.org/bugzilla/show_bug.cgi?id=39804
     651                // see also apps/jetty/build.xml
     652                Class.forName("org.eclipse.jetty.apache.jsp.JettyJasperInitializer");
     653            } catch (ClassNotFoundException cnfe) {
     654                System.err.println("Warning: JettyJasperInitializer not found");
     655            }
    644656            initialize(_context, (WebAppContext)(rootWebApp.getHandler()));
    645657            chColl.addHandler(rootWebApp);
  • apps/susidns/src/build.xml

    rd3abbe8 rb72085bc  
    1717                <pathelement location="${lib}/commons-el.jar" />
    1818                <pathelement location="${lib}/javax.servlet.jar"/>
    19                 <!-- jsp-api.jar only present for debian builds -->
     19
     20                <!-- following jars only present for debian builds -->
    2021                <pathelement location="${lib}/jsp-api.jar" />
    21                 <!-- tomcat-api.jar only present for debian builds -->
    2222                <pathelement location="${lib}/tomcat-api.jar" />
    23                 <!-- tomcat-util.jar only present for debian builds -->
    2423                <pathelement location="${lib}/tomcat-util.jar" />
     24                <pathelement location="${lib}/tomcat-util-scan.jar" />
     25                <pathelement location="${lib}/jasper-el.jar" />
     26
    2527                <pathelement location="lib/jstl.jar" />
    2628                <pathelement location="lib/standard.jar" />
    2729                <pathelement location="${lib}/jasper-runtime.jar" />
    2830                <pathelement location="${lib}/commons-logging.jar" />
    29                 <!-- jasper-el.jar only present for debian builds -->
    30                 <pathelement location="${lib}/jasper-el.jar" />
     31                <pathelement location="${lib}/jetty-util.jar" />
    3132                <pathelement location="${ant.home}/lib/ant.jar" />
    3233                <pathelement location="../../../core/java/build/i2p.jar" />
  • build.properties

    rd3abbe8 rb72085bc  
    132132# Don't include geoip files, we will use geoip-database package
    133133#with-geoip-database=true
    134 # Don't include jetty files, we will use libjetty8-java package
    135 #with-libjetty8-java=true
    136 # Don't include tomcat files, we will use libtomcat6-java package
    137 #with-libtomcat6-java=true
    138 # Don't include tomcat files, we will use libtomcat7-java package
    139 #with-libtomcat7-java=true
     134# Don't include jetty files, we will use libjetty9-java package
     135#with-libjetty9-java=true
    140136# Don't include tomcat files, we will use libtomcat8-java package
    141137#with-libtomcat8-java=true
  • build.xml

    rd3abbe8 rb72085bc  
    7272            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
    7373            <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
    74             <echo message="  devscripts libjetty8-java glassfish-javaee"  />
     74            <echo message="  devscripts libjetty9-java glassfish-javaee"  />
    7575            <echo message=" " />
    7676            <echo message="The following command will install the additional runtime dependencies:" />
     
    12431243    </target>
    12441244
    1245     <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
     1245    <target name="copyjetty-unlesspkg" unless="${with-libjetty9-java}" >
    12461246        <copy todir="pkg-temp/lib" >
    12471247            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
     
    12901290
    12911291    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
     1292<!--  replacement?
    12921293        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     1294-->
    12931295    </target>
    12941296
     
    22212223            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    22222224            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2223             <!-- libjetty8-java -->
    2224             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2225            <!-- libjetty9-java -->
     2226            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    22252227            <!-- libjstl1.1-java or glassfish-javaee -->
    22262228          <!--
     
    22292231            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    22302232            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2231             <!-- libtomcat6-java or libtomcat7-java -->
    2232           <!--
    2233             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2234             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2235            -->
    22362233            <!-- anything added above, add in debian-release-tarball also -->
    22372234        </delete>
     
    22492246           -->
    22502247                <exclude name="apps/susidns/src/lib/standard.jar" />
    2251           <!--
    2252                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2253                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2254            -->
    22552248                <!-- anything added above, add in debian-release-tarball also -->
    22562249            </tarfileset>
     
    23032296            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    23042297            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2305             <!-- libjetty8-java -->
     2298            <!-- libjetty9-java -->
    23062299          <!--
    2307             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2300            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    23082301           -->
    23092302            <!-- libjstl1.1-java or glassfish-javaee -->
     
    23132306            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    23142307            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2315             <!-- libtomcat6-java or libtomcat7-java -->
    2316           <!--
    2317             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2318             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2319            -->
    23202308            <!-- anything added above, add in debian-release-tarball also -->
    23212309        </delete>
     
    23352323           -->
    23362324                <exclude name="apps/susidns/src/lib/standard.jar" />
    2337           <!--
    2338                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2339                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2340            -->
    23412325                <!-- anything added above, add in debian-release-tarball also -->
    23422326            </tarfileset>
     
    23822366            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    23832367            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2384             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2368            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    23852369          <!--
    23862370            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    23872371           -->
    23882372            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2389           <!--
    2390             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2391             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2392            -->
    23932373            <!-- anything added above, add in debian-tarball also -->
    23942374        </delete>
     
    24062386           -->
    24072387                <exclude name="apps/susidns/src/lib/standard.jar" />
    2408           <!--
    2409                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2410                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2411            -->
    24122388                <!-- anything added above, add in debian-tarball also -->
    24132389            </tarfileset>
  • debian-alt/doc/dependencies.txt

    rd3abbe8 rb72085bc  
    4242  In non-Debian builds we bundle the source code; it's removed in the Debian source package.
    4343
    44 * libjetty8-java
    45   For /usr/share/java/jetty8-*.jar.
     44* libjetty9-java
     45  For /usr/share/java/jetty9-*.jar.
    4646  In non-Debian builds we bundle the jars; it's removed in the Debian source package.
    4747  For some Debian and Ubuntu releases, these seem to be much older than what we're bundling,
     
    5353  Jetty 9 ticket is https://trac.i2p2.de/ticket/1512
    5454  Updating Jetty may break external plugins. Extensive testing is required.
    55   Note that the libjetty8-java dependency brings in libservlet3.0-java which we require.
     55  Note that the libjetty9-java dependency brings in libservlet3.0-java which we require.
    5656
    5757* glassfish-javaee
  • debian-alt/precise/i2p-router.install

    rd3abbe8 rb72085bc  
    3535
    3636
    37 # uncomment if not building with libjetty8-java
     37# uncomment if not building with libjetty9-java
    3838# ubuntu: in trusty vivid wily xenial
    3939# debian: in wheezy jessie stretch sid
     
    5252pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
    5353pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
    54 # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     54# following two are from libservlet3.1-java which is a dependency of libjetty9-java
    5555pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    5656
  • debian-alt/precise/i2p-router.links

    rd3abbe8 rb72085bc  
    77
    88
    9 # comment out if not building with libjetty8-java
     9# comment out if not building with libjetty9-java
    1010# ubuntu: in trusty vivid wily xenial
    1111# debian: in wheezy jessie stretch sid
    12 #usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
    13 #usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
    14 #usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
    15 #usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
     12#usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
     13#usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
     14#usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
     15#usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
    1616# legacy name in lib/
    17 #usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
    18 #usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
    19 #usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
    20 #usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
    21 #usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
    22 #usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
    23 #usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
    24 #usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
     17#usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
     18#usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
     19#usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
     20#usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
     21#usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
     22#usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
     23#usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
     24#usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
    2525# legacy name in lib/
    26 #usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
     26#usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
    2727# legacy name in lib/
    28 #usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
    29 # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     28#usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
     29# following two are from libservlet3.1-java which is a dependency of libjetty9-java
    3030# legacy name in lib/
    31 #usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
     31#usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
    3232# combined into javax.servlet.jar in non-package builds
    33 #usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
    34 
    35 
    36 # comment out if not building with libtomcat6-java
    37 # ubuntu: only in precise trusty vivid
    38 # debian: only in wheezy
    39 # legacy name, contains only tomcat-juli, not commons-logging
    40 #usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
    41 #usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    42 # combined into jasper-runtime.jar in non-package builds
    43 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
    44 # combined into commons-el.jar in non-package builds
    45 #usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    46 # following is from libservlet2.5-java which is a dependency of libtomcat6-java
    47 # legacy name in lib/
    48 #usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
    49 
    50 
    51 # comment out if not building with libtomcat7-java
    52 # ubuntu: only in precise trusty vivid
    53 # debian: only in wheezy
    54 # legacy name, contains only tomcat-juli, not commons-logging
    55 #usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
    56 #usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    57 # combined into jasper-runtime.jar in non-package builds
    58 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
    59 # tomcat 7 only
    60 #usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
    61 #usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
    62 # combined into commons-el.jar in non-package builds
    63 #usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    64 # following is from libservlet3.0-java which is a dependency of libtomcat7-java
    65 # legacy name in lib/
    66 #usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
     33#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
    6734
    6835
  • debian-alt/precise/rules

    rd3abbe8 rb72085bc  
    8787        @# ubuntu: not in precise
    8888        @# debian: in wheezy jessie stretch sid
    89         @#/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     89        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    9090        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    91         @#ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    92         @#ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
    93         @#ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
    94         @#ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
    95         @#ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
    96         @#ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
    97         @#ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
    98         @#ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
    99         @#ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
    100         @#ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
    101         @#ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
    102         @#ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
    103         @#ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    104         @#ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    105         @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    106         @#ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    107         @#ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    108 
    109         @# ubuntu: only in precise trusty vivid
    110         @# debian: only in wheezy
    111         @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    112         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    113         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    114         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    115         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    116         @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    117         @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
    118         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    119 
    120         @# debian and ubuntu: everywhere
    121         @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    122         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    123         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    124         @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    125         @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    126         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    127         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    128         @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    129         @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
    130         @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     91        @#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     92        @#ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     93        @#ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     94        @#ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     95        @#ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     96        @#ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     97        @#ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     98        @#ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     99        @#ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     100        @#ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     101        @#ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     102        @#ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     103        @#ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     104        @#ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     105        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     106        @#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     107        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    131108
    132109        @# debian and ubuntu: everywhere
  • debian-alt/trusty/rules

    rd3abbe8 rb72085bc  
    8686        @# ubuntu: not in precise
    8787        @# debian: in wheezy jessie stretch sid
    88         @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
    89         mkdir -p $(CURDIR)/apps/jetty/jettylib
    90         ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    91         ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
    92         ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
    93         ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
    94         ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
    95         ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
    96         ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
    97         ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
    98         ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
    99         ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
    100         ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
    101         ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
    102         ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    103         ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    104         @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    105         ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    106         ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107 
    108         @# ubuntu: only in precise trusty vivid
    109         @# debian: only in wheezy
    110         @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     88        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    11189        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    112         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    113         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    114         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    115         @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    116         @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
    117         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    118 
    119         @# debian and ubuntu: everywhere
    120         @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    121         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    122         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    123         @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    124         @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    125         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    126         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    127         @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    128         @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
    129         @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     90        @#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     91        @#ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     92        @#ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     93        @#ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     94        @#ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     95        @#ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     96        @#ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     97        @#ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     98        @#ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     99        @#ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     100        @#ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     101        @#ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     102        @#ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     103        @#ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     104        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     105        @#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     106        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    130107
    131108        @# debian and ubuntu: everywhere
  • debian-alt/xenial/control

    rd3abbe8 rb72085bc  
    1111 ,debconf
    1212 ,openjdk-8-jdk
     13 ,libjetty9-java
    1314 ,glassfish-javaee
     15 ,libtomcat8-java
    1416 ,dh-apparmor
    1517 ,gettext
     
    7476Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7577 openjdk-8-jre-headless | java8-runtime-headless,
    76  libecj-java,
     78 libjetty9-java,
     79 glassfish-javaee,
     80 libtomcat8-java,
    7781 geoip-database,
    7882 gettext-base,
    7983 libgetopt-java,
    80  glassfish-javaee
    8184Replaces: i2p ( << 0.8.6-5)
    8285Breaks: i2p (<< 0.8.6-5)
  • debian-alt/xenial/rules

    rd3abbe8 rb72085bc  
    8686        @# ubuntu: not in precise
    8787        @# debian: in wheezy jessie stretch sid
    88         @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     88        @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        mkdir -p $(CURDIR)/apps/jetty/jettylib
    90         ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    91         ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
    92         ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
    93         ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
    94         ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
    95         ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
    96         ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
    97         ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
    98         ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
    99         ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
    100         ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
    101         ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
    102         ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    103         ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    104         @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    105         ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    106         ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107 
    108         @# ubuntu: only in precise trusty vivid
    109         @# debian: only in wheezy
    110         @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    111         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    112         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    113         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    114         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    115         @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    116         @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
    117         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    118 
    119         @# debian and ubuntu: everywhere
    120         @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    121         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    122         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    123         @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    124         @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    125         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    126         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    127         @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    128         @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
    129         @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     90        ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     91        ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     92        ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     93        ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     94        ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     95        ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     96        ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     97        ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     98        ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     99        ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     100        ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     101        ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     102        ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     103        ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     104        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     105        ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     106        @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
     107        ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     108
     109        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
     110        /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     111        mkdir -p $(CURDIR)/apps/jetty/jettylib
     112        ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     113        ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     114        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     115        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     116        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     117        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     118        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     119        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    130120
    131121        @# debian and ubuntu: everywhere
  • debian/control

    rd3abbe8 rb72085bc  
    1111 ,debconf
    1212 ,openjdk-7-jdk
    13  ,libjetty8-java, libservlet3.0-java
     13 ,libjetty9-java
    1414 ,glassfish-javaee
     15 ,libtomcat8-java
    1516 ,dh-apparmor
    1617 ,gettext
     
    8081 gettext-base,
    8182 libgetopt-java,
    82  libjetty8-java, libservlet3.0-java,
    83  glassfish-javaee
     83 libjetty9-java,
     84 glassfish-javaee,
     85 libtomcat8-java
    8486Replaces: i2p ( << 0.8.6-5)
    8587Breaks: i2p (<< 0.8.6-5)
  • debian/i2p-router.install

    rd3abbe8 rb72085bc  
    3535
    3636
    37 # uncomment if not building with libjetty8-java
     37# uncomment if not building with libjetty9-java
    3838# ubuntu: in trusty vivid wily xenial
    3939# debian: in wheezy jessie stretch sid
     
    5252#pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
    5353#pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
    54 # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     54# following two are from libservlet3.0-java which is a dependency of libjetty9-java
    5555#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    5656
    5757
    58 # uncomment if not building with either libtomcat6-java or libtomcat7-java
     58# uncomment if not building with libtomcat8-java
    5959pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    6060# legacy name, contains only tomcat-juli, not commons-logging
  • debian/i2p-router.links

    rd3abbe8 rb72085bc  
    77
    88
    9 # comment out if not building with libjetty8-java
     9# comment out if not building with libjetty9-java
    1010# ubuntu: in trusty vivid wily xenial
    1111# debian: in wheezy jessie stretch sid
    12 usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
    13 usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
    14 usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
    15 usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
     12usr/share/java/jetty9-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar
     13usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
     14usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
     15usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
     16usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
    1617# legacy name in lib/
    17 usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
    18 usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
    19 usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
    20 usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
    21 usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
    22 usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
    23 usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
    24 usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
     18usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
     19usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
     20usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
     21usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
     22usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
     23usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
     24usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
     25usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
    2526# legacy name in lib/
    26 usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
     27usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
    2728# legacy name in lib/
    28 usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
    29 # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     29usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
     30# following two are from libservlet3.1-java which is a dependency of libjetty9-java
    3031# legacy name in lib/
    31 usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
     32usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
    3233# combined into javax.servlet.jar in non-package builds
    33 usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
    34 
    35 
    36 # comment out if not building with libtomcat6-java
    37 # ubuntu: only in precise trusty vivid
    38 # debian: only in wheezy
    39 # legacy name, contains only tomcat-juli, not commons-logging
    40 #usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
    41 #usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    42 # combined into jasper-runtime.jar in non-package builds
    43 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
    44 # combined into commons-el.jar in non-package builds
    45 #usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    46 # following is from libservlet2.5-java which is a dependency of libtomcat6-java
    47 # legacy name in lib/
    48 #usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
    49 
    50 
    51 # comment out if not building with libtomcat7-java
    52 # ubuntu: only in precise trusty vivid
    53 # debian: only in wheezy
    54 # legacy name, contains only tomcat-juli, not commons-logging
    55 #usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
    56 #usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    57 # combined into jasper-runtime.jar in non-package builds
    58 #usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
    59 # tomcat 7 only
    60 #usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
    61 #usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
    62 # combined into commons-el.jar in non-package builds
    63 #usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    64 # following is from libservlet3.0-java which is a dependency of libtomcat7-java
    65 # legacy name in lib/
    66 #usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
     34usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
    6735
    6836
     
    7139# debian: wheezy-backports, jessie+
    7240# legacy name, contains only tomcat-juli, not commons-logging
    73 #usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
    74 #usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     41usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
     42usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
    7543# combined into jasper-runtime.jar in non-package builds
    76 #usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
    77 # tomcat 7 only
    78 #usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
    79 #usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     44usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     45usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
     46usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     47usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
    8048# combined into commons-el.jar in non-package builds
    81 #usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     49usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
    8250# legacy name in lib/
    83 #usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     51usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
    8452
    8553
  • debian/rules

    rd3abbe8 rb72085bc  
    8686        @# ubuntu: not in precise
    8787        @# debian: in wheezy jessie stretch sid
    88         @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     88        @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        mkdir -p $(CURDIR)/apps/jetty/jettylib
    90         ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    91         ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
    92         ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
    93         ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
    94         ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
    95         ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
    96         ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
    97         ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
    98         ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
    99         ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
    100         ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
    101         ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
    102         ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    103         ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    104         @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    105         ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    106         ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107 
    108         @# ubuntu: only in precise trusty vivid
    109         @# debian: only in wheezy
    110         @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    111         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    112         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    113         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    114         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    115         @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    116         @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
    117         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    118 
    119         @# debian and ubuntu: everywhere
    120         @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    121         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    122         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    123         @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    124         @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    125         @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    126         @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    127         @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    128         @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
    129         @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     90        ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     91        ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     92        ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     93        ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     94        ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     95        ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     96        ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     97        ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     98        ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     99        ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     100        ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     101        ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     102        ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     103        ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     104        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
     105        ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     106        @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
     107        ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    130108
    131109        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
    132         @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
    133         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    134         @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    135         @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    136         @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    137         @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    138         @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    139         @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    140         @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     110        /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     111        mkdir -p $(CURDIR)/apps/jetty/jettylib
     112        ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     113        ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     114        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     115        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     116        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     117        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     118        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     119        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    141120
    142121        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.