Author: brushed
Date: Sat Aug 23 13:16:03 2008
New Revision: 688407
URL: http://svn.apache.org/viewvc?rev=688407&view=rev
Log:
v2.7.0-alpha-26 [JSPWIKI-333] Side-impact GroupManager
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=688407&r1=688406&r2=688407&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Aug 23 13:16:03 2008
@@ -1,5 +1,13 @@
2008-08-23 Dirk Frederickx <[EMAIL PROTECTED]>
+ * 2.7.0-alpha-26
+
+ * [JSPWIKI-333] Fixed side-impact in GroupManager due to new
+ InputValidator constructor.
+
+
+2008-08-23 Dirk Frederickx <[EMAIL PROTECTED]>
+
* 2.7.0-alpha-25 Template fixes (mainly section editing)
* The Section-Editing user preference can now also be set via the
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=688407&r1=688406&r2=688407&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sat Aug 23
13:16:03 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "25";
+ public static final String BUILD = "26";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java?rev=688407&r1=688406&r2=688407&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
Sat Aug 23 13:16:03 2008
@@ -579,12 +579,12 @@
public final void validateGroup( WikiContext context, Group group )
{
WikiSession session = context.getWikiSession();
- InputValidator validator = new InputValidator( MESSAGES_KEY, session );
+ InputValidator validator = new InputValidator( MESSAGES_KEY, context );
// Name cannot be null or one of the restricted names
try
{
- checkGroupName( session, group.getName() );
+ checkGroupName( context, group.getName() );
}
catch( WikiSecurityException e )
{
@@ -631,17 +631,12 @@
* <code>null</code> or the Group name is illegal
* @see Group#RESTRICTED_GROUPNAMES
*/
- protected final void checkGroupName( WikiSession session, String name )
throws WikiSecurityException
+ protected final void checkGroupName( WikiContext context, String name )
throws WikiSecurityException
{
//TODO: groups cannot have the same name as a user
- if( session == null )
- {
- throw new WikiSecurityException( "Session cannot be null." );
- }
-
// Name cannot be null
- InputValidator validator = new InputValidator( MESSAGES_KEY, session );
+ InputValidator validator = new InputValidator( MESSAGES_KEY, context );
validator.validateNotNull( name, "Group name" );
// Name cannot be one of the restricted names either
