Return-Path: <tcurdt@dff.st>
Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list cocoon-dev@xml.apache.org
Received: (qmail 87750 invoked from network); 1 Jan 2001 19:41:19 -0000
Received: from pns.dff.st (HELO mail.dff.st) (62.153.127.51)
  by h31.sny.collab.net with SMTP; 1 Jan 2001 19:41:19 -0000
Received: from mail.dff.local ([172.16.1.10])
	by mail.dff.st with esmtp (Exim 3.14 #3)
	id 14DBh6-0000Kh-00
	for cocoon-dev@xml.apache.org; Mon, 01 Jan 2001 21:36:36 +0100
Received: from shodan.dff.local ([172.16.2.1] helo=shodan)
	by mail.dff.local with smtp (Exim 3.16 #3)
	id 14DApE-0008Lw-00
	for cocoon-dev@xml.apache.org; Mon, 01 Jan 2001 20:40:56 +0100
From: "Torsten Curdt" <tcurdt@dff.st>
To: "Cocoon-Dev" <cocoon-dev@xml.apache.org>
Subject: [patch] xsp:logicsheet
Date: Mon, 1 Jan 2001 20:40:56 +0100
Message-ID: <CHEGLKNOIJHFNDNBCIAJIEECCAAA.tcurdt@dff.st>
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_0007_01C07433.23EA84E0"
X-Priority: 3 (Normal)
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0)
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
Importance: Normal
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

------=_NextPart_000_0007_01C07433.23EA84E0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Happy new year cocooners :)

Hey, Giacomo, here is the modification
on the XSPGenerator class that I proposed.

With this modification we can easily include
a xsp page into another one.
--
Torsten
------=_NextPart_000_0007_01C07433.23EA84E0
Content-Type: application/octet-stream;
	name="generate.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="generate.patch"

RCS file: =
/home/cvspublic/xml-cocoon/src/org/apache/cocoon/components/language/mark=
up/xsp/java/Attic/xsp.xsl,v
retrieving revision 1.1.2.17
diff -u -w -r1.1.2.17 xsp.xsl
--- xsp.xsl	2000/12/27 21:12:03	1.1.2.17
+++ xsp.xsl	2001/01/01 19:12:44
@@ -70,7 +70,7 @@
         static {
             dateCreated =3D <xsl:value-of select=3D"@creation-date"/>L;
             dependencies =3D new File[] {
-                <xsl:for-each select=3D"xsp:dependency">
+          <xsl:for-each select=3D"//xsp:dependency">
                   new File("<xsl:value-of select=3D"translate(., =
'\','/')"/>"),
                 </xsl:for-each>
             };
@@ -82,6 +82,17 @@
         /**
         * Generate XML data.
         */
+      public void generateContent() throws SAXException {
+        AttributesImpl xspAttr =3D new AttributesImpl();
+
+        <!-- Process only 1st non-XSP element as generated root -->
+        <xsl:call-template name=3D"process-first-element">
+          <xsl:with-param
+                          name=3D"content"
+                          select=3D"*[not(starts-with(name(.), =
'xsp:'))]"/>
+        </xsl:call-template>
+      }
+
         public void generate() throws SAXException {
             this.contentHandler.startDocument();
             AttributesImpl xspAttr =3D new AttributesImpl();
@@ -97,11 +108,7 @@
                   );
             </xsl:for-each>
=20
-            <!-- Process only 1st non-XSP element as generated root -->
-            <xsl:call-template name=3D"process-first-element">
-              <xsl:with-param name=3D"content"
-                              select=3D"*[not(starts-with(name(.), =
'xsp:'))]"/>
-            </xsl:call-template>
+        generateContent();
=20
             <!-- End top-level namespace prefix mapping -->
             <xsl:for-each select=3D"namespace::*[not(local-name(.) =3D =
'xsp')]">

------=_NextPart_000_0007_01C07433.23EA84E0--