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/12/08 03:38:46 UTC
svn commit: r602302 - in /cocoon/trunk/blocks/cocoon-core-sample:
cocoon-core-additional-sample/src/main/resources/COB-INF/
cocoon-core-additional-sample/src/main/resources/COB-INF/modules/
cocoon-core-additional-sample/src/main/resources/COB-INF/prope...
Author: vgritsenko
Date: Fri Dec 7 18:38:44 2007
New Revision: 602302
URL: http://svn.apache.org/viewvc?rev=602302&view=rev
Log:
move sitemap expressions sample to the sitemap samples group in cocoon-core-main-sample.
Added:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/config/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/config/properties/
- copied from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/properties/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/
- copied from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/
Removed:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/properties/
Modified:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/config/properties/variables.properties
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties/variables.properties
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/samples.xml
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml?rev=602302&r1=602301&r2=602302&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml Fri Dec 7 18:38:44 2007
@@ -24,9 +24,6 @@
<samples name="Additional Cocoon Core Samples">
<group name="More Core Samples">
- <sample href="modules/" name="The Power of Sitemap: Input Modules">
- This example shows the usage of Input Modules in sitemap attribute expressions.
- </sample>
<sample href="components" name="Core Components">
Some samples of various components that are included with the core,
e.g. Stream Generators, Paginator Transformers, Image Readers.
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap?rev=602302&r1=602301&r2=602302&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap Fri Dec 7 18:38:44 2007
@@ -24,8 +24,6 @@
<!-- ========================= Components ================================ -->
<map:components>
- <map:include-properties dir="properties"/>
-
<map:generators default="file">
<map:generator name="linkstatus" src="org.apache.cocoon.generation.LinkStatusGenerator"/>
<map:generator name="calendar" src="org.apache.cocoon.generation.CalendarGenerator"/>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/config/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/config/properties/variables.properties?rev=602302&r1=601761&r2=602302&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/config/properties/variables.properties (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/config/properties/variables.properties Fri Dec 7 18:38:44 2007
@@ -15,5 +15,5 @@
#
# Define global parameters, used in the input modules demo.
-global-sitemap=This value is defined in the samples/sitemap.xmap
-global-sitemap-override=This value is defined in the samples/sitemap.xmap, should be overridden by samples/modules/sitemap.xmap
+global-sitemap=This value is defined in the /config/properties/variables.properties file.
+global-sitemap-override=This value is defined in the /config/properties/variables.properties file; should be overridden by modules/variables.properties
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties/variables.properties?rev=602302&r1=601761&r2=602302&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties/variables.properties (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/properties/variables.properties Fri Dec 7 18:38:44 2007
@@ -15,5 +15,5 @@
#
# (Re)Define global parameters, used in the input modules demo.
-global-sub-sitemap=This value is defined in the samples/modules/sitemap.xmap
-global-sitemap-override=This value was defined in the samples/sitemap.xmap, but was overridden by samples/modules/sitemap.xmap
+global-sub-sitemap=This value is defined in the /modules/variables.properties file.
+global-sitemap-override=This value was defined in the /config/properties/variables.properties, but was overridden by /modules/variables.properties.
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap?rev=602302&r1=601761&r2=602302&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap Fri Dec 7 18:38:44 2007
@@ -16,16 +16,19 @@
limitations under the License.
-->
-<!--+
- | Input Modules sample sitemap.
- |
- | @version $Id$
- +-->
+<!--
+ - Input Modules sample sitemap.
+ -
+ - $Id$
+ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<!-- =========================== Components ============================== -->
+
<map:components>
- <map:include-properties dir="properties" />
+ <!-- Load variables.properties file -->
+ <map:include-properties dir="."/>
+
<map:actions>
<!-- Action to store locale name as cookie. -->
<map:action name="cookie-locale" src="org.apache.cocoon.acting.LocaleAction">
@@ -35,6 +38,7 @@
</map:components>
<!-- =========================== Resources =============================== -->
+
<map:resources>
<!-- This resource is used to create a composite page from menu and content -->
<map:resource name="composite">
@@ -53,18 +57,17 @@
<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>
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=602302&r1=602301&r2=602302&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 Fri Dec 7 18:38:44 2007
@@ -35,15 +35,19 @@
</group>
<group name="Cocoon Sitemap">
- <sample href="sources/" name="Sources">
+ <sample name="Sources" href="sources/">
This example shows the usage of sources in the sitemap.
</sample>
+ <sample name="Expressions" href="modules/">
+ This example shows the usage of input modules in the sitemap attribute
+ expressions.
+ </sample>
<sample name="Content Syndication & Aggregation" href="aggregation/">
Separation of content and style allows not only to serve your content
in different ways, but also to syndicate, aggregate or otherwise include
and transform content provided by other web sites.
</sample>
- <sample href="errorhandling/" name="Error Handling">
+ <sample name="Error Handling" href="errorhandling/">
An example page producing exceptions and handling them. Demonstrates the
error handlers hierarchy and the exception selectors.
</sample>