Author: dimuthul
Date: Tue Jan 8 19:32:56 2008
New Revision: 11991
Log:
Fixing build failure.
Added:
trunk/commons/usermanager/modules/core/src/test/resources/org/
trunk/commons/usermanager/modules/core/src/test/resources/org/wso2/
trunk/commons/usermanager/modules/core/src/test/resources/org/wso2/usermanager/
trunk/commons/usermanager/modules/core/src/test/resources/org/wso2/usermanager/resources.properties
Removed:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/resources.properties
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/AuthorizingRealmConfig.java
Modified:
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/AuthorizingRealmConfig.java
==============================================================================
---
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/AuthorizingRealmConfig.java
(original)
+++
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/AuthorizingRealmConfig.java
Tue Jan 8 19:32:56 2008
@@ -7,7 +7,14 @@
private Realm realm = null;
private String authenticatedUserName = null;
+
+ private String adminRoleName = null;
+
+
+ private boolean isCurrentUserReadable = false;
+ private boolean isCurrentUserEditable = false;
+
public AuthorizingRealmConfig() {
}
@@ -40,8 +47,8 @@
* @param adminRoleName
* @param isRemovable
*/
- public void enableAdminRole(String adminRoleName) {
-
+ public void setAdminRoleName(String adminRoleName) {
+ this.adminRoleName = adminRoleName;
}
/**
@@ -49,21 +56,32 @@
* @param readable - Let current user read his properties
* @param editable - Let current user edit his properties/password
*/
- public void enablePermissionOnCurrentUser(boolean readable,
- boolean editable) {
+
+ public String getAdminRoleName() {
+ return adminRoleName;
+ }
+
+ public boolean isCurrentUserReadable() {
+ return isCurrentUserReadable;
}
-
- /**
- * Enable Role relative permissions when add/edit/deleting users.
- *
- * @param readOthersInRole - If the authorizedUser has the same role as
the questioning user - allow him to read the questioning user.
- * @param editOthersInRole - If the authorizedUser has the same role as
the questioning user - allow him to edit the questioning user.
- * @param removeOthersInRole - If the authorizedUser has the same role as
the questioning user - allow him to edit the questioning user.
- */
- public void enablePermissionOnCurrentRole(boolean readOthersInRole,
- boolean editOthersInRole, boolean removeOthersInRole) {
+ public boolean isCurrentUserEditable() {
+ return isCurrentUserEditable;
}
+
+
+ public void setCurrentUserReadable(boolean isCurrentUserReadable) {
+ this.isCurrentUserReadable = isCurrentUserReadable;
+ }
+
+ public void setCurrentUserEditable(boolean isCurrentUserEditable) {
+ this.isCurrentUserEditable = isCurrentUserEditable;
+ }
+
+
+
+
+
}
Added:
trunk/commons/usermanager/modules/core/src/test/resources/org/wso2/usermanager/resources.properties
==============================================================================
--- (empty file)
+++
trunk/commons/usermanager/modules/core/src/test/resources/org/wso2/usermanager/resources.properties
Tue Jan 8 19:32:56 2008
@@ -0,0 +1,43 @@
+errorAddingUserToRole = Error adding user to role. {0}
+duplicateUser = User name already exists. Please select another user name!
+exceptionOnConnectionOpen = Error occuered while connecting to Userstore
+sqlFileNotFound = SQL file not found for Default Realm
+errorModifyingUserStore = Error modifying the database
+errorReadingFromUserStore = Error reading users from database
+nullData = Invalid or Null data provided
+nullUser = Invalid user name provided
+nullRole = Invalid role name provided
+beanMappingNotfound = AuthenticationProvider Bean Mapping must be provided in
file
+nullAuthProvider = AuthenticationProvider id must be present
+unsupportedCredential = Credential type unsupported
+initVerifier = Please call init() method in the verifier
+sendingMailProblems = Problems encountered while trying to send mail
+error= Error
+pendingAdd = Error occured while adding you. Please try again.
+invalidOrExpired = Invalid or expired
+exceptionOnAuthenticate = Exception on Authenticate
+getProperties = Getting properties of user
+unknownUserNameFormatInLDAP= Unknown format of Users in LDAP. We expect
boo=username : object.class
+errorOpeningLDAP = Error opening connection to the LDAP directory. Please
check connection name, password and url.
+bindFailedBecauseAuthenticationException = Failed to Authenticate because of
bind failure
+errorInitializingConnection = Error Initializing Connection.
+copyAuthorizationFailedPermissionExist = Copying Authorizations failed,
because permissions exist for the destination Resource
+errorCopyingAuthorizations = Error copying authorizations
+errorCreatingPasswordDigest = Error creating password digest
+unAuthorized = User is unauthorized to perform the action
+authorizerNullatAuthorizer = Authorizer is null at AuthorizingRealm. This
cannot be
+errorClosingConnection = Error closing connection!
+oldPasswordIncorrect = Cannot update password of user. Invalid user name
password!
+nullRealm = Null Realm not permitted.
+verifierUserDatabaseInit = Cannot create the Email Verifier Database
+#validation errors
+jdbcConfigValidation = UserTable, UserNameColumn, UserCredentialColumn,
ConnectionURL cannot be null or empty
+acegiConfigValidation = AuthProviderId, AuthenticationProviderBeanMappingFile
cannot be null or empty
+ldapConfigValidation = ConnectionName, ConnectionPass, ConnectionUrl,
UserPattern cannot be null or empty
+#only log messages
+getGenericUserByPattern = Searching user by generic pattern
+validatingCredentials = Validating users
+dbCreationNotSupported = Database creation not supported for this driver
+nullConnection = Cannot get connection. Contact Administrator
+unableToResetPool = Unable to reset realm. There are people holding instances
of PoolManager
+
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
