Mercurial > hg > thermostat-ng > web-gateway

changeset 295:518eb52b8990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable JSP support for services. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-October/025535.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Thu, 26 Oct 2017 12:16:32 +0200
parents a15fda7deea0
children d28b7994e59e
files server/src/main/java/com/redhat/thermostat/gateway/server/services/WebArchiveCoreService.java services/schema/src/main/webapp/WEB-INF/web.xml
diffstat 2 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/server/src/main/java/com/redhat/thermostat/gateway/server/services/WebArchiveCoreService.java	Thu Oct 26 11:50:07 2017 +0200
+++ b/server/src/main/java/com/redhat/thermostat/gateway/server/services/WebArchiveCoreService.java	Thu Oct 26 12:16:32 2017 +0200
@@ -87,6 +87,7 @@
     @Override
     public ServletContextHandler createServletContextHandler(Server server) {
         WebAppContext webAppContext = new WebAppContext();
+        webAppContext.setDefaultsDescriptor(null);
 
         webAppContext.setContextPath(contextPath);
         webAppContext.setWar(warPath);
--- a/services/schema/src/main/webapp/WEB-INF/web.xml	Thu Oct 26 11:50:07 2017 +0200
+++ b/services/schema/src/main/webapp/WEB-INF/web.xml	Thu Oct 26 12:16:32 2017 +0200
@@ -55,11 +55,6 @@
     </servlet>
 
     <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/doc</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
         <servlet-name>SchemaInfoServlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>