You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2010/04/08 15:31:22 UTC
svn commit: r931932 - in /portals/jetspeed-2/portal/trunk/jetspeed-installer:
etc/ant-installer/antinstall-config.xml etc/tomcat/conf/logging.properties
jetspeed-mvn-tomcat-portal-pom.xml
Author: ate
Date: Thu Apr 8 13:31:22 2010
New Revision: 931932
URL: http://svn.apache.org/viewvc?rev=931932&view=rev
Log:
Bundle latest Tomcat 6.0.26 with the jetspeed installer.
Note: also adding an logging.properties override, see: https://issues.apache.org/jira/browse/JS2-1183
Added:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/logging.properties
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=931932&r1=931931&r2=931932&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml Thu Apr 8 13:31:22 2010
@@ -96,7 +96,7 @@
<page type="input" name="requiredComponents" displayText="Components selection, (Demo)" ifProperty="(${operation}=install) AND (${installationType}=demo)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
<comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT, (Demo)" bold="true" />
- <target displayText="Tomcat 6.0.18 Webserver" target="install" defaultValue="true" force="true" />
+ <target displayText="Tomcat 6.0.26 Webserver" target="install" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Administration Portlets" property="dummy" defaultValue="true" force="true" />
@@ -110,7 +110,7 @@
<page type="input" name="requiredComponents" displayText="Components selection, (Minimal)" ifProperty="(${operation}=install) AND (${installationType}=minimal)">
<hidden property="setupDBAntTarget" value="runSetupNoDB" />
<comment displayText="Jetspeed Enterprise Portal version 2.2.1-SNAPSHOT" bold="true" />
- <target displayText="Tomcat 6.0.18 Webserver" target="install" defaultValue="true" force="true" />
+ <target displayText="Tomcat 6.0.26 Webserver" target="install" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy" defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Administration Portlets" property="dummy" defaultValue="true" force="true" />
Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/logging.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/logging.properties?rev=931932&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/logging.properties (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/logging.properties Thu Apr 8 13:31:22 2010
@@ -0,0 +1,67 @@
+# 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.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+3manager.org.apache.juli.FileHandler.level = FINE
+3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.FileHandler.prefix = manager.
+
+4host-manager.org.apache.juli.FileHandler.level = FINE
+4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# 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.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
+
+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.FileHandler
+
+# directing WebappClassLoader messages to 2localhost FileHandler instead of to Console
+org.apache.catalina.loader.WebappClassLoader.handlers = 2localhost.org.apache.juli.FileHandler
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#org.apache.catalina.startup.ContextConfig.level = FINE
+#org.apache.catalina.startup.HostConfig.level = FINE
+#org.apache.catalina.session.ManagerBase.level = FINE
+#org.apache.catalina.core.AprLifecycleListener.level=FINE
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=931932&r1=931931&r2=931932&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml Thu Apr 8 13:31:22 2010
@@ -39,7 +39,7 @@
<properties>
<tomcat.version.major>6</tomcat.version.major>
- <tomcat.version.minor>6.0.18</tomcat.version.minor>
+ <tomcat.version.minor>6.0.26</tomcat.version.minor>
<tomcat.name>apache-tomcat-${tomcat.version.minor}</tomcat.name>
<org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
<org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
@@ -81,6 +81,7 @@
<delete file="${org.apache.jetspeed.portal.home}/bin/catalina.sh"/>
<delete file="${org.apache.jetspeed.portal.home}/conf/context.xml"/>
<delete file="${org.apache.jetspeed.portal.home}/conf/server.xml"/>
+ <delete file="${org.apache.jetspeed.portal.home}/conf/logging.properties"/>
<delete file="${org.apache.jetspeed.portal.home}/conf/tomcat-users.xml"/>
<delete dir="${org.apache.jetspeed.portal.home}/webapps/examples"/>
<delete dir="${org.apache.jetspeed.portal.home}/webapps/docs"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org