summaryrefslogtreecommitdiff
path: root/booter-jetty8/src/main
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2012-10-22 16:44:11 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2012-10-22 16:46:16 +0200
commitb147563525e9b0b059acb94cb39c6cf0f439bdb8 (patch)
treec9c33deec7f95516f801a399e17375c792cf4340 /booter-jetty8/src/main
parentda1410d3c8ae760ccc66c724c76d5013df7f96af (diff)
downloadapp.sh-java-b147563525e9b0b059acb94cb39c6cf0f439bdb8.tar.gz
app.sh-java-b147563525e9b0b059acb94cb39c6cf0f439bdb8.tar.bz2
app.sh-java-b147563525e9b0b059acb94cb39c6cf0f439bdb8.tar.xz
app.sh-java-b147563525e9b0b059acb94cb39c6cf0f439bdb8.zip
o Getting the Jetty dependencies correct for JSPX support.HEADmaster
Diffstat (limited to 'booter-jetty8/src/main')
-rw-r--r--booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java
index b69ff1d..15279dc 100644
--- a/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java
+++ b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java
@@ -51,7 +51,7 @@ public class Main {
}
}
- String httpPort = properties.getProperty("http.port");
+ String httpPort = properties.getProperty("httpPort", System.getenv("httpPort"));
if (httpPort != null) {
server.setHttpPort(parseInt(httpPort));
}