svn commit: r544800 - in /cocoon/trunk/core/cocoon-webapp/src/main/webapp: ./ block-samples/ blocks/ samples/ stylesheets/ stylesheets/system/

[gi...@apache.org]

Author: giacomo
Date: Wed Jun  6 03:53:44 2007
New Revision: 544800

URL: http://svn.apache.org/viewvc?view=rev&rev=544800
Log:
cleanup

Added:
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/
      - copied from r544762, cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/stylesheets/exception2html.xslt
      - copied unchanged from r544762, cocoon/trunk/core/cocoon-webapp/src/main/webapp/stylesheets/system/exception2html.xslt
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/stylesheets/xml2html.xslt
      - copied unchanged from r544762, cocoon/trunk/core/cocoon-webapp/src/main/webapp/stylesheets/system/xml2html.xslt
Removed:
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/stylesheets/system/
Modified:
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/group2samples.xsl
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/sitemap.xmap
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/welcome.xml

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/group2samples.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/group2samples.xsl?view=diff&rev=544800&r1=544762&r2=544800
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/group2samples.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/group2samples.xsl Wed Jun  6 03:53:44 2007
@@ -40,7 +40,7 @@
   </xsl:template>
   
   <xsl:template match="sample">
-    <sample href="{../../../../@name}/" name="{@name}">
+    <sample href="../blocks-test/{../../../../@name}/" name="{@name}">
       <xsl:copy-of select="*|text()"/>
     </sample>
   </xsl:template>

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/sitemap.xmap?view=diff&rev=544800&r1=544762&r2=544800
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/block-samples/sitemap.xmap Wed Jun  6 03:53:44 2007
@@ -30,7 +30,7 @@
           <map:parameter name="xmlFiles" value="\.xsamples$"/> 
         </map:generate> 
         <map:transform src="group2samples.xsl"/>
-        <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+        <map:transform src="context://stylesheets/simple-samples2html.xsl">
           <map:parameter name="contextPath" value="{request:contextPath}"/>
         </map:transform>
         <map:serialize type="html"/>        

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap?view=diff&rev=544800&r1=544799&r2=544800
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap Wed Jun  6 03:53:44 2007
@@ -60,7 +60,7 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="stylesheets/system/xml2html.xslt"/>
+      <map:transform src="stylesheets/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
 
@@ -306,7 +306,7 @@
 
         <map:when test="not-found">
           <map:generate type="exception"/>
-          <map:transform src="stylesheets/system/exception2html.xslt">
+          <map:transform src="stylesheets/exception2html.xslt">
             <map:parameter name="contextPath" value="{request:contextPath}"/>
             <map:parameter name="realPath" value="{realpath:}"/>
             <map:parameter name="pageTitle" value="Resource not found"/>
@@ -316,7 +316,7 @@
 
         <map:when test="invalid-continuation">
           <map:generate type="exception"/>
-          <map:transform src="stylesheets/system/exception2html.xslt">
+          <map:transform src="stylesheets/exception2html.xslt">
             <map:parameter name="contextPath" value="{request:contextPath}"/>
             <map:parameter name="realPath" value="{realpath:}"/>
             <map:parameter name="pageTitle" value="Invalid Continuation"/>
@@ -326,7 +326,7 @@
 
         <map:otherwise>
           <map:generate type="exception"/>
-          <map:transform src="stylesheets/system/exception2html.xslt">
+          <map:transform src="stylesheets/exception2html.xslt">
             <map:parameter name="contextPath" value="{request:contextPath}"/>
             <map:parameter name="realPath" value="{realpath:}"/>
           </map:transform>

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/welcome.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/welcome.xml?view=diff&rev=544800&r1=544799&r2=544800
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/welcome.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/welcome.xml Wed Jun  6 03:53:44 2007
@@ -28,6 +28,6 @@
     your Apache Cocoon installation was successful.
   </message>
   <message>
-    To know more about Cocoon capabilities, look at the <link href="blocks/">sample blocks</link>.    
+    To know more about Cocoon capabilities, look at the <link href="block-samples/">sample blocks</link>.    
   </message>
 </welcome>