You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by fl...@apache.org on 2008/11/30 13:09:30 UTC
svn commit: r721805 - in /incubator/jspwiki/trunk: ChangeLog
etc/log4j.properties
Author: florianh
Date: Sun Nov 30 04:09:30 2008
New Revision: 721805
URL: http://svn.apache.org/viewvc?rev=721805&view=rev
Log:
corrected a copy & paste error in the newly introduced log4j.properties
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/log4j.properties
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=721805&r1=721804&r2=721805&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Nov 30 04:09:30 2008
@@ -1,3 +1,7 @@
+2008-11-30 Florian Holeczek <fl...@apache.org>
+
+ * corrected a copy & paste error in the newly introduced log4j.properties
+
2008-11-29 Dirk Frederickx <di...@gmail.com>
* 3.0.0-svn-14
Modified: incubator/jspwiki/trunk/etc/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/log4j.properties?rev=721805&r1=721804&r2=721805&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/log4j.properties (original)
+++ incubator/jspwiki/trunk/etc/log4j.properties Sun Nov 30 04:09:30 2008
@@ -1,4 +1,3 @@
-
###########################################################################
#
# Configure logs. See log4j documentation for more information
@@ -71,24 +70,3 @@
#log4j.appender.SpamAppender.File = @spamlog@
#log4j.appender.SpamAppender.layout = org.apache.log4j.PatternLayout
#log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
-
-###########################################################################
-#
-# Workflow configuration
-#
-# The following properties map specific workflow steps to their associated approvers
-# The name of the workflow or decision is the part of the key after "jspwiki.approver.".
-# This is a logical name JSPWiki uses to determine which Principal to consult for approval.
-# The Principal is identified up by AuthorizationManager at runtime; it looks for a Principal
-# match as follows: GroupPrincipals; Roles; WikiPrincipals/other principals. Thus, if a value
-# of "Admin" is supplied JSPWiki will first check the GroupManager to see if group Admin exits;
-# then the container roles, if any; then, user Principals. If the value is blank or the
-# property is commented out, it means that the workflow does not require approval.
-#
-# EXAMPLE:
-# Uncomment the next line to require the Admin group (or Admin user, if a group is not found)
-# to approve wiki pages after saving.
-#jspwiki.approver.workflow.saveWikiPage=Admin
-
-# Uncomment the next line to require the Admin group to approve new user profiles
-#jspwiki.approver.workflow.createUserProfile=Admin