portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r774033 - in /portals/jetspeed-2/applications/j2-admin/trunk/src: main/resources/log4j.properties webapp/WEB-INF/log4j.properties webapp/WEB-INF/web.xml webapp/logs/
Date Tue, 12 May 2009 19:15:06 GMT
Author: rwatler
Date: Tue May 12 19:15:06 2009
New Revision: 774033

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

Removed:
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/log4j.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/logs/
Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/log4j.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/log4j.properties?rev=774033&r1=774032&r2=774033&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/log4j.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/log4j.properties Tue
May 12 19:15:06 2009
@@ -12,21 +12,49 @@
 # 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.debug=TRUE
+#
+# If we don't know the logging facility, put it into the pa.log
+# 
+#
+log4j.rootLogger = ERROR, pa
 
-#log4j.rootLogger=FATAL, stdout
-#log4j.rootLogger=ERROR, stdout
-log4j.rootLogger=WARN, stdout
-#log4j.rootLogger=INFO, stdout
-#log4j.rootLogger=DEBUG, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+log4j.category.org.apache.jetspeed = ERROR, pa
+log4j.additivity.org.apache.jetspeed = false
 
-# spring portlet mvc classes
-log4j.logger.org.springframework.web.portlet=DEBUG
+#
+# Velocity
+#
+log4j.category.velocity = ERROR, velocity
+log4j.additivity.velocity = false
 
-# spring portlet mvc sample classes
-log4j.logger.org.springframework.web.portlet.sample=DEBUG
+########################################################################
+#
+# Logfile definitions
+#
+########################################################################
+
+#
+# j2-admin.log
+#
+log4j.appender.pa = org.apache.log4j.FileAppender
+log4j.appender.pa.file = ${org.apache.portals.logdir}/j2-admin.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
+
+#
+# j2-admin-velocity.log
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${org.apache.portals.logdir}/j2-admin-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/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml?rev=774033&r1=774032&r2=774033&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml Tue May 12 19:15:06
2009
@@ -32,16 +32,6 @@
       <param-value>deployment</param-value>
     </context-param>
     
-    <context-param>
-		<param-name>webAppRootKey</param-name>
-	    <param-value>org.apache.portals.applications.j2-admin.applicationRoot</param-value>
-	</context-param>
-
-    <context-param>
-        <param-name>log4jConfigLocation</param-name>
-        <param-value>/WEB-INF/log4j.properties</param-value>
-    </context-param>
-	
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>/WEB-INF/springmvc/context/applicationContext.xml</param-value>
@@ -193,14 +183,6 @@
       
   	<!-- Listener, that does all the startup work (configuration, init). -->
 
-    <listener>
-		<listener-class>org.springframework.web.util.WebAppRootListener</listener-class>
-	</listener>
-
-    <listener>
-        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-    </listener>
-
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>



---------------------------------------------------------------------
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