jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r797654 - in /incubator/jspwiki/trunk: ChangeLog etc/priha.properties src/WebContent/WEB-INF/classes/log4j.properties src/WebContent/WEB-INF/classes/priha.properties src/java/org/apache/wiki/Release.java
Date Fri, 24 Jul 2009 21:00:47 GMT
Author: jalkanen
Date: Fri Jul 24 21:00:47 2009
New Revision: 797654

URL: http://svn.apache.org/viewvc?rev=797654&view=rev
Log:
Installed default priha and log4j properties.

Added:
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/priha.properties
      - copied unchanged from r797203, incubator/jspwiki/trunk/etc/priha.properties
Removed:
    incubator/jspwiki/trunk/etc/priha.properties
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=797654&r1=797653&r2=797654&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Jul 24 21:00:47 2009
@@ -1,5 +1,14 @@
 2009-07-23 Janne Jalkanen <jalkanen@apache.org>
 
+        * 3.0.0-svn-136
+        
+        * Improved LoggerFactory not to fail horribly when the SLF4J
+        bridge classes were missing.
+        
+        * Installed default priha and log4j config files to WEB-INF/classes
+        
+2009-07-23 Janne Jalkanen <jalkanen@apache.org>
+
         * 3.0.0-svn-135
         
         * Moved some classes from the top-level package to better places.

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties?rev=797654&r1=797653&r2=797654&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties Fri Jul 24 21:00:47
2009
@@ -48,7 +48,7 @@
 log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
 log4j.appender.FileLog.MaxFileSize    = 10MB
 log4j.appender.FileLog.MaxBackupIndex = 14
-log4j.appender.FileLog.File = @logfile@
+log4j.appender.FileLog.File = /tmp/jspwiki.log
 log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
 log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
 
@@ -97,9 +97,9 @@
 #log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
 
 # Enable this if you want to debug the Stripes framework
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-log4j.rootLogger=INFO, stdout
-log4j.logger.net.sourceforge.stripes=DEBUG
+#log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout.Target=System.out
+#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+#log4j.rootLogger=INFO, stdout
+#log4j.logger.net.sourceforge.stripes=DEBUG

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=797654&r1=797653&r2=797654&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Fri Jul 24 21:00:47 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "135";
+    public static final String     BUILD         = "136";
 
     /**
      *  This is the generic version string you should use



Mime
View raw message