From e6e1dbfb3b1018f8136a9ddc9e54a5097f8d0cf8 Mon Sep 17 00:00:00 2001
From: Bala Raman <srbala@gmail.com>
Date: Sun, 15 Jan 2017 19:05:48 -0500
Subject: Update to web.xml, fix to #1132

Update to web.xml, fix to #1132

Fixes to namespace to fix xml parse error, where strict validation required
---
 src/main/java/WEB-INF/web.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.2.3


From 7bd114df717a8a626da8bd051d59c1d49dd92c75 Mon Sep 17 00:00:00 2001
From: Bala Raman <srbala@gmail.com>
Date: Mon, 16 Jan 2017 14:29:45 -0500
Subject: Update weblogic.xml

Update to web app 3.0 xsd
---
 src/main/java/WEB-INF/weblogic.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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> 
-- 
cgit v1.2.3