Author: dimuthul
Date: Thu Feb 28 06:54:11 2008
New Revision: 14315
Log:
Adding the changes.
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
Thu Feb 28 06:54:11 2008
@@ -13,7 +13,7 @@
import org.wso2.registry.users.def.DefaultAccessControlAdmin;
import org.wso2.registry.users.def.DefaultAuthorizer;
import org.wso2.registry.users.def.DefaultRealmConfig;
-import org.wso2.registry.users.def.DefaultStrategy;
+import org.wso2.registry.users.def.DefaultDataSupplier;
public class WSASRegistryRealm implements UserRealm {
@@ -47,9 +47,9 @@
dataSource = (DataSource) basicDataSource;
authenticator = new WSASAuthenticator();
- authorizer = new DefaultAuthorizer(dataSource,
DefaultRealmConfig.PERMISSION_BLOCK_FIRST, (DefaultStrategy)new
WSASStrategyImpl());
+ authorizer = new DefaultAuthorizer(dataSource,
DefaultRealmConfig.PERMISSION_BLOCK_FIRST, (DefaultDataSupplier)new
WSASStrategyImpl());
aclAdmin = new DefaultAccessControlAdmin(dataSource,
- (DefaultStrategy)new WSASStrategyImpl());
+ (DefaultDataSupplier)new WSASStrategyImpl());
usAdmin = new WSASUserStoreAdmin(dataSource, new WSASStrategyImpl());
usReader = new WSASUserStoreReader(dataSource, new WSASStrategyImpl());
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASStrategyImpl.java
Thu Feb 28 06:54:11 2008
@@ -4,18 +4,18 @@
import org.wso2.registry.users.UserStoreException;
import org.wso2.registry.users.def.DefaultRealmConstants;
-import org.wso2.registry.users.def.DefaultStrategy;
-import org.wso2.registry.users.def.util.DefaultStrategyImpl;
+import org.wso2.registry.users.def.DefaultDataSupplier;
+import org.wso2.registry.users.def.util.DefaultDataSupplierImpl;
import org.wso2.wsas.admin.service.UserAdmin;
import org.wso2.wsas.admin.service.util.RoleData;
import org.wso2.wsas.admin.service.util.UserData;
-public class WSASStrategyImpl implements DefaultStrategy{
+public class WSASStrategyImpl implements DefaultDataSupplier{
- private DefaultStrategyImpl defaultStrategy = null;
+ private DefaultDataSupplierImpl defaultStrategy = null;
public WSASStrategyImpl() {
- defaultStrategy = new DefaultStrategyImpl();
+ defaultStrategy = new DefaultDataSupplierImpl();
}
public static final String GET_ROLE_AUTHORIZED_SQL = "select" +
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java
Thu Feb 28 06:54:11 2008
@@ -12,7 +12,7 @@
import org.wso2.mashup.MashupConstants;
import org.wso2.registry.users.UserStoreAdmin;
import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.def.DefaultStrategy;
+import org.wso2.registry.users.def.DefaultDataSupplier;
import org.wso2.registry.users.def.DefaultUserStoreAdmin;
import org.wso2.wsas.admin.service.UserAdmin;
@@ -22,7 +22,7 @@
private UserStoreAdmin defaultAdmin = null;
- public WSASUserStoreAdmin(DataSource dSource, DefaultStrategy strategy)
throws UserStoreException {
+ public WSASUserStoreAdmin(DataSource dSource, DefaultDataSupplier
strategy) throws UserStoreException {
super(dSource, strategy);
defaultAdmin = new DefaultUserStoreAdmin(dSource, strategy);
}
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreReader.java
Thu Feb 28 06:54:11 2008
@@ -10,7 +10,7 @@
import org.wso2.registry.users.UserStoreException;
import org.wso2.registry.users.UserStoreReader;
-import org.wso2.registry.users.def.DefaultStrategy;
+import org.wso2.registry.users.def.DefaultDataSupplier;
import org.wso2.registry.users.def.DefaultUserStoreReader;
import org.wso2.wsas.admin.service.UserAdmin;
import org.wso2.wsas.admin.service.util.RoleData;
@@ -20,9 +20,9 @@
private UserStoreReader defaultReader = null;
protected DataSource dataSource = null;
- protected DefaultStrategy strategy = null;
+ protected DefaultDataSupplier strategy = null;
- public WSASUserStoreReader(DataSource dSource, DefaultStrategy
strategyObject) throws UserStoreException{
+ public WSASUserStoreReader(DataSource dSource, DefaultDataSupplier
strategyObject) throws UserStoreException{
strategy = strategyObject;
defaultReader = new DefaultUserStoreReader(dSource, strategy);
dataSource = dSource;
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
Thu Feb 28 06:54:11 2008
@@ -173,7 +173,7 @@
String adminName = "".equals(fullName.trim()) ? userName :
fullName;
String adminEmail = "".equals(emailId.trim()) ? "none" :
emailId;
-
+
// Create the admin user profile.
RegistryUtils.createUser(registry, realm, userName,
adminName, adminEmail, "System
Administrator");
@@ -334,15 +334,15 @@
errors.put("fullName", "Full name cannot be empty.");
valid = false;
}
-
+
if (emailId.equals("")) {
errors.put("emailId", "E-mail ID cannot be empty.");
valid = false;
}
}
-
+
valid = isPasswordValid(password, confirmedPassword, errors);
-
+
// Expensive operation, so do only once all other data has been
validated.
if (valid) {
if (ManageUsers.isExistingUser(request, userName)) {
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
