Skip to content

Commit a48ffcf

Browse files
committed
[bugfix] Correct the System Identifier of the Jetty configuration DTD
1 parent ea3aeff commit a48ffcf

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

exist-distribution/src/main/xslt/catalog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
4747
-->
4848
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
49-
<system systemId="http://www.eclipse.org/jetty/configure_9_3.dtd"
49+
<system systemId="https://www.eclipse.org/jetty/configure_9_3.dtd"
5050
uri="configure_9_3.dtd"/>
5151
<uri name="http://xmlns.jcp.org/xml/ns/javaee" uri="web-app_3_1.xsd"/>
5252
<uri name="http://www.w3.org/XML/1998/namespace" uri="xml.xsd"/>

exist-distribution/src/main/xslt/jetty-deploy.xslt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
-->
4949
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
5050
version="2.0">
51-
<xsl:output method="xml" omit-xml-declaration="no" doctype-public="-//Jetty//Configure//EN" doctype-system="http://www.eclipse.org/jetty/configure_9_3.dtd" indent="yes"/>
51+
<xsl:output method="xml" omit-xml-declaration="no" doctype-public="-//Jetty//Configure//EN" doctype-system="https://www.eclipse.org/jetty/configure_9_3.dtd" indent="yes"/>
5252
<xsl:template match="Set[@name eq 'monitoredDirName']">
5353
<xsl:copy><xsl:copy-of select="@*"/><xsl:copy-of select="Property[@name eq 'jetty.base']"/>/etc/jetty/<xsl:copy-of select="Property[@name eq 'jetty.deploy.monitoredDir']"/></xsl:copy>
5454
</xsl:template>

exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/portal/WEB-INF/jetty-web.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
2+
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
33
<Configure id="elemental-portal-context" class="org.eclipse.jetty.webapp.WebAppContext">
44
<Set name="contextPath">/</Set>
55
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>

0 commit comments

Comments
 (0)