Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 97193 invoked from network); 11 Aug 2004 20:14:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Aug 2004 20:14:14 -0000 Received: (qmail 27402 invoked by uid 500); 11 Aug 2004 20:14:13 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 27348 invoked by uid 500); 11 Aug 2004 20:14:12 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 27337 invoked by uid 99); 11 Aug 2004 20:14:12 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 11 Aug 2004 13:14:12 -0700 Received: (qmail 97133 invoked by uid 65534); 11 Aug 2004 20:14:12 -0000 Date: 11 Aug 2004 20:14:12 -0000 Message-ID: <20040811201412.97128.qmail@minotaur.apache.org> From: ugo@apache.org To: cvs@cocoon.apache.org Subject: svn commit: rev 36247 - in cocoon/branches/butterfly/src: java/org/apache/butterfly/servlet webapp X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ugo Date: Wed Aug 11 13:14:11 2004 New Revision: 36247 Modified: cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/ButterflyServlet.java cocoon/branches/butterfly/src/webapp/sitemap.groovy Log: Pass environment to sitemap Modified: cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/ButterflyServlet.java ============================================================================== --- cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/ButterflyServlet.java (original) +++ cocoon/branches/butterfly/src/java/org/apache/butterfly/servlet/ButterflyServlet.java Wed Aug 11 13:14:11 2004 @@ -118,7 +118,7 @@ Class sitemapClass = loader.parseClass(fis); GroovyObject sitemap = (GroovyObject) sitemapClass.newInstance(); sitemap.setProperty("beanFactory", this.applicationContext); - Object[] args = { uri }; + Object[] args = { env }; Boolean retval = (Boolean) sitemap.invokeMethod("setup", args); if (retval.booleanValue()) { sitemap.invokeMethod("process", new Object[] { env }); Modified: cocoon/branches/butterfly/src/webapp/sitemap.groovy ============================================================================== --- cocoon/branches/butterfly/src/webapp/sitemap.groovy (original) +++ cocoon/branches/butterfly/src/webapp/sitemap.groovy Wed Aug 11 13:14:11 2004 @@ -21,18 +21,19 @@ */ class Sitemap extends Pipeline { - boolean setup(String requestPath) { - if (requestPath == "") { + boolean setup(environment) { + uri = environment.uri + if (uri == "") { generate "file", "welcome.xml", [] transform "trax", "welcome.xslt", [] serialize "xml", [ 'encoding': 'UTF-8' ] - } else if (m = (requestPath =~ "(.*)\.html")) { + } else if (m = (uri =~ "(.*)\.html")) { generate "file", m.group(1) + ".xml", [] transform "trax", "welcome.xslt", [] serialize "xml", [ 'encoding': 'UTF-8' ] - } else if (m = (requestPath =~ "images/(.*)\.gif")) { + } else if (m = (uri =~ "images/(.*)\.gif")) { read "resources/images/" + m.group(1) + ".gif", "image/gif", [] - } else if (m = (requestPath =~ "styles/(.*)\.css")) { + } else if (m = (uri =~ "styles/(.*)\.css")) { read "resources/styles/" + m.group(1) + ".css", "text/css", [] } else { return false;