Author: ruchith
Date: Sun Dec 9 18:12:48 2007
New Revision: 10736
Log:
Fixed an error handling issue and updated version numbers in README
Modified:
trunk/solutions/identity/README
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/SetDefaultUserStoreAction.java
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/realmconfigurations.jsp
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
trunk/solutions/identity/modules/mod-cspace/README
Modified: trunk/solutions/identity/README
==============================================================================
--- trunk/solutions/identity/README (original)
+++ trunk/solutions/identity/README Sun Dec 9 18:12:48 2007
@@ -27,14 +27,14 @@
Identity Provider and Java Relying Party
----------------------------------------
- wso2-identity-solution-1.0-beta-src.zip - Source Distribution
- wso2-identity-solution-1.0-beta.zip - Binary Dirstibution
+ wso2-identity-solution-1.0-src.zip - Source Distribution
+ wso2-identity-solution-1.0.zip - Binary Dirstibution
CardSpace Authentication Module for Apache2
-------------------------------------------
- mod_cspace-src-1.0-beta.tar.gz - Source Distribution
- mod_cspace-bin-1.0-beta-linux.tar.gz - Linux Binary Distribution
- mod_cspace-bin-1.0-beta-win32.tar.gz - Win32 Binary Distribution
+ mod_cspace-src-1.0.tar.gz - Source Distribution
+ mod_cspace-bin-1.0-linux.tar.gz - Linux Binary Distribution
+ mod_cspace-bin-1.0-win32.tar.gz - Win32 Binary Distribution
Project Information
===================
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/SetDefaultUserStoreAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/SetDefaultUserStoreAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/SetDefaultUserStoreAction.java
Sun Dec 9 18:12:48 2007
@@ -19,13 +19,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.solutions.identity.IdentityProviderConstants;
+import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.admin.RealmConfigAdmin;
import org.wso2.solutions.identity.admin.STSConfigAdmin;
import org.wso2.solutions.identity.i18n.Messages;
import com.opensymphony.xwork2.ActionSupport;
-public class SetDefaultUserStoreAction extends ActionSupport {
+public class SetDefaultUserStoreAction extends ManagedAction {
private static final long serialVersionUID = 5197582050072207667L;
@@ -39,11 +40,15 @@
public String execute() throws Exception {
if (configName != null && configName.trim().length() > 0) {
- RealmConfigAdmin admin = new RealmConfigAdmin();
- admin.setDefaultRealmConfiguration(configName);
-
- log.info(messages.getMessage("changedDefaultUserStore",
- new String[] { configName }));
+ try {
+ RealmConfigAdmin admin = new RealmConfigAdmin();
+ admin.setDefaultRealmConfiguration(configName);
+
+ log.info(messages.getMessage("changedDefaultUserStore",
+ new String[] { configName }));
+ } catch (IdentityProviderException e) {
+ this.addErrorMessage(e.getMessage());
+ }
} else {
return ERROR;
}
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/realmconfigurations.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/realmconfigurations.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/realmconfigurations.jsp
Sun Dec 9 18:12:48 2007
@@ -33,7 +33,15 @@
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | Available User
Stores</div>
<h1 class="headding-userstores">Available User
Stores</h1>
-
+
+ <s:iterator value="errorMessages">
+ <p><font color="#FF0000"><s:property /></font></p>
+ </s:iterator>
+
+ <s:iterator value="infoMessages">
+ <p><font color="#00FF00"><s:property /></font></p>
+ </s:iterator>
+
<table cellpadding="0" cellspacing="0"
border="0" class="data-table">
<tr><th>Configuration
name</th><th>Realm Class</th><th>Enabled</th></tr>
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
Sun Dec 9 18:12:48 2007
@@ -258,7 +258,7 @@
} catch (UserManagerException e) {
throw new IdentityProviderException(
"errorExtractingUserNames",
- new String[] { this.realm.getClass().getName() });
+ new String[] { this.realm.getClass().getName() }, e);
}
}
Modified: trunk/solutions/identity/modules/mod-cspace/README
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/README (original)
+++ trunk/solutions/identity/modules/mod-cspace/README Sun Dec 9 18:12:48 2007
@@ -19,7 +19,7 @@
The documentation available as of the date of this release is included in
MOD_CSPACE_GUIDE file. Up-to-date documentation can be found at
-
http://wso2.org/project/solutions/identity/1.0-beta/docs/mod_cspace_config.html
+ http://wso2.org/project/solutions/identity/1.0/docs/mod_cspace_config.html
Installation
============
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
