You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by Stefano Mazzocchi <st...@apache.org> on 2000/08/22 17:18:50 UTC
Re: cvs commit: xml-cocoon/webapp/stylesheets/system error2html.xsl
status2html.xsl
bloritsch@locus.apache.org wrote:
>
> bloritsch 00/08/21 12:29:17
>
> Modified: webapp/docs/samples Tag: xml-cocoon2 error-giving-page.xml
> webapp/docs/samples/slides Tag: xml-cocoon2
> pyramid-model.gif schema.jpg
> webapp/resources/images Tag: xml-cocoon2 banner.gif
> cocoon.gif cocoon.png
> webapp/resources/images/slides Tag: xml-cocoon2 home.png
> next-section.png next.png previous-section.png
> previous.png
> webapp/stylesheets Tag: xml-cocoon2 dynamic-page2html.xsl
> simple-samples2html.xsl simple-sql2html.xsl
> slides-apachecon.xsl slides-navigation.xsl
> webapp/stylesheets/page Tag: xml-cocoon2
> simple-page2html.xsl simple-page2wml.xsl
> webapp/stylesheets/sites Tag: xml-cocoon2
> jakarta_apache_org-html.xsl
> java_apache_org-html.xsl
> webapp/stylesheets/system Tag: xml-cocoon2 error2html.xsl
> status2html.xsl
> Log:
> Fixed up the webapps so we don't get those resource not found errors.
Please explain me this because I don't get it.
> Revision Changes Path
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +1 -1 xml-cocoon/webapp/docs/samples/Attic/error-giving-page.xml
>
> Index: error-giving-page.xml
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/Attic/error-giving-page.xml,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- error-giving-page.xml 2000/08/21 17:48:38 1.1.2.1
> +++ error-giving-page.xml 2000/08/21 19:28:55 1.1.2.2
> @@ -12,4 +12,4 @@
> <content>
> </para>This is my first Cocoon2 page!</para>
> </content>
> -</page>
> \ No newline at end of file
> +</page>
>
>
>
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +25 -8 xml-cocoon/webapp/docs/samples/slides/Attic/pyramid-model.gif
>
> <<Binary file>>
>
>
> 1.1.2.2 +213 -91 xml-cocoon/webapp/docs/samples/slides/Attic/schema.jpg
>
> <<Binary file>>
>
>
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +81 -51 xml-cocoon/webapp/resources/images/Attic/banner.gif
>
> <<Binary file>>
>
>
> 1.1.2.2 +25 -15 xml-cocoon/webapp/resources/images/Attic/cocoon.gif
>
> <<Binary file>>
>
>
> 1.1.2.2 +25 -15 xml-cocoon/webapp/resources/images/Attic/cocoon.png
>
> <<Binary file>>
>
>
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +10 -5 xml-cocoon/webapp/resources/images/slides/Attic/home.png
>
> <<Binary file>>
>
>
> 1.1.2.2 +11 -6 xml-cocoon/webapp/resources/images/slides/Attic/next-section.png
>
> <<Binary file>>
>
>
> 1.1.2.2 +14 -6 xml-cocoon/webapp/resources/images/slides/Attic/next.png
>
> <<Binary file>>
>
>
> 1.1.2.2 +10 -6 xml-cocoon/webapp/resources/images/slides/Attic/previous-section.png
>
> <<Binary file>>
>
>
> 1.1.2.2 +14 -8 xml-cocoon/webapp/resources/images/slides/Attic/previous.png
>
> <<Binary file>>
All the images that you committed don't work on my system, they appear
damanged.
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/Attic/dynamic-page2html.xsl
>
> Index: dynamic-page2html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/dynamic-page2html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- dynamic-page2html.xsl 2000/08/21 17:48:52 1.1.2.1
> +++ dynamic-page2html.xsl 2000/08/21 19:29:04 1.1.2.2
> @@ -7,7 +7,7 @@
> xmlns:xsp-response="http://xml.apache.org/cocoon/xsp/response"
> >
>
> - <xsl:include href="simple-page2html.xsl"/>
> + <xsl:include href="page/simple-page2html.xsl"/>
Ok, I got this one.
> <xsl:template match="xsp-request:uri">
> <b><xsl:value-of select="."/></b>
>
>
>
> 1.1.2.2 +2 -2 xml-cocoon/webapp/stylesheets/Attic/simple-samples2html.xsl
>
> Index: simple-samples2html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/simple-samples2html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- simple-samples2html.xsl 2000/08/21 17:48:52 1.1.2.1
> +++ simple-samples2html.xsl 2000/08/21 19:29:04 1.1.2.2
> @@ -12,7 +12,7 @@
>
> <p align="center"><img border="0" src="images/cocoon.png"/></p>
>
> - <h3 align="center">version @version@</h3>
> + <h3 align="center">version 2.0a2</h3>
>
> <p><br/></p>
>
> @@ -20,7 +20,7 @@
>
> <p align="center">
> <font size="-1">
> - Copyright © @year@ <a href="http://xml.apache.org">The Apache XML Project</a>.<br/>
> + Copyright © 1999-2000 <a href="http://xml.apache.org">The Apache XML Project</a>.<br/>
> All rights reserved.
> </font>
> </p>
But I don't get this one? why?
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/Attic/simple-sql2html.xsl
>
> Index: simple-sql2html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/simple-sql2html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- simple-sql2html.xsl 2000/08/21 17:48:52 1.1.2.1
> +++ simple-sql2html.xsl 2000/08/21 19:29:05 1.1.2.2
> @@ -4,7 +4,7 @@
> xmlns:sql="http://apache.org/cocoon/SQL">
>
>
> - <xsl:import href="simple-page2html.xsl"/>
> + <xsl:import href="page/simple-page2html.xsl"/>
>
> <xsl:template match="sql:ROWSET">
> <xsl:choose>
>
>
>
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/Attic/slides-apachecon.xsl
>
> Index: slides-apachecon.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/slides-apachecon.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- slides-apachecon.xsl 2000/08/21 17:48:52 1.1.2.1
> +++ slides-apachecon.xsl 2000/08/21 19:29:05 1.1.2.2
> @@ -135,4 +135,4 @@
> </p>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
>
>
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/Attic/slides-navigation.xsl
>
> Index: slides-navigation.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/slides-navigation.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- slides-navigation.xsl 2000/08/21 17:48:52 1.1.2.1
> +++ slides-navigation.xsl 2000/08/21 19:29:06 1.1.2.2
> @@ -131,4 +131,4 @@
> </xsl:copy>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
>
>
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/page/Attic/simple-page2html.xsl
>
> Index: simple-page2html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/page/Attic/simple-page2html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- simple-page2html.xsl 2000/08/21 17:48:55 1.1.2.1
> +++ simple-page2html.xsl 2000/08/21 19:29:11 1.1.2.2
> @@ -27,4 +27,4 @@
> </p>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
>
>
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/page/Attic/simple-page2wml.xsl
>
> Index: simple-page2wml.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/page/Attic/simple-page2wml.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- simple-page2wml.xsl 2000/08/21 17:48:56 1.1.2.1
> +++ simple-page2wml.xsl 2000/08/21 19:29:11 1.1.2.2
> @@ -35,4 +35,4 @@
> </p>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
>
>
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +3 -3 xml-cocoon/webapp/stylesheets/sites/Attic/jakarta_apache_org-html.xsl
>
> Index: jakarta_apache_org-html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/sites/Attic/jakarta_apache_org-html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- jakarta_apache_org-html.xsl 2000/08/21 17:48:57 1.1.2.1
> +++ jakarta_apache_org-html.xsl 2000/08/21 19:29:13 1.1.2.2
> @@ -1,7 +1,7 @@
> <?xml version="1.0"?>
>
> <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
> -<!-- Version: $Id: jakarta_apache_org-html.xsl,v 1.1.2.1 2000/08/21 17:48:57 stefano Exp $ -->
> +<!-- Version: $Id: jakarta_apache_org-html.xsl,v 1.1.2.2 2000/08/21 19:29:13 bloritsch Exp $ -->
>
> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
>
> @@ -35,7 +35,7 @@
> <tr>
> <td>
> <p class="fineprint">
> - Copyright © @year@ The Apache Software Foundation<br/>
> + Copyright © 1999-2000 The Apache Software Foundation<br/>
> <a href="legal.html">Legal Stuff They Make Us Say</a><br/>
> <a href="contact.html">Contact Information</a>
> </p>
> @@ -82,4 +82,4 @@
> <a href="{@href}"><xsl:apply-templates/></a><br/>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
>
>
> 1.1.2.2 +2 -2 xml-cocoon/webapp/stylesheets/sites/Attic/java_apache_org-html.xsl
>
> Index: java_apache_org-html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/sites/Attic/java_apache_org-html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- java_apache_org-html.xsl 2000/08/21 17:48:58 1.1.2.1
> +++ java_apache_org-html.xsl 2000/08/21 19:29:14 1.1.2.2
> @@ -1,7 +1,7 @@
> <?xml version="1.0"?>
>
> <!-- Author: Stefano Mazzocchi "stefano@apache.org" -->
> -<!-- Version: $Id: java_apache_org-html.xsl,v 1.1.2.1 2000/08/21 17:48:58 stefano Exp $ -->
> +<!-- Version: $Id: java_apache_org-html.xsl,v 1.1.2.2 2000/08/21 19:29:14 bloritsch Exp $ -->
>
> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
>
> @@ -134,4 +134,4 @@
> </tr>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
>
>
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/system/Attic/error2html.xsl
>
> Index: error2html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/system/Attic/error2html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- error2html.xsl 2000/08/21 17:49:00 1.1.2.1
> +++ error2html.xsl 2000/08/21 19:29:16 1.1.2.2
> @@ -91,4 +91,4 @@
> </tr>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
>
>
>
> 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/system/Attic/status2html.xsl
>
> Index: status2html.xsl
> ===================================================================
> RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/system/Attic/status2html.xsl,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- status2html.xsl 2000/08/21 17:49:01 1.1.2.1
> +++ status2html.xsl 2000/08/21 19:29:16 1.1.2.2
> @@ -73,4 +73,4 @@
> <xsl:if test="../line"><br/></xsl:if>
> </xsl:template>
>
> -</xsl:stylesheet>
> \ No newline at end of file
> +</xsl:stylesheet>
Please, checkout again and look at the images, unless there is something
wrong on my machine, they are damaged.
--
Stefano Mazzocchi One must still have chaos in oneself to be
able to give birth to a dancing star.
<st...@apache.org> Friedrich Nietzsche
--------------------------------------------------------------------
Missed us in Orlando? Make it up with ApacheCON Europe in London!
------------------------- http://ApacheCon.Com ---------------------
Re: cvs commit: xml-cocoon/webapp/stylesheets/system error2html.xsl
status2html.xsl
Posted by Berin Loritsch <bl...@infoplanning.com>.
Stefano Mazzocchi wrote:
>
> bloritsch@locus.apache.org wrote:
> > Log:
> > Fixed up the webapps so we don't get those resource not found errors.
>
> Please explain me this because I don't get it.
> All the images that you committed don't work on my system, they appear
> damanged.
Those images were not supposed to be updated! Blast this WinCVS!
>
> > 1.1.2.2 +1 -1 xml-cocoon/webapp/stylesheets/Attic/dynamic-page2html.xsl
> >
> > Index: dynamic-page2html.xsl
> > ===================================================================
> > RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/dynamic-page2html.xsl,v
> > retrieving revision 1.1.2.1
> > retrieving revision 1.1.2.2
> > diff -u -r1.1.2.1 -r1.1.2.2
> > --- dynamic-page2html.xsl 2000/08/21 17:48:52 1.1.2.1
> > +++ dynamic-page2html.xsl 2000/08/21 19:29:04 1.1.2.2
> > @@ -7,7 +7,7 @@
> > xmlns:xsp-response="http://xml.apache.org/cocoon/xsp/response"
> > >
> >
> > - <xsl:include href="simple-page2html.xsl"/>
> > + <xsl:include href="page/simple-page2html.xsl"/>
>
> Ok, I got this one.
That and a couple of other XSL / XMAP changes
> > Index: simple-samples2html.xsl
> > ===================================================================
> > RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/simple-samples2html.xsl,v
> > retrieving revision 1.1.2.1
> > retrieving revision 1.1.2.2
> > diff -u -r1.1.2.1 -r1.1.2.2
> > --- simple-samples2html.xsl 2000/08/21 17:48:52 1.1.2.1
> > +++ simple-samples2html.xsl 2000/08/21 19:29:04 1.1.2.2
> > @@ -12,7 +12,7 @@
> >
> > <p align="center"><img border="0" src="images/cocoon.png"/></p>
> >
> > - <h3 align="center">version @version@</h3>
> > + <h3 align="center">version 2.0a2</h3>
> >
> > <p><br/></p>
> >
> > @@ -20,7 +20,7 @@
> >
> > <p align="center">
> > <font size="-1">
> > - Copyright © @year@ <a href="http://xml.apache.org">The Apache XML Project</a>.<br/>
> > + Copyright © 1999-2000 <a href="http://xml.apache.org">The Apache XML Project</a>.<br/>
> > All rights reserved.
> > </font>
> > </p>
>
> But I don't get this one? why?
I was fixing stuff in my test directory that was already filtered. I didn't
realize that at the time. Sorry.
> Please, checkout again and look at the images, unless there is something
> wrong on my machine, they are damaged.
>
> --
> Stefano Mazzocchi One must still have chaos in oneself to be
> able to give birth to a dancing star.
> <st...@apache.org> Friedrich Nietzsche
> --------------------------------------------------------------------
> Missed us in Orlando? Make it up with ApacheCON Europe in London!
> ------------------------- http://ApacheCon.Com ---------------------
What is the command to roll back changes? I did not intend to alter the
images at all? WinCVS doesn't seem to cooperate on that note.