Author: dimuthul
Date: Wed Jan 9 01:13:13 2008
New Revision: 12022
Log:
Fixing few issues - 163, 164, 166
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSHistoryAction.java
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/showusers.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailcard.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailtoken.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ActionDO.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSHistoryAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSHistoryAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSHistoryAction.java
Wed Jan 9 01:13:13 2008
@@ -25,23 +25,22 @@
private String toDate = null;
- private String details = null;
-
private String type = null;
+ private String title = null;
+
public String execute() throws Exception {
ReportAdmin admin = new ReportAdmin();
if(UIConstants.REPORT_FAIL_CI.equals(type)){
- details = "Failed Card Issuences";
stsActions = admin.getFailedCardIssueActions(null, null);
+ title = "Failed Card Issuences";
}else if(UIConstants.REPORT_FAIL_TI.equals(type)){
- details = "Failed Token Issuences";
stsActions = admin.getFailedTokenIssueActions(null, null);
+ title = "Failed Token Issuences";
}else{
- details = "Unknown Report type";
return ERROR;
}
return SUCCESS;
@@ -71,14 +70,6 @@
this.toDate = toDate;
}
- public String getDetails() {
- return details;
- }
-
- public void setDetails(String details) {
- this.details = details;
- }
-
public String getType() {
return type;
}
@@ -87,6 +78,14 @@
this.type = type;
}
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/showusers.jsp
==============================================================================
--- trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/showusers.jsp
(original)
+++ trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/showusers.jsp
Wed Jan 9 01:13:13 2008
@@ -37,6 +37,7 @@
<tr><td><s:property/></td></tr>
</s:iterator>
</table>
+ <s:a href="ShowStatistics.action" cssClass="back-link"
>Back</s:a>
</td>
</tr>
</table>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailcard.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailcard.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailcard.jsp
Wed Jan 9 01:13:13 2008
@@ -47,8 +47,7 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | Card Issuer
Configuration</div>
- <p></p>
- <h3>Card Details</h3>
+ <h1 class="headding-statistics">Card
Details</h1>
<table cellpadding="0" cellspacing="0"
border="0" class="data-table">
<tr>
<th>CardId</th>
@@ -61,9 +60,8 @@
</tr>
</s:iterator>
</table>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
-
- </td>
+ <s:a
href="ReportInfoCardByUser.action?type=cardsByUser"
cssClass="back-link">Back</s:a>
+ </td>
</tr> </table>
<!-- END Content -->
</div>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailtoken.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailtoken.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailtoken.jsp
Wed Jan 9 01:13:13 2008
@@ -47,8 +47,7 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | Card Issuer
Configuration</div>
- <p></p>
- <h3>Token Details</h3>
+ <h1 class="headding-statistics">Token
Details</h1>
<s:if test="%{type eq 'tokensByUser'}">
<table cellpadding="0"
cellspacing="0" border="0" class="data-table">
<tr>
@@ -95,8 +94,22 @@
</s:iterator>
</table>
</s:if>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
-
+
+
+ <s:if test="%{type eq 'tokensByUser'}">
+ <s:a
href="ReportTokenByUser.action?type=tokensByUser"
cssClass="back-link">Back</s:a>
+ </s:if>
+ <s:elseif test="%{type eq 'tokensByCard'}">
+ <s:a
href="ReportTokenByUser.action?type=tokensByCard"
cssClass="back-link">Back</s:a>
+ </s:elseif>
+ <s:elseif test="%{type eq 'tokensByCardAndUser'}">
+ <s:a
href="ReportTokenByUser.action?type=tokensByCardAndUser"
cssClass="back-link">Back</s:a>
+ </s:elseif>
+ <s:else>
+ <s:a
href="ShowStatistics.action" cssClass="back-link">Back</s:a>
+ </s:else>
+
+
</td>
</tr> </table>
<!-- END Content -->
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
Wed Jan 9 01:13:13 2008
@@ -47,9 +47,8 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowStatistics.action">Statistics</a> |
Failures</div>
- <h1 class="headding-statistics">Failure
Report</h1>
-
- <table cellpadding="0" cellspacing="0" border="0"
class="data-table">
+ <h1 class="headding-statistics"><s:property
value="title" /></h1>
+ <table cellpadding="0" cellspacing="0"
border="0" class="data-table">
<tr>
<th>User Name</th>
<th>Description</th>
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ActionDO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ActionDO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ActionDO.java
Wed Jan 9 01:13:13 2008
@@ -27,8 +27,8 @@
public final static String ACTION_USER_LOG_IN_UT = "User Login - Username
Token";
public final static String ACTION_USER_LOG_IN_CARD = "User Login - Info
Card";
public final static String ACTION_USER_LOG_OUT = "User Logged out";
- public final static String ACTION_USER_INFOCARD_SUBMIT = "Register
InfoCard";
- public final static String ACTION_USER_REGISTER = "User registration";
+ public final static String ACTION_USER_INFOCARD_SUBMIT = "User Register
InfoCard";
+ public final static String ACTION_USER_REGISTER = "InfoCard registration";
public final static String ACTION_USER_DOWNLOAD_CARD = "Downloaded Card";
public final static String ACTION_USER_ADD_RP = "Add trusted Relying
Party";
public final static String ACTION_CARD_ISSUE_FAILURE = "Issue Card
Failure";
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
Wed Jan 9 01:13:13 2008
@@ -327,7 +327,13 @@
issuerPolicy = filterConfig
.getInitParameter(TokenVerifierConstants.ISSUER_POLICY);
-
+
+ if(issuerPolicy != null &&
!(issuerPolicy.equals(TokenVerifierConstants.SELF_ONLY)
+ || issuerPolicy.equals(TokenVerifierConstants.MANGED_ONLY)
+ ||
issuerPolicy.equals(TokenVerifierConstants.SELF_AND_MANGED))){
+ throw new ServletException("Invalid Issuer Policy!");
+ }
+
try {
KeyStore store = KeyStore.getInstance(storeType);
String realPath = config.getServletContext().getRealPath(keyStore);
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
Wed Jan 9 01:13:13 2008
@@ -26,6 +26,8 @@
import org.wso2.solutions.identity.UserStore;
import org.wso2.solutions.identity.admin.ClaimsAdmin;
import org.wso2.solutions.identity.admin.RegisteredInfoCardInfoAdmin;
+import org.wso2.solutions.identity.admin.ReportAdmin;
+import org.wso2.solutions.identity.persistence.dataobject.ActionDO;
import org.wso2.solutions.identity.persistence.dataobject.ClaimDO;
import org.wso2.solutions.identity.relyingparty.TokenVerifierConstants;
import org.wso2.solutions.identity.util.IdentityUtil;
@@ -72,6 +74,7 @@
String issuerInfo = (String)
request.getAttribute(TokenVerifierConstants.ISSUER_INFO);
admin.registerNewInfoCardInformation(ppid, userName, issuerInfo);
+ ReportAdmin.record(userName, ActionDO.ACTION_USER_INFOCARD_SUBMIT,
"PPID="+ppid);
this.addInfoMessage(getText("user_successfully_added",
new String[] { userName }));
} catch (RuntimeException e) {
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
