Return-Path: 
 <cvs-return-22672-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 61461 invoked from network); 21 Mar 2005 10:47:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 21 Mar 2005 10:47:38 -0000
Received: (qmail 13016 invoked by uid 500); 21 Mar 2005 10:47:37 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 12864 invoked by uid 500); 21 Mar 2005 10:47:36 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 12847 invoked by uid 99); 21 Mar 2005 10:47:36 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 21 Mar 2005 02:47:36 -0800
Received: (qmail 54519 invoked by uid 65534); 21 Mar 2005 10:20:54 -0000
Message-ID: <20050321102054.54518.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Mon, 21 Mar 2005 10:20:54 -0000
Subject: svn commit: r158440 -
 cocoon/blocks/supported/html/trunk/samples/samples.xml
 cocoon/blocks/supported/html/trunk/samples/sitemap.xmap
 cocoon/blocks/supported/html/trunk/samples/stylesheets/apache.xsl
 cocoon/blocks/supported/html/trunk/samples/stylesheets/googlenews.xsl
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Mon Mar 21 02:20:53 2005
New Revision: 158440

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D158440
Log:
Fix html sample by replacing google news with our own news

Added:
    cocoon/blocks/supported/html/trunk/samples/stylesheets/apache.xsl   (wi=
th props)
Removed:
    cocoon/blocks/supported/html/trunk/samples/stylesheets/googlenews.xsl
Modified:
    cocoon/blocks/supported/html/trunk/samples/samples.xml
    cocoon/blocks/supported/html/trunk/samples/sitemap.xmap

Modified: cocoon/blocks/supported/html/trunk/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/supported/html/trunk/sampl=
es/samples.xml?view=3Ddiff&r1=3D158439&r2=3D158440
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/blocks/supported/html/trunk/samples/samples.xml (original)
+++ cocoon/blocks/supported/html/trunk/samples/samples.xml Mon Mar 21 02:20=
:53 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
=20
-<!-- CVS $Id: samples.xml,v 1.5 2004/04/05 12:25:33 antonio Exp $ -->
+<!-- CVS $Id$ -->
=20
 <samples name=3D"HTML Block Samples" xmlns:xlink=3D"http://www.w3.org/1999=
/xlink">
=20
@@ -25,7 +25,7 @@
   </group>
=20
   <group name=3D"HTMLGenerator">
-    <sample name=3D"Google News Sci/Tech" href=3D"googlenews">
+    <sample name=3D"Cocoon News Website" href=3D"apache">
       Shows how to get remote resource and convert it to valid XHTML using=
 HTMLGenerator.
     </sample>
   </group>

Modified: cocoon/blocks/supported/html/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/supported/html/trunk/sampl=
es/sitemap.xmap?view=3Ddiff&r1=3D158439&r2=3D158440
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/blocks/supported/html/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/supported/html/trunk/samples/sitemap.xmap Mon Mar 21 02:2=
0:53 2005
@@ -17,7 +17,7 @@
=20
 <!--+
     | HTML block samples sitemap
-    | CVS $Id: sitemap.xmap,v 1.5 2004/03/06 02:25:56 antonio Exp $
+    | CVS $Id$
     +-->
=20
 <map:sitemap xmlns:map=3D"http://apache.org/cocoon/sitemap/1.0">
@@ -59,11 +59,11 @@
=20
       <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D  TIDY  =3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 -->
=20
-      <map:match pattern=3D"googlenews">
-        <map:generate type=3D"html" src=3D"http://news.google.com/news/en/=
us/technology.html">
+      <map:match pattern=3D"apache">
+        <map:generate type=3D"html" src=3D"http://cocoon.apache.org/news">
           <map:parameter name=3D"xpath" value=3D"/html"/>
         </map:generate>
-        <map:transform src=3D"stylesheets/googlenews.xsl"/>
+        <map:transform src=3D"stylesheets/apache.xsl"/>
         <map:serialize type=3D"xhtml"/>
       </map:match>
=20

Added: cocoon/blocks/supported/html/trunk/samples/stylesheets/apache.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/supported/html/trunk/sampl=
es/stylesheets/apache.xsl?view=3Dauto&rev=3D158440
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/blocks/supported/html/trunk/samples/stylesheets/apache.xsl (adde=
d)
+++ cocoon/blocks/supported/html/trunk/samples/stylesheets/apache.xsl Mon M=
ar 21 02:20:53 2005
@@ -0,0 +1,50 @@
+<?xml version=3D"1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/Tr=
ansform"
+                              xmlns:xhtml=3D"http://www.w3.org/1999/xhtml">
+
+<xsl:template match=3D"/xhtml:html">
+  <html>
+    <head>
+      <title><xsl:value-of select=3D"xhtml:head/xhtml:title"/></title>
+    </head>
+    <body>
+      <h2><xsl:value-of select=3D"xhtml:head/xhtml:title"/></h2>
+      <ul>
+        <xsl:apply-templates select=3D"//xhtml:div[@class=3D'content']/xht=
ml:ul"/>
+      </ul>
+    </body>
+  </html>
+</xsl:template>
+
+<xsl:template match=3D"xhtml:ul">
+    <ul>
+        <xsl:apply-templates select=3D"xhtml:li"/>
+    </ul>
+</xsl:template>
+
+<xsl:template match=3D"xhtml:li">
+    <li><xsl:apply-templates/></li>
+</xsl:template>
+
+<xsl:template match=3D"xhtml:a">
+    <a href=3D"http://cocoon.apache.org/news/{@href}" title=3D"{@title}">
+      <xsl:value-of select=3D"text()"/>
+    </a>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file

Propchange: cocoon/blocks/supported/html/trunk/samples/stylesheets/apache.x=
sl
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/blocks/supported/html/trunk/samples/stylesheets/apache.x=
sl
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id