From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Mar 2011 00:34:24 +0000 (+0000)
Subject: Allows usernames with uppercase
X-Git-Tag: argeo-commons-2.1.30~1321
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=239b41dca64d630abc357e67f9d00391008264c9;p=lgpl%2Fargeo-commons.git

Allows usernames with uppercase

git-svn-id: https://svn.argeo.org/commons/trunk@4357 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java
index dddec0357..964c9dff2 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java
@@ -4,14 +4,14 @@ import java.util.Set;
 
 import org.springframework.security.userdetails.UserDetailsManager;
 
-public interface UserAdminService extends UserDetailsManager{
+public interface UserAdminService extends UserDetailsManager {
 	/**
 	 * Usernames must match this regexp pattern ({@value #USERNAME_PATTERN}).
 	 * Thanks to <a href=
 	 * "http://www.mkyong.com/regular-expressions/how-to-validate-username-with-regular-expression/"
-	 * >this tip</a> (modified to remove '-')
+	 * >this tip</a> (modified to remove '-' and add upper-case)
 	 */
-	public final static String USERNAME_PATTERN = "^[a-z0-9_]{3,15}$";
+	public final static String USERNAME_PATTERN = "^[a-zA-Z0-9_]{3,15}$";
 
 	/**
 	 * Email addresses must match this regexp pattern ({@value #EMAIL_PATTERN}.
diff --git a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
index a2d790a94..19fba3775 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
+++ b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
@@ -10,9 +10,9 @@ mixin
 // user should be lower case, between 3 and 15 characters long
 [argeo:userHome] > mix:created, mix:lastModified
 mixin
-- argeo:userID (STRING) m < '^[a-z0-9_]{3,15}$'
+- argeo:userID (STRING) m
 + argeo:profile (argeo:userProfile)
 
 [argeo:userProfile] > mix:created, mix:lastModified, mix:title, mix:versionable
 mixin
-- argeo:userID (STRING) m < '^[a-z0-9_]{3,15}$'
+- argeo:userID (STRING) m