You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bd...@apache.org on 2005/07/18 15:58:49 UTC
svn commit: r219491 - in /cocoon/trunk/src:
java/org/apache/cocoon/matching/MountTableMatcher.java webapp/sitemap.xmap
Author: bdelacretaz
Date: Mon Jul 18 06:58:20 2005
New Revision: 219491
URL: http://svn.apache.org/viewcvs?rev=219491&view=rev
Log:
default MountTableMatcher disabled while working on OSGI stuff, wouldn't work with ../ anyway
Modified:
cocoon/trunk/src/java/org/apache/cocoon/matching/MountTableMatcher.java
cocoon/trunk/src/webapp/sitemap.xmap
Modified: cocoon/trunk/src/java/org/apache/cocoon/matching/MountTableMatcher.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/matching/MountTableMatcher.java?rev=219491&r1=219490&r2=219491&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/matching/MountTableMatcher.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/matching/MountTableMatcher.java Mon Jul 18 06:58:20 2005
@@ -100,6 +100,9 @@
final String uri = source.getURI();
// Check if source exists
+ // FIXME: source.exists() returns true in the case of an OSGI bundle uri,
+ // For example if uri=bundle://11/../mount-table.xml, exists() returns true
+ // but the Source is unusable
if (!source.exists()) {
if (this.ignoreMissingTables) {
return Collections.EMPTY_MAP;
Modified: cocoon/trunk/src/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/sitemap.xmap?rev=219491&r1=219490&r2=219491&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/sitemap.xmap (original)
+++ cocoon/trunk/src/webapp/sitemap.xmap Mon Jul 18 06:58:20 2005
@@ -661,9 +661,13 @@
| Note that other mount-tables can be added here using the xpatch ant task
| (see src/confpatch/mount-table.xmap)
+-->
+ <!--
+ Disabled while working on OSGI stuff, this wouldn't work anyway
+ (due to the ../) and it causes an NPE in the MountTableMatcher
<map:match type="mount-table" pattern="../../mount-table.xml">
<map:mount src="{src}" uri-prefix="{uri-prefix}"/>
</map:match>
+ -->
<!--+
| Call blocks deployed in wiring.xml. The blocks protocol