cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r597533 - in /cocoon/trunk/blocks/cocoon-core-sample: cocoon-core-additional-sample/src/main/resources/COB-INF/ cocoon-core-main-sample/src/main/resources/COB-INF/ cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/ cocoon-core-...
Date Fri, 23 Nov 2007 03:38:20 GMT
Author: vgritsenko
Date: Thu Nov 22 19:38:18 2007
New Revision: 597533

URL: http://svn.apache.org/viewvc?rev=597533&view=rev
Log:
from samples page, add a link to the sitemap file

Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
    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/COB-INF/errorhandling/exception/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/reloading/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/slides/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/core-samples-additional.xsamples Thu Nov 22 19:38:18 2007
@@ -21,8 +21,8 @@
   -->
 <xsamples>
 
-  <group name="Core samples" priority="100">
-    <sample name="Additional Core Samples" href="/cocoon-core-additional-sample/">
+  <group name="Core Samples" priority="100">
+    <sample name="Extra Samples" href="/cocoon-core-additional-sample/">
       Samples of additional core functionality and components 
       (the main samples are in the core-samples-main block).
     </sample>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml Thu Nov 22 19:38:18 2007
@@ -22,6 +22,10 @@
   -->
 <samples name="Aggregation">
 
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
+
   <group name="Back">
     <sample name="Back" href="../">
       Back to the samples home page.

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -28,7 +28,7 @@
       <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
         <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/samples.xml Thu Nov 22 19:38:18 2007
@@ -16,45 +16,49 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
+<!--
+  - $Id$
+  -->
+<samples name="Catalogs and DocBook">
 
-<samples name="Catalogs and DocBook" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
 
- <group name="Back">
-  <sample name="Back" href="../">
-   Back to the samples home page.
-  </sample>
- </group>
+  <group name="Back">
+    <sample name="Back" href="../">
+      Back to the samples home page.
+    </sample>
+  </group>
 
- <group name="XML Entity Catalogs">
-  <sample name="Entity Resolution Using Catalogs" href="catalog-demo">
-   Catalog entity resolver. External entities (e.g. DTDs, symbols,
-   character entity sets, images) are resolved to local copies of the
-   resources. The catalog manager facilitates the mapping between public
-   identifiers or system identifiers and other system identifiers.
-  </sample>
- </group>
+  <group name="XML Entity Catalogs">
+    <sample name="Entity Resolution Using Catalogs" href="catalog-demo">
+      Catalog entity resolver. External entities (e.g. DTDs, symbols,
+      character entity sets, images) are resolved to local copies of the
+      resources. The catalog manager facilitates the mapping between public
+      identifiers or system identifiers and other system identifiers.
+    </sample>
+  </group>
 
- <group name="DocBook">
-  <note>
-   Follow the configuration steps first ...
-  </note>
-  <sample name="Entity Resolution With Catalogs"
-          href="../../docs/userdocs/concepts/catalog.html#config">
-    The Apache Cocoon documentation "Entity
-    resolution with catalogs" has a section "Example local configuration
-    for Simplified DocBook". Do that and then ...
-  </sample>
-  <sample name="DocBook Demo"
-          href="sdocbook-demo">
-   Demonstration of Catalog Entity Resolver and Simplified DocBook.
-   You will need the DocBook DTDs installed locally and the catalog
-   properly configured.
-  </sample>
-  <note>
-   If you get a FileNotFoundException, then you have not configured the
-   OASIS catalog properly. Follow the documentation as suggested above.
-  </note>
- </group>
+  <group name="DocBook">
+    <note>
+      Follow the configuration steps first ...
+    </note>
+    <sample name="Entity Resolution With Catalogs"
+            href="../../docs/userdocs/concepts/catalog.html#config">
+      The Apache Cocoon documentation "Entity
+      resolution with catalogs" has a section "Example local configuration
+      for Simplified DocBook". Do that and then ...
+    </sample>
+    <sample name="DocBook Demo" href="sdocbook-demo">
+      Demonstration of Catalog Entity Resolver and Simplified DocBook.
+      You will need the DocBook DTDs installed locally and the catalog
+      properly configured.
+    </sample>
+    <note>
+      If you get a FileNotFoundException, then you have not configured the
+      OASIS catalog properly. Follow the documentation as suggested above.
+    </note>
+  </group>
 
 </samples>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/catalog/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -21,17 +21,37 @@
   -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
+
   <map:pipelines>
     <map:pipeline>
 
       <map:match pattern="">
-        <map:redirect-to uri="welcome" />
+        <map:redirect-to uri="welcome"/>
       </map:match>
 
       <map:match pattern="welcome">
-        <map:generate src="samples.xml" />
+        <map:generate src="samples.xml"/>
         <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style:/service/common/simple-samples2html" />
+          <map:parameter name="service" value="servlet:style:/service/common/simple-samples2html"/>
         </map:serialize>
       </map:match>
 
@@ -39,30 +59,30 @@
         <map:read src="sitemap.xmap" mime-type="text/xml" />
       </map:match>
 
-      <!-- Catalog entity resolver =========================== -->
+      <!-- ================ Catalog entity resolver ======================== -->
 
       <map:match pattern="catalog-demo">
-        <map:generate src="catalog-demo.xml" />
-        <map:transform src="style.xsl" />
-        <map:serialize type="html" />
+        <map:generate src="catalog-demo.xml"/>
+        <map:transform src="style.xsl"/>
+        <map:serialize type="html"/>
       </map:match>
 
       <map:match pattern="entity-test.html">
-        <map:generate src="catalog-test.xml" />
-        <map:transform src="style.xsl" />
-        <map:serialize type="html" />
+        <map:generate src="catalog-test.xml"/>
+        <map:transform src="style.xsl"/>
+        <map:serialize type="html"/>
       </map:match>
 
       <map:match pattern="sdocbook-demo">
-        <map:generate src="article.xml" />
-        <map:transform src="sdocbook2body.xsl" />
-        <map:serialize type="html" />
+        <map:generate src="article.xml"/>
+        <map:transform src="sdocbook2body.xsl"/>
+        <map:serialize type="html"/>
       </map:match>
 
-      <!-- ========================= Resources ================================ -->
+      <!-- ======================== Resources ============================== -->
 
       <map:match pattern="images/**.gif">
-        <map:read src="context://resources/images/{1}.gif" mime-type="image/gif" />
+        <map:read src="context://resources/images/{1}.gif" mime-type="image/gif"/>
       </map:match>
 
     </map:pipeline>

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=597533&r1=597532&r2=597533&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 Thu Nov 22 19:38:18 2007
@@ -21,7 +21,7 @@
   -->
 <xsamples>
 
-  <group name="Core samples" priority="100" >
+  <group name="Core Samples" priority="100" >
     <sample name="Core Samples" priority="100" href="/samples/core/">
       Samples of the most important core concepts and components.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/exception/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/exception/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/exception/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/exception/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -16,11 +16,30 @@
   limitations under the License.
 -->
 
-<!--+
-    |
-    | $Id$
-    +-->
+<!--
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/samples.xml Thu Nov 22 19:38:18 2007
@@ -21,6 +21,10 @@
   -->
 <samples name="Internal Requests Error Handling Samples">
 
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
+
   <group name="Back">
     <sample name="Back" href="../">
       Back to the error handling samples page.

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/internal/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -22,6 +22,27 @@
   - $Id$
   -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
+
   <map:pipelines>
 
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/samples.xml Thu Nov 22 19:38:18 2007
@@ -16,10 +16,14 @@
   limitations under the License.
 -->
 
-<!--+
-    | $Id$
-    +-->
-<samples name="Error Handling Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
+<!--
+  - $Id$
+  -->
+<samples name="Error Handling Samples">
+
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
 
   <group name="Back">
     <sample name="Back" href="../">

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -45,6 +45,26 @@
     </map:actions>
   </map:components>
 
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
+
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="">

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/jxcalc/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -18,7 +18,7 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <!-- =========================== Flowscripts =================================== -->
+  <!-- ======================== Flowscripts ================================ -->
 
   <map:flow language="javascript">
     <map:script src="calc.js" />
@@ -28,22 +28,22 @@
 
   <map:views>
     <map:view name="content" from-label="content">
-      <map:serialize type="xml" />
+      <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
-      <!-- Make use of servlet services -->
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
-        <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
     </map:view>
 
     <map:view name="links" from-position="last">
-      <map:serialize type="links" />
+      <map:serialize type="links"/>
     </map:view>
   </map:views>
 
-  <!-- =========================== Pipelines ================================= -->
+  <!-- =========================== Pipelines =============================== -->
+
   <map:pipelines>
     <map:pipeline>
       <!--+

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/prefs/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -21,15 +21,24 @@
   -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+  <!-- ======================== Flowscripts ================================ -->
+
+  <!-- indicates what flowscript to attach to this sitemap -->
+  <map:flow language="javascript">
+    <map:script src="prefs.js"/>
+  </map:flow>
+
+  <!-- =========================== Views =================================== -->
+
   <map:views>
     <map:view name="content" from-label="content">
       <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter"/>
-      <map:serialize type="html"/>
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
     </map:view>
 
     <map:view name="links" from-position="last">
@@ -37,10 +46,7 @@
     </map:view>
   </map:views>
 
-  <!-- indicates what flowscript to attach to this sitemap -->
-  <map:flow language="javascript">
-    <map:script src="prefs.js"/>
-  </map:flow>
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -23,6 +23,26 @@
   -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
+
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="*">

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/flow/test/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -22,21 +22,25 @@
     <map:script src="sendpage.js"/>
   </map:flow>
 
+  <!-- =========================== Views =================================== -->
+
   <map:views>
     <map:view name="content" from-label="content">
       <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter" />
-      <map:serialize type="html"/>
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
     </map:view>
 
     <map:view name="links" from-position="last">
       <map:serialize type="links"/>
     </map:view>
   </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/samples.xml Thu Nov 22 19:38:18 2007
@@ -16,99 +16,104 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
-
+<!--
+  - $Id$
+  -->
 <samples name="Hello, World!">
 
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
+
   <group name="Back">
-   <sample name="Back" href="../">
-    Back to the samples home page.
-   </sample>
+    <sample name="Back" href="../">
+      Back to the samples home page.
+    </sample>
   </group>
 
   <group name="About">
-   <note>All examples on this page have been created using a single data source,
-   hello.xml file.
-   </note>
-   <sample name="XML" href="hello.xml">
-    Hello world XML document.
-   </sample>
+    <note>All examples on this page have been created using a single data source,
+      hello.xml file.
+    </note>
+    <sample name="XML" href="hello.xml">
+      Hello world XML document.
+    </sample>
   </group>
 
   <group name="Multichannel Hello World!">
-   <sample name="HTML" href="hello.html">
-    This page shows how a simple XML page can be presented in HTML.
-   </sample>
-   <sample name="XHTML" href="hello.xhtml">
-    This is the same page as above, but rendered in XHTML (which is the 
-    well-formed XML version of HTML). Note that both the page and the
-    stylesheet used to transform it didn't change from the previous
-    example, Cocoon does everything for you by setting a different serializer.
-   </sample>
-   <sample name="WML" href="hello.wml">
-    By changing the stylesheet, it's possible to render the same content
-    for consumption on different devices. Here, for example, it's rendered
-    in WML (Wireless Markup Language) which is the markup language used
-    in WAP-enabled agents (such as PDA or cell phones).
-   </sample>
-   <sample name="CHTML" href="hello.chtml">
-    Or, as CHTML (Compact HTML), which is used by i-Mode compatible cell phones.
-   </sample>
-   <sample name="SVG" href="hello.svg">
-    Given the power of XSLT and the fact that many presentation languages are
-    based on the XML syntax, it is possible to generate even vector graphics
-    from your content. Here is an example that renders to  SVG (Scalable Vector
-    Graphics). (You need an SVG plugin, or an SVG-capable browser to see this.)
-   </sample>   
-   <sample name="SWF" href="hello.swf">
-    Flash is everywhere. In fact many people have the plugin installed.
-    Let Cocoon configure your flash movie. A little action script and you set.
-    See this sample how it works.
-   </sample>
-   <sample name="Plain Text" href="hello.txt">
-    Sometimes you don't need to be very fancy, so here is a plain text
-    version of your content.
-   </sample>
-   <sample name="VRML" href="hello.wrl">
-    But sometimes you need to be fancy to impress people, so here is a 3D
-    version of your content (you need a VRML plugin in your browser to visualize
-    this).
-   </sample>
-   <sample name="VoiceML" href="hello.vml">
-    Or sometimes you don't even have a display in front of you, so you want to
-    hear your content, so here is a VoiceML representation of your content (you 
-    need a VoiceML-capable agent to hear this).
-   </sample>
-   <sample name="Zip archive" href="hello.zip">
-    Or you might want your information nicely packaged as a zip file.
-   </sample>
+    <sample name="HTML" href="hello.html">
+      This page shows how a simple XML page can be presented in HTML.
+    </sample>
+    <sample name="XHTML" href="hello.xhtml">
+      This is the same page as above, but rendered in XHTML (which is the
+      well-formed XML version of HTML). Note that both the page and the
+      stylesheet used to transform it didn't change from the previous
+      example, Cocoon does everything for you by setting a different serializer.
+    </sample>
+    <sample name="WML" href="hello.wml">
+      By changing the stylesheet, it's possible to render the same content
+      for consumption on different devices. Here, for example, it's rendered
+      in WML (Wireless Markup Language) which is the markup language used
+      in WAP-enabled agents (such as PDA or cell phones).
+    </sample>
+    <sample name="CHTML" href="hello.chtml">
+      Or, as CHTML (Compact HTML), which is used by i-Mode compatible cell phones.
+    </sample>
+    <sample name="SVG" href="hello.svg">
+      Given the power of XSLT and the fact that many presentation languages are
+      based on the XML syntax, it is possible to generate even vector graphics
+      from your content. Here is an example that renders to SVG (Scalable Vector
+      Graphics). (You need an SVG plugin, or an SVG-capable browser to see this.)
+    </sample>
+    <sample name="SWF" href="hello.swf">
+      Flash is everywhere. In fact many people have the plugin installed.
+      Let Cocoon configure your flash movie. A little action script and you set.
+      See this sample how it works.
+    </sample>
+    <sample name="Plain Text" href="hello.txt">
+      Sometimes you don't need to be very fancy, so here is a plain text
+      version of your content.
+    </sample>
+    <sample name="VRML" href="hello.wrl">
+      But sometimes you need to be fancy to impress people, so here is a 3D
+      version of your content (you need a VRML plugin in your browser to visualize
+      this).
+    </sample>
+    <sample name="VoiceML" href="hello.vml">
+      Or sometimes you don't even have a display in front of you, so you want to
+      hear your content, so here is a VoiceML representation of your content (you
+      need a VoiceML-capable agent to hear this).
+    </sample>
+    <sample name="Zip archive" href="hello.zip">
+      Or you might want your information nicely packaged as a zip file.
+    </sample>
   </group>
 
   <group name="Hello Office!">
-   <sample name="OpenOffice Writer" href="hello.sxw">
-    This document shows how a simple XML page can be presented in OpenOffice Writer file format.
-   </sample>
-   <sample name="OpenOffice Calc" href="hello.sxc">
-    This spreadsheet shows how a simple XML page can be presented in OpenOffice Calc file format.
-   </sample>
-   <sample name="OpenOffice Impress" href="hello.sxi">
-    This presentation shows how a simple XML page can be presented in OpenOffice Impress file format.
-   </sample>
-   <sample name="OpenOffice Draw" href="hello.sxd">
-    This drawing shows how a simple XML page can be presented in OpenOffice Draw file format.
-   </sample>
-   <sample name="MS Word 2003" href="hello-worldml.doc">
-    This document shows how a simple XML page can be presented in MS Word 2003 XML file format.
-   </sample>
+    <sample name="OpenOffice Writer" href="hello.sxw">
+      This document shows how a simple XML page can be presented in OpenOffice Writer file format.
+    </sample>
+    <sample name="OpenOffice Calc" href="hello.sxc">
+      This spreadsheet shows how a simple XML page can be presented in OpenOffice Calc file format.
+    </sample>
+    <sample name="OpenOffice Impress" href="hello.sxi">
+      This presentation shows how a simple XML page can be presented in OpenOffice Impress file format.
+    </sample>
+    <sample name="OpenOffice Draw" href="hello.sxd">
+      This drawing shows how a simple XML page can be presented in OpenOffice Draw file format.
+    </sample>
+    <sample name="MS Word 2003" href="hello-worldml.doc">
+      This document shows how a simple XML page can be presented in MS Word 2003 XML file format.
+    </sample>
   </group>
 
   <group name="Hello World Web Service">
-   <sample name="Web Service" href="hello.service">
-    Here is a super-simple web service that says hi!
-   </sample>
-   <sample name="Web Service WSDL Descriptor" href="hello.service/WSDL">
-    And this is the corresponding WSDL descriptor.
-   </sample>
+    <sample name="Web Service" href="hello.service">
+      Here is a super-simple web service that says hi!
+    </sample>
+    <sample name="Web Service WSDL Descriptor" href="hello.service/WSDL">
+      And this is the corresponding WSDL descriptor.
+    </sample>
   </group>
 
   <!--
@@ -119,34 +124,34 @@
   -->
   <!--
   <group name="Blocks Hello World!">
-   <note>
-    These samples only work if the corresponding blocks are activated
-    at build time. 
-   </note>
-   <sample name="RTF" href="servlet:jfor:/hello.rtf">
-    Hello from the jfor block in Rich Text Format.
-   </sample>
-   <sample name="PDF" href="servlet:fop:/hello.pdf">
-    Hello from the fop block in Portable Document Format.
-   </sample>
-   <sample name="PS" href="servlet:fop:/hello.ps">
-    Hello from the fop block in PostScript format.
-   </sample>
-   <sample name="PDF" href="servlet:itext:/hello.pdf">
-    Another hello in Portable Document Format, from the itext block.
-   </sample>
-   <sample name="JPEG" href="servlet:batik:/hello.jpeg">
-    Hello from the batik block in JPEG.
-   </sample>
-   <sample name="PNG" href="servlet:batik:/hello.png">
-    Hello from the batik block in PNG.
-   </sample>
-   <sample name="XLS" href="servlet:poi:/hello.xls">
-    Hello in Excel spreadsheet format from the POI block.
-   </sample>
-   <sample name="HTML" href="servlet:stx:/hello.html">
-    Hello in the HTML format, but now with help from stx block.
-   </sample>
+    <note>
+      These samples only work if the corresponding blocks are activated
+      at build time.
+    </note>
+    <sample name="RTF" href="servlet:jfor:/hello.rtf">
+      Hello from the jfor block in Rich Text Format.
+    </sample>
+    <sample name="PDF" href="servlet:fop:/hello.pdf">
+      Hello from the fop block in Portable Document Format.
+    </sample>
+    <sample name="PS" href="servlet:fop:/hello.ps">
+      Hello from the fop block in PostScript format.
+    </sample>
+    <sample name="PDF" href="servlet:itext:/hello.pdf">
+      Another hello in Portable Document Format, from the itext block.
+    </sample>
+    <sample name="JPEG" href="servlet:batik:/hello.jpeg">
+      Hello from the batik block in JPEG.
+    </sample>
+    <sample name="PNG" href="servlet:batik:/hello.png">
+      Hello from the batik block in PNG.
+    </sample>
+    <sample name="XLS" href="servlet:poi:/hello.xls">
+      Hello in Excel spreadsheet format from the POI block.
+    </sample>
+    <sample name="HTML" href="servlet:stx:/hello.html">
+      Hello in the HTML format, but now with help from stx block.
+    </sample>
   </group>
   -->
 </samples>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/hello-world/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -16,30 +16,30 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
-
+<!--
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <!-- =========================== Views =================================== -->
 
   <map:views>
     <map:view name="content" from-label="content">
-      <map:serialize type="xml" />
+      <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
-      <!-- Make use of servlet services -->
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
-        <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
     </map:view>
 
     <map:view name="links" from-position="last">
-      <map:serialize type="links" />
+      <map:serialize type="links"/>
     </map:view>
   </map:views>
 
-  <!-- =========================== Pipelines ================================= -->
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml Thu Nov 22 19:38:18 2007
@@ -20,10 +20,8 @@
 <book software="Apache Cocoon" 
       title="Apache Cocoon i18n Samples" 
       copyright="@year@ The Apache Software Foundation"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-      i18n:attr="title"
->
+      i18n:attr="title">
 
   <menu label="Samples" i18n:attr="label">
     <menu-item label="Static (XML)" href="simple.xml" i18n:attr="label"/>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -16,12 +16,11 @@
   limitations under the License.
 -->
 
-<!--+
-    | Internationalization samples sitemap
-    |
-    | CVS $Id$
-    +-->
-
+<!--
+  - Internationalization samples sitemap
+  -
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <!-- =========================== Components ================================ -->
@@ -79,6 +78,7 @@
   </map:components>
 
   <!-- =========================== Resources =============================== -->
+
   <map:resources>
     <!--+
       | This resource is used to create a composite page from menu and content
@@ -102,22 +102,21 @@
 
   <map:views>
     <map:view name="content" from-label="content">
-      <map:serialize type="xml" />
+      <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
-      <!-- Make use of servlet services -->
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
-        <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
     </map:view>
 
     <map:view name="links" from-position="last">
-      <map:serialize type="links" />
+      <map:serialize type="links"/>
     </map:view>
   </map:views>
 
-  <!-- =========================== Pipelines ================================= -->
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/reloading/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/reloading/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/reloading/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/reloading/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -16,20 +16,43 @@
   limitations under the License.
 -->
 
+<!--
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
- <map:components>
-  <map:classloader factory-role="org.apache.cocoon.classloader.ClassLoaderFactory/reloading">  
-    <class-dir src="../../../../../../../blocks/cocoon-core-sample/cocoon-core-main-sample/target/classes">
-      <store class="org.apache.commons.jci.stores.MemoryResourceStore"/>
-    </class-dir>
-    <!-- Implicit exclude-all, except those included -->
-    <include-classes pattern="org.apache.cocoon.core.container.reloading.**"/>
-  </map:classloader>
-  <map:generators default="file">
-   <map:generator name="mygenerator" src="org.apache.cocoon.core.container.reloading.MyGenerator"/>
-  </map:generators>  
- </map:components>
+  <map:components>
+    <map:classloader factory-role="org.apache.cocoon.classloader.ClassLoaderFactory/reloading">
+      <class-dir src="../../../../../../../blocks/cocoon-core-sample/cocoon-core-main-sample/target/classes">
+        <store class="org.apache.commons.jci.stores.MemoryResourceStore"/>
+      </class-dir>
+      <!-- Implicit exclude-all, except those included -->
+      <include-classes pattern="org.apache.cocoon.core.container.reloading.**"/>
+    </map:classloader>
+    <map:generators default="file">
+      <map:generator name="mygenerator" src="org.apache.cocoon.core.container.reloading.MyGenerator"/>
+    </map:generators>
+  </map:components>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml Thu Nov 22 19:38:18 2007
@@ -23,6 +23,10 @@
   -->
 <samples name="Cocoon Core Samples">
 
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
+
   <group name="Cocoon Pipelines">
     <sample name="Hello World!" href="hello-world/">
       Generating various types of content

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -33,7 +33,7 @@
       <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
         <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
@@ -53,6 +53,16 @@
         <map:serialize type="servletService">
           <map:parameter name="service" value="servlet:style:/service/common/simple-samples2html"/>
         </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:generate src="sitemap.xmap"/>
+        <map:serialize type="xml"/>
+      </map:match>
+
+      <map:match pattern="**/sitemap.xmap">
+        <map:generate src="{1}/sitemap.xmap"/>
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="*/**">

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/samples.xml Thu Nov 22 19:38:18 2007
@@ -16,25 +16,30 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id$ -->
-
+<!--
+  - $Id$
+  -->
 <samples name="XML-ized Web Sites">
 
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
+
   <group name="Back">
-   <sample name="Back" href="../">
-    Back to the samples home page.
-   </sample>
+    <sample name="Back" href="../">
+      Back to the samples home page.
+    </sample>
   </group>
 
   <group name="Sites">
-   <sample name="jakarta.apache.org" href="jakarta.apache.org/">
-    This is a snapshot of the jakarta.apache.org web site and then 
-    XML-ized.
-   </sample>
-   <sample name="java.apache.org" href="java.apache.org/">
-    This is a snapshot of the java.apache.org web site and then 
-    XML-ized.    
-   </sample>
+    <sample name="jakarta.apache.org" href="jakarta.apache.org/">
+      This is a snapshot of the jakarta.apache.org web site and then
+      XML-ized.
+    </sample>
+    <sample name="java.apache.org" href="java.apache.org/">
+      This is a snapshot of the java.apache.org web site and then
+      XML-ized.
+    </sample>
   </group>
-   
+
 </samples>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sites/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -25,21 +25,21 @@
 
   <map:views>
     <map:view name="content" from-label="content">
-      <map:serialize type="xml" />
+      <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
-        <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
     </map:view>
 
     <map:view name="links" from-position="last">
-      <map:serialize type="links" />
+      <map:serialize type="links"/>
     </map:view>
   </map:views>
 
-  <!-- ========================== Pipelines ================================ -->
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/slides/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/slides/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/slides/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/slides/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -21,6 +21,26 @@
   -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
+
   <map:pipelines>
     <map:pipeline>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/samples.xml Thu Nov 22 19:38:18 2007
@@ -16,10 +16,14 @@
   limitations under the License.
 -->
 
-<!--+
-    | $Id$
-    +-->
+<!--
+  - $Id$
+  -->
 <samples name="Using Sources">
+
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
 
   <group name="Back">
     <sample name="Back" href="../">

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/sources/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -28,7 +28,7 @@
       <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
         <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
@@ -39,7 +39,7 @@
     </map:view>
   </map:views>
 
-  <!-- ========================== Pipelines ================================ -->
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml Thu Nov 22 19:38:18 2007
@@ -15,14 +15,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- @version $Id$ -->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
+<!--
+  - $Id$
+  -->
 <beans>
 
-  <bean id="spring-test" class="org.apache.cocoon.core.container.spring.test.TestBean" abstract="false" singleton="true" lazy-init="default">
-    <property name="settings" ref="org.apache.cocoon.configuration.Settings" />
-    <property name="javaVersion" value="${java.specification.version}" />
+  <bean name="spring-test"
+        class="org.apache.cocoon.core.container.spring.test.TestBean"
+        abstract="false" singleton="true" lazy-init="default">
+    <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
+    <property name="javaVersion" value="${java.specification.version}"/>
   </bean>
 
 </beans>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -15,10 +15,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- @version $Id$ -->
+
+<!--
+  - $Id$
+  -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <!-- By default all flow scripts from the ./flow directory are read. -->
   <map:flow language="javascript"/>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml"/>
+    </map:view>
+
+    <map:view name="pretty-content" from-label="content">
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links"/>
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml Thu Nov 22 19:38:18 2007
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- SVN $Id$ -->
+
+<!--
+  - $Id$
+  -->
 <document xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <p>This is a simple demo page</p>
   <p>Message from a Spring Bean:</p>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/samples.xml?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/samples.xml Thu Nov 22 19:38:18 2007
@@ -16,18 +16,22 @@
   limitations under the License.
 -->
 
-<!--+
-    | Main samples page
-    |
-    | CVS $Id$
-    +-->
+<!--
+  - Core Samples : System Samples
+  -
+  - $Id$
+  -->
 
 <samples name="System Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
 
+  <links>
+    <link role="see-also" href="sitemap.xmap">Sitemap</link>
+  </links>
+
   <group name="Back">
-   <sample name="Back" href="../">
-    Back to the samples home page.
-   </sample>
+    <sample name="Back" href="../">
+      Back to the samples home page.
+    </sample>
   </group>
 
   <group name="System Tools And Pages">
@@ -38,11 +42,11 @@
     <sample name="Status Page (with continuations)" href="status-with-continuations.html">
       This page shows the current internal status of cocoon, along with
       information on the cache and the object stores and the continuations.
-    </sample>    
+    </sample>
     <sample name="Status Page (with continuations - XML)" href="status-with-continuations.xml">
       This page shows the current internal status of cocoon, along with
       information on the cache and the object stores and the continuations.
-    </sample>        
+    </sample>
     <sample name="Clear Cache" href="clearcache.html">
       Empties the Cocoon in-memory cache.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap?rev=597533&r1=597532&r2=597533&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/system/sitemap.xmap Thu Nov 22 19:38:18 2007
@@ -30,7 +30,7 @@
       <map:serialize type="xml"/>
     </map:view>
 
-    <map:view from-label="content" name="pretty-content">
+    <map:view name="pretty-content" from-label="content">
       <map:serialize type="servletService">
         <map:parameter name="service" value="servlet:style:/service/system/xml2html"/>
       </map:serialize>
@@ -41,7 +41,7 @@
     </map:view>
   </map:views>
 
-  <!-- =========================== Pipelines ================================= -->
+  <!-- =========================== Pipelines =============================== -->
 
   <map:pipelines>
     <map:pipeline>



Mime
View raw message