Author: ruchith
Date: Wed Dec 5 04:38:01 2007
New Revision: 10556
Log:
Fixed IDENTITY-146
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
Wed Dec 5 04:38:01 2007
@@ -16,8 +16,6 @@
package org.wso2.solutions.identity.admin.ui.action;
-import java.io.File;
-
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.admin.ParameterAdmin;
@@ -25,10 +23,9 @@
import org.wso2.solutions.identity.cards.CardIssuerConfig;
import org.wso2.wsas.ServerConstants;
-import com.opensymphony.xwork2.ActionSupport;
+import java.io.File;
-public class EditCardissuerConfigAction
- extends ActionSupport {
+public class EditCardissuerConfigAction extends ManagedAction {
private static final long serialVersionUID = 0L;
@@ -84,8 +81,9 @@
String tokValues = null;
if (samlVersion10 == false && samlVersion11 == false) {
- throw new IdentityProviderException(
- "Please select at least one token type");
+ this.addErrorMessage(getText("no_token_types_selected"));
+ this.loadMessages();
+ return ERROR;
}
if (samlVersion10) {
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
Wed Dec 5 04:38:01 2007
@@ -18,6 +18,7 @@
unable_to_verify_string = Your request is invalid or expired! Please try again.
successful_verification = You are successfully verified. You may login now!!
no_user_store_config = No configuration properties available for this user
store
+no_token_types_selected = Please select at least one token type
add_claim_duplicate_claim = Duplicate claim : {0}
add_claim_uri_null = Claim URI missing
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
Wed Dec 5 04:38:01 2007
@@ -49,6 +49,15 @@
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowConfigureCardIssuer.action">Card Issuer
Configuration</a> |Edit Card Issuer Configuration</div>
<h1 class="headding-CardIssuer">Edit Card
Issuer Configuration</h1>
<s:property value="message" />
+
+ <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>
+
<s:form action="EditCardIssuer" method="post"
enctype="multipart/form-data" theme="simple">
<table cellpadding="0" cellspacing="0"
border="0" class="form-table">
<!--
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
