taylor 2005/01/13 21:44:23
Modified:
applications/security/src/java/org/apache/jetspeed/portlets/security/sso
SSODetails.java
applications/security/src/java/org/apache/jetspeed/portlets/security/resources
SSOResources.properties
applications/security/src/webapp/WEB-INF/security/sso
sites-details.vm
Log:
http://issues.apache.org/jira/browse/JS2-178
basic UI appears functional to me
still need for Roger to hook in Group support for remote principals tomorrow
Im going to close the UI end of the issue
Revision Changes Path
1.7 +29 -8
jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/sso/SSODetails.java
Index: SSODetails.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/sso/SSODetails.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SSODetails.java 13 Jan 2005 23:30:08 -0000 1.6
+++ SSODetails.java 14 Jan 2005 05:44:22 -0000 1.7
@@ -131,7 +131,7 @@
if (selectedSite != null)
{
context.put("currentSite", selectedSite);
- }
+ }
// get relative link, TODO: encapsulate Jetspeed links access into
component
String userChooser = getAbsoluteUrl(request,
"/Administrative/choosers/users.psml");
@@ -160,18 +160,39 @@
if (request.getPortletMode() == PortletMode.VIEW)
{
String refresh = request.getParameter("sso.refresh");
- String save = request.getParameter("sso.save");
- String neue = request.getParameter("sso.new");
+ String add = request.getParameter("sso.add");
+ String delete = request.getParameter("ssoDelete");
+
if (refresh != null)
{
this.clearBrowserIterator(request);
}
- else if (neue != null)
+ else if (delete != null && !(isEmpty(delete)))
{
- //PortletMessaging.cancel(request, "site", "selected");
- //PortletMessaging.cancel(request, "site", "selectedUrl");
+ try
+ {
+ String siteName =
(String)PortletMessaging.receive(request, "site", "selectedUrl");
+ SSOSite site = sso.getSite(siteName);
+ User user = userManager.getUser(delete);
+ if (site != null && user != null)
+ {
+ Subject subject = user.getSubject();
+ sso.removeCredentialsForSite(subject,
site.getSiteURL());
+ this.clearBrowserIterator(request);
+ }
+ }
+ catch (SecurityException e)
+ {
+ // TODO: exception handling
+ System.err.println("Exception storing site: " + e);
+ }
+ catch (SSOException e)
+ {
+ // TODO: exception handling
+ System.err.println("Exception storing site: " + e);
+ }
}
- else if (save != null)
+ else if (add != null)
{
// Roger: here is the principal type
String principalType =
request.getParameter("principal.type");
1.2 +2 -0
jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SSOResources.properties
Index: SSOResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/SSOResources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SSOResources.properties 3 Jan 2005 08:14:32 -0000 1.1
+++ SSOResources.properties 14 Jan 2005 05:44:23 -0000 1.2
@@ -3,3 +3,5 @@
save = Save
delete = Delete
deleteQuestion = OK to delete?
+add = Add
+
1.6 +6 -4
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/sso/sites-details.vm
Index: sites-details.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/sso/sites-details.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sites-details.vm 13 Jan 2005 06:13:16 -0000 1.5
+++ sites-details.vm 14 Jan 2005 05:44:23 -0000 1.6
@@ -72,7 +72,9 @@
<div align="center"><a
href='$action'>$principal.RemotePrincipalName</a></div>
</td>
<td class="$rowstyle" nowrap width='24' align='center'>
- <img src="/security/images/waste_bin.gif" width="20" height="15"
border="0"/>
+ <a href="javascript:YesNoPopup('Confirm to Delete Remote:','Confirm
Delete','securityform','ssoDelete','$principal.PortalPrincipalName','YesNoReturnMethod()');">
+ <img src="/security/images/waste_bin.gif" width="20" height="15"
border="0"/>
+ </a>
</td>
<td class=""> </td>
</tr>
@@ -92,6 +94,7 @@
<br/>
<form name='securityform' action="$renderResponse.createActionURL()"
method="post">
<input type='hidden' name='principal.type' value='user'/>
+<input name='ssoDelete' type='hidden' value=''/>
<table>
<tr colspan="2" align="right">
<td nowrap class="portlet-section-alternate" align="right">Portal
Principal: </td>
@@ -121,9 +124,8 @@
</tr>
</table>
<br/>
-<input name='sso.save' type="submit" value="$MESSAGES.getString('save')"
class="portlet-form-button"/>
+<input name='sso.add' type="submit" value="$MESSAGES.getString('add')"
class="portlet-form-button"/>
<input name='sso.refresh' class="portlet-form-button" type="submit"
value="$MESSAGES.getString('refresh')" />
-<input name='sso.new' class="portlet-form-button" type="submit"
value="$MESSAGES.getString('new')" />
</form>
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
