You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by st...@locus.apache.org on 2000/03/01 17:05:42 UTC

cvs commit: xml-cocoon/samples/xsp lib-page.xml page-html.xsl page-xsp.xsl

stefano     00/03/01 08:05:42

  Modified:    samples/dcp sample-page-html.xsl
               samples/entities entities-page-html.xsl
               samples/fo novel-fo.xsl
               samples/hello hello-page-html.xsl
               samples/import import-page-html.xsl
               samples/ldap ldap.xsl
               samples/sites/jakarta.apache.org page-html.xsl
               samples/sites/java.apache.org fancy-page-html.xsl
                        text-page-html.xsl
               samples/vml hello-page-vml.xsl
               samples/vrml hello-vrml.xsl
               samples/wap portfolio-html.xsl portfolio-wml.xsl
               samples/xsp lib-page.xml page-html.xsl page-xsp.xsl
  Log:
  added the version to the XSLT stylesheets
  
  Revision  Changes    Path
  1.6       +1 -1      xml-cocoon/samples/dcp/sample-page-html.xsl
  
  Index: sample-page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/dcp/sample-page-html.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sample-page-html.xsl	2000/02/28 23:32:18	1.5
  +++ sample-page-html.xsl	2000/03/01 16:05:31	1.6
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.4       +1 -1      xml-cocoon/samples/entities/entities-page-html.xsl
  
  Index: entities-page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/entities/entities-page-html.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- entities-page-html.xsl	2000/02/28 23:32:18	1.3
  +++ entities-page-html.xsl	2000/03/01 16:05:33	1.4
  @@ -6,7 +6,7 @@
   
   <!-- Written by Stefano Mazzocchi "stefano@apache.org" -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.5       +1 -1      xml-cocoon/samples/fo/novel-fo.xsl
  
  Index: novel-fo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/fo/novel-fo.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- novel-fo.xsl	2000/02/28 23:32:19	1.4
  +++ novel-fo.xsl	2000/03/01 16:05:33	1.5
  @@ -1,4 +1,4 @@
  -<xsl:stylesheet
  +<xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format">
   
  
  
  
  1.6       +1 -1      xml-cocoon/samples/hello/hello-page-html.xsl
  
  Index: hello-page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/hello/hello-page-html.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- hello-page-html.xsl	2000/02/28 23:32:20	1.5
  +++ hello-page-html.xsl	2000/03/01 16:05:34	1.6
  @@ -2,7 +2,7 @@
   
   <!-- Written by Stefano Mazzocchi "stefano@apache.org" -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.5       +1 -1      xml-cocoon/samples/import/import-page-html.xsl
  
  Index: import-page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/import/import-page-html.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- import-page-html.xsl	2000/02/28 23:32:20	1.4
  +++ import-page-html.xsl	2000/03/01 16:05:34	1.5
  @@ -2,7 +2,7 @@
   
   <!-- Written by Stefano Mazzocchi "stefano@apache.org" -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:import href="../hello/hello-page-html.xsl"/>
   
  
  
  
  1.5       +1 -1      xml-cocoon/samples/ldap/ldap.xsl
  
  Index: ldap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/ldap/ldap.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ldap.xsl	2000/02/28 23:32:20	1.4
  +++ ldap.xsl	2000/03/01 16:05:35	1.5
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/XSL/Transform/1.0">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/XSL/Transform/1.0">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.5       +2 -2      xml-cocoon/samples/sites/jakarta.apache.org/page-html.xsl
  
  Index: page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/sites/jakarta.apache.org/page-html.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- page-html.xsl	2000/02/28 23:32:21	1.4
  +++ page-html.xsl	2000/03/01 16:05:36	1.5
  @@ -1,9 +1,9 @@
   <?xml version="1.0"?>
   
   <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
  -<!-- Version: $Id: page-html.xsl,v 1.4 2000/02/28 23:32:21 stefano Exp $ -->
  +<!-- Version: $Id: page-html.xsl,v 1.5 2000/03/01 16:05:36 stefano Exp $ -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.6       +2 -2      xml-cocoon/samples/sites/java.apache.org/fancy-page-html.xsl
  
  Index: fancy-page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/sites/java.apache.org/fancy-page-html.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- fancy-page-html.xsl	2000/02/28 23:32:21	1.5
  +++ fancy-page-html.xsl	2000/03/01 16:05:37	1.6
  @@ -1,9 +1,9 @@
   <?xml version="1.0"?>
   
   <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
  -<!-- Version: $Id: fancy-page-html.xsl,v 1.5 2000/02/28 23:32:21 stefano Exp $ -->
  +<!-- Version: $Id: fancy-page-html.xsl,v 1.6 2000/03/01 16:05:37 stefano Exp $ -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.5       +2 -2      xml-cocoon/samples/sites/java.apache.org/text-page-html.xsl
  
  Index: text-page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/sites/java.apache.org/text-page-html.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- text-page-html.xsl	2000/02/28 23:32:21	1.4
  +++ text-page-html.xsl	2000/03/01 16:05:37	1.5
  @@ -1,11 +1,11 @@
   <?xml version="1.0"?>
   
   <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
  -<!-- Version: $Id: text-page-html.xsl,v 1.4 2000/02/28 23:32:21 stefano Exp $ -->
  +<!-- Version: $Id: text-page-html.xsl,v 1.5 2000/03/01 16:05:37 stefano Exp $ -->
   
   <!-- This stylesheet is for text browsers -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
       <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.5       +1 -1      xml-cocoon/samples/vml/hello-page-vml.xsl
  
  Index: hello-page-vml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/vml/hello-page-vml.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- hello-page-vml.xsl	2000/02/28 23:32:21	1.4
  +++ hello-page-vml.xsl	2000/03/01 16:05:38	1.5
  @@ -16,7 +16,7 @@
       session.
   -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/xml"</xsl:processing-instruction>
  
  
  
  1.4       +1 -1      xml-cocoon/samples/vrml/hello-vrml.xsl
  
  Index: hello-vrml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/vrml/hello-vrml.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- hello-vrml.xsl	2000/02/28 23:32:22	1.3
  +++ hello-vrml.xsl	2000/03/01 16:05:39	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/XSL/Transform/1.0">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/XSL/Transform/1.0">
   
   	<xsl:template match="page">
   		<xsl:processing-instruction name="cocoon-format">type="model/vrml"</xsl:processing-instruction>
  
  
  
  1.6       +1 -1      xml-cocoon/samples/wap/portfolio-html.xsl
  
  Index: portfolio-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/wap/portfolio-html.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- portfolio-html.xsl	2000/02/28 23:32:22	1.5
  +++ portfolio-html.xsl	2000/03/01 16:05:39	1.6
  @@ -2,7 +2,7 @@
   
   <!-- Written by Stefano Mazzocchi "stefano@apache.org" -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="portfolio">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.6       +1 -1      xml-cocoon/samples/wap/portfolio-wml.xsl
  
  Index: portfolio-wml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/wap/portfolio-wml.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- portfolio-wml.xsl	2000/02/28 23:32:22	1.5
  +++ portfolio-wml.xsl	2000/03/01 16:05:40	1.6
  @@ -2,7 +2,7 @@
   
   <!-- Written by Stefano Mazzocchi "stefano@apache.org" -->
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
    <xsl:template match="portfolio">
     <xsl:processing-instruction name="cocoon-format">type="text/wml"</xsl:processing-instruction>
  
  
  
  1.5       +13 -15    xml-cocoon/samples/xsp/lib-page.xml
  
  Index: lib-page.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/xsp/lib-page.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- lib-page.xml	2000/01/09 23:44:19	1.4
  +++ lib-page.xml	2000/03/01 16:05:40	1.5
  @@ -1,14 +1,14 @@
   <?xml version="1.0"?>
   
   <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
  -<!-- Version: $Id: lib-page.xml,v 1.4 2000/01/09 23:44:19 stefano Exp $ -->
  +<!-- Version: $Id: lib-page.xml,v 1.5 2000/03/01 16:05:40 stefano Exp $ -->
   
   <?cocoon-process type="xsp"?>
   
   <?cocoon-process type="xslt"?>
   <?xml-stylesheet href="page-html.xsl" type="text/xsl"?>
   
  -<xsp:page 
  +<xsp:page
     language="java"
     xmlns:xsp="http://www.apache.org/1999/XSP/Core"
     xmlns:request="http://www.apache.org/1999/XSP/Request"
  @@ -21,20 +21,20 @@
     <name>Stefano Mazzocchi</name>
     <address>stefano@apache.org</address>
    </author>
  - 
  +
    <p>Hi, I'm your first XSP page ever.</p>
  - 
  +
    <p>I've been requested <util:counter/> times.</p>
  - 
  +
    <p>The content you are seeing in this page is provided to you
    by an XML content producer that was compiled into Java bytecode
    and executed at request time. This allows greater flexibility and
    ease of use for page programmers without any performance degradation
    since all XML parsing and such is precompiled and it's avoided at
    request time.</p>
  - 
  +
    <p>Let's show some useful information with expression evaluation...</p>
  - 
  +
    <list title="Request Data">
     <element name="Request method"><request:get-method/></element>
     <element name="Request URI"><request:get-request-uri/></element>
  @@ -52,28 +52,26 @@
     <element name="Remote host"><request:get-remote-host/></element>
     <element name="Authorization scheme"><request:get-auth-type/></element>
    </list>
  -   
  +
    <p>Ok. Now that you know how logic can be transformed into content, let's
    add some juice and mix logic with content generation
    in a way that allows you to forget about what method is used to generate and
  - handle the content as XML and concentrate on having your work done. 
  + handle the content as XML and concentrate on having your work done.
    Note, how XSP don't allow you to explicitly write something on the response
    from the logic realm: this is one of the major
    differences between XSP and other server pages technologies and allows
    further processing of the produced content, as required, for example, by
    XSL-transformations.</p>
  - 
  - <!-- FIXME (SM): here should go some taglib to emulate the other two 
  +
  + <!-- FIXME (SM): here should go some taglib to emulate the other two
         examples, but we don't have yet a good way to iterate over items
         and so on without using logic directly... more feedback is needed on
         the taglib issue. -->
  -      
  +
    <p>All right, the first XSP page is over, but you can see the dynamically syntax highlighted
    <link href="view-source.xml?filename=lib-page.xml">source of this page</link>,
  - <link href="view-source.xml?url=resource://org/apache/cocoon/processor/xsp/library/java/request.xsl">the servlet request library logicsheet</link>,
  - <link href="view-source.xml?url=resource://org/apache/cocoon/processor/xsp/library/java/util.xsl">the utility library logicsheet</link>,
    all provided to you by another XSP page.</p>
  - 
  +
    <p>Enjoy XSP!</p>
   </page>
   </xsp:page>
  
  
  
  1.7       +1 -1      xml-cocoon/samples/xsp/page-html.xsl
  
  Index: page-html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/xsp/page-html.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page-html.xsl	2000/02/28 23:32:23	1.6
  +++ page-html.xsl	2000/03/01 16:05:41	1.7
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:template match="page">
      <xsl:processing-instruction name="cocoon-format">type="text/html"</xsl:processing-instruction>
  
  
  
  1.7       +1 -1      xml-cocoon/samples/xsp/page-xsp.xsl
  
  Index: page-xsp.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/xsp/page-xsp.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page-xsp.xsl	2000/02/28 23:31:41	1.6
  +++ page-xsp.xsl	2000/03/01 16:05:41	1.7
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<xsl:stylesheet
  +<xsl:stylesheet version="1.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:xsp="http://www.apache.org/1999/XSP/Core"
   >