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
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.