diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2012-10-22 16:44:11 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2012-10-22 16:46:16 +0200 |
| commit | b147563525e9b0b059acb94cb39c6cf0f439bdb8 (patch) | |
| tree | c9c33deec7f95516f801a399e17375c792cf4340 /booter-jetty8 | |
| parent | da1410d3c8ae760ccc66c724c76d5013df7f96af (diff) | |
| download | app.sh-java-master.tar.gz app.sh-java-master.tar.bz2 app.sh-java-master.tar.xz app.sh-java-master.zip | |
Diffstat (limited to 'booter-jetty8')
| -rw-r--r-- | booter-jetty8/pom.xml | 40 | ||||
| -rw-r--r-- | booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java | 2 |
2 files changed, 39 insertions, 3 deletions
diff --git a/booter-jetty8/pom.xml b/booter-jetty8/pom.xml index 78987d6..98d4b59 100644 --- a/booter-jetty8/pom.xml +++ b/booter-jetty8/pom.xml @@ -20,15 +20,51 @@ <artifactId>jetty-webapp</artifactId> <version>${versions.jetty8}</version> </dependency> + + <!-- + $ (cd jetty-distribution-8.1.7.v20120910; find * -name \*.jar|sort|grep jsp) + lib/jsp/com.sun.el-2.2.0.v201108011116.jar + lib/jsp/javax.el-2.2.0.v201108011116.jar + lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar + lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar + lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar + lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar + lib/jsp/org.eclipse.jdt.core-3.7.1.jar + --> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>org.apache.jasper.glassfish</artifactId> - <version>2.2.2.v201112011158</version> + <artifactId>com.sun.el</artifactId> + <version>2.2.0.v201108011116</version> </dependency> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.el</artifactId> <version>2.2.0.v201108011116</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp</artifactId> + <version>2.2.0.v201112011158</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp.jstl</artifactId> + <version>1.2.0.v201105211821</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.apache.jasper.glassfish</artifactId> + <version>2.2.2.v201112011158</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.apache.taglibs.standard.glassfish</artifactId> + <version>1.2.0.v201112081803</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.eclipse.jdt.core</artifactId> + <version>3.7.1</version> + </dependency> </dependencies> </project> 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)); } |