From 4018b840200906fec54ab3bb06bdaa8d4fa5711f Mon Sep 17 00:00:00 2001 From: Paul Millar Date: Wed, 5 Nov 2014 21:58:27 +0100 Subject: [PATCH] srm-server: add servlet webapp-2.3.dtd file The SRM server makes use of an XML file that follows the Sevlet 2.3 deployment descriptor. When receiving the first SRM operation, Jetty will parse the deployment descriptor, which requires the corresponding DTD. Previously (with Jetty 8) the DTD came as part of the servlet-api-2.x jar file. Jetty 9 depends on servlet-api 3.1, which does not contain the deployment descriptor DTD: https://java.net/jira/browse/SERVLET_SPEC-115 Therefore, when it receives the first SRM operation, dCache will download the DTD from java.sun.com. For most sites, this is merely undesirable, but if the dCache instance is not connected to the Internet then this is problematic as a stack-trace is logged with the root cause of: java.net.UnknownHostException: java.sun.com and the SRM does not work. This patch works around the problem by embedding the DTD in the srm-server jar file. Target: master Patch: https://rb.dcache.org/r/7459 Acked-by: Gerd Behrmann Request: 2.11 Require-notes: no Require-book: no --- .../javax/servlet/resources/web-app_2_3.dtd | 1063 +++++++++++++++++ 1 file changed, 1063 insertions(+) create mode 100644 modules/srm-server/src/main/resources/javax/servlet/resources/web-app_2_3.dtd diff --git a/modules/srm-server/src/main/resources/javax/servlet/resources/web-app_2_3.dtd b/modules/srm-server/src/main/resources/javax/servlet/resources/web-app_2_3.dtd new file mode 100644 index 00000000000..5e3ab01c0fe --- /dev/null +++ b/modules/srm-server/src/main/resources/javax/servlet/resources/web-app_2_3.dtd @@ -0,0 +1,1063 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +