Changeset 646

Show
Ignore:
Timestamp:
06/23/06 00:37:08
Author:
douglm
Message:

Add some missing files - further portlet fix

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/common/src/edu/rpi/sss/util/jsp/UtilAbstractAction.java

    r609 r646  
    313313         ---------------------------------------------------------------- */ 
    314314 
    315       forward = checkLogOut(request, form); 
     315      if (!isPortlet) { 
     316        forward = checkLogOut(request, form); 
     317      } else { 
     318        forward = null; 
     319      } 
     320 
    316321      if (forward != null) { 
    317322        // Disable xslt filters 
    318323        response.setContentType("text/html"); 
    319324      } else { 
    320         response.setContentType(defaultContentType); 
     325        if (!isPortlet) { 
     326          response.setContentType(defaultContentType); 
     327        } 
    321328        forward = checkVarReq(request, form); 
    322329 

  • trunk/calendar3/uportal/src/ca/mun/portal/strutsbridge/taglib/CalRewriteTag.java

    r645 r646  
    150150      urlStr = url.getFile(); 
    151151 
    152       System.out.println("RRRRRRRRRRRRRRRRRUrlStr = " + urlStr); 
     152      //System.out.println("RRRRRRRRRRRRRRRRRUrlStr = " + urlStr); 
    153153 
    154154      /* Drop the context 
    …… 
    176176      urlStr = urlStr.replaceAll("&", "&"); 
    177177 
    178       System.out.println("RRRRRRRRRRRRRRRRRUrlStr = " + urlStr); 
     178      //System.out.println("RRRRRRRRRRRRRRRRRUrlStr = " + urlStr); 
    179179    } catch (MalformedURLException mue) { 
    180180      throw new JspException(mue);