You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2005/09/06 12:43:37 UTC
svn commit: r278970 -
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap
Author: thorsten
Date: Tue Sep 6 03:43:31 2005
New Revision: 278970
URL: http://svn.apache.org/viewcvs?rev=278970&view=rev
Log:
Added testing pipes for tims debugging of the lm
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap?rev=278970&r1=278969&r2=278970&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap Tue Sep 6 03:43:31 2005
@@ -20,24 +20,18 @@
<map:pipelines>
<map:pipeline>
-<<<<<<< .mine
+ <!-- TEMPTORARY PIPELINES -->
+ <!-- Pipelines below this section are for testing purposes only -->
+ <!-- They should be removed before merging with trunk -->
+ <map:match pattern="samples/xhtml2_subset.html">
+ <map:generate src="{project:content.xdocs}/samples/xhtml2_subset.xml"/>
+ <map:serialize/>
+ </map:match>
<!--Views-->
<map:match pattern="getView-**">
<map:generate src="{lm:views/{1}}" />
<map:serialize type="xml"/>
</map:match>
-=======
-
- <!-- TEMPTORARY PIPELINES -->
- <!-- Pipelines below this section are for testing purposes only -->
- <!-- They should be removed before merging with trunk -->
-
->>>>>>> .r278967
- <map:match pattern="samples/xhtml2_subset.html">
- <map:generate src="{project:content.xdocs}/samples/xhtml2_subset.xml"/>
- <map:serialize/>
- </map:match>
-
</map:pipeline>
</map:pipelines>