You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@locus.apache.org on 2000/08/31 19:13:34 UTC

cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java response.xsl

giacomo     00/08/31 10:13:34

  Modified:    src/org/apache/cocoon/components/language/markup/xsp Tag:
                        xml-cocoon2 XSPResponseHelper.java
               src/org/apache/cocoon/components/language/markup/xsp/java
                        Tag: xml-cocoon2 response.xsl
  Log:
  Added send-redirect tag to xsp-response logicsheet. This patch was contributed by Anthony Uk.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +15 -1     xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java
  
  Index: XSPResponseHelper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- XSPResponseHelper.java	2000/08/31 16:42:00	1.1.2.5
  +++ XSPResponseHelper.java	2000/08/31 17:13:32	1.1.2.6
  @@ -7,6 +7,7 @@
    *****************************************************************************/
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import java.io.IOException;
   import java.util.Enumeration;
   
   import javax.servlet.http.HttpServletResponse;
  @@ -21,7 +22,7 @@
    * The XSP <code>HttpResponse</code> object helper
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/31 16:42:00 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/31 17:13:32 $
    */
   public class XSPResponseHelper extends XSPObjectHelper {
     /**
  @@ -51,5 +52,18 @@
      */
     public static void setContentType(HttpServletResponse response, String type) {
       response.setContentType(type);
  +  }
  +
  +  /**
  +   * Send an HTTP redirect
  +   *
  +   * @param response The <code>HttpServletResponse</code>
  +   * @param location The location URL
  +   */
  +  public static void sendRedirect(HttpServletResponse response, String location) {
  +    try {
  +      response.sendRedirect(location);
  +    }
  +    catch (IOException e) {}  
     }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +17 -1     xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl
  
  Index: response.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- response.xsl	2000/08/31 15:52:36	1.1.2.6
  +++ response.xsl	2000/08/31 17:13:33	1.1.2.7
  @@ -11,7 +11,7 @@
   
   <!--
    * @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/31 15:52:36 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/31 17:13:33 $
   -->
   
   <!-- XSP Response logicsheet for the Java language -->
  @@ -65,6 +65,22 @@
   
       <xsp:logic>
         XSPResponseHelper.setContentType(response, <xsl:value-of select="$type"/>);
  +    </xsp:logic>
  +  </xsl:template>
  +
  +  <xsl:template match="xsp-response:send-redirect">
  +    <xsl:variable name="location">
  +      <xsl:choose>
  +        <xsl:when test="@location">"<xsl:value-of select="@location"/>"</xsl:when>
  +        <xsl:when test="location">
  +          <xsl:call-template name="get-nested-content">
  +            <xsl:with-param name="content" select="xsp-response:location"/>
  +          </xsl:call-template>
  +        </xsl:when>
  +      </xsl:choose>
  +    </xsl:variable>
  +    <xsp:logic>
  +      XSPResponseHelper.sendRedirect(response, <xsl:value-of select="$location"/>);
       </xsp:logic>
     </xsl:template>