Author: dimuthul
Date: Mon Dec 17 19:49:41 2007
New Revision: 11299
Log:
Adding another constructor.
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
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 19:49:41 2007
@@ -5,14 +5,13 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.commons.dbcp.BasicDataSource;
+import javax.sql.DataSource;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.usermanager.AccessControlAdmin;
import org.wso2.usermanager.UserManagerException;
-import javax.sql.DataSource;
-
public class DefaultAccessControlAdmin
extends DefaultAuthorizer implements AccessControlAdmin {
@@ -21,6 +20,14 @@
public DefaultAccessControlAdmin(DataSource dataSource, String algo) {
super(dataSource, algo);
}
+
+ public DefaultAccessControlAdmin(DataSource dataSource, String algo,
UserStoreData store) {
+ super(dataSource, algo, store);
+ }
+
+ public DefaultAccessControlAdmin(DataSource dataSource, UserStoreData
store) {
+ super(dataSource, DefaultRealmConfig.PERMISSION_BLOCK_FIRST, store);
+ }
public void clearUserAuthorization(String userName, String resourceId,
String action) throws UserManagerException {
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 19:49:41 2007
@@ -29,6 +29,11 @@
this.dataSource = dataSource;
this.data = new UserStoreData(dataSource);
}
+
+ public DefaultAuthenticator(DataSource dataSource, UserStoreData store) {
+ this.dataSource = dataSource;
+ this.data = store;
+ }
public boolean authenticate(String userName, Object credentials)
throws UserManagerException {
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 19:49:41 2007
@@ -27,6 +27,12 @@
this.algorithm = algo;
}
+ public DefaultAuthorizer(DataSource dataSource, String algo, UserStoreData
store) {
+ this.dataSource = dataSource;
+ this.data = store;
+ this.algorithm = algo;
+ }
+
public boolean isRoleAuthorized(String roleName, String resourceId,
String action) throws UserManagerException {
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 19:49:41 2007
@@ -46,15 +46,13 @@
protected DefaultUserStoreAdmin usAdmin = null;
protected DefaultUserStoreReader usReader = null;
-
+
protected DataSource dataSource = null;
-
- protected UserStoreData userStoreData = null;
-
+
private static Log log = LogFactory.getLog(DefaultRealm.class);
-
+
public DefaultRealm() {
-
+
}
public Object getRealmConfiguration() throws UserManagerException {
@@ -72,7 +70,7 @@
return;
}
this.config = (DefaultRealmConfig) configBean;
-
+
if (config.getDataSource() == null) {
BasicDataSource basicDataSource = new BasicDataSource();
basicDataSource.setUrl(config.getConnectionURL());
@@ -83,12 +81,14 @@
} else {
dataSource = config.getDataSource();
}
-
+
UUIDGenerator.getInitialUUID();
authenticator = new DefaultAuthenticator(dataSource);
- authorizer = new DefaultAuthorizer(dataSource,
config.getPermissionAlgo());
- aclAdmin = new DefaultAccessControlAdmin(dataSource,
config.getPermissionAlgo());
+ authorizer = new DefaultAuthorizer(dataSource, config
+ .getPermissionAlgo());
+ aclAdmin = new DefaultAccessControlAdmin(dataSource, config
+ .getPermissionAlgo());
usAdmin = new DefaultUserStoreAdmin(dataSource);
usReader = new DefaultUserStoreReader(dataSource);
@@ -115,14 +115,4 @@
return usReader;
}
- public UserStoreData getUserStoreData() {
- return userStoreData;
- }
-
- public void setUserStoreData(UserStoreData userStoreData) {
- this.userStoreData = userStoreData;
- }
-
-
-
}
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 19:49:41 2007
@@ -26,6 +26,10 @@
super(dataSource);
}
+ public DefaultUserStoreAdmin(DataSource dataSource, UserStoreData store) {
+ super(dataSource, store);
+ }
+
public void addUser(String userName, Object credential)
throws UserManagerException {
if (!(credential instanceof String)) {
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 19:49:41 2007
@@ -29,6 +29,11 @@
this.data = new UserStoreData(dataSource);
}
+ public DefaultUserStoreReader(DataSource dataSource, UserStoreData store) {
+ this.dataSource = dataSource;
+ this.data = store;
+ }
+
public String[] getAllRoleNames() throws UserManagerException {
String[] names = new String[0];
Connection dbConnection = null;
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
