From b147563525e9b0b059acb94cb39c6cf0f439bdb8 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 22 Oct 2012 16:44:11 +0200
Subject: o Getting the Jetty dependencies correct for JSPX support.

---
 booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java')

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));
             }
-- 
cgit v1.2.3