portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r774040 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/resources/ applications/jetspeed/src/main/webapp/WEB-INF/ applications/jetspeed/src/main/webapp/WEB-INF/conf/ applications/jetspeed/src/main/webapp/logs/ jetspeed...
Date Tue, 12 May 2009 19:22:41 GMT
Author: rwatler
Date: Tue May 12 19:22:41 2009
New Revision: 774040

URL: http://svn.apache.org/viewvc?rev=774040&view=rev
Log:
APA-9: integrate apa-logging via use of org.apache.portals.logdir system property in log4j.properties;
remove logging within webapp

Added:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.properties
Removed:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/conf/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/logs/
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/debug/Log4j.properties
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.properties?rev=774040&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.properties
(added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.properties
Tue May 12 19:22:41 2009
@@ -0,0 +1,172 @@
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id: Log4j.properties 772479 2009-05-07 00:43:28Z ate $
+#
+# ------------------------------------------------------------------------
+
+#
+# Default Logger
+#
+log4j.rootLogger = ERROR, jetspeed
+
+#
+# Jetspeed Categories
+#
+log4j.category.org.apache.jetspeed = ERROR, jetspeed
+log4j.additivity.org.apache.jetspeed = false
+
+log4j.category.org.apache.jetspeed.tools = ERROR, jetspeed
+log4j.additivity.org.apache.jetspeed.tools = false
+
+log4j.category.org.apache.portals.tutorials = ERROR, jetspeed
+log4j.additivity.org.apache.portals.tutorials = false
+
+#
+# Digester Category
+#
+log4j.category.org.apache.commons.digester = ERROR, digester
+log4j.additivity.org.apache.commons.digester = false
+
+#
+# Diagnostics Category
+#
+log4j.category.diagnostics = ERROR, diagnostics
+log4j.additivity.diagnostics = false
+
+#
+# Velocity Logfile
+#
+log4j.category.velocity = ERROR, velocity
+log4j.additivity.velocity = false
+
+#
+# OJB Logfile
+#
+log4j.category.org.apache.ojb= ERROR, ojb
+log4j.additivity.org.apache.ojb= false
+
+#
+# Scheduler Category
+#
+log4j.category.scheduler = ERROR, scheduler
+log4j.additivity.scheduler = false
+
+#
+# Pluto Category
+#
+log4j.category.org.apache.pluto = ERROR, pluto
+log4j.additivity.org.apache.pluto = false
+
+#
+# Deployment Category
+#
+log4j.category.deployment = ERROR, deployment
+log4j.additivity.deployment = false
+
+#
+# Console Category
+#
+log4j.category.console = ERROR, console
+log4j.additivity.console = false
+
+########################################################################
+#
+# Logfile definitions
+#
+########################################################################
+
+#
+# jetspeed.log
+#
+log4j.appender.jetspeed = org.apache.log4j.FileAppender
+log4j.appender.jetspeed.file = ${org.apache.portals.logdir}/jetspeed.log
+log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
+log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.jetspeed.append = false
+
+#
+# jetspeed-diagnostics.log
+#
+log4j.appender.diagnostics = org.apache.log4j.FileAppender
+log4j.appender.diagnostics.file = ${org.apache.portals.logdir}/jetspeed-diagnostics.log
+log4j.appender.diagnostics.layout = org.apache.log4j.PatternLayout
+log4j.appender.diagnostics.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.diagnostics.append = false
+
+#
+# digester.log
+#
+log4j.appender.digester = org.apache.log4j.FileAppender
+log4j.appender.digester.file = ${org.apache.portals.logdir}/jetspeed-digester.log
+log4j.appender.digester.layout = org.apache.log4j.PatternLayout
+log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.digester.append = false
+
+#
+# pluto.log
+#
+log4j.appender.pluto = org.apache.log4j.FileAppender
+log4j.appender.pluto.file = ${org.apache.portals.logdir}/jetspeed-pluto.log
+log4j.appender.pluto.layout = org.apache.log4j.PatternLayout
+log4j.appender.pluto.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.pluto.append = false
+
+#
+# deployment.log
+#
+log4j.appender.deployment = org.apache.log4j.FileAppender
+log4j.appender.deployment.file = ${org.apache.portals.logdir}/jetspeed-deployment.log
+log4j.appender.deployment.layout = org.apache.log4j.PatternLayout
+log4j.appender.deployment.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.deployment.append = false
+
+#
+# jetspeed-scheduler.log
+#
+log4j.appender.scheduler = org.apache.log4j.FileAppender
+log4j.appender.scheduler.file = ${org.apache.portals.logdir}/jetspeed-scheduler.log
+log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
+log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.scheduler.append = false
+
+#
+# jetspeed-velocity.log
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${org.apache.portals.logdir}/jetspeed-velocity.log
+log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
+log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.velocity.append = false
+
+#
+# jetspeed-ojb.log
+#
+log4j.appender.ojb = org.apache.log4j.FileAppender
+log4j.appender.ojb.file = ${org.apache.portals.logdir}/jetspeed-ojb.log
+log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
+log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.ojb.append = false
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%5p: %m%n

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml?rev=774040&r1=774039&r2=774040&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
Tue May 12 19:22:41 2009
@@ -24,11 +24,6 @@
     <param-value>org.apache.portals.jetspeed-2.applicationRoot</param-value>
   </context-param>
     
-  <context-param>
-    <param-name>log4jConfigLocation</param-name>
-    <param-value>/WEB-INF/conf/Log4j.properties</param-value>
-  </context-param>
-      
   <!-- for deploying on Websphere: disable Websphere default portletcontainer -->
   <context-param>
     <param-name>com.ibm.websphere.portletcontainer.PortletDeploymentEnabled</param-name>
@@ -70,9 +65,6 @@
   </filter-mapping>  
 -->  
   <listener>
-    <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-  </listener>  
-  <listener>
     <listener-class>org.apache.jetspeed.engine.JetspeedServlet</listener-class>
   </listener>
 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml?rev=774040&r1=774039&r2=774040&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml Tue May
12 19:22:41 2009
@@ -83,19 +83,6 @@
        </filterset>
     </move>
 
-  	<echo>Configuring log directories</echo>
-    <delete dir="${installDir}/webapps/jetspeed/WEB-INF/logs" />
-    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties" 
-        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties.unfiltered"/>
-    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties.unfiltered"

-        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties"
-       	overwrite="true">
-		 <!-- note that the $ is escaped here -->
-       <filterset begintoken="$${applicationRoot}" endtoken="logs/">
-         <filter token="/" value="$${applicationRoot}/../../logs/jetspeed/" />
-       </filterset>
-    </move>
-
     <echo>Setting up the Jetspeed database (if selected)</echo>
     <ant antfile="${installDir}/database/build.xml" target="${setupDBAntTarget}" dir="${installDir}/database"
/>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message