summaryrefslogtreecommitdiff
path: root/src/main/java/io/trygvis/appsh/booter/jetty/Main.java
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-11 22:24:26 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-11 22:24:26 +0100
commite5b20aa811ed2180d01e71d96c3d5d2ffa886c5f (patch)
treedad879d954a01a74712bc1807be01b09b97ef7f1 /src/main/java/io/trygvis/appsh/booter/jetty/Main.java
parentb327982f49172604c38ca3ca7af28b49b3407102 (diff)
downloadapp.sh-booter-jetty-e5b20aa811ed2180d01e71d96c3d5d2ffa886c5f.tar.gz
app.sh-booter-jetty-e5b20aa811ed2180d01e71d96c3d5d2ffa886c5f.tar.bz2
app.sh-booter-jetty-e5b20aa811ed2180d01e71d96c3d5d2ffa886c5f.tar.xz
app.sh-booter-jetty-e5b20aa811ed2180d01e71d96c3d5d2ffa886c5f.zip
o New feature: Ability to run web apps from nested classpath (foo.jar!/my-webapp/WEB-INF/web.xml).
o Refactored the code to separate configuration from the "active" parts.
Diffstat (limited to 'src/main/java/io/trygvis/appsh/booter/jetty/Main.java')
-rwxr-xr-xsrc/main/java/io/trygvis/appsh/booter/jetty/Main.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/io/trygvis/appsh/booter/jetty/Main.java b/src/main/java/io/trygvis/appsh/booter/jetty/Main.java
index 1f2c58f..b0784a7 100755
--- a/src/main/java/io/trygvis/appsh/booter/jetty/Main.java
+++ b/src/main/java/io/trygvis/appsh/booter/jetty/Main.java
@@ -53,12 +53,10 @@ public class Main {
if (value.startsWith("classpath:")) {
value = value.substring(10);
- File war = new File("wat");
-
- server.addClasspathContext(contextPath, war, value);
+ server.addContext(new JettyWebServer.ClasspathContext(contextPath, value));
}
else {
- server.addContext(contextPath, new File(basedir, value));
+ server.addContext(new JettyWebServer.WarContext(contextPath, new File(basedir, value)));
}
}
}