diff --git a/pom.xml b/pom.xml index 3df4d23..55ab185 100644 --- a/pom.xml +++ b/pom.xml @@ -18,20 +18,9 @@ - dh.nexus.releases - Cophi Nexus Releases - http://dev.digital-humanities.de/nexus/content/repositories/releases - - true - - - false - - - - dh.nexus.snapshots - Cophi Nexus snapshots - http://dev.digital-humanities.de/nexus/content/repositories/snapshots + dh.nexus.public + Cophi Nexus + http://dev.digital-humanities.de/nexus/content/groups/public true @@ -225,21 +214,35 @@ true + - com.github.klieber - phantomjs-maven-plugin - 0.7 - - 2.2.0-SNAPSHOT - + org.apache.maven.plugins + maven-dependency-plugin + 2.10 - - install - + get-slimerjs compile + unpack + + + + net.faustedition + slimerjs + 0.10.1 + zip + + + org.mozilla + firefox + 45.4.0esr + linux-x86_64 + tar.bz2 + + + - + @@ -257,12 +260,13 @@ en_US.UTF-8 en_US.UTF-8 + ${project.build.directory}/dependency/firefox/firefox java -classpath - -Dphantomjs.binary=${phantomjs.binary} + -Dphantomjs.binary=${project.build.directory}/dependency/slimerjs-0.10.1/slimerjs -Dfaust.diplo.allowedFailures=${faust.diplo.allowedFailures} -Dfaust.diplo.server=${faust.diplo.server} -Dfaust.diplo.debug=${faust.diplo.debug} diff --git a/rendersvgs.js b/rendersvgs.js index 8f8e001..5a4e6cc 100644 --- a/rendersvgs.js +++ b/rendersvgs.js @@ -15,7 +15,7 @@ var page = require('webpage').create(), var backend = system.args[1], input = system.args[2], output = system.args[3], - links = system.args[4]; + links = system.args[4], linkout = system.args[5]; if (system.args.length !== 4 && system.args.length !== 6) { diff --git a/src/main/java/net/faustedition/gen/DiplomaticConversion.java b/src/main/java/net/faustedition/gen/DiplomaticConversion.java index 5a8a135..b8f1dce 100644 --- a/src/main/java/net/faustedition/gen/DiplomaticConversion.java +++ b/src/main/java/net/faustedition/gen/DiplomaticConversion.java @@ -116,8 +116,7 @@ public boolean buildSVGs() { } try { - if (debugPhantomJS) - logger.fine(() -> String.join(" ", arguments)); + logger.info(() -> String.join(" ", arguments)); final Process renderProcess = new ProcessBuilder(arguments).redirectErrorStream(true).start(); final BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(new BufferedInputStream(renderProcess.getInputStream()))); @@ -180,6 +179,8 @@ public static void main(final String[] args) throws IOException { "rendersvgs.js", serverURL); logger.info(() -> "PhantomJS command line: " + String.join(" ", baseCmdLine) + " [ ]"); + + logger.info(() -> "Environment:\n" + Joiner.on("\n").withKeyValueSeparator("=").join(System.getenv())); if (onlyWebServer) { logger.info("Hit Ctrl+C to interrupt");