From 05048442a125d33787032eb84eee5af32b17ec50 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Tue, 20 Dec 2016 17:22:27 +0100
Subject: [PATCH] merged both context.xml files

---
 WebContent/META-INF/context.xml       | 51 ++++++++-------------------
 WebContent/WEB-INF/context.sample.xml | 11 ------
 2 files changed, 15 insertions(+), 47 deletions(-)
 mode change 100644 => 100755 WebContent/META-INF/context.xml
 delete mode 100755 WebContent/WEB-INF/context.sample.xml

diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
old mode 100644
new mode 100755
index 9f5a308..bbeff12
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -1,47 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  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.
--->
-<!-- The contents of this file will be loaded for each web application -->
+<!-- This file should modified and copied to /etc/tomcat7/Catalina/localhost/Zallery.xml -->
 <Context>
 
     <!-- Default set of monitored resources -->
     <WatchedResource>WEB-INF/web.xml</WatchedResource>
-	
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-    <!--
-    <Manager pathname="" />
-    -->
 
-    <!-- Uncomment this to enable Comet connection tacking (provides events
-         on session expiration as well as webapp lifecycle) -->
-    <!--
-    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
-    -->
+	<Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
+	<Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/zallery/" />
+	<Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
+	<Environment type="java.lang.String" name="DATA_PATH" value="C:\\data" />
 
-	<Resource 
-		name="jdbc/mysql" 
-		auth="Container" 
+	<Resource
+		name="jdbc/mysql"
+		auth="Container"
 		type="javax.sql.DataSource"
-		username="main" 
-		password="ZL5CU5qzbx4MzEnA" 
+		username="main"
+		password="ZL5CU5qzbx4MzEnA"
 		driverClassName="com.mysql.jdbc.Driver"
-		url="jdbc:mysql://koc.se:3306/main" 
-		maxActive="8" 
-		maxIdle="4" 
-		validationQuery="SELECT 1" 
+		url="jdbc:mysql://koc.se:3306/main"
+		maxActive="8"
+		maxIdle="4"
+		validationQuery="SELECT 1"
 		testOnBorrow="true" />
+
 </Context>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/context.sample.xml b/WebContent/WEB-INF/context.sample.xml
deleted file mode 100755
index 9c44dd1..0000000
--- a/WebContent/WEB-INF/context.sample.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context>
-
-    <Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
-    <Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/zallery/" />
-    <Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
-    <Environment type="java.lang.String" name="DATA_PATH" value="C:\\data" />
-
-</Context>
-
-