svn commit: r886736 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher: dataModel.xmap internal.xmap themes.xmap

Author: thorsten
Date: Thu Dec  3 10:54:20 2009
New Revision: 886736

URL: http://svn.apache.org/viewvc?rev=886736&view=rev
Log:
Redoing r733422 in the dispatcher

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap?rev=886736&r1=886735&r2=886736&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap Thu Dec  3 10:54:20 2009
@@ -131,7 +131,8 @@
       <!-- navigation for the current request PART tab: relegated to a separate
            sitemap to allow proper i18n. -->
       <map:match pattern="**.tab.xml">
-        <map:mount uri-prefix="" src="dataModel-tabs.xmap"
+        <map:mount uri-prefix="" 
+          src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/dataModel-tabs.xmap"
         check-reload="yes" />
       </map:match>
     </map:pipeline>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=886736&r1=886735&r2=886736&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap Thu Dec  3 10:54:20 2009
@@ -325,16 +325,19 @@
     </map:pipeline>
     <map:pipeline>
       <!-- businessHelper -->
-      <map:mount uri-prefix="" src="dataModel.xmap" check-reload="yes"
+      <map:mount uri-prefix="" 
+        src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap" check-reload="yes"
       pass-through="true" />
     </map:pipeline>
     <!-- linkmap -->
     <map:pipeline>
-      <map:mount uri-prefix="" src="ls.xmap" check-reload="yes"
+      <map:mount uri-prefix="" 
+        src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/ls.xmap" check-reload="yes"
       pass-through="true" />
     </map:pipeline>
     <map:pipeline>
-      <map:mount uri-prefix="" src="themes.xmap" check-reload="yes"
+      <map:mount uri-prefix="" 
+        src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/themes.xmap" check-reload="yes"
       pass-through="true" />
     </map:pipeline>
   </map:pipelines>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=886736&r1=886735&r2=886736&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap Thu Dec  3 10:54:20 2009
@@ -68,7 +68,7 @@
       </map:match>
       <map:match pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg">
 
-        <map:generate src="status.xml" />
+        <map:generate src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/status.xml" />
         <map:transform src="{lm:theme.images.corner.round}">
           <map:parameter name="orientation-tb" value="{2}" />
           <map:parameter name="orientation-lr" value="{3}" />
@@ -85,7 +85,6 @@
         <map:serialize type="svg2png" />
       </map:match>
       <map:match pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.png">
-
         <map:read src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg-to-png"
         mime-type="image/png" />
       </map:match>