update wrapperconfig

2 files changed, 28 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5e5c0e4cdcd6..c47ed1b93952 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,12 +44,12 @@ sha256sums=('SKIP'
             'a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769'
             '434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f'
             'c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25'
-            '560ff07854d5167c83de753c133059c0fcff404c463d31940d8cad3b9ff23845')
+            '30788b1b7856fbcfcfbe6825cd772a22b75cf1d680c2cbfd9b15ef3fc2d0c077')
 
 pkgver() {
     cd "fred"
     printf "%s.%s" "${_pkgver}" \
-                   "$(git describe --abbrev=0 |sed 's/build0//;s/-/./g')"
+        "$(git describe --abbrev=0 |sed 's/build0//;s/-/./g')"
 }
 
 prepare() {
@@ -59,12 +59,6 @@ prepare() {
     git pull origin pull/658/head
     git apply -v "$srcdir/0001-strip-non-compile-deps.patch"
 
-    sed -i "$srcdir/plugin-WebOfTrust/build.xml" \
-        -e 's:value="7":value="1.8":'
-    sed -i "$srcdir/plugin-UPnP/build.xml" \
-        -e 's:value="1.5":value="1.8":'
-    sed -i "$srcdir/plugin-KeyUtils/build.xml" \
-        -e 's:value="1.6":value="1.8":'
     sed -i "gradle.properties" \
         -e "s:targetJavaVersion.*:targetJavaVersion=$(javac -version 2>&1 |awk '{print $2}'):"
 }
@@ -88,6 +82,7 @@ build_plugins() {
         msg "Building Plugin ${plugin}..."
         cd "$srcdir/plugin-${plugin}"
         ant dist \
+            -Dtarget-version=8 -Dsource-version=8 \
             -Dfreenet-cvs-snapshot.location=../fred/build/output/freenet.jar \
             -Dfreenet-ext.location=../fred/build/output/freenet-ext-29.jar \
             -Dtest.skip=true
diff --git a/wrapper.config b/wrapper.config
index d2c4b2f248c2..8e4690f939fb 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -1,12 +1,12 @@
 #encoding=UTF-8
-
+#********************************************************************
+# Wrapper Properties
+#********************************************************************
 # Java Application
 wrapper.java.command=/usr/lib/jvm/default/bin/java
 
 # Java Main class.  This class must implement the WrapperListener interface
-#  or guarantee that the WrapperManager class is initialized.  Helper
-#  classes are provided to do this for you.  See the Integration section
-#  of the documentation for details.
+#  or guarantee that the WrapperManager class is initialized.
 wrapper.java.mainclass=freenet.node.NodeStarter
 
 # Java Classpath (include wrapper.jar)  Add class path elements as
@@ -30,15 +30,11 @@ wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
 # You might want to set the following line if you have changed java.maxmemory
 # wrapper.java.additional.5=-XX:MaxPermSize=
 
-# Enable the Shenandoah Gargabe Collector
-#wrapper.java.additional.6=-XX:+UnlockExperimentalVMOptions
-#wrapper.java.additional.7=-XX:+UseShenandoahGC
-
 # Initial Java Heap Size (in MB)
 # If a non-zero value is specified for this property then an appropriate -Xms
 #  parameter will be added. The initial memory must be less than or equal to
 #  the value set for the maxmemory property
-wrapper.java.initmemory=128
+#wrapper.java.initmemory=4
 
 # Maximum Java Heap Size (in MB)
 wrapper.java.maxmemory=512
@@ -77,7 +73,7 @@ wrapper.logfile.loglevel=INFO
 #  the log is rolled. Size is specified in bytes.  The default value
 #  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
 #  'm' (mb) suffix.  For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=2M
+wrapper.logfile.maxsize=2m
 
 # Maximum number of rolled log files which will be allowed before old
 #  files are deleted.  The default value of 0 implies no limit.
@@ -106,20 +102,17 @@ wrapper.on_exit.4=RESTART
 wrapper.on_exit.5=RESTART
 
 # the router may take a few seconds to save state, etc
-wrapper.jvm_exit.timeout=120
-
-wrapper.restart.reload_configuration=TRUE
-wrapper.filter.trigger.1=java.lang.OutOfMemoryError
-wrapper.filter.action.1=RESTART
+wrapper.jvm_exit.timeout=60
 
 # give the OS 60s to clear all the old sockets / etc before restarting
 # Let's change the default from 60 to 10 seconds and see if anyone moans..
 wrapper.restart.delay=5
-wrapper.ping.interval=300
+wrapper.restart.reload_configuration=TRUE
 
 # The ping timeout must be at least 5 seconds longer than the value of wrapper.ping.interval.
 # Extend this if you are getting 'JVM appears hung' shutdowns.
 wrapper.ping.timeout=320
+wrapper.ping.interval=300
 
 # pid file for the JVM
 # Directory must exist or the wrapper will fail to start.
@@ -132,7 +125,7 @@ wrapper.java.pidfile=/run/freenet/freenet.pid
 wrapper.ignore_sequence_gaps=TRUE
 
 # Title to use when running as a console
-wrapper.console.title=Freenet 0.7
+wrapper.console.title=Freenet Router Service
 
 # Set permissions used when creating files
 # See http://wrapper.tanukisoftware.com/doc/english/prop-umask.html
@@ -140,3 +133,18 @@ wrapper.console.title=Freenet 0.7
 wrapper.umask=0022
 wrapper.java.umask=0022
 wrapper.logfile.umask=077
+
+#********************************************************************
+# Wrapper JVM Checks
+#********************************************************************
+# Out Of Memory detection.
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+wrapper.filter.action.1=RESTART
+wrapper.filter.message.1=The JVM has run out of memory.
+
+#********************************************************************
+# Advanced Options
+#********************************************************************
+# Enable the Shenandoah Gargabe Collector
+#wrapper.java.additional.100=-XX:+UnlockExperimentalVMOptions
+#wrapper.java.additional.101=-XX:+UseShenandoahGC