ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

merged both context.xml files

Browse source
This commit is contained in:
Ziver Koc 2016-12-20 17:22:27 +01:00
parent 1f215879fd
commit 05048442a1
2 changed files with 15 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

51
WebContent/META-INF/context.xml Normal file → Executable file
View file

@ -1,47 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!-- This file should modified and copied to /etc/tomcat7/Catalina/localhost/Zallery.xml -->
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 -->
<Context> <Context>
<!-- Default set of monitored resources --> <!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource> <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 <Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
on session expiration as well as webapp lifecycle) --> <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" />
<Valve className="org.apache.catalina.valves.CometConnectionManagerValve" /> <Environment type="java.lang.String" name="DATA_PATH" value="C:\\data" />
-->
<Resource <Resource
name="jdbc/mysql" name="jdbc/mysql"
auth="Container" auth="Container"
type="javax.sql.DataSource" type="javax.sql.DataSource"
username="main" username="main"
password="ZL5CU5qzbx4MzEnA" password="ZL5CU5qzbx4MzEnA"
driverClassName="com.mysql.jdbc.Driver" driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://koc.se:3306/main" url="jdbc:mysql://koc.se:3306/main"
maxActive="8" maxActive="8"
maxIdle="4" maxIdle="4"
validationQuery="SELECT 1" validationQuery="SELECT 1"
testOnBorrow="true" /> testOnBorrow="true" />
</Context> </Context>

11
WebContent/WEB-INF/context.sample.xml
View file

@ -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>