Author: iocanel
Date: Thu Sep 16 10:01:15 2010
New Revision: 997668
URL: http://svn.apache.org/viewvc?rev=997668&view=rev
Log:
[KARAF-180] The queries for password and role retrieval can be now passed as
options to the JDBC Login Module.
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java?rev=997668&r1=997667&r2=997668&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
Thu Sep 16 10:01:15 2010
@@ -49,6 +49,8 @@ public class JDBCLoginModule extends Abs
private static final Log LOG =
LogFactory.getLog(PropertiesLoginModule.class);
private static final String DATASOURCE = "datasource";
+ private static final String PASSWORD_QUERY = "query.password";
+ private static final String ROLE_QUERY = "query.role";
private static final String JNDI = "jndi:";
private static final String OSGI = "osgi:";
private String datasourceURL;
@@ -58,6 +60,8 @@ public class JDBCLoginModule extends Abs
public void initialize(Subject subject, CallbackHandler callbackHandler,
Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(subject, callbackHandler, options);
datasourceURL = (String) options.get(DATASOURCE);
+ passwordQuery = (String) options.get(PASSWORD_QUERY);
+ roleQuery = (String) options.get(ROLE_QUERY);
if (datasourceURL == null || datasourceURL.trim().length() == 0) {
LOG.error("No datasource was specified ");
} else if (!datasourceURL.startsWith(JNDI) &&
!datasourceURL.startsWith(OSGI)) {
