[Identity-dev] svn commit r15054 - in trunk/solutions/identity/modules/admin-ui/src/main: java/org/wso2/solutions/identity/admin/ui/action webapp/jsp

[svn]

Author: dimuthul
Date: Mon Mar 24 22:59:45 2008
New Revision: 15054

Log:

Fixing issue 187



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/ShowConfigureCardIssuerAction.java
   
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
 Mon Mar 24 22:59:45 2008
@@ -69,6 +69,8 @@
                 samlVersion10 = true;
             } else if (arrTypes[i].equals(IdentityConstants.SAML11_URL)) {
                 samlVersion11 = true;
+            } else if (arrTypes[i].equals(IdentityConstants.SAML20_URL)) {
+                samlVersion20 = true;
             }
         }
         useSymmBinding = admin
@@ -135,6 +137,14 @@
                 }
 
             }
+            
+            if (samlVersion20) {
+                if (tokValues != null) {
+                    tokValues = tokValues + "," + IdentityConstants.SAML20_URL;
+                } else {
+                    tokValues = IdentityConstants.SAML20_URL;
+                }
+            }
 
             admin.createOrUpdatearameter(
                     IdentityConstants.PARAM_SUPPORTED_TOKEN_TYPES, tokValues);
@@ -210,6 +220,14 @@
         this.samlVersion11 = samlVersion11;
     }
 
+    public boolean isSamlVersion20() {
+        return samlVersion20;
+    }
+
+    public void setSamlVersion1(boolean samlVersion20) {
+        this.samlVersion20 = samlVersion20;
+    }
+    
     public String getCardName() {
         return cardName;
     }

Modified: 
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowConfigureCardIssuerAction.java
==============================================================================
--- 
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowConfigureCardIssuerAction.java
      (original)
+++ 
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowConfigureCardIssuerAction.java
      Mon Mar 24 22:59:45 2008
@@ -59,6 +59,7 @@
         
         if(buff.length()>1){
             buff.deleteCharAt(buff.length()-1);
+            buff.deleteCharAt(buff.length()-1);
             tokenTypes = buff.toString();
         }
         

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
    Mon Mar 24 22:59:45 2008
@@ -60,7 +60,7 @@
 
                 
                 <s:form action="EditCardIssuer" method="post" theme="simple" 
enctype="multipart/form-data">
-                               <table cellpadding="0" cellspacing="0" 
border="0" class="form-table">
+                               <table cellpadding="0" cellspacing="0" 
border="0" class="form-table" style="width: 450px;">
                                        <tr>
                                                <td valign="top" 
style="width:150px;">Card Name<span style="color:red">*</span></td>
                                                <td><s:textfield 
name="cardName" value="%{cardName}"/></td>
@@ -73,7 +73,8 @@
                                                <td valign="top" 
style="width:150px;">Token Types<span style="color:red">*</span></td>
                                                <td>
                                                        <s:checkbox 
name="samlVersion10" value="samlVersion10" fieldValue="true"/> SAML1.0 
&nbsp;&nbsp;
-                                                       <s:checkbox 
name="samlVersion11" value="samlVersion11" fieldValue="true"/> SAML1.1 
+                                                       <s:checkbox 
name="samlVersion11" value="samlVersion11" fieldValue="true"/> SAML1.1 
&nbsp;&nbsp;
+                                                       <s:checkbox 
name="samlVersion20" value="samlVersion20" fieldValue="true"/> SAML2.0
                                                </td>
                                        </tr>
                                        <tr>

_______________________________________________
Identity-dev mailing list
Identity-dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev