Author: prabath
Date: Mon Mar 17 00:51:26 2008
New Revision: 14889
Log:
admin can now visually differentiate between issued OpenID Information cards
and SAML based Information cards through admin interface
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statdetailcard.jsp
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/InfoCardDO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ICReportData.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ReportUtil.java
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
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
Mon Mar 17 00:51:26 2008
@@ -51,12 +51,17 @@
<table cellpadding="0" cellspacing="0"
border="0" class="data-table">
<tr>
<th>CardId</th>
- <th>Valid Period</th>
+ <th>Valid Period</th>
+ <th> </th>
</tr>
<s:iterator value="dataList" status="status">
<tr>
<td><s:property value="cardId" /></td>
- <td><s:property value="validPeriod" /></td>
+ <td><s:property value="validPeriod" /></td>
+ <td>
+ <s:if test="%{openIDInfoCard}"><img border="0"
src="images/openid-input.gif" alt="OpenID Information Card"/></s:if>
+ <s:else> </s:else>
+ </td>
</tr>
</s:iterator>
</table>
Modified:
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
(original)
+++
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
Mon Mar 17 00:51:26 2008
@@ -253,7 +253,8 @@
<property name="userId" column="user_Id" not-null="true"/>
<property name="cardId" column="card_Id" not-null="true"/>
<property name="dateIssued" column="date_Issued" not-null="true"/>
- <property name="dateExpires" column="date_Expires" not-null="true"/>
+ <property name="dateExpires" column="date_Expires" not-null="true"/>
+ <property name="openIDInfoCard" column="is_openid_infocard"
not-null="true"/>
<set name="tokens" lazy="true" cascade="all">
<key column="card"/>
<one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.IssuedTokensDO"/>
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
Mon Mar 17 00:51:26 2008
@@ -378,6 +378,7 @@
cardDo.setDateIssued(card.getTimeIssued());
cardDo.setUserId(userId);
cardDo.setDateExpires(card.getTimeExpires());
+ cardDo.setOpenIDInfoCard(this.isOpenIdInfoCard);
dbman.create(cardDo);
log.info("Information card details stored for card id : "
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/InfoCardDO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/InfoCardDO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/InfoCardDO.java
Mon Mar 17 00:51:26 2008
@@ -28,6 +28,8 @@
private Date dateExpires = null;
+ private boolean openIDInfoCard;
+
private Set tokens = null;
public Date getDateIssued() {
@@ -70,5 +72,13 @@
this.tokens = tokens;
}
+ public boolean isOpenIDInfoCard() {
+ return openIDInfoCard;
+ }
+
+ public void setOpenIDInfoCard(boolean openIDInfoCard) {
+ this.openIDInfoCard = openIDInfoCard;
+ }
+
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ICReportData.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ICReportData.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ICReportData.java
Mon Mar 17 00:51:26 2008
@@ -19,6 +19,15 @@
private String cardId;
private String validPeriod;
+ private boolean openIDInfoCard;
+
+ public boolean isOpenIDInfoCard() {
+ return openIDInfoCard;
+ }
+
+ public void setOpenIDInfoCard(boolean openIDInfoCard) {
+ this.openIDInfoCard = openIDInfoCard;
+ }
public String getCardId() {
return cardId;
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ReportUtil.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ReportUtil.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/report/ReportUtil.java
Mon Mar 17 00:51:26 2008
@@ -67,6 +67,7 @@
String period = card.getDateIssued().toString() + " - "
+ card.getDateExpires().toString();
data.setValidPeriod(period);
+ data.setOpenIDInfoCard(card.isOpenIDInfoCard());
lst.add(data);
}
return lst;
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
Mon Mar 17 00:51:26 2008
@@ -253,7 +253,8 @@
<property name="userId" column="user_Id" not-null="true"/>
<property name="cardId" column="card_Id" not-null="true"/>
<property name="dateIssued" column="date_Issued" not-null="true"/>
- <property name="dateExpires" column="date_Expires" not-null="true"/>
+ <property name="dateExpires" column="date_Expires" not-null="true"/>
+ <property name="openIDInfoCard" column="is_openid_infocard"
not-null="true"/>
<set name="tokens" lazy="true" cascade="all">
<key column="card"/>
<one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.IssuedTokensDO"/>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
