Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 42095 invoked from network); 8 Jul 2005 13:05:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Jul 2005 13:05:16 -0000 Received: (qmail 40355 invoked by uid 500); 8 Jul 2005 13:05:15 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 40308 invoked by uid 500); 8 Jul 2005 13:05:14 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 40295 invoked by uid 99); 8 Jul 2005 13:05:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jul 2005 06:05:14 -0700 X-ASF-Spam-Status: No, hits=-9.2 required=10.0 tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP,NO_REAL_NAME,WEIRD_PORT 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.29) with SMTP; Fri, 08 Jul 2005 06:05:10 -0700 Received: (qmail 42036 invoked by uid 65534); 8 Jul 2005 13:05:08 -0000 Message-ID: <20050708130508.42033.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r209756 - in /forrest/trunk/main: fresh-site/src/documentation/content/ fresh-site/src/documentation/content/xdocs/ fresh-site/src/documentation/content/xdocs/samples/ fresh-site/src/documentation/content/xdocs/samples/locationmap/ java/org... Date: Fri, 08 Jul 2005 13:05:03 -0000 To: svn@forrest.apache.org From: rgardler@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rgardler Date: Fri Jul 8 06:05:02 2005 New Revision: 209756 URL: http://svn.apache.org/viewcvs?rev=209756&view=rev Log: complete merge of locationmap branch Added: forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml - copied unchanged from r209747, forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/locationmap.xml forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/ - copied from r209747, forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap.xml (with props) forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml (contents, props changed) - copied, changed from r209747, forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf forrest/trunk/main/webapp/sitemap.xmap Added: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap.xml URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap.xml?rev=209756&view=auto ============================================================================== --- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap.xml (added) +++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap.xml Fri Jul 8 06:05:02 2005 @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap.xml ------------------------------------------------------------------------------ svn:eol-style = native Copied: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml (from r209747, forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml) URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml?p2=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml&p1=forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml&r1=209747&r2=209756&rev=209756&view=diff ============================================================================== --- forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml (original) +++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml Fri Jul 8 06:05:02 2005 @@ -52,11 +52,11 @@ This is useful if you want to pull files from different directory structures, oe even remote repositories.

-

The target of href="/remoteDemo/index.html" +

The target of "/remoteDemo/index.html" is generated from a source retrieved from the Forrest SVN via viewSVN.

- Because the above link retrieves the source file from viewSVN it will - only work if you are online. + Because the above URL retrieves the source file from viewSVN it will + only work if you are online. For this reason we have not enabled this link as it would stop you building this site offline. However, if you are online you can enter the URL into the browesr and it will work (however, note the surrent limitations regarding the site: and ext: protocols).

The locationmap matcher for the link above is:

@@ -69,7 +69,7 @@

Note that because this is a wildcard matcher you can request any page from viewsSVN simply by requesting /remoteDemo/PATH/TO/FILE/FILENAME.html. In addition, we - can request any other output format available via FOrrest plugins.

+ can request any other output format available via Forrest plugins.

When including resources from remote repositories one has to be careful about things like site and ext @@ -80,6 +80,8 @@ page generated from the above example are broken. + + +

Link Rewriting

The locationmap can be used to rewrite URLs when the page is generated. @@ -170,6 +174,7 @@ an offsite address not specified in the link, which has href="lm:rewriteDemo/index".

+ Propchange: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml?rev=209756&r1=209755&r2=209756&view=diff ============================================================================== --- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml (original) +++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml Fri Jul 8 06:05:02 2005 @@ -66,6 +66,7 @@ description="Custom XML Schemas"/> + Modified: forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java URL: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java?rev=209756&r1=209755&r2=209756&view=diff ============================================================================== --- forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java (original) +++ forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java Fri Jul 8 06:05:02 2005 @@ -75,6 +75,15 @@ /** Return true if Source 'uri' resolves and exists. */ public boolean select(String uri, Map objectModel, Parameters parameters) { Source src = null; + + // The locationmap module will return null if there is no match for + // the supplied hint, without the following the URI will be resolved to + // the context root, which always exists, but does not contain a valid + // resource. + if (uri == null || uri == "") { + return false; + } + try { src = resolver.resolveURI(uri); if (src.exists()) { Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=209756&r1=209755&r2=209756&view=diff ============================================================================== --- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original) +++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Fri Jul 8 06:05:02 2005 @@ -173,6 +173,13 @@ + + + + + href src - site ext + site ext lm + @@ -353,6 +354,11 @@ + + + + +