Skip to content

Commit d0d6278

Browse files
authored
Merge pull request #1178 from srbala/patch-1
Update declaration to Servlet 3.0 in web.xml and weblogic.xml. Fixes #1132
2 parents 5541f37 + 7bd114d commit d0d6278

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/java/WEB-INF/web.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app version="2.4"
3-
xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_0.xsd">
2+
<web-app version="3.0"
3+
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
55

66
<!-- The base folder is used to specify the root location of your Gitblit data.
77
@@ -49,4 +49,4 @@
4949
<session-config>
5050
<tracking-mode>COOKIE</tracking-mode>
5151
</session-config>
52-
</web-app>
52+
</web-app>

src/main/java/WEB-INF/weblogic.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<wls:weblogic-web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wls="http://www.bea.com/ns/weblogic/90" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-web-app.xsd">
2+
<wls:weblogic-web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wls="http://www.bea.com/ns/weblogic/90" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-web-app.xsd">
33
<wls:weblogic-version>12.1.1</wls:weblogic-version>
44
<wls:context-root>gitblit</wls:context-root>
55
<wls:container-descriptor>
66
<wls:show-archived-real-path-enabled>true</wls:show-archived-real-path-enabled>
77
<wls:prefer-web-inf-classes>true</wls:prefer-web-inf-classes>
88
</wls:container-descriptor>
9-
</wls:weblogic-web-app>
9+
</wls:weblogic-web-app>

0 commit comments

Comments
 (0)