You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/10/23 11:16:16 UTC
cvs commit: cocoon-2.1/src/blocks/xmldb/conf xmldb.samplesxpipe xmldb.deprecated.samplesxpipe
joerg 2003/10/23 02:16:16
Modified: src/blocks/lucene/conf lucene.samplesxpipe
src/blocks/xmldb/conf xmldb.samplesxpipe
xmldb.deprecated.samplesxpipe
Log:
*argh* I hate such side effects!! I added a pipeline internal-only="true" to the samples sitemap for view-source, which broke the xmldb and the lucene search mounting. Fixed now.
Revision Changes Path
1.3 +4 -2 cocoon-2.1/src/blocks/lucene/conf/lucene.samplesxpipe
Index: lucene.samplesxpipe
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/conf/lucene.samplesxpipe,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lucene.samplesxpipe 14 May 2003 15:21:44 -0000 1.2
+++ lucene.samplesxpipe 23 Oct 2003 09:16:16 -0000 1.3
@@ -1,10 +1,12 @@
<?xml version="1.0"?>
-<samplesxpipe xpath="/sitemap/pipelines/pipeline[last()]"
- unless="match[@pattern='search/**']">
+<samplesxpipe xpath="/sitemap/pipelines"
+ unless="pipeline/match[@pattern='search/**']">
+ <map:pipeline>
<!-- Mount search pages sitemap, for using indexing & searching -->
<map:match pattern="search/**">
<map:mount check-reload="yes" src="search/" uri-prefix="search"/>
</map:match>
+ </map:pipeline>
</samplesxpipe>
1.3 +4 -2 cocoon-2.1/src/blocks/xmldb/conf/xmldb.samplesxpipe
Index: xmldb.samplesxpipe
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmldb/conf/xmldb.samplesxpipe,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldb.samplesxpipe 14 May 2003 15:21:44 -0000 1.2
+++ xmldb.samplesxpipe 23 Oct 2003 09:16:16 -0000 1.3
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
-<samplesxpipe xpath="/sitemap/pipelines/pipeline[last()]"
- unless="match[@pattern='xmldb/**']">
+<samplesxpipe xpath="/sitemap/pipelines"
+ unless="pipeline/match[@pattern='xmldb/**']">
+ <map:pipeline>
<!-- ======================= XML:DB ============================== -->
<map:match pattern="xmldb/**">
<map:match type="request-parameter" pattern="xpath">
@@ -13,4 +14,5 @@
<map:generate src="xmldb:xindice://localhost:4080/db/{1}"/>
<map:serialize type="xml"/>
</map:match>
+ </map:pipeline>
</samplesxpipe>
1.3 +4 -2 cocoon-2.1/src/blocks/xmldb/conf/xmldb.deprecated.samplesxpipe
Index: xmldb.deprecated.samplesxpipe
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmldb/conf/xmldb.deprecated.samplesxpipe,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldb.deprecated.samplesxpipe 14 May 2003 15:21:44 -0000 1.2
+++ xmldb.deprecated.samplesxpipe 23 Oct 2003 09:16:16 -0000 1.3
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
-<samplesxpipe xpath="/sitemap/pipelines/pipeline[last()]"
- unless="match[@pattern='xmldb-generator/db/**/']">
+<samplesxpipe xpath="/sitemap/pipelines"
+ unless="pipeline/match[@pattern='xmldb-generator/db/**/']">
+ <map:pipeline>
<!-- =================== XML:DB Generators ========================= -->
<!-- BEWARE: the following examples use the unmaintained XML:DB -->
<!-- generators, going to be deprecated soon. -->
@@ -16,4 +17,5 @@
<map:generate type="xmldb" src="/{1}"/>
<map:serialize type="xml"/>
</map:match>
+ </map:pipeline>
</samplesxpipe>