svn commit: r695777 - /lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap

Author: andreas
Date: Tue Sep 16 01:57:10 2008
New Revision: 695777

URL: http://svn.apache.org/viewvc?rev=695777&view=rev
Log:
Don't require that the path of CSS and JavaScript resources contains 'css' or 'javascript', resp.

Modified:
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap?rev=695777&r1=695776&r2=695777&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap Tue Sep 16 01:57:10 2008
@@ -26,21 +26,21 @@
       
       <!-- Lenya Publications -->
       
-      <!-- matches pub-id/area/css/*.css -->
-      <map:match pattern="*/*/css/*.css">
-        <map:act type="resource-exists" src="pubs/{1}/resources/shared/css/{3}.xml">
-          <map:generate src="pubs/{../1}/resources/shared/css/{../3}.xml"/>
+      <!-- matches pub-id/area/**.css -->
+      <map:match pattern="*/*/**.css">
+        <map:act type="resource-exists" src="pubs/{1}/resources/shared/{3}.xml">
+          <map:generate src="pubs/{../1}/resources/shared/{../3}.xml"/>
           <map:transform src="resources/css/css.xsl">
             <map:parameter name="contextprefix" value="{request:contextPath}"/>
           </map:transform>
           <map:serialize type="text" mime-type="text/css"/>
         </map:act>
-        <map:read src="pubs/{1}/resources/shared/css/{3}.css" mime-type="text/css" />
+        <map:read src="pubs/{1}/resources/shared/{3}.css" mime-type="text/css" />
       </map:match>
       
-          <!-- matches pub-id/area/javascript/**.js -->
-          <map:match pattern="*/*/javascript/**.js">
-            <map:read src="pubs/{1}/resources/shared/javascript/{3}.js" mime-type="application/x-javascript" />
+          <!-- matches pub-id/area/**.js -->
+          <map:match pattern="*/*/**.js">
+            <map:read src="pubs/{1}/resources/shared/{3}.js" mime-type="application/x-javascript" />
           </map:match>
 
           <!-- matches pub-id/area/**.jpg -->