Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-03-17 07:22:36 +0000
committerGreg Wilkins2014-03-18 22:56:19 +0000
commit119718d86fb773ae9c5839639107de4be126999e (patch)
tree1788a20ec32bd5e4e5f59143c7ac5b8af42496d2 /jetty-deploy/src
parent1ffd308bbef7c9cad816631131c1029fe7ac88db (diff)
downloadorg.eclipse.jetty.project-119718d86fb773ae9c5839639107de4be126999e.tar.gz
org.eclipse.jetty.project-119718d86fb773ae9c5839639107de4be126999e.tar.xz
org.eclipse.jetty.project-119718d86fb773ae9c5839639107de4be126999e.zip
added jetty-quickstart module
Diffstat (limited to 'jetty-deploy/src')
-rw-r--r--jetty-deploy/src/main/config/etc/jetty-deploy.xml2
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
index 16e5253a86..c368a06d8f 100644
--- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
@@ -18,7 +18,7 @@
</Set>
<Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
+ <Arg>.*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\\.jar$</Arg>
</Call>
<!-- Add a customize step to the deployment lifecycle -->
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
index add8f76ce7..7e50a96433 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
@@ -280,7 +280,7 @@ public class WebAppProvider extends ScanningAppProvider
}
}
};
-
+
xmlc.getIdMap().put("Server", getDeploymentManager().getServer());
xmlc.getProperties().put("jetty.home",System.getProperty("jetty.home","."));
xmlc.getProperties().put("jetty.base",System.getProperty("jetty.base","."));

Back to the top