[EMAIL PROTECTED] wrote:
Author: thorsten
Date: Mon Mar 6 02:50:01 2006
New Revision: 383510
URL: http://svn.apache.org/viewcvs?rev=383510&view=rev
Log:
Adding the content dir to the fallback URIs like described in
http://marc.theaimsgroup.com/?l=lenya-dev&m=114142602919893&w=2. This fixes the
second part of the 'external' resources/asset preview.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java?rev=383510&r1=383509&r2=383510&view=diff
==============================================================================
---
lenya/trunk/src/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java
(original)
+++
lenya/trunk/src/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java
Mon Mar 6 02:50:01 2006
@@ -111,10 +111,15 @@
protected String[] getBaseURIs(Publication publication) {
List uris = new ArrayList();
+ String contentDir = null;
Publication[] publications = getPublications(publication);
for (int i = 0; i < publications.length; i++) {
uris.add(getBaseURI(publications[i]));
+ contentDir = publications[i].getContentDir();
+ if (contentDir != null){
+ uris.add(contentDir);
+ }
Thorsten, does this really make sense? IMO it is very dangerous.
The fallback has a well-defined meaning [1]. If we add the content
directory to the list of URLs to traverse, we have two different
locations in the same publication that could match. Apart from the
danger of clashes, the semantics are totally changed.
Would you mind explaining why the fallback is the correct location
to implement this behaviour? Thanks a lot!
-- Andreas
[1]
http://lenya.apache.org/1_4/reference/publication-templating/index.html#The+Concept+of+Publication+Templating
--
Andreas Hartmann
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
[EMAIL PROTECTED] [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
