Author: chathura
Date: Mon Dec 17 04:31:58 2007
New Revision: 11242
Log:
Changes to be compatible with the user manager.
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java
Mon Dec 17 04:31:58 2007
@@ -17,6 +17,7 @@
package org.wso2.registry.jdbc.realm;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.secure.HSQLDBInitializer;
import org.wso2.registry.jdbc.utils.RegistryDataSource;
public class InMemoryRegistryRealm extends RegistryRealm {
@@ -34,6 +35,8 @@
INMEMORY_DB_USER_NAME,
INMEMORY_DB_PASSWORD);
+ new HSQLDBInitializer().createHSQLTables(dataSource);
+
super.configure(dataSource);
}
}
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java
Mon Dec 17 04:31:58 2007
@@ -48,14 +48,12 @@
private void init(DataSource dataSource) throws RegistryException {
- new HSQLDBInitializer().createHSQLTables(dataSource);
-
try {
DefaultRealmConfig config =
(DefaultRealmConfig)this.getRealmConfiguration();
config.setDataSource(dataSource);
this.init(config);
- userStoreAdmin = new RegistryUserStoreAdmin(basicDataSource);
+ userStoreAdmin = new RegistryUserStoreAdmin(dataSource);
AuthorizationUtil.populateUserStore(this);
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java
Mon Dec 17 04:31:58 2007
@@ -32,7 +32,7 @@
public class RegistryUserStoreAdmin extends DefaultUserStoreAdmin {
- public RegistryUserStoreAdmin(BasicDataSource dataSource) throws
UserManagerException {
+ public RegistryUserStoreAdmin(DataSource dataSource) throws
UserManagerException {
super(dataSource);
}
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
