aboutsummaryrefslogtreecommitdiff
path: root/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
commit0217493175adfd43dd0e7828c1b336ba5e8c01e1 (patch)
tree1212a232a40ddd7533c4a2b5f168d5767ac19b9d /src/main
parent95f506ef0d7c2d33fff1df28e6613583e5cbf0b3 (diff)
downloadapp.sh-booter-jetty-0217493175adfd43dd0e7828c1b336ba5e8c01e1.tar.gz
app.sh-booter-jetty-0217493175adfd43dd0e7828c1b336ba5e8c01e1.tar.bz2
app.sh-booter-jetty-0217493175adfd43dd0e7828c1b336ba5e8c01e1.tar.xz
app.sh-booter-jetty-0217493175adfd43dd0e7828c1b336ba5e8c01e1.zip
o Getting the Jetty dependencies correct for JSPX support.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/io/trygvis/appsh/booter/jetty8/Main.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java b/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java
index b69ff1d..15279dc 100644
--- a/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java
+++ b/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));
}