Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 46120 invoked from network); 17 Oct 2006 21:39:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Oct 2006 21:39:20 -0000 Received: (qmail 10633 invoked by uid 500); 17 Oct 2006 21:39:19 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 10569 invoked by uid 500); 17 Oct 2006 21:39:19 -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: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 10550 invoked by uid 99); 17 Oct 2006 21:39:18 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Oct 2006 14:39:18 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Oct 2006 14:39:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EF9191A981A; Tue, 17 Oct 2006 14:38:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r465066 - /cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java Date: Tue, 17 Oct 2006 21:38:57 -0000 To: cvs@cocoon.apache.org From: danielf@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061017213857.EF9191A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danielf Date: Tue Oct 17 14:38:56 2006 New Revision: 465066 URL: http://svn.apache.org/viewvc?view=rev&rev=465066 Log: Allow file system URLs for blockContextURL in BlockServlets (COCOON-1934). Due to Alexander Klimetschek. Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java?view=diff&rev=465066&r1=465065&r2=465066 ============================================================================== --- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java (original) +++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java Tue Oct 17 14:38:56 2006 @@ -103,15 +103,19 @@ public URL getResource(String path) throws MalformedURLException { if (path.length() == 0 || path.charAt(0) != '/') throw new MalformedURLException("The path must start with '/' " + path); - if (this.blockContextURL.length() != 0 && this.blockContextURL.charAt(0) != '/') - throw new MalformedURLException("The blockContextURL must be empty or start with '/' " - + this.blockContextURL); - // prefix the path with the block context resolve and resolve in the embeding - // servlet context - path = this.blockContextURL + path; - - return super.getResource(path); + // HACK: allow file:/ URLs for reloading of sitemaps during development + if (this.blockContextURL.startsWith("file:")) { + return new URL(this.blockContextURL + path); + } else { + if (this.blockContextURL.length() != 0 && this.blockContextURL.charAt(0) != '/') + throw new MalformedURLException("The blockContextURL must be empty or start with '/' " + + this.blockContextURL); + + // prefix the path with the block context resolve and resolve in the embeding + // servlet context + return super.getResource(this.blockContextURL + path); + } } /*