[jboss-cvs] Picketbox SVN: r217 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2011-05-12 11:33:20 -0400 (Thu, 12 May 2011)
New Revision: 217

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersRolesLoginModule.java
Log:
Allow system properties to be used in the file path

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersRolesLoginModule.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersRolesLoginModule.java	2011-05-11 20:42:46 UTC (rev 216)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersRolesLoginModule.java	2011-05-12 15:33:20 UTC (rev 217)
@@ -30,6 +30,8 @@
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.LoginException;
 
+import org.jboss.util.StringPropertyReplacer;
+
 /** A simple Properties map based login module that consults two Java Properties
  formatted text files for username to password("users.properties") and
  username to roles("roles.properties") mapping. The names of the properties
@@ -110,16 +112,16 @@
          // Check for usersProperties & rolesProperties
          String option = (String) options.get("usersProperties");
          if (option != null)
-            usersRsrcName = option;
+            usersRsrcName = StringPropertyReplacer.replaceProperties(option);
          option = (String) options.get("defaultUsersProperties");
          if (option != null)
-            defaultUsersRsrcName = option;
+            defaultUsersRsrcName = StringPropertyReplacer.replaceProperties(option);
          option = (String) options.get("rolesProperties");
          if (option != null)
-            rolesRsrcName = option;
+            rolesRsrcName = StringPropertyReplacer.replaceProperties(option);
          option = (String) options.get("defaultRolesProperties");
          if (option != null)
-            defaultRolesRsrcName = option;
+            defaultRolesRsrcName = StringPropertyReplacer.replaceProperties(option);
          option = (String) options.get("roleGroupSeperator");
          if( option != null )
             roleGroupSeperator = option.charAt(0);