You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/11/15 18:19:49 UTC

svn commit: r595369 - in /cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF: ./ resource/external/icons/ resource/external/images/ resource/external/logos/ resource/external/scripts/ resource/external/styles/ resource/icons/ resource/images...

Author: vgritsenko
Date: Thu Nov 15 09:19:39 2007
New Revision: 595369

URL: http://svn.apache.org/viewvc?rev=595369&view=rev
Log:
get rid of external/internal sub directories

Added:
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/icons/
      - copied from r594628, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/icons/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/icons/cocoon.ico
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/icons/cocoon.ico
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/
      - copied from r594628, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/apache-logo.jpg
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/apache-logo.jpg
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/cocoon-logo.jpg
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/cocoon-logo.jpg
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/cocoon.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/cocoon.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/group-title-line.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/group-title-line.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/h1-image.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/h1-image.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/logo-background.jpg
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/logo-background.jpg
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/powered.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/powered.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/images/top-background.jpg
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/top-background.jpg
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/
      - copied from r594628, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-300.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-300.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-458.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-458.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-button-powered-158.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-button-powered-158.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-buttons-built-126.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-buttons-built-126.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-buttons-built-158.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-buttons-built-158.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-buttons-built-88.png
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-buttons-built-88.png
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-buttons-powered-126.gif
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-buttons-powered-126.gif
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/cocoon-buttons-powered-88.png
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/cocoon-buttons-powered-88.png
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/logos/logos.html
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/logos.html
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/scripts/
      - copied from r594628, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/scripts/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/scripts/main.js
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/scripts/main.js
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/scripts/prettycontent.js
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/scripts/prettycontent.js
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/styles/
      - copied from r594628, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/styles/main.css
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/main.css
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/styles/prettycontent.css
      - copied unchanged from r595368, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/prettycontent.css
Removed:
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/icons/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/logos/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/scripts/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/internal/
Modified:
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap?rev=595369&r1=595368&r2=595369&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap Thu Nov 15 09:19:39 2007
@@ -178,26 +178,26 @@
 
       <!-- Images -->
       <map:match pattern="images/*.gif">
-        <map:read src="resource/external/images/{1}.gif" mime-type="image/gif"/>
+        <map:read src="resource/images/{1}.gif" mime-type="image/gif"/>
       </map:match>
 
       <map:match pattern="images/*.jpg">
-        <map:read src="resource/external/images/{1}.jpg" mime-type="image/jpeg"/>
+        <map:read src="resource/images/{1}.jpg" mime-type="image/jpeg"/>
       </map:match>
 
       <!-- CSS stylesheets -->
       <map:match pattern="styles/*.css">
-        <map:read src="resource/external/styles/{1}.css" mime-type="text/css"/>
+        <map:read src="resource/styles/{1}.css" mime-type="text/css"/>
       </map:match>
 
       <!-- JavaScript scripts -->
       <map:match pattern="scripts/*.js">
-        <map:read src="resource/external/scripts/{1}.js" mime-type="text/javascript"/>
+        <map:read src="resource/scripts/{1}.js" mime-type="text/javascript"/>
       </map:match>
 
       <!-- Favicon -->
       <map:match pattern="**favicon.ico">
-        <map:read mime-type="image/x-icon" src="resource/external/icons/cocoon.ico"/>
+        <map:read mime-type="image/x-icon" src="resource/icons/cocoon.ico"/>
       </map:match>
 
       <!--+