Changeset a3a17a4f
- Timestamp:
- Nov 25, 2017 6:59:04 PM (3 years ago)
- Branches:
- master
- Children:
- 752c17c
- Parents:
- 7f6ba8cd
- Files:
-
- 2 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
apps/routerconsole/java/build.xml
r7f6ba8cd ra3a17a4f 129 129 <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more --> 130 130 <!-- All new jetty 7 jars should have been in 0.9.6, added in 0.9.7 --> 131 <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar j etty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar" />131 <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jstlel.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar" /> 132 132 <attribute name="Implementation-Version" value="${full.version}" /> 133 133 <attribute name="Built-By" value="${build.built-by}" /> -
apps/susidns/src/build.xml
r7f6ba8cd ra3a17a4f 24 24 <pathelement location="${lib}/tomcat-util-scan.jar" /> 25 25 <pathelement location="${lib}/jasper-el.jar" /> 26 <pathelement location="lib/jstlel.jar" /> 26 27 27 28 <pathelement location="lib/jstl.jar" /> -
build.properties
r7f6ba8cd ra3a17a4f 12 12 javasedocs.url=http://docs.oracle.com/javase/7/docs/api/ 13 13 javaeedocs.url=http://docs.oracle.com/javaee/7/api/ 14 # The following link is dead, perhaps temporarily, 15 # perhaps not, as they move 7 and 8 to unsupported status. 16 #jettydocs.url=http://download.eclipse.org/jetty/stable-8/apidocs/ 14 # The following link is for 9.4.x 15 #jettydocs.url=http://download.eclipse.org/jetty/stable-9/apidocs/ 17 16 jettydocs.url=http://download.eclipse.org/jetty/9.2.21.v20170120/apidocs/ 18 17 wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/ … … 148 147 # Don't include tomcat files, we will use libtomcat8-java package 149 148 #with-libtomcat8-java=true 149 # Don't include jstl.jar and standard.jar, we will use libtaglibs-standard-* packages 150 #with-libtaglibs-standard=true 150 151 # Don't include jstl.jar and standard.jar, we will use glassfish-javaee package 151 152 #with-glassfish-javaee=true -
build.xml
r7f6ba8cd ra3a17a4f 1275 1275 </target> 1276 1276 1277 <!-- todo handle alt package too -->1278 1277 <!-- 1279 glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail 1280 <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" > 1278 jstl.jar 1279 glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail, 1280 and libjstl1.1-java isn't sufficient, 1281 so we only skip it with libtaglibs-standard 1281 1282 --> 1282 <target name="copyjstl-unlesspkg" >1283 <target name="copyjstl-unlesspkg" unless="${with-libtaglibs-standard}" > 1283 1284 <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" /> 1284 1285 </target> 1285 1286 1286 <!-- todo handle alt package too --> 1287 <target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" > 1287 <!-- standard.jar --> 1288 <target name="copystandard-unlesspkg" depends="copystandard-unlesspkg1, copystandard-unlesspkg2" /> 1289 <target name="copystandard-unlesspkg1" > 1290 <condition property="with-any-standard-pkg" > 1291 <or> 1292 <istrue value="${with-libtaglibs-standard}" /> 1293 <istrue value="${with-glassfish-javaee}" /> 1294 <istrue value="${libjakarta-taglibs-standard-java}" /> 1295 </or> 1296 1297 </condition> 1298 </target> 1299 <target name="copystandard-unlesspkg2" unless="${with-any-standard-pkg}" > 1288 1300 <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" /> 1289 1301 </target> … … 2270 2282 <!-- libtomcat8-java --> 2271 2283 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" /> 2272 <!-- libjstl1.1-java or glassfish-javaee --> 2273 <!-- 2284 <!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard --> 2274 2285 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> 2275 --> 2276 <!-- libjakarta-taglibs-standard-java or glassfish-javaee --> 2286 <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard --> 2277 2287 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2278 2288 <!-- anything added above, add in debian-release-tarball also --> … … 2288 2298 <exclude name="apps/jetty/jetty-distribution-*/**"/> 2289 2299 <exclude name="apps/jetty/apache-tomcat-*/**"/> 2290 <!--2291 2300 <exclude name="apps/susidns/src/lib/jstl.jar" /> 2292 -->2293 2301 <exclude name="apps/susidns/src/lib/standard.jar" /> 2294 2302 <!-- anything added above, add in debian-release-tarball also --> … … 2416 2424 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" /> 2417 2425 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" /> 2418 <!--2419 2426 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> 2420 -->2421 2427 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2422 2428 <!-- anything added above, add in debian-tarball also --> … … 2432 2438 <exclude name="apps/jetty/jetty-distribution-*/**"/> 2433 2439 <exclude name="apps/jetty/apache-tomcat-*/**"/> 2434 <!--2435 2440 <exclude name="apps/susidns/src/lib/jstl.jar" /> 2436 -->2437 2441 <exclude name="apps/susidns/src/lib/standard.jar" /> 2438 2442 <!-- anything added above, add in debian-tarball also --> -
debian-alt/README.txt
r7f6ba8cd ra3a17a4f 10 10 xenial may be copied to yakkety, zesty. 11 11 12 tails-jessie and tails-wheezy are currently the same as 13 jessie and wheezy, respectively. If they diverge, put the changes here. 12 Not maintained: 13 wheezy files are not maintained. Use the precise files instead. 14 jessie files may not be maintained. Use the trusty files instead. 14 15 15 16 Note on systemd: -
debian-alt/buster/control
r7f6ba8cd ra3a17a4f 10 10 ,openjdk-8-jdk 11 11 ,libjetty9-java (>= 9.2.22) 12 , glassfish-javaee12 ,libtaglibs-standard-jstlel-java 13 13 ,libtomcat8-java 14 14 ,dh-apparmor … … 76 76 openjdk-8-jre-headless | java8-runtime-headless, 77 77 libjetty9-java, 78 glassfish-javaee,78 libtaglibs-standard-jstlel-java, 79 79 libtomcat8-java, 80 80 geoip-database, -
debian-alt/buster/rules
r7f6ba8cd ra3a17a4f 53 53 rm -f $(CURDIR)/override.properties 54 54 rm -f $(CURDIR)/apps/susidns/src/lib/standard.jar 55 rm -f $(CURDIR)/apps/susidns/src/lib/jstl.jar 56 rm -f $(CURDIR)/apps/susidns/src/lib/jstlel.jar 55 57 debconf-updatepo 56 58 … … 120 122 ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar 121 123 122 @# debian and ubuntu: everywhere 123 @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties 124 @# debian and ubuntu: stretch+, zesty+ 125 @/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties 126 ln -sf /usr/share/java/taglibs-standard-spec.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar 127 ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar 128 ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar 129 130 @# debian and ubuntu: everywhere 131 @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties 124 132 @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail 125 133 @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar 126 ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar134 @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar 127 135 128 136 @# debian and ubuntu: everywhere -
debian-alt/doc/debian-build.txt
r7f6ba8cd ra3a17a4f 74 74 reprepro -v update precise 75 75 reprepro -v update trusty 76 reprepro -v update vivid77 76 reprepro -v update xenial 78 77 reprepro -v update zesty -
debian-alt/doc/dependencies.txt
r7f6ba8cd ra3a17a4f 9 9 instructions are at https://geti2p.net/debian 10 10 11 This document is current as of release 0.9.3 0, 2017-05-03.11 This document is current as of release 0.9.33, scheduled 2018-01 12 12 13 13 … … 52 52 They are removed in the Debian source package. 53 53 54 * glassfish-javaee 54 * libtaglibs-standard-*-java (stretch and later, zesty and later only) 55 Provides JSTL 1.2, solves the glassfish-javaee problem described below. 56 57 * glassfish-javaee (wheezy, jessie, xenial and earlier only) 55 58 We need jstl.jar and standard.jar version 1.2. 56 59 This is an ancient and terrible package, but it's the only place we've found version 1.2 jars. -
debian/control
r7f6ba8cd ra3a17a4f 11 11 ,openjdk-7-jdk 12 12 ,libjetty9-java 13 , glassfish-javaee13 ,libtaglibs-standard-jstlel-java 14 14 ,libtomcat8-java 15 15 ,dh-apparmor … … 82 82 libgetopt-java, 83 83 libjetty9-java, 84 glassfish-javaee,84 libtaglibs-standard-jstlel-java, 85 85 libtomcat8-java 86 86 Replaces: i2p ( << 0.8.6-5) -
debian/i2p-router.install
r7f6ba8cd ra3a17a4f 64 64 65 65 66 # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java66 # uncomment if not building with either glassfish-javaee, libjakarta-taglibs-standard-java or libtaglibs-standard 67 67 # ubuntu and debian: everywhere 68 68 # glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail 69 pkg-temp/lib/jstl.jar usr/share/i2p/lib69 #pkg-temp/lib/jstl.jar usr/share/i2p/lib 70 70 71 71 72 # uncomment if not building with either glassfish-javaee or libjstl1.1-java72 # uncomment if not building with either glassfish-javaee, libjstl1.1-java or libtaglibs-standard 73 73 # ubuntu and debian: everywhere 74 74 #pkg-temp/lib/standard.jar usr/share/i2p/lib -
debian/i2p-router.links
r7f6ba8cd ra3a17a4f 52 52 53 53 54 # comment out if not building with libtaglibs-standard 55 usr/share/java/taglibs-standard-spec.jar usr/share/i2p/lib/jstl.jar 56 usr/share/java/taglibs-standard-impl.jar usr/share/i2p/lib/standard.jar 57 usr/share/java/taglibs-standard-jstlel.jar usr/share/i2p/lib/jstlel.jar 58 59 54 60 # comment out if not building with glassfish-javaee 55 61 # glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail 56 62 #usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar 57 usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar63 #usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar 58 64 59 65 -
debian/rules
r7f6ba8cd ra3a17a4f 53 53 rm -f $(CURDIR)/override.properties 54 54 rm -f $(CURDIR)/apps/susidns/src/lib/standard.jar 55 rm -f $(CURDIR)/apps/susidns/src/lib/jstl.jar 56 rm -f $(CURDIR)/apps/susidns/src/lib/jstlel.jar 55 57 debconf-updatepo 56 58 … … 120 122 ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar 121 123 122 @# debian and ubuntu: everywhere 123 @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties 124 @# debian and ubuntu: stretch+, zesty+ 125 @/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties 126 ln -sf /usr/share/java/taglibs-standard-spec.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar 127 ln -sf /usr/share/java/taglibs-standard-impl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar 128 ln -sf /usr/share/java/taglibs-standard-jstlel.jar $(CURDIR)/apps/susidns/src/lib/jstlel.jar 129 130 @# debian and ubuntu: everywhere 131 @#/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties 124 132 @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail 125 133 @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar 126 ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar134 @#ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar 127 135 128 136 @# debian and ubuntu: everywhere
Note: See TracChangeset
for help on using the changeset viewer.