You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2001/12/14 20:41:17 UTC

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

vgritsenko    01/12/14 11:41:17

  Modified:    src/org/apache/cocoon/components/language/markup/xsp/java
                        Tag: cocoon_20_branch request.xsl
  Log:
  Add <xsp-request:get-server-port/>
  Fix <xsp-request:get-server-name as="xml"/>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.5   +27 -4     xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/request.xsl
  
  Index: request.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/request.xsl,v
  retrieving revision 1.3.2.4
  retrieving revision 1.3.2.5
  diff -u -r1.3.2.4 -r1.3.2.5
  --- request.xsl	2001/10/23 09:58:19	1.3.2.4
  +++ request.xsl	2001/12/14 19:41:17	1.3.2.5
  @@ -11,7 +11,7 @@
   
   <!--
    * @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
  - * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/23 09:58:19 $
  + * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/12/14 19:41:17 $
   -->
   
   <!-- XSP Request logicsheet for the Java language -->
  @@ -424,9 +424,32 @@
         </xsl:when>
         <xsl:when test="$as = 'xml'">
           <xsp:element name="xsp-request:server-name">
  -          <xsp:logic>
  -            XSPRequestHelper.getServerName(objectModel);
  -          </xsp:logic>
  +          <xsp:expr>
  +            (XSPRequestHelper.getServerName(objectModel))
  +          </xsp:expr>
  +        </xsp:element>
  +      </xsl:when>
  +    </xsl:choose>
  +  </xsl:template>
  +
  +  <xsl:template match="xsp-request:get-server-port">
  +    <xsl:variable name="as">
  +      <xsl:call-template name="value-for-as">
  +        <xsl:with-param name="default" select="'string'"/>
  +      </xsl:call-template>
  +    </xsl:variable>
  +
  +    <xsl:choose>
  +      <xsl:when test="$as = 'string'">
  +        <xsp:expr>
  +          (XSPRequestHelper.getServerPort(objectModel))
  +        </xsp:expr>
  +      </xsl:when>
  +      <xsl:when test="$as = 'xml'">
  +        <xsp:element name="xsp-request:server-port">
  +          <xsp:expr>
  +            (XSPRequestHelper.getServerPort(objectModel))
  +          </xsp:expr>
           </xsp:element>
         </xsl:when>
       </xsl:choose>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org