Repository: ode Updated Branches: refs/heads/ode-1.3.x 073304738 -> 05aec3746
Enabled tomcat logs Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/05aec374 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/05aec374 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/05aec374 Branch: refs/heads/ode-1.3.x Commit: 05aec37468396b110f950e33fd0e7a87e73c1fa4 Parents: 0733047 Author: sathwik <sath...@apache.org> Authored: Tue Mar 6 15:48:38 2018 +0530 Committer: sathwik <sath...@apache.org> Committed: Tue Mar 6 15:48:38 2018 +0530 ---------------------------------------------------------------------- dependencies.rb | 3 +- tomee-server/src/main/server/bin/start.sh | 8 ++- .../src/main/server/conf/logging.properties | 70 ++++++++++++++++++++ 3 files changed, 79 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/05aec374/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index 3b3fa8d..66c496f 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -213,7 +213,8 @@ TOMEE = struct( "tomcat-websocket", "tomcat-juli", :under=>"org.apache.tomcat", :version=>"8.5.23" - ) + ), + "org.apache.tomcat.extras:tomcat-extras-juli:jar:8.5.2" ], :javaee_api => "org.apache.tomee:javaee-api:jar:7.0-1", :commons => ["org.apache.commons:commons-lang3:jar:3.5", http://git-wip-us.apache.org/repos/asf/ode/blob/05aec374/tomee-server/src/main/server/bin/start.sh ---------------------------------------------------------------------- diff --git a/tomee-server/src/main/server/bin/start.sh b/tomee-server/src/main/server/bin/start.sh index 6e3cc02..f8ccac8 100755 --- a/tomee-server/src/main/server/bin/start.sh +++ b/tomee-server/src/main/server/bin/start.sh @@ -57,6 +57,7 @@ ODE_SERVER_LIB="$ODE_SERVER_HOME/lib" ODE_SERVER_CONF="$ODE_SERVER_HOME/conf" + if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -96,8 +97,13 @@ done ODE_SERVER_JAVAOPTS="$JAVA_OPTS \ -Dode.server.home=$ODE_SERVER_HOME \ -Dderby.system.home=$ODE_SERVER_HOME \ +-Dcatalina.base=$ODE_SERVER_HOME \ +-Dcatalina.home=$ODE_SERVER_HOME \ -Djava.naming.factory.initial=org.apache.openejb.core.OpenEJBInitialContextFactory \ --Dorg.jboss.logging.provider=slf4j" +-Dorg.jboss.logging.provider=slf4j \ +-Djava.util.logging.config.file=$ODE_SERVER_HOME/conf/logging.properties \ +-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" + # For Cygwin, switch paths to Windows format before running java http://git-wip-us.apache.org/repos/asf/ode/blob/05aec374/tomee-server/src/main/server/conf/logging.properties ---------------------------------------------------------------------- diff --git a/tomee-server/src/main/server/conf/logging.properties b/tomee-server/src/main/server/conf/logging.properties new file mode 100644 index 0000000..a2ad9c2 --- /dev/null +++ b/tomee-server/src/main/server/conf/logging.properties @@ -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
