Changeset f38ee48


Ignore:
Timestamp:
Mar 4, 2017 2:24:48 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
87cff00
Parents:
ec6c244
Message:

Move setting of InstanceManager? to WebAppConfiguration? to avoid race
Fix up LICENSES.txt
Build.xml cleanup
Debian:

  • Add support for with-libtomcat8-java but not with-libjetty9-java for wheezy/jessie
  • Fix wheezy/precise/trusty build files to use tomcat8 but not jetty9 packages
  • Remove build dependency on ant-optional, not required
  • Remove some remaining eclipse-ecj dependencies
  • Add short README files for wheezy and jessie
Files:
2 added
20 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    rec6c244 rf38ee48  
    213213       See licenses/LICENSE-Apache2.0.txt
    214214
    215    Jetty 8.1.21.v20160908:
     215   Jetty 9.2.21.v20170120:
    216216   See licenses/ABOUT-Jetty.html
    217217   See licenses/NOTICE-Jetty.html
    218218   See licenses/LICENSE-Apache2.0.txt
    219219   See licenses/LICENSE-ECLIPSE-1.0.html
    220    See licenses/NOTICE-Commons-Logging.txt
    221220
    222221   JRobin 1.6.0-1:
     
    284283      See licenses/LICENSE-LGPLv2.1.txt
    285284
    286    Tomcat 6.0.48:
     285   Tomcat 8.0.33:
    287286   Copyright 1999-2016 The Apache Software Foundation
    288287   See licenses/LICENSE-Apache2.0.txt
  • apps/jetty/build.xml

    rec6c244 rf38ee48  
    2626    <property name="javac.compilerargs" value="" />
    2727    <property name="javac.version" value="1.7" />
    28 <!--
    29     <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
    30     <property name="tomcat.ver" value="6.0.48" />
    31     <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
    32     <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
    33 -->
    3428
    3529    <target name="all" depends="build" />
     
    126120
    127121    <!-- Jetty and tomcat files -->
    128     <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib" />
     122    <!--
     123         We support the following configurations:
     124           no system jars: Precise, Trusty
     125           with-libtomcat8-java: Jessie (without backports), Wheezy
     126           with-libtomcat8-java AND with-libjetty9-java: Xenial, Jessie (with backports), Stretch
     127           with-libjetty9-java (only): not supported
     128     -->
     129    <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib1, copyJettylib2, copyTomcatLib" />
    129130
    130131    <!-- Jetty files only -->
     
    172173            </manifest>
    173174        </jar>
     175    </target>
     176
     177    <!-- If with-libtomcat8-java but not with-libjetty9-java, we don't do this -->
     178    <target name="copyJettylib2" depends="extractJettylib" unless="${with-libtomcat8-java}" >
    174179        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    175180            <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" />
     
    189194        <delete dir="${jetty.base}" />
    190195      -->
    191         <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over,
    192              needed for old plugins and things. We add tomcat-juli below.
    193           -->
    194       <!--
    195         * Removed in 0.9.24, see ticket #1679
    196         * Jetty now uses tomcat-juli (added below to commons-logging.jar), not commons-logging proper,
    197         * and no known plugins use it either.
    198         <jar destfile="jettylib/commons-logging.jar" filesetmanifest="mergewithoutmain" >
    199             <zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
    200         </jar>
    201       -->
    202     </target>
    203 
    204     <!-- Tomcat util jar.
    205          As of Tomcat 6.0.39, the deployer does not contain some classes that are required
    206          to precompile jsps with tags (SusiDNS and i2p-bote).
    207          These classes are in the main Tomcat package, in lib/tomcat-coyote.jar.
    208          As the jar is 800 KB and we only need 12 KB of that, we extract the required classes
    209          to a new jar, created and checked in using this target.
    210          Apparently this is only required for precompilation of jsps, so this is put in
    211          with the JspC compiler jasper-runtime.jar below.
    212      -->
    213 
    214     <!-- take only what we need from the tomcat-coyote jar -->
    215 <!--
    216     <target name="buildTomcatUtilJar" unless="${with-libjetty9-java}" >
    217         <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
    218             <zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
    219              includes="org/apache/tomcat/util/descriptor/* org/apache/tomcat/util/res/*" />
    220         </jar>
    221     </target>
    222 -->
     196    </target>
     197
    223198
    224199    <!-- Tomcat.
     
    259234         -->
    260235        <!-- the javax.el API, AND the com.sun.el parser -->
    261         <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
     236        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
    262237        <jar destfile="jettylib/commons-el.jar" >
    263238          <!--
     
    269244        </jar>
    270245
    271         <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
     246        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
    272247        <jar destfile="jettylib/jasper-runtime.jar" >
    273248          <!--
     
    288263        </jar>
    289264
    290 <!--
    291         <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    292             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
    293             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
    294             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar" />
    295             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util.jar" />
    296         </jar>
    297 -->
    298265        <!-- Ant bug, don't set update and filesetmanifest or the update doesn't happen,
    299266             Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
    300267          -->
    301268        <jar destfile="jettylib/commons-logging.jar" update="true" >
    302 <!--
    303             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
    304 -->
    305269            <manifest>
    306270                <attribute name="Note" value="Intentionally empty" />
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    rec6c244 rf38ee48  
    4141import net.i2p.util.SystemVersion;
    4242
    43 import org.apache.tomcat.SimpleInstanceManager;
    4443import org.eclipse.jetty.security.HashLoginService;
    4544import org.eclipse.jetty.security.ConstraintMapping;
     
    649648                System.err.println("Warning: JettyJasperInitializer not found");
    650649            }
    651             initialize(_context, (WebAppContext)(rootWebApp.getHandler()));
     650            WebAppContext wac = (WebAppContext)(rootWebApp.getHandler());
     651            initialize(_context, wac);
     652            WebAppStarter.setWebAppConfiguration(wac);
    652653            chColl.addHandler(rootWebApp);
    653654
     
    663664            // start does a mapContexts()
    664665            _server.start();
    665             // can't do this before start
    666             // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
    667             // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
    668             rootServletHandler.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
    669666        } catch (Throwable me) {
    670667            // NoClassFoundDefError from a webapp is a throwable, not an exception
  • apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java

    rec6c244 rf38ee48  
    1616import net.i2p.I2PAppContext;
    1717
     18import org.apache.tomcat.SimpleInstanceManager;
    1819import org.eclipse.jetty.webapp.Configuration;
    1920import org.eclipse.jetty.webapp.WebAppClassLoader;
     
    192193    public void configure(WebAppContext context) throws Exception {
    193194        configureClassPath(context);
     195        // do we just need one, in the ContextHandlerCollection, or one for each?
     196        // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
     197        // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
     198        context.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
    194199    }
    195200
  • apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java

    rec6c244 rf38ee48  
    1111import net.i2p.util.SecureDirectory;
    1212
    13 import org.apache.tomcat.SimpleInstanceManager;
    1413import org.eclipse.jetty.server.Handler;
    1514import org.eclipse.jetty.server.Server;
     
    6564         wac.setThrowUnavailableOnStartupException(true);
    6665         wac.start();
    67          // can't do this before start
    68          // do we just need one, in the ContextHandlerCollection, or one for each?
    69          // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
    70          // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
    71          wac.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
    7266    }
    7367
     
    116110        // this does the passwords...
    117111        RouterConsoleRunner.initialize(ctx, wac);
     112        setWebAppConfiguration(wac);
     113        server.addHandler(wac);
     114        server.mapContexts();
     115        return wac;
     116    }
    118117
     118    /**
     119     *  @since Jetty 9
     120     */
     121    static void setWebAppConfiguration(WebAppContext wac) {
    119122        // see WebAppConfiguration for info
    120123        String[] classNames = wac.getConfigurationClasses();
     
    131134        newClassNames[classNames.length] = WebAppConfiguration.class.getName();
    132135        wac.setConfigurationClasses(newClassNames);
    133         server.addHandler(wac);
    134         server.mapContexts();
    135         return wac;
    136136    }
    137137
  • build.properties

    rec6c244 rf38ee48  
    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 libjetty9-java package
     134# Don't include jetty files, we will use libjetty9-java package. Requires with-libtomcat8-java=true.
    135135#with-libjetty9-java=true
    136136# Don't include tomcat files, we will use libtomcat8-java package
  • debian-alt/README.txt

    rec6c244 rf38ee48  
    1 The files in ../debian/ are for jessie/stable.
     1The files in ../debian/ are for stretch.
     2You may also use them for jessie if you have libjetty9-java from jessie-backports.
     3
    24Alternates are in the subdirectories here.
     5To use them, copy them over the files in ../debian/  .
    36
    4 trusty may be copied to utopic, vivid, wily, xenial.
     7Built file compatibility:
     8trusty may be copied to vivid.
     9trusty may be used for jessie without libjetty9-java from backports.
     10xenial may be copied to yakkety, zesty.
    511
    612tails-jessie and tails-wheezy are currently the same as
  • debian-alt/precise/control

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-7-jdk
     
    1413# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
    1514 ,openjdk-6-jdk
     15 ,libtomcat8-java
    1616 ,glassfish-javaee
    1717 ,dh-apparmor
     
    7777Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7878 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
    79  libecj-java,
     79 libtomcat8-java,
    8080 geoip-database,
    8181 gettext-base,
  • debian-alt/precise/i2p-router.install

    rec6c244 rf38ee48  
    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.1-java which is a dependency of libjetty9-java
    55 pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    5654
    5755
    58 # uncomment if not building with either libtomcat6-java or libtomcat7-java
    59 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     56# uncomment if not building with libtomcat8-java
     57#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    6058# legacy name, contains only tomcat-juli, not commons-logging
    61 pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    62 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     59#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     60#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     61#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    6362
    6463
  • debian-alt/precise/i2p-router.links

    rec6c244 rf38ee48  
    33usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    5 
    6 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
    75
    86
     
    3230# combined into javax.servlet.jar in non-package builds
    3331#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
     32
     33
     34# comment out if not building with libtomcat8-java
     35# ubuntu: only in xenial+
     36# debian: wheezy-backports, jessie+
     37# legacy name, contains only tomcat-juli, not commons-logging
     38usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
     39usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     40# combined into jasper-runtime.jar in non-package builds
     41usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     42usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
     43usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     44usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
     45# combined into commons-el.jar in non-package builds
     46usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     47# legacy name in lib/
     48usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     49usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
     50usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
    3451
    3552
  • debian-alt/precise/rules

    rec6c244 rf38ee48  
    8585        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8686
    87         @# ubuntu: not in precise
    88         @# debian: in wheezy jessie stretch sid
     87        @# ubuntu: in xenial
     88        @# debian: in jessie-backports stretch sid
    8989        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    9090        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    107107        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    108108
     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-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     113        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     114        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     115        ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     116        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     117        ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     118        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     119        ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     120        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     121        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     122
    109123        @# debian and ubuntu: everywhere
    110124        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
  • debian-alt/trusty/control

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-7-jdk
     
    1413# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
    1514 ,openjdk-6-jdk
     15 ,libtomcat8-java
    1616 ,dh-apparmor
    1717 ,gettext
     
    7676Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    7777 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
    78  libecj-java,
     78 libtomcat8-java,
    7979 geoip-database,
    8080 gettext-base,
  • debian-alt/trusty/i2p-router.install

    rec6c244 rf38ee48  
    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 libjetty9-java
    55 pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    5654
    5755
    5856# uncomment if not building with libtomcat8-java
    59 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     57#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    6058# legacy name, contains only tomcat-juli, not commons-logging
    61 pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    62 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     59#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     60#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     61#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    6362
    6463
  • debian-alt/trusty/i2p-router.links

    rec6c244 rf38ee48  
    33usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    5 
    6 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
    75
    86
     
    3230# combined into javax.servlet.jar in non-package builds
    3331#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
     32
     33
     34# comment out if not building with libtomcat8-java
     35# ubuntu: only in xenial+
     36# debian: wheezy-backports, jessie+
     37# legacy name, contains only tomcat-juli, not commons-logging
     38usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
     39usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     40# combined into jasper-runtime.jar in non-package builds
     41usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     42usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
     43usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     44usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
     45# combined into commons-el.jar in non-package builds
     46usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     47# legacy name in lib/
     48usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     49usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
     50usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
    3451
    3552
  • debian-alt/trusty/rules

    rec6c244 rf38ee48  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
    8888        @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    106106        @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107107
     108        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
     109        @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     110        mkdir -p $(CURDIR)/apps/jetty/jettylib
     111        ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     112        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     113        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     114        ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     115        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     116        ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     117        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     118        ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     119        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     120        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     121
    108122        @# debian and ubuntu: everywhere
    109123        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
  • debian-alt/wheezy/control

    rec6c244 rf38ee48  
    11Source: i2p
    2 Maintainer: Kill Your TV <killyourtv@i2pmail.org>
     2Maintainer: zzz <zzz@i2pmail.org>
    33Section: net
    44Standards-Version: 3.9.6
     
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    12  ,default-jdk | openjdk-7-jdk | openjdk-6-jdk
     11 ,default-jdk | openjdk-7-jdk
     12 ,libtomcat8-java
     13 ,glassfish-javaee
    1314 ,gettext
    1415 ,dh-apparmor
     
    7273Priority: optional
    7374Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    74  openjdk-8-jre-headless | openjdk-7-jre-headless | openjdk-6-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless | java6-runtime-headless, libecj-java
     75 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
     76 libtomcat8-java,
     77 geoip-database,
     78 gettext-base,
     79 libgetopt-java,
     80 glassfish-javaee
    7581Replaces: i2p ( << 0.8.6-5)
    7682Breaks: i2p (<< 0.8.6-5)
  • debian-alt/xenial/control

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-8-jdk
  • debian-alt/xenial/rules

    rec6c244 rf38ee48  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
    8888        @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    108108
    109109        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
    110         /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     110        @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
    111111        mkdir -p $(CURDIR)/apps/jetty/jettylib
     112        ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     113        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     114        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    112115        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
     116        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     117        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    114118        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    115119        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
    120120
    121121        @# debian and ubuntu: everywhere
  • debian/control

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-7-jdk
  • debian/rules

    rec6c244 rf38ee48  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
    8888        @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    110110        /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
    111111        mkdir -p $(CURDIR)/apps/jetty/jettylib
     112        ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     113        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     114        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    112115        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
     116        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     117        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    114118        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    115119        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
    120120
    121121        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.