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/14 14:56:43 UTC
svn commit: r594884 - in /cocoon/trunk/blocks: cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/ cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/ cocoon-welcome/src/main/resources/COB-INF/samples/

Author: vgritsenko
Date: Wed Nov 14 05:56:40 2007
New Revision: 594884

URL: http://svn.apache.org/viewvc?rev=594884&view=rev
Log:
relocate core samples to logical location

Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/prepare-samples.xsl

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples?rev=594884&r1=594883&r2=594884&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/core-samples-main.xsamples Wed Nov 14 05:56:40 2007
@@ -22,7 +22,7 @@
 <xsamples>
 
   <group name="Core samples" priority="100" >
-    <sample name="Core Samples" priority="100" href="/cocoon-core-samples-main/">
+    <sample name="Core Samples" priority="100" href="/samples/core/">
       Samples of the most important core concepts and components.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml?rev=594884&r1=594883&r2=594884&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml Wed Nov 14 05:56:40 2007
@@ -26,7 +26,7 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
   <bean name="org.apache.cocoon.core.main.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/cocoon-core-main-sample" context-path="blockcontext:/cocoon-core-main-sample/">
+    <servlet:context mount-path="/samples/core" context-path="blockcontext:/cocoon-core-main-sample/">
       <servlet:connections>
         <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/prepare-samples.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/prepare-samples.xsl?rev=594884&r1=594883&r2=594884&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/prepare-samples.xsl (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/samples/prepare-samples.xsl Wed Nov 14 05:56:40 2007
@@ -47,7 +47,7 @@
       - Document structure is:
       - /collection[@name]/collection/resource/group[@name]/sample[@name]
       -->
-    <sample href="../{../../../../@name}/" name="{@name}">
+    <sample href="{@href}" name="{@name}">
       <xsl:copy-of select="*|text()"/>
     </sample>
   </xsl:template>