You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by rw...@apache.org on 2009/05/12 21:14:34 UTC
svn commit: r774030 - in
/portals/applications/dbbrowser/trunk/dbbrowser-war/src/main:
java/WebAppRootListener.java webapp/WEB-INF/classes/log4j.properties
webapp/WEB-INF/web.xml webapp/logs/
Author: rwatler
Date: Tue May 12 19:14:34 2009
New Revision: 774030
URL: http://svn.apache.org/viewvc?rev=774030&view=rev
Log:
integrate apa-logging via use of org.apache.portals.logdir system property in log4j.properties; remove logging within webapp
Removed:
portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/java/WebAppRootListener.java
portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/logs/
Modified:
portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/classes/log4j.properties
portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml
Modified: portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/classes/log4j.properties?rev=774030&r1=774029&r2=774030&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/classes/log4j.properties (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/classes/log4j.properties Tue May 12 19:14:34 2009
@@ -3,58 +3,58 @@
# 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:$
-#
-# ------------------------------------------------------------------------
-
-#
-# If we don't know the logging facility, put it into the pa.log
-#
-#
-log4j.rootLogger = ERROR, pa
-
-log4j.category.org.apache.jetspeed = ERROR, pa
-log4j.additivity.org.apache.jetspeed = false
-
-#
-# Velocity
-#
-log4j.category.velocity = ERROR, velocity
-log4j.additivity.velocity = false
-
-########################################################################
-#
-# Logfile definitions
-#
-########################################################################
-
-#
-# pa.log
-#
+# 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:$
+#
+# ------------------------------------------------------------------------
+
+#
+# If we don't know the logging facility, put it into the pa.log
+#
+#
+log4j.rootLogger = ERROR, pa
+
+log4j.category.org.apache.jetspeed = ERROR, pa
+log4j.additivity.org.apache.jetspeed = false
+
+#
+# Velocity
+#
+log4j.category.velocity = ERROR, velocity
+log4j.additivity.velocity = false
+
+########################################################################
+#
+# Logfile definitions
+#
+########################################################################
+
+#
+# dbbrowser.log
+#
log4j.appender.pa = org.apache.log4j.FileAppender
-log4j.appender.pa.file = ${org.apache.portals.applications.dbbrowser.webappRoot}/logs/pa.log
+log4j.appender.pa.file = ${org.apache.portals.logdir}/dbbrowser.log
log4j.appender.pa.layout = org.apache.log4j.PatternLayout
log4j.appender.pa.layout.conversionPattern = %d [%t] %-5p %c - %m%n
log4j.appender.pa.append = false
#
-# velocity.log
+# dbbrowser-velocity.log
#
log4j.appender.velocity = org.apache.log4j.FileAppender
-log4j.appender.velocity.file = ${org.apache.portals.applications.dbbrowser.webappRoot}/logs/velocity.log
+log4j.appender.velocity.file = ${org.apache.portals.logdir}/dbbrowser-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
Modified: portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml?rev=774030&r1=774029&r2=774030&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml Tue May 12 19:14:34 2009
@@ -19,14 +19,6 @@
<display-name>Portals Database Browser application</display-name>
<description>Apache Portals Applications: db-browser portlet application</description>
- <context-param>
- <param-name>webAppRootKey</param-name>
- <param-value>org.apache.portals.applications.dbbrowser.webappRoot</param-value>
- </context-param>
- <listener>
- <listener-class>WebAppRootListener</listener-class>
- </listener>
-
<!-- Define Velocity Servlet -->
<servlet>
<servlet-name>velocity</servlet-name>