Author: chathura
Date: Mon Dec 17 04:31:07 2007
New Revision: 11241
Log:
Changed data source related code to use DataSource interface everywhere.
And a minor bug fix.
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAccessControlAdmin.java
Mon Dec 17 04:31:07 2007
@@ -11,12 +11,14 @@
import org.wso2.usermanager.AccessControlAdmin;
import org.wso2.usermanager.UserManagerException;
+import javax.sql.DataSource;
+
public class DefaultAccessControlAdmin
extends DefaultAuthorizer implements AccessControlAdmin {
private static Log log = LogFactory.getLog(DefaultAuthenticator.class);
- public DefaultAccessControlAdmin(BasicDataSource dataSource, String algo) {
+ public DefaultAccessControlAdmin(DataSource dataSource, String algo) {
super(dataSource, algo);
}
@@ -24,7 +26,7 @@
String action) throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -78,7 +80,7 @@
String idUserPermission = UUIDGenerator.getUUID();
short allow = 0;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -119,7 +121,7 @@
String idRolePermission = UUIDGenerator.getUUID();
short allow = 1;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -159,7 +161,7 @@
String idRolePermission = UUIDGenerator.getUUID();
short allow = 0;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -190,7 +192,7 @@
String action) throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -237,7 +239,7 @@
throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -265,7 +267,7 @@
throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -379,7 +381,7 @@
String idUserPermission = UUIDGenerator.getUUID();
short allow = 1;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -418,7 +420,7 @@
String permissionId = null;
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthenticator.java
Mon Dec 17 04:31:07 2007
@@ -7,25 +7,26 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.usermanager.Authenticator;
import org.wso2.usermanager.UserManagerException;
import org.wso2.usermanager.util.Base64;
+import javax.sql.DataSource;
+
public class DefaultAuthenticator implements Authenticator {
private static Log log = LogFactory.getLog(DefaultAuthenticator.class);
- protected BasicDataSource basicDataSource = null;
+ protected DataSource dataSource = null;
protected DefaultRealm realm = null;
protected UserStoreData data = null;
- public DefaultAuthenticator(BasicDataSource dataSource) {
- this.basicDataSource = dataSource;
+ public DefaultAuthenticator(DataSource dataSource) {
+ this.dataSource = dataSource;
this.data = new UserStoreData(dataSource);
}
@@ -34,7 +35,7 @@
boolean isAuth = false;
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultAuthorizer.java
Mon Dec 17 04:31:07 2007
@@ -13,15 +13,17 @@
import org.wso2.usermanager.Authorizer;
import org.wso2.usermanager.UserManagerException;
+import javax.sql.DataSource;
+
public class DefaultAuthorizer implements Authorizer {
- protected BasicDataSource basicDataSource = null;
+ protected DataSource dataSource = null;
protected UserStoreData data = null;
private static Log log = LogFactory.getLog(DefaultAuthorizer.class);
private String algorithm = null;
- public DefaultAuthorizer(BasicDataSource dataSource, String algo) {
- this.basicDataSource = dataSource;
+ public DefaultAuthorizer(DataSource dataSource, String algo) {
+ this.dataSource = dataSource;
this.data = new UserStoreData(dataSource);
this.algorithm = algo;
}
@@ -62,7 +64,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -100,7 +102,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -138,7 +140,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -177,7 +179,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -246,7 +248,7 @@
Boolean isAuthorized = null;
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -281,7 +283,7 @@
Boolean result = null;
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultRealm.java
Mon Dec 17 04:31:07 2007
@@ -29,6 +29,8 @@
import org.wso2.usermanager.UserStoreAdmin;
import org.wso2.usermanager.UserStoreReader;
+import javax.sql.DataSource;
+
public class DefaultRealm implements Realm {
protected DefaultRealmConfig config = null;
@@ -45,7 +47,7 @@
protected DefaultUserStoreReader usReader = null;
- protected BasicDataSource basicDataSource = null;
+ protected DataSource dataSource = null;
private static Log log = LogFactory.getLog(DefaultRealm.class);
@@ -70,20 +72,23 @@
this.config = (DefaultRealmConfig) configBean;
if (config.getDataSource() == null) {
- basicDataSource = new BasicDataSource();
+ BasicDataSource basicDataSource = new BasicDataSource();
basicDataSource.setUrl(config.getConnectionURL());
basicDataSource.setDriverClassName(config.getDriverName());
basicDataSource.setUsername(config.getConnectionUserName());
basicDataSource.setPassword(config.getConnectionPassword());
+ dataSource = basicDataSource;
+ } else {
+ dataSource = config.getDataSource();
}
UUIDGenerator.getInitialUUID();
- authenticator = new DefaultAuthenticator(basicDataSource);
- authorizer = new DefaultAuthorizer(basicDataSource,
config.getPermissionAlgo());
- aclAdmin = new DefaultAccessControlAdmin(basicDataSource,
config.getPermissionAlgo());
- usAdmin = new DefaultUserStoreAdmin(basicDataSource);
- usReader = new DefaultUserStoreReader(basicDataSource);
+ authenticator = new DefaultAuthenticator(dataSource);
+ authorizer = new DefaultAuthorizer(dataSource,
config.getPermissionAlgo());
+ aclAdmin = new DefaultAccessControlAdmin(dataSource,
config.getPermissionAlgo());
+ usAdmin = new DefaultUserStoreAdmin(dataSource);
+ usReader = new DefaultUserStoreReader(dataSource);
}
@@ -109,8 +114,4 @@
}
-
-
-
-
}
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
Mon Dec 17 04:31:07 2007
@@ -10,21 +10,22 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.usermanager.UserManagerException;
import org.wso2.usermanager.UserStoreAdmin;
import org.wso2.usermanager.util.Base64;
+import javax.sql.DataSource;
+
public class DefaultUserStoreAdmin extends DefaultUserStoreReader implements
UserStoreAdmin {
private static Log log = LogFactory.getLog(DefaultUserStoreAdmin.class);
- public DefaultUserStoreAdmin(BasicDataSource dataSource) {
+ public DefaultUserStoreAdmin(DataSource dataSource) {
super(dataSource);
}
-
+
public void addUser(String userName, Object credential)
throws UserManagerException {
if (!(credential instanceof String)) {
@@ -33,7 +34,7 @@
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -72,7 +73,7 @@
throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -124,7 +125,7 @@
public void deleteUser(String userName) throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -161,7 +162,7 @@
}
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -213,7 +214,7 @@
}
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -261,7 +262,7 @@
public void addRole(String roleName) throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -290,7 +291,7 @@
public void deleteRole(String roleName) throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -325,7 +326,7 @@
}
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -356,7 +357,7 @@
throws UserManagerException {
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreReader.java
Mon Dec 17 04:31:07 2007
@@ -10,21 +10,22 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.usermanager.UserManagerException;
import org.wso2.usermanager.UserStoreReader;
+import javax.sql.DataSource;
+
public class DefaultUserStoreReader implements UserStoreReader {
private static Log log = LogFactory.getLog(DefaultUserStoreReader.class);
- protected BasicDataSource basicDataSource = null;
+ protected DataSource dataSource = null;
protected UserStoreData data = null;
- public DefaultUserStoreReader(BasicDataSource dataSource) {
- this.basicDataSource = dataSource;
+ public DefaultUserStoreReader(DataSource dataSource) {
+ this.dataSource = dataSource;
this.data = new UserStoreData(dataSource);
}
@@ -32,7 +33,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -67,7 +68,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -105,7 +106,7 @@
Map props = new HashMap();
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -143,7 +144,7 @@
Map props = new HashMap();
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -181,7 +182,7 @@
String[] propNames = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -227,7 +228,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -272,7 +273,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/UserStoreData.java
Mon Dec 17 04:31:07 2007
@@ -10,16 +10,18 @@
import org.apache.commons.dbcp.BasicDataSource;
import org.wso2.usermanager.UserManagerException;
+import javax.sql.DataSource;
+
/**
* Represents the user store. If you change this object it will change the way
* the DefaultRealmBehaves.
*/
public class UserStoreData {
- protected BasicDataSource basicDataSource = null;
+ protected DataSource dataSource = null;
- public UserStoreData(BasicDataSource dataSource){
- basicDataSource = dataSource;
+ public UserStoreData(DataSource dataSource){
+ this.dataSource = dataSource;
}
protected String getColumnName(int columnID) {
@@ -253,7 +255,7 @@
String id = null;
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -283,7 +285,7 @@
String id = null;
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
@@ -315,7 +317,7 @@
String[] names = new String[0];
Connection dbConnection = null;
try {
- dbConnection = basicDataSource.getConnection();
+ dbConnection = dataSource.getConnection();
if (dbConnection == null) {
throw new UserManagerException("null_connection");
}
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
