Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x'

This commit is contained in:
Jesse McConnell 2017-01-28 16:24:15 -06:00
parent 9574ec2fa1 700491f0da
commit 4543c73052
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-deploy/src/test/resources/etc/webdefault.xml
View File

@ -26,7 +26,7 @@
<description> <description>
Default web.xml file. Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file This file is applied to a Web application before its own WEB_INF/web.xml file
</description> </description>
<!-- ==================================================================== --> <!-- ==================================================================== -->

2
jetty-osgi/test-jetty-osgi/src/test/config/etc/webdefault.xml
View File

@ -26,7 +26,7 @@
<description> <description>
Default web.xml file. Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file This file is applied to a Web application before its own WEB_INF/web.xml file
</description> </description>
<!-- ==================================================================== --> <!-- ==================================================================== -->

2
jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/web-default.xml
View File

@ -26,7 +26,7 @@
<description> <description>
Default web.xml file. Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file This file is applied to a Web application before its own WEB_INF/web.xml file
</description> </description>
<!-- ==================================================================== --> <!-- ==================================================================== -->

2
jetty-webapp/src/main/config/etc/webdefault.xml
View File

@ -26,7 +26,7 @@
<description> <description>
Default web.xml file. Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file This file is applied to a Web application before its own WEB_INF/web.xml file
</description> </description>
<!-- ==================================================================== --> <!-- ==================================================================== -->

2
tests/test-integration/src/test/resources/webdefault.xml
View File

@ -26,7 +26,7 @@
<description> <description>
Default web.xml file. Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file This file is applied to a Web application before its own WEB_INF/web.xml file
</description> </description>
<!-- ==================================================================== --> <!-- ==================================================================== -->