From 4a84a3921ecc37dd09e473a564656eae6d11a1a2 Mon Sep 17 00:00:00 2001
From: Manuri <amaya.uom@gmail.com>
Date: Fri, 16 Sep 2016 12:15:28 +0530
Subject: [PATCH 1/3] Removing dbconsole related configs

---
 .../src/conf/security/Owasp.CsrfGuard.Carbon.properties        | 3 ---
 modules/distribution/src/conf/tomcat/carbon/WEB-INF/web.xml    | 1 -
 2 files changed, 4 deletions(-)

diff --git a/modules/distribution/src/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules/distribution/src/conf/security/Owasp.CsrfGuard.Carbon.properties
index cc7dbcc..3da239d 100644
--- a/modules/distribution/src/conf/security/Owasp.CsrfGuard.Carbon.properties
+++ b/modules/distribution/src/conf/security/Owasp.CsrfGuard.Carbon.properties
@@ -449,9 +449,6 @@ org.owasp.csrfguard.configOverlay.secondsBetweenUpdateChecks = 60
 # please remove the below entry to enable protection for services.
 org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*
 
-# need to disable protection for db explorer because otherwise it is not possible to login to db console
-org.owasp.csrfguard.unprotected.dbconsole=%servletContext%/dbconsole/*
-
 #to enable access for remote registry
 org.owasp.csrfguard.unprotected.Registry=%servletContext%/registry/*
 
diff --git a/modules/distribution/src/conf/tomcat/carbon/WEB-INF/web.xml b/modules/distribution/src/conf/tomcat/carbon/WEB-INF/web.xml
index f7554f1..f9ddff6 100644
--- a/modules/distribution/src/conf/tomcat/carbon/WEB-INF/web.xml
+++ b/modules/distribution/src/conf/tomcat/carbon/WEB-INF/web.xml
@@ -113,7 +113,6 @@
 
     <filter-mapping>
         <filter-name>HttpHeaderSecurityFilter_Tools</filter-name>
-        <url-pattern>/dbconsole/*</url-pattern>
         <url-pattern>/services/WSDLValidatorService/*</url-pattern>
         <url-pattern>/fileupload/wsdl</url-pattern>
         <url-pattern>/fileupload/tools</url-pattern>

From 7c714f1f9e0fde8dd622d1f0c74ac322e94ccdaa Mon Sep 17 00:00:00 2001
From: Manuri <amaya.uom@gmail.com>
Date: Fri, 16 Sep 2016 12:15:58 +0530
Subject: [PATCH 2/3] Fixing README and release-notes issues

---
 modules/distribution/README.txt         | 4 ++--
 modules/distribution/release-notes.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/distribution/README.txt b/modules/distribution/README.txt
index b5cd976..94363cf 100755
--- a/modules/distribution/README.txt
+++ b/modules/distribution/README.txt
@@ -52,7 +52,7 @@ http://docs.wso2.org/wiki/display/Carbon400/Installation+Prerequisites
 Known Issues
 ------------
 
-All known issues have been recorded at https://wso2.org/jira/browse/CARBON
+All known issues have been recorded at https://wso2.org/jira/browse/DS
 
 Samples:-
 
@@ -208,7 +208,7 @@ Bouncycastle     : http://www.bouncycastle.org/
 
 
 For further details, see the WSO2 Carbon documentation at
-http://wso2.org/project/data-services/3.1.1/docs/
+https://docs.wso2.com/display/DSS351/WSO2+Data+Services+Server+Documentation
 
 ---------------------------------------------------------------------------
  Copyright 2012 WSO2 Inc.
diff --git a/modules/distribution/release-notes.html b/modules/distribution/release-notes.html
index da0cfde..5eac4ee 100755
--- a/modules/distribution/release-notes.html
+++ b/modules/distribution/release-notes.html
@@ -84,7 +84,7 @@ <h2>Key Features</h2>
 <h2>Bug Fixes / Improvements</h2>
 
 <p>Following bug fixes and improvements are available in the current release.
-   <a href="https://wso2.org/jira/issues/?filter=11678">
+   <a href="https://wso2.org/jira/browse/DS-1246?filter=13343">
 dss-3.5.1-fixed-issues</a>
 </p>
 
@@ -110,10 +110,10 @@ <h2>Contact us</h2>
     http://wso2.org/mail</a>
 <br/>
 <br/>
-Alternatively, questions can also be raised in the Data Services Server forum:
+Alternatively, questions can also be raised in the stackoverflow forum:
 <br/>
 <strong>Forum </strong>
-<a href="http://www.wso2.org/forum/404" target="_blank">http://www.wso2.org/forum/404</a>
+<a href="http://stackoverflow.com/questions/tagged/wso2" target="_blank">http://stackoverflow.com/questions/tagged/wso2</a>
 <br/>
 
 <h2>Support</h2>

From 74137c8051aa4597b37e46e7ca4d7929c429ca2e Mon Sep 17 00:00:00 2001
From: Manuri <amaya.uom@gmail.com>
Date: Fri, 16 Sep 2016 12:21:26 +0530
Subject: [PATCH 3/3] Fixing jira links

---
 modules/distribution/release-notes.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/release-notes.html b/modules/distribution/release-notes.html
index 5eac4ee..8ab5c00 100755
--- a/modules/distribution/release-notes.html
+++ b/modules/distribution/release-notes.html
@@ -84,12 +84,12 @@ <h2>Key Features</h2>
 <h2>Bug Fixes / Improvements</h2>
 
 <p>Following bug fixes and improvements are available in the current release.
-   <a href="https://wso2.org/jira/browse/DS-1246?filter=13343">
+   <a href="https://wso2.org/jira/issues/?filter=13343">
 dss-3.5.1-fixed-issues</a>
 </p>
 
 <h2>Known Issues</h2>
-        <p>All known issues have been recorded at <a href="https://wso2.org/jira/issues/?filter=11677">
+        <p>All known issues have been recorded at <a href="https://wso2.org/jira/issues/?filter=13348">
         dss-3.5.1-outstanding-issues</a></p>
 <h2>Reporting Problems</h2>
 Issues can be reported using the public JIRA available at