You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/10/15 02:34:07 UTC
svn commit: rev 54811 - in incubator/lenya: branches/BRANCH_1_2_X/src/webapp branches/BRANCH_1_2_X/src/webapp/lenya trunk/src/webapp trunk/src/webapp/lenya
Author: gregor
Date: Thu Oct 14 17:34:07 2004
New Revision: 54811
Modified:
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap
incubator/lenya/trunk/src/webapp/lenya/resources-shared.xmap
incubator/lenya/trunk/src/webapp/sitemap.xmap
Log:
remove cocoon favicon, provide capability to have one for your publication
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/resources-shared.xmap Thu Oct 14 17:34:07 2004
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
@@ -245,11 +245,11 @@
<map:read src="pubs/{1}/resources/shared/{3}.cfg" mime-type="application/x-ms-word" />
</map:match>
-<!-- matches pub-id/area/**.* this fallback may not work very well, but better than a 404
- <map:match pattern="*/*/**.*">
- <map:read src="pubs/{1}/resources/shared/{3}.*" mime-type="application/x-ms-word" />
+ <!-- matches pub-id/area/**favicon.ico -->
+ <map:match pattern="*/*/**favicon.ico">
+ <map:read src="pubs/{1}/resources/shared/favicon.ico" mime-type="application/ico"/>
</map:match>
--->
+
</map:pipeline>
</map:pipelines>
</map:sitemap>
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap Thu Oct 14 17:34:07 2004
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
@@ -489,11 +489,6 @@
<map:read mime-type="text/javascript" src="resources/scripts/{1}.js"/>
</map:match>
- <!-- favicon -->
- <map:match pattern="**favicon.ico">
- <map:read mime-type="image/x-icon" src="resources/icons/cocoon.ico"/>
- </map:match>
-
<map:handle-errors>
<map:generate type="notifying"/>
<map:transform src="stylesheets/system/error2html.xslt">
Modified: incubator/lenya/trunk/src/webapp/lenya/resources-shared.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources-shared.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources-shared.xmap Thu Oct 14 17:34:07 2004
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
@@ -247,11 +247,11 @@
<map:read src="pubs/{1}/resources/shared/{3}.cfg" mime-type="application/x-ms-word" />
</map:match>
-<!-- matches pub-id/area/**.* this fallback may not work very well, but better than a 404
- <map:match pattern="*/*/**.*">
- <map:read src="pubs/{1}/resources/shared/{3}.*" mime-type="application/x-ms-word" />
+ <!-- matches pub-id/area/**favicon.ico -->
+ <map:match pattern="*/*/**favicon.ico">
+ <map:read src="pubs/{1}/resources/shared/favicon.ico" mime-type="application/ico"/>
</map:match>
--->
+
</map:pipeline>
</map:pipelines>
</map:sitemap>
Modified: incubator/lenya/trunk/src/webapp/sitemap.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/sitemap.xmap (original)
+++ incubator/lenya/trunk/src/webapp/sitemap.xmap Thu Oct 14 17:34:07 2004
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
@@ -480,11 +480,6 @@
<!-- JavaScript scripts -->
<map:match pattern="scripts/*.js">
<map:read mime-type="text/javascript" src="resources/scripts/{1}.js"/>
- </map:match>
-
- <!-- favicon -->
- <map:match pattern="**favicon.ico">
- <map:read mime-type="image/x-icon" src="resources/icons/cocoon.ico"/>
</map:match>
<map:handle-errors>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org