# HG changeset patch
# User smith@nwoca.org
# Date 1476315596 -3600
# Node ID 120fc16ea5113573722c83a4e3262347d80a80cd
# Parent  fe7b8e3b4100c78fd3fe8df35ac2dcf27a297d32
USASR-2388: update tomcat. customize logging.  disable autodepoy.

diff -r fe7b8e3b4100 -r 120fc16ea511 tomcat/Dockerfile
--- a/tomcat/Dockerfile	Thu Sep 22 01:49:20 2016 +0100
+++ b/tomcat/Dockerfile	Thu Oct 13 00:39:56 2016 +0100
@@ -1,4 +1,4 @@
-FROM tomcat:8.0.33-jre8
+FROM tomcat:8.5.5-jre8
 
 MAINTAINER Dave Smith <smith@nwoca.org>
 
@@ -10,7 +10,7 @@
 WORKDIR /usr/local/tomcat
 
 COPY setenv.sh bin/
-COPY tomcat-users.xml server.xml context.xml conf/
+COPY tomcat-users.xml server.xml context.xml logging.properties conf/
 
 RUN rm -rf webapps/docs webapps/ROOT webapps/examples webapps/docs webapps/host-manager \
 	&& chmod +x bin/setenv.sh
@@ -19,4 +19,4 @@
 
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu/
 
-RUN apt-get install -y libtcnative-1
\ No newline at end of file
+RUN apt-get install -y libtcnative-1
diff -r fe7b8e3b4100 -r 120fc16ea511 tomcat/context.xml
--- a/tomcat/context.xml	Thu Sep 22 01:49:20 2016 +0100
+++ b/tomcat/context.xml	Thu Oct 13 00:39:56 2016 +0100
@@ -17,6 +17,8 @@
 -->
 <Context>
 
+    <Resources cachingAllowed="false"/>
+
     <!-- Uncomment this to disable session persistence across Tomcat restarts -->
     <Manager pathname="" />
 
diff -r fe7b8e3b4100 -r 120fc16ea511 tomcat/logging.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tomcat/logging.properties	Thu Oct 13 00:39:56 2016 +0100
@@ -0,0 +1,70 @@
+# 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.
+
+handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
+
+3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
+
+#4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+#4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+#4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+
+#org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+#org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff -r fe7b8e3b4100 -r 120fc16ea511 tomcat/server.xml
--- a/tomcat/server.xml	Thu Sep 22 01:49:20 2016 +0100
+++ b/tomcat/server.xml	Thu Oct 13 00:39:56 2016 +0100
@@ -63,7 +63,7 @@
                resourceName="UserDatabase"/>
       </Realm>
 
-      <Host name="localhost"  appBase="webapps" unpackWARs="true" autoDeploy="true">
+      <Host name="localhost"  appBase="webapps" unpackWARs="false" autoDeploy="false">
         <Valve className="org.apache.catalina.valves.AccessLogValve" 
 				directory="logs"
                 prefix="localhost_access_log" suffix=".txt"