svn commit: r291813 - in /lenya/trunk/src: java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationTemplateFallbackModule.java webapp/lenya/usecase.xmap

Author: chestnut
Date: Mon Sep 26 20:57:38 2005
New Revision: 291813

URL: http://svn.apache.org/viewcvs?rev=291813&view=rev
Log:
fallback:// proto used outside of a publication should be treated like 
context:// protocol (shouldn't look in non existent publications)

Modified:
    
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationTemplateFallbackModule.java
    lenya/trunk/src/webapp/lenya/usecase.xmap

Modified: 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationTemplateFallbackModule.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationTemplateFallbackModule.java?rev=291813&r1=291812&r2=291813&view=diff
==============================================================================
--- 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationTemplateFallbackModule.java
 (original)
+++ 
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationTemplateFallbackModule.java
 Mon Sep 26 20:57:38 2005
@@ -84,10 +84,14 @@
                             + "]");
                 }
             }
-            ExistingSourceResolver resolver = new ExistingSourceResolver();
-            templateManager.visit(publication, targetUri, resolver);
-            resolvedUri = resolver.getURI();
-
+            if (publication.exists()) {
+                ExistingSourceResolver resolver = new ExistingSourceResolver();
+                templateManager.visit(publication, targetUri, resolver);
+                resolvedUri = resolver.getURI();
+            } else {
+                //outside of a publication
+               resolvedUri = "context://" + targetUri;
+            }
         } catch (final Exception e) {
             String message = "Resolving path [" + name + "] failed: ";
             getLogger().error(message, e);

Modified: lenya/trunk/src/webapp/lenya/usecase.xmap
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecase.xmap?rev=291813&r1=291812&r2=291813&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecase.xmap Mon Sep 26 20:57:38 2005
@@ -54,9 +54,7 @@
     
     <map:pipeline>
       <map:match type="registered-usecase">
-          <!-- TODO: fallback outside of a pub context doesn't work --> 
-          <!--<map:mount src="{fallback://lenya/usecases/usecase.xmap}" 
uri-prefix="" check-reload="yes" reload-method="synchron"/>-->
-          <map:mount src="usecases/usecase.xmap" uri-prefix="" 
check-reload="yes" reload-method="synchron"/>
+          <map:mount src="{fallback://lenya/usecases/usecase.xmap}" 
uri-prefix="" check-reload="yes" reload-method="synchron"/>
       </map:match>
     </map:pipeline>