Author: crossley
Date: Thu Oct 31 11:47:30 2013
New Revision: 1537450
URL: http://svn.apache.org/r1537450
Log:
Use locationmap to find project.css.** CSS resources.
Modified:
forrest/trunk/main/webapp/locationmap.xml
forrest/trunk/main/webapp/resources.xmap
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/webapp/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap.xml?rev=1537450&r1=1537449&r2=1537450&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Thu Oct 31 11:47:30 2013
@@ -98,6 +98,9 @@
<match pattern="project.js.**">
<location src="{properties:resources}scripts/{1}.js" />
</match>
+ <match pattern="project.css.**">
+ <location src="{properties:resources}css/{1}.css" />
+ </match>
<match pattern="project.xml.site">
<location src="{properties:content.xdocs}site.xml" />
</match>
Modified: forrest/trunk/main/webapp/resources.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?rev=1537450&r1=1537449&r2=1537450&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources.xmap (original)
+++ forrest/trunk/main/webapp/resources.xmap Thu Oct 31 11:47:30 2013
@@ -156,7 +156,7 @@ $Revision: 1.13 $
</map:match>
<!-- @deprecated -->
<map:match pattern="**.css">
- <map:read src="resources/css/{1}.css" mime-type="text/css" />
+ <map:read src="{lm:project.css.{1}}" mime-type="text/css" />
</map:match>
<!-- special case corner generator pipeline -->
<map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1537450&r1=1537449&r2=1537450&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Thu Oct 31 11:47:30 2013
@@ -155,6 +155,9 @@
</action>
<!-- 2013-10 -->
<action context="code" type="update" dev="DC">
+ Use locationmap to find project.css.** CSS resources.
+ </action>
+ <action context="code" type="update" dev="DC">
Fixed locationmap to properly find project.js.** javascript resources.
</action>
<action context="docs" type="update" dev="DC">
