diff options
| author | Florian Zschocke <fzs@users.noreply.github.com> | 2017-01-16 20:51:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 20:51:30 +0100 |
| commit | d0d62788e3865db025b2636883988c6067fb59f8 (patch) | |
| tree | 15f6ad6ae83e1f61f320a6bf4e73c84f4ae727b2 | |
| parent | 5541f37ea97b5f78680344e74c5150831c45a8ab (diff) | |
| parent | 7bd114df717a8a626da8bd051d59c1d49dd92c75 (diff) | |
| download | gitblit-d0d62788e3865db025b2636883988c6067fb59f8.tar.gz gitblit-d0d62788e3865db025b2636883988c6067fb59f8.zip | |
Merge pull request #1178 from srbala/patch-1
Update declaration to Servlet 3.0 in web.xml and weblogic.xml.
Fixes #1132
| -rw-r--r-- | src/main/java/WEB-INF/web.xml | 8 | ||||
| -rw-r--r-- | src/main/java/WEB-INF/weblogic.xml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml index db772153..c648dcde 100644 --- a/src/main/java/WEB-INF/web.xml +++ b/src/main/java/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_0.xsd"> +<web-app version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> <!-- The base folder is used to specify the root location of your Gitblit data. @@ -49,4 +49,4 @@ <session-config> <tracking-mode>COOKIE</tracking-mode> </session-config> -</web-app>
\ No newline at end of file +</web-app> diff --git a/src/main/java/WEB-INF/weblogic.xml b/src/main/java/WEB-INF/weblogic.xml index cd08111d..f41fa00d 100644 --- a/src/main/java/WEB-INF/weblogic.xml +++ b/src/main/java/WEB-INF/weblogic.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<wls:weblogic-version>12.1.1</wls:weblogic-version>
<wls:context-root>gitblit</wls:context-root>
<wls:container-descriptor>
<wls:show-archived-real-path-enabled>true</wls:show-archived-real-path-enabled>
<wls:prefer-web-inf-classes>true</wls:prefer-web-inf-classes>
</wls:container-descriptor>
-</wls:weblogic-web-app>
\ No newline at end of file +</wls:weblogic-web-app>
|