taylor      2005/01/13 15:30:08

  Modified:    applications/security/src/webapp/WEB-INF/security/sso
                        sites-view.vm
               
applications/security/src/java/org/apache/jetspeed/portlets/security/sso
                        SSODetails.java SSOBrowser.java
  Log:
  adjusted sso ui to use url instead of name
  
  Revision  Changes    Path
  1.3       +8 -11     
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/sso/sites-view.vm
  
  Index: sites-view.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/sso/sites-view.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sites-view.vm     11 Jan 2005 09:30:52 -0000      1.2
  +++ sites-view.vm     13 Jan 2005 23:30:08 -0000      1.3
  @@ -26,20 +26,21 @@
   <table cellpadding=0 cellspacing=1 border=0 width='100%' >
     <tr>
       <td width='12' class="jetdbHeadNoLink"></td>      
  -    #foreach ($column in $title)
  +    #set ($column = $title.get(1))
          #set ($columnLink = $renderResponse.createRenderURL())
          $columnLink.setParameter("js_dbcolumn",$column)
   ##      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap 
onClick="window.location.href='$columnLink'">
         <td align='center' class="jetdbHeadNoLink" width="40%" nowrap>
           $column
         </td>
  -    #end
       <td width='24' class="jetdbHeadNoLink">&nbsp;</td>    
       <td class=""></td>        
     </tr>
  -  #foreach ( $ssoName in $table )
  +  #foreach ( $ssoItem in $table )
     <tr>
  -     #if ($currentSite == $ssoName)
  +     #set ($ssoName = $ssoItem.get(1))
  +     #set ($ssoUrl = $ssoItem.get(0))
  +     #if ($currentUrl == $ssoUrl)
          #set ($rowstyle = "jetdbLight")
          <td class="$rowstyle" nowrap width='12'>
            <img src="/security/images/selected.gif" width="7" height="12" 
border="0" vspace="2"/>
  @@ -52,7 +53,7 @@
         #end            
         <td class="$rowstyle" nowrap width="40%">
           #set ($action = $renderResponse.createActionURL())
  -        $action.setParameter('ssoSite', $ssoName)
  +        $action.setParameter('ssoSite', $ssoUrl)
           <div align="center"><a href='$action'>$ssoName</a></div>
         </td>
          <td class="$rowstyle" nowrap width='24' align='center'>
  @@ -63,12 +64,8 @@
     #end
     <tr>
       <td width='12' class="jetdbHeadNoLink"></td>      
  -    #foreach ($column in $title)
  -       #set ($columnLink = $renderResponse.createRenderURL())
  -       $columnLink.setParameter("js_dbcolumn",$column)
         <td align='center' class="jetdbHeadNoLink" width="75%" nowrap>
         </td>
  -    #end
       <td width='24' class="jetdbHeadNoLink">&nbsp;</td>    
       <td class=""></td>        
     </tr>
  @@ -79,7 +76,7 @@
     <tr colspan="2" align="right">
       <td nowrap class="portlet-section-alternate" align="right">Site 
Name:&nbsp;</td>
       <td class="portlet-section-body" align="left">
  -      <input type="text" name="site.name" size="40" value="$!currentSite" 
class="portlet-form-field-label">
  +      <input type="text" name="site.name" size="40" value="$!currentName" 
class="portlet-form-field-label">
       </td>
     </tr>
     <tr colspan="2" align="right">
  
  
  
  1.6       +4 -4      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SSODetails.java   13 Jan 2005 06:23:19 -0000      1.5
  +++ SSODetails.java   13 Jan 2005 23:30:08 -0000      1.6
  @@ -95,7 +95,7 @@
               resultSetTypeList.add(String.valueOf(Types.VARCHAR));
               resultSetTitleList.add("Remote");
               
  -            String selectedSite = (String)PortletMessaging.receive(request, 
"site", "selected");
  +            String selectedSite = (String)PortletMessaging.receive(request, 
"site", "selectedUrl");
               if (selectedSite != null)
               {
                   site = sso.getSite(selectedSite);
  @@ -127,7 +127,7 @@
               this.clearBrowserIterator(request);
           }
           Context context = this.getContext(request);        
  -        String selectedSite = (String)PortletMessaging.receive(request, 
"site", "selected");
  +        String selectedSite = (String)PortletMessaging.receive(request, 
"site", "selectedUrl");
           if (selectedSite != null)
           {        
               context.put("currentSite", selectedSite);
  @@ -182,7 +182,7 @@
                   {
                       try
                       {
  -                        String siteName = 
(String)PortletMessaging.receive(request, "site", "selected");                  
      
  +                        String siteName = 
(String)PortletMessaging.receive(request, "site", "selectedUrl");               
         
                           SSOSite site = sso.getSite(siteName);
                           User user = userManager.getUser(portalPrincipal);    
                    
                           if (site != null && user != null)
  
  
  
  1.4       +19 -13    
jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/sso/SSOBrowser.java
  
  Index: SSOBrowser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/sso/SSOBrowser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SSOBrowser.java   4 Jan 2005 23:16:54 -0000       1.3
  +++ SSOBrowser.java   13 Jan 2005 23:30:08 -0000      1.4
  @@ -76,7 +76,9 @@
               //
               
               resultSetTypeList.add(String.valueOf(Types.VARCHAR));
  +            resultSetTypeList.add(String.valueOf(Types.VARCHAR));
               resultSetTitleList.add("Site");
  +            resultSetTitleList.add("Url");
   
               //subPopulate(rundata, qResult, repo, folder, null);
   
  @@ -84,13 +86,17 @@
               List list = new ArrayList();
               while (sites.hasNext())
               {
  +                List row = new ArrayList(2);
                   SSOSite site = (SSOSite)sites.next();
  -                list.add(site.getName());
  +                row.add(0, site.getSiteURL());                     
  +                row.add(1, site.getName());
  +                list.add(row);
               }            
               BrowserIterator iterator = new DatabaseBrowserIterator(
                       list, resultSetTitleList, resultSetTypeList,
                       windowSize);
               setBrowserIterator(request, iterator);
  +            iterator.sort("Site");
           }
           catch (Exception e)
           {
  @@ -103,13 +109,13 @@
       public void doView(RenderRequest request, RenderResponse response)
       throws PortletException, IOException
       {
  -        String selectedSite = (String)PortletMessaging.receive(request, 
"site", "selected");
  +        String selectedSite = (String)PortletMessaging.receive(request, 
"site", "selectedUrl");
           if (selectedSite != null)
           {        
               Context context = this.getContext(request);
  -            context.put("currentSite", selectedSite);
  -            String selectedUrl = (String)PortletMessaging.receive(request, 
"site", "selectedUrl");
  -            context.put("currentUrl", selectedUrl);            
  +            context.put("currentUrl", selectedSite);
  +            String selectedName = (String)PortletMessaging.receive(request, 
"site", "selectedName");
  +            context.put("currentName", selectedName);            
           }
           super.doView(request, response);
       }
  @@ -125,8 +131,8 @@
                   SSOSite site = sso.getSite(selectedSite);
                   if (site != null)
                   {
  -                    PortletMessaging.publish(request, "site", "selected", 
selectedSite);
  -                    PortletMessaging.publish(request, "site", "selectedUrl", 
site.getSiteURL());
  +                    PortletMessaging.publish(request, "site", "selectedUrl", 
selectedSite);
  +                    PortletMessaging.publish(request, "site", 
"selectedName", site.getName());
                       PortletMessaging.publish(request, "site", "change", 
selectedSite);
                   }
               }
  @@ -151,14 +157,14 @@
                       try
                       {
                           SSOSite site = null;
  -                        String oldName = 
(String)PortletMessaging.receive(request, "site", "selected");
  -                        if (oldName != null)
  +                        String old = 
(String)PortletMessaging.receive(request, "site", "selectedUrl");
  +                        if (old != null)
                           {
  -                            site = sso.getSite(oldName);
  +                            site = sso.getSite(old);
                           }
                           else
                           {
  -                            site = sso.getSite(siteName);
  +                            site = sso.getSite(siteUrl);
                           }                        
                           if (site != null)
                           {
  @@ -166,7 +172,7 @@
                               site.setSiteURL(siteUrl);
                               sso.updateSite(site);
                               this.clearBrowserIterator(request);
  -                            PortletMessaging.publish(request, "site", 
"selected", siteName);
  +                            PortletMessaging.publish(request, "site", 
"selectedName", siteName);
                               PortletMessaging.publish(request, "site", 
"selectedUrl", siteUrl);                            
                           }
                           else
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to