From c6cd9a21fb6c064b7e583b77a8ce9abe014347d2 Mon Sep 17 00:00:00 2001
From: Theus Hossmann <theus.hossmann@swisscom.com>
Date: Mon, 4 Aug 2014 13:03:17 +0200
Subject: [PATCH 1/5] addint users

---
 resources/tomcat/conf/tomcat-users.xml | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 resources/tomcat/conf/tomcat-users.xml

diff --git a/resources/tomcat/conf/tomcat-users.xml b/resources/tomcat/conf/tomcat-users.xml
new file mode 100644
index 0000000000..90fe62f48d
--- /dev/null
+++ b/resources/tomcat/conf/tomcat-users.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='cp1252'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<tomcat-users>
+<role rolename="interactive-gui"/>
+<user username="taahoth1" password="mypass" roles="interactive-gui" />
+<!--
+  NOTE:  By default, no user is included in the "manager-gui" role required
+  to operate the "/manager/html" web application.  If you wish to use this app,
+  you must define such a user - the username and password are arbitrary.
+-->
+<!--
+  NOTE:  The sample user and role entries below are wrapped in a comment
+  and thus are ignored when reading this file. Do not forget to remove
+  <!.. ..> that surrounds them.
+-->
+<!--
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <user username="tomcat" password="tomcat" roles="tomcat"/>
+  <user username="both" password="tomcat" roles="tomcat,role1"/>
+  <user username="role1" password="tomcat" roles="role1"/>
+-->
+</tomcat-users>

From 7972cabcab281a5a0b5b5f5ac46b33677648c00e Mon Sep 17 00:00:00 2001
From: Theus Hossmann <theus.hossmann@swisscom.com>
Date: Mon, 4 Aug 2014 13:33:59 +0200
Subject: [PATCH 2/5] config of JDBC datasource

---
 resources/tomcat/conf/server.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml
index 0b94ee9cde..a0eb6b92a1 100644
--- a/resources/tomcat/conf/server.xml
+++ b/resources/tomcat/conf/server.xml
@@ -24,6 +24,11 @@
         <Connector port='${http.port}' bindOnInit="false"/>
 
         <Engine defaultHost='localhost' name='Catalina'>
+			<Realm className="org.apache.catalina.realm.JDBCRealm"
+				driverName="org.mariadb.jdbc.Driver"
+				connectionURL="jdbc:MariaDB://FEOYYAJn6p6phe8l:KuIyoR8oBNNe3LTr@100.64.2.103:3306/cf_a58de310_3dd8_4a13_badd_6b0bc7c67b2e"
+				userTable="users" userNameCol="user_name" userCredCol="user_pass"
+				userRoleTable="user_roles" roleNameCol="role_name"/>
             <Valve className="org.apache.catalina.valves.RemoteIpValve" protocolHeader="x-forwarded-proto"/>
             <Valve className="com.gopivotal.cloudfoundry.tomcat.logging.access.CloudFoundryAccessLoggingValve"
                    pattern='[ACCESS] %h %l %t %D %F %B %S vcap_request_id:%{X-Vcap-Request-Id}i' enabled="${access.logging.enabled}"/>

From 5b129479904ab7209f31bbef090d0760af300fca Mon Sep 17 00:00:00 2001
From: Theus Hossmann <theus.hossmann@swisscom.com>
Date: Mon, 4 Aug 2014 16:13:27 +0200
Subject: [PATCH 3/5] mysql connection string

---
 resources/tomcat/conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml
index a0eb6b92a1..1eabd1ff81 100644
--- a/resources/tomcat/conf/server.xml
+++ b/resources/tomcat/conf/server.xml
@@ -26,7 +26,7 @@
         <Engine defaultHost='localhost' name='Catalina'>
 			<Realm className="org.apache.catalina.realm.JDBCRealm"
 				driverName="org.mariadb.jdbc.Driver"
-				connectionURL="jdbc:MariaDB://FEOYYAJn6p6phe8l:KuIyoR8oBNNe3LTr@100.64.2.103:3306/cf_a58de310_3dd8_4a13_badd_6b0bc7c67b2e"
+				connectionURL="jdbc:mysql://FEOYYAJn6p6phe8l:KuIyoR8oBNNe3LTr@100.64.2.103:3306/cf_a58de310_3dd8_4a13_badd_6b0bc7c67b2e"
 				userTable="users" userNameCol="user_name" userCredCol="user_pass"
 				userRoleTable="user_roles" roleNameCol="role_name"/>
             <Valve className="org.apache.catalina.valves.RemoteIpValve" protocolHeader="x-forwarded-proto"/>

From 37435a71541306216cece6c80c5e674e574b844b Mon Sep 17 00:00:00 2001
From: Theus Hossmann <theus.hossmann@swisscom.com>
Date: Mon, 4 Aug 2014 17:03:27 +0200
Subject: [PATCH 4/5] removed mysql connection string

---
 resources/tomcat/conf/server.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml
index 1eabd1ff81..0acc81fcba 100644
--- a/resources/tomcat/conf/server.xml
+++ b/resources/tomcat/conf/server.xml
@@ -24,11 +24,7 @@
         <Connector port='${http.port}' bindOnInit="false"/>
 
         <Engine defaultHost='localhost' name='Catalina'>
-			<Realm className="org.apache.catalina.realm.JDBCRealm"
-				driverName="org.mariadb.jdbc.Driver"
-				connectionURL="jdbc:mysql://FEOYYAJn6p6phe8l:KuIyoR8oBNNe3LTr@100.64.2.103:3306/cf_a58de310_3dd8_4a13_badd_6b0bc7c67b2e"
-				userTable="users" userNameCol="user_name" userCredCol="user_pass"
-				userRoleTable="user_roles" roleNameCol="role_name"/>
+
             <Valve className="org.apache.catalina.valves.RemoteIpValve" protocolHeader="x-forwarded-proto"/>
             <Valve className="com.gopivotal.cloudfoundry.tomcat.logging.access.CloudFoundryAccessLoggingValve"
                    pattern='[ACCESS] %h %l %t %D %F %B %S vcap_request_id:%{X-Vcap-Request-Id}i' enabled="${access.logging.enabled}"/>

From 26825f17c84e1909d63d00e232e33b64285bab99 Mon Sep 17 00:00:00 2001
From: Theus Hossmann <theus.hossmann@swisscom.com>
Date: Tue, 5 Aug 2014 11:24:21 +0200
Subject: [PATCH 5/5] enable compression for json files

---
 resources/tomcat/conf/server.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/tomcat/conf/server.xml b/resources/tomcat/conf/server.xml
index 0acc81fcba..01f2ee2c06 100644
--- a/resources/tomcat/conf/server.xml
+++ b/resources/tomcat/conf/server.xml
@@ -21,7 +21,11 @@
     <Listener className='org.apache.catalina.core.JasperListener'/>
 
     <Service name='Catalina'>
-        <Connector port='${http.port}' bindOnInit="false"/>
+        <Connector 
+			port='${http.port}' 
+			bindOnInit="false"
+			compressableMimeType="text/html,text/xml,text/plain,application/json,application/javascript"
+			compression="on"/>
 
         <Engine defaultHost='localhost' name='Catalina'>