Changeset b72085bc for debian


Ignore:
Timestamp:
Mar 3, 2017 3:48:10 PM (4 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
Location:
debian
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • 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.