You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/06/09 17:21:36 UTC

svn commit: r413068 - in /lenya/trunk/src/webapp/lenya/config/sitemap: comments.xmap pipelines.xmap resources.xmap selectors.xmap serializers.xmap transformers.xmap

Author: andreas
Date: Fri Jun  9 08:21:35 2006
New Revision: 413068

URL: http://svn.apache.org/viewvc?rev=413068&view=rev
Log:
Modified sitemap patch files so that they are not applied during each build

Modified:
    lenya/trunk/src/webapp/lenya/config/sitemap/comments.xmap
    lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap
    lenya/trunk/src/webapp/lenya/config/sitemap/resources.xmap
    lenya/trunk/src/webapp/lenya/config/sitemap/selectors.xmap
    lenya/trunk/src/webapp/lenya/config/sitemap/serializers.xmap
    lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/comments.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/comments.xmap?rev=413068&r1=413067&r2=413068&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/comments.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/comments.xmap Fri Jun  9 08:21:35 2006
@@ -15,4 +15,4 @@
   limitations under the License.
 -->
 
-<xmap xpath="/sitemap" remove="//comment()"/>
\ No newline at end of file
+<xmap xpath="/sitemap" unless="not(//comment())" remove="//comment()"/>
\ No newline at end of file

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap?rev=413068&r1=413067&r2=413068&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap Fri Jun  9 08:21:35 2006
@@ -15,7 +15,10 @@
   limitations under the License.
 -->
 
-<xmap remove="/sitemap/pipelines" xpath="/sitemap" insert-after="/sitemap/resources">
+<xmap remove="/sitemap/pipelines"
+      unless="/sitemap/pipelines/pipeline/match[@pattern = 'lenya-screen.xsl']"
+      xpath="/sitemap"
+      insert-after="/sitemap/resources">
 
 <!-- =========================== Pipelines ================================= -->
 

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/resources.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/resources.xmap?rev=413068&r1=413067&r2=413068&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/resources.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/resources.xmap Fri Jun  9 08:21:35 2006
@@ -15,7 +15,11 @@
   limitations under the License.
 -->
 
-<xmap remove="/sitemap/resources" xpath="/sitemap" insert-after="/sitemap/views">
+<xmap unless="/sitemap/resources/resource[@name = 'style-cms-page']"
+  remove="/sitemap/resources"
+  xpath="/sitemap"
+  insert-after="/sitemap/views">
+  
 <!-- =========================== Resources ================================= -->
 
   <map:resources>

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/selectors.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/selectors.xmap?rev=413068&r1=413067&r2=413068&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/selectors.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/selectors.xmap Fri Jun  9 08:21:35 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<xmap xpath="/sitemap/components/selectors">
+<xmap xpath="/sitemap/components/selectors" unless="/sitemap/components/selectors/selector[@name = 'client']">
     <map:selector logger="sitemap.selector.browser" name="client" src="org.apache.cocoon.selection.BrowserSelector">
       <browser name="explorer" useragent="MSIE"/>
       <browser name="mozilla5" useragent="Mozilla/5"/>

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/serializers.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/serializers.xmap?rev=413068&r1=413067&r2=413068&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/serializers.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/serializers.xmap Fri Jun  9 08:21:35 2006
@@ -15,8 +15,15 @@
   limitations under the License.
 -->
 
-<xmap remove="/sitemap/components/serializers" xpath="/sitemap/components" insert-after="/sitemap/components/transformers">
+<xmap remove="/sitemap/components/serializers"
+  unless="/sitemap/components/serializers/serializer[@name = 'patch-test']"
+  xpath="/sitemap/components"
+  insert-after="/sitemap/components/transformers">
+  
   <map:serializers default="xhtml">
+
+    <!-- this declaration is just to test if the patch has already been applied -->
+    <map:serializer name="patch-test"  src="org.apache.cocoon.components.serializers.HTMLSerializer"/>
 
     <map:serializer name="html" logger="sitemap.serializer.html" mime-type="text/html; charset=utf-8" pool-grow="4" pool-max="32" 
     pool-min="4" src="org.apache.cocoon.components.serializers.HTMLSerializer">

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap?rev=413068&r1=413067&r2=413068&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap Fri Jun  9 08:21:35 2006
@@ -18,6 +18,7 @@
 <xmap xpath="/sitemap/components/transformers" 
   unless="/sitemap/components/transformers/transformer[@name = 'link-rewrite']"
   xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  
     <map:transformer name="link-rewrite" logger="lenya.sitemap.transformer.link-rewrite" src="org.apache.lenya.cms.cocoon.transformation.LinkRewritingTransformer"/>
     <map:transformer name="usecasemenu" logger="lenya.sitemap.transformer.usecasemenu" src="org.apache.lenya.cms.cocoon.transformation.UsecaseMenuTransformer"/>
     <map:transformer name="workflowmenu" logger="lenya.sitemap.transformer.workflowmenu" src="org.apache.lenya.cms.cocoon.transformation.WorkflowMenuTransformer"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org