portals-portalapps-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r774029 - in /portals/applications/demo/trunk/src/main: java/WebAppRootListener.java resources/log4j.properties webapp/WEB-INF/web.xml webapp/logs/
Date Tue, 12 May 2009 19:14:15 GMT
Author: rwatler
Date: Tue May 12 19:14:15 2009
New Revision: 774029

URL: http://svn.apache.org/viewvc?rev=774029&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/demo/trunk/src/main/java/WebAppRootListener.java
    portals/applications/demo/trunk/src/main/webapp/logs/
Modified:
    portals/applications/demo/trunk/src/main/resources/log4j.properties
    portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml

Modified: portals/applications/demo/trunk/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/resources/log4j.properties?rev=774029&r1=774028&r2=774029&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/resources/log4j.properties (original)
+++ portals/applications/demo/trunk/src/main/resources/log4j.properties Tue May 12 19:14:15
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
+#
+########################################################################
+
+#
+# demo.log
+#
 log4j.appender.pa = org.apache.log4j.FileAppender
-log4j.appender.pa.file = ${org.apache.portals.applications.demo.webappRoot}/logs/pa.log
+log4j.appender.pa.file = ${org.apache.portals.logdir}/demo.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
+# demo-velocity.log
 #
 log4j.appender.velocity = org.apache.log4j.FileAppender
-log4j.appender.velocity.file = ${org.apache.portals.applications.demo.webappRoot}/logs/velocity.log
+log4j.appender.velocity.file = ${org.apache.portals.logdir}/demo-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/demo/trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml?rev=774029&r1=774028&r2=774029&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml Tue May 12 19:14:15 2009
@@ -25,15 +25,6 @@
     <param-value>false</param-value>
   </context-param>
 
-  <context-param>
-    <param-name>webAppRootKey</param-name>
-    <param-value>org.apache.portals.applications.demo.webappRoot</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>WebAppRootListener</listener-class>
-  </listener>
-    
   <!-- Define Velocity Servlet -->
   <servlet>
     <servlet-name>velocity</servlet-name>



Mime
View raw message