cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r542312 [1/14] - in /cocoon/trunk/blocks: cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/ cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/ cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ coc...
Date Mon, 28 May 2007 20:17:18 GMT
Author: felixk
Date: Mon May 28 13:17:10 2007
New Revision: 542312

URL: http://svn.apache.org/viewvc?view=rev&rev=542312
Log:
Reformatting:
All XML files, traditionally, come with 2 space indenting.

(Happy to realize that some traditions are more equal than others :-) )

Modified:
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/cocoon-auth-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/META-INF/cocoon/spring/cocoon-axis-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/src/main/resources/META-INF/cocoon/spring/cocoon-batik-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/src/main/resources/META-INF/cocoon/spring/cocoon-bsf-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/src/main/resources/META-INF/cocoon/spring/cocoon-captcha-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/catalog/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/errorhandling/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/filter/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/imagereader/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/paginator/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/protected/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/four/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/one/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/three/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/simpleform/two/sitemap.xmap
    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-additional-sample/src/main/resources/COB-INF/sites/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/slides/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sources/xsp.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/stream/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-additional-sample.xml
    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/hello-world/sitemap.xmap
    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/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/system/sitemap.xmap
    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-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases-sitemap.xconf
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-databases.xconf
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/src/main/resources/META-INF/cocoon/spring/cocoon-deli-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-eventcache.xconf
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/src/main/resources/META-INF/cocoon/spring/cocoon-eventcache-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/src/main/resources/META-INF/cocoon/spring/cocoon-faces-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-ng-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-fop-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/data/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/META-INF/cocoon/spring/cocoon-html-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-imageop.xconf
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-imageop-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/META-INF/cocoon/spring/cocoon-itext-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jcr-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jfor-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jsp-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/bookdemo/sitemap.xmap
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo-ns/sitemap.xmap
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo/sitemap.xmap
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/META-INF/cocoon/spring/cocoon-linkrewriter-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/conf/sendmail_xsl.xconf
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail/sitemap.xmap
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sendmail/sitemap.xmap
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-midi/cocoon-midi-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-midi/cocoon-midi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-midi-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ojb-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-profiler-sitemap.xconf
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/META-INF/cocoon/spring/cocoon-profiler-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/META-INF/cocoon/spring/cocoon-proxy-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-language.xconf
    cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-xsp.xconf
    cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/META-INF/cocoon/spring/cocoon-qdox-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/META-INF/cocoon/spring/cocoon-samples-style-default-blockServlet.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/flow-webservices/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/intercepted-flow/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-session-fw_components.xconf
    cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/yapt/sitemap.xmap
    cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-template.xconf
    cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/flow/sitemap.xmap
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/multi-channel/sitemap.xmap
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/pipelines/sitemap.xmap
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/META-INF/cocoon/spring/cocoon-validation-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-xmldb-sitemap.xconf
    cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/WEB-INF/xindice.xml
    cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,28 +24,28 @@
 
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-    
-    <map:flow language="javascript">
-        <map:script src="System.Upload.js"/>
-    </map:flow>
-    
-    <map:pipelines>
-        <map:pipeline>
-            
-            <!-- JSON support -->
-            <map:match pattern="send-json">
-                <map:read src="module:flow-attr:json" mime-type="text/javascript" />
-            </map:match>
-            
-            <!-- upload progress bar support -->
-            <map:match pattern="upload/*">
-                <map:call function="System.Upload.{1}">
-                    <map:parameter name="catalogue" value="messages"/>
-                    <map:parameter name="location" value="i18n"/>
-                </map:call>
-            </map:match>
-        
-        </map:pipeline>
-    </map:pipelines>
+
+  <map:flow language="javascript">
+    <map:script src="System.Upload.js" />
+  </map:flow>
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <!-- JSON support -->
+      <map:match pattern="send-json">
+        <map:read src="module:flow-attr:json" mime-type="text/javascript" />
+      </map:match>
+
+      <!-- upload progress bar support -->
+      <map:match pattern="upload/*">
+        <map:call function="System.Upload.{1}">
+          <map:parameter name="catalogue" value="messages" />
+          <map:parameter name="location" value="i18n" />
+        </map:call>
+      </map:match>
+
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,10 +23,10 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.ajax.impl.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-ajax-impl" context-path="blockcontext:/cocoon-ajax-impl/"/>
-    </bean>
-    <bean id="org.apache.cocoon.ajax.impl.system.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-ajax-impl/system" context-path="blockcontext:/cocoon-ajax-impl/system/"/>
-    </bean>
+  <bean id="org.apache.cocoon.ajax.impl.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-ajax-impl" context-path="blockcontext:/cocoon-ajax-impl/" />
+  </bean>
+  <bean id="org.apache.cocoon.ajax.impl.system.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-ajax-impl/system" context-path="blockcontext:/cocoon-ajax-impl/system/" />
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -21,78 +21,78 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
-        <map:generators>
-            <!-- use the new implementation of JX -->
-            <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator" />
-        </map:generators>
-    </map:components>
-
-    <!-- =========================== Resources =================================== -->
-
-    <map:resources>
-        <!-- this will later become a virtual transformer -->
-        <map:resource name="simple-page2html">
-            <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
-        </map:resource>
-    </map:resources>
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService" mime-type="text/html">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="">
-                <map:generate src="welcome.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService" mime-type="text/html">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <!-- =========================== Ajax ================================= -->
-
-            <map:match pattern="*.html">
-                <map:generate type="jx" src="{1}.xml" />
-                <map:call resource="simple-page2html" />
-                <map:transform type="servletLinkRewriter" label="content" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="linked-updater-content-*">
-                <map:generate type="jx" src="{0}.xml" label="content" />
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="display-*">
-                <map:generate type="jx" src="{0}.xml" label="content" />
-                <map:serialize type="html" />
-            </map:match>
+  <map:components>
+    <map:generators>
+      <!-- use the new implementation of JX -->
+      <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator" />
+    </map:generators>
+  </map:components>
+
+  <!-- =========================== Resources =================================== -->
+
+  <map:resources>
+    <!-- this will later become a virtual transformer -->
+    <map:resource name="simple-page2html">
+      <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
+    </map:resource>
+  </map:resources>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService" mime-type="text/html">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="">
+        <map:generate src="welcome.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService" mime-type="text/html">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <!-- =========================== Ajax ================================= -->
+
+      <map:match pattern="*.html">
+        <map:generate type="jx" src="{1}.xml" />
+        <map:call resource="simple-page2html" />
+        <map:transform type="servletLinkRewriter" label="content" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="linked-updater-content-*">
+        <map:generate type="jx" src="{0}.xml" label="content" />
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="display-*">
+        <map:generate type="jx" src="{0}.xml" label="content" />
+        <map:serialize type="html" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,12 +23,12 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.ajax.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-ajax-sample" context-path="blockcontext:/cocoon-ajax-sample/">
-            <servlet:connections>
-                <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.ajax.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-ajax-sample" context-path="blockcontext:/cocoon-ajax-sample/">
+      <servlet:connections>
+        <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,151 +24,151 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
-        <map:transformers default="xslt">
-            <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-                <catalogues default="forms">
-                    <catalogue id="other" name="OtherMessages" location="messages" />
-                    <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n" />
-                </catalogues>
-                <cache-at-startup>true</cache-at-startup>
-            </map:transformer>
-        </map:transformers>
-    </map:components>
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Resources =================================== -->
-
-    <map:resources>
-        <map:resource name="serialize-jx-screen">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
-            </map:serialize>
-        </map:resource>
-    </map:resources>
-
-    <!-- =========================== Flowscripts =================================== -->
-
-    <map:flow language="apples" />
-
-    <!-- =========================== Pipelines =================================== -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="">
-                <map:generate src="welcome.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <!-- =========================== Apples =================================== -->
-
-            <map:match pattern="*.continue">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <map:match pattern="continue.*">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <!--+
-                |   Binding form sample, reuses pipelines stolen from Cocoon Forms
-                +-->
-
-            <!--map:match pattern="form2xml.flow">
-                <map:call function="org.apache.cocoon.components.flow.apples.samples.BindingWoodyApple">
-                <map:parameter name="form-src" value="block:cocoon-samples-style-default:blocks/forms/forms/form2_model.xml"/>
-                <map:parameter name="binding-src" value="block:cocoon-forms-sample:forms-data/form2_bind_xml.xml"/>
-                <map:parameter name="documentURI" value="block:cocoon-forms-sample:forms-data/form2_data.xml"/>
-                <map:parameter name="form-pipe" value="block:cocoon-forms-sample:forms/form2-display-pipeline"/>
-                <map:parameter name="valid-pipe" value="block:cocoon-forms-sample:forms/form2-success-pipeline"/>
-                </map:call>
-                </map:match-->
-
-
-            <!--+ 
-                |  Calculator sample, uses stolen and modified xsp's from flowscript sample
-                +-->
-
-            <map:match pattern="calc.flow">
-                <map:call function="org.apache.cocoon.components.flow.apples.samples.CalculationApple" />
-            </map:match>
-
-            <map:match pattern="calc/*">
-                <map:generate type="jx" src="servlet:main-sample:/flow/jxcalc/screens/{1}.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
-                </map:serialize>
-                <map:serialize />
-            </map:match>
-
-
-            <!--+ 
-                |  Guess Game sample, borrowed setup from the uses stolen and modified xsp's from flowscript
-                +-->
-
-            <map:match pattern="guess.flow">
-                <map:call function="org.apache.cocoon.components.flow.apples.samples.GuessGameApple" />
-            </map:match>
-
-
-            <!--+ 
-                |  Tower of Hanoi Puzzle sample.
-                +-->
-
-            <map:match pattern="hanoi.flow">
-                <map:call function="org.apache.cocoon.components.flow.apples.samples.HanoiApple" />
-            </map:match>
-
-
-            <!--+ 
-                |  JX screen pipes 
-                +-->
-
-            <map:match pattern="hanoi/hanoi.jx">
-                <map:generate type="jx" src="hanoi/hanoi.jx" />
-                <map:transform src="hanoi/hanoi.xsl" />
-                <map:call resource="serialize-jx-screen">
-                    <map:parameter name="screen-src" value="hanoi/hanoi.jx" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="*/*.jx">
-                <map:generate type="jx" src="{1}/{2}.jx" />
-                <map:call resource="serialize-jx-screen">
-                    <map:parameter name="screen-src" value="{1}/{2}.jx" />
-                </map:call>
-            </map:match>
+  <map:components>
+    <map:transformers default="xslt">
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="forms">
+          <catalogue id="other" name="OtherMessages" location="messages" />
+          <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n" />
+        </catalogues>
+        <cache-at-startup>true</cache-at-startup>
+      </map:transformer>
+    </map:transformers>
+  </map:components>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Resources =================================== -->
+
+  <map:resources>
+    <map:resource name="serialize-jx-screen">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+      </map:serialize>
+    </map:resource>
+  </map:resources>
+
+  <!-- =========================== Flowscripts =================================== -->
+
+  <map:flow language="apples" />
+
+  <!-- =========================== Pipelines =================================== -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="">
+        <map:generate src="welcome.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <!-- =========================== Apples =================================== -->
+
+      <map:match pattern="*.continue">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <map:match pattern="continue.*">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <!--+
+        |   Binding form sample, reuses pipelines stolen from Cocoon Forms
+        +-->
+
+      <!--map:match pattern="form2xml.flow">
+        <map:call function="org.apache.cocoon.components.flow.apples.samples.BindingWoodyApple">
+        <map:parameter name="form-src" value="block:cocoon-samples-style-default:blocks/forms/forms/form2_model.xml"/>
+        <map:parameter name="binding-src" value="block:cocoon-forms-sample:forms-data/form2_bind_xml.xml"/>
+        <map:parameter name="documentURI" value="block:cocoon-forms-sample:forms-data/form2_data.xml"/>
+        <map:parameter name="form-pipe" value="block:cocoon-forms-sample:forms/form2-display-pipeline"/>
+        <map:parameter name="valid-pipe" value="block:cocoon-forms-sample:forms/form2-success-pipeline"/>
+        </map:call>
+        </map:match-->
+
+
+      <!--+ 
+        |  Calculator sample, uses stolen and modified xsp's from flowscript sample
+        +-->
+
+      <map:match pattern="calc.flow">
+        <map:call function="org.apache.cocoon.components.flow.apples.samples.CalculationApple" />
+      </map:match>
+
+      <map:match pattern="calc/*">
+        <map:generate type="jx" src="servlet:main-sample:/flow/jxcalc/screens/{1}.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+        </map:serialize>
+        <map:serialize />
+      </map:match>
+
+
+      <!--+ 
+        |  Guess Game sample, borrowed setup from the uses stolen and modified xsp's from flowscript
+        +-->
+
+      <map:match pattern="guess.flow">
+        <map:call function="org.apache.cocoon.components.flow.apples.samples.GuessGameApple" />
+      </map:match>
+
+
+      <!--+ 
+        |  Tower of Hanoi Puzzle sample.
+        +-->
+
+      <map:match pattern="hanoi.flow">
+        <map:call function="org.apache.cocoon.components.flow.apples.samples.HanoiApple" />
+      </map:match>
+
+
+      <!--+ 
+        |  JX screen pipes 
+        +-->
+
+      <map:match pattern="hanoi/hanoi.jx">
+        <map:generate type="jx" src="hanoi/hanoi.jx" />
+        <map:transform src="hanoi/hanoi.xsl" />
+        <map:call resource="serialize-jx-screen">
+          <map:parameter name="screen-src" value="hanoi/hanoi.jx" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="*/*.jx">
+        <map:generate type="jx" src="{1}/{2}.jx" />
+        <map:call resource="serialize-jx-screen">
+          <map:parameter name="screen-src" value="{1}/{2}.jx" />
+        </map:call>
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/cocoon-apples-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,13 +23,13 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.apples.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-apples-sample" context-path="blockcontext:/cocoon-apples-sample/">
-            <servlet:connections>
-                <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet"/>
-                <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.apples.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-apples-sample" context-path="blockcontext:/cocoon-apples-sample/">
+      <servlet:connections>
+        <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet" />
+        <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,67 +18,67 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate type="directory" src="data">
-                    <map:parameter name="include" value="\.txt$" />
-                </map:generate>
-                <map:transform src="dir2html.xsl" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-
-            <!-- =========================== Asciiart ================================= -->
-
-            <!-- expects format xxxyyyzzt.txt.png -->
-            <map:match pattern="*.jpg">
-                <map:generate type="asciiart-svg" src="data/{1}" />
-                <map:serialize type="svg2jpeg" />
-            </map:match>
-
-            <!-- expects format xxxyyyzzt.txt.png -->
-            <map:match pattern="*.png">
-                <map:generate type="asciiart-svg" src="data/{1}" />
-                <map:serialize type="svg2png" />
-            </map:match>
-
-            <map:match pattern="*.txt">
-                <map:read src="data/{1}.txt" mime-type="text/plain" />
-            </map:match>
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate type="directory" src="data">
+          <map:parameter name="include" value="\.txt$" />
+        </map:generate>
+        <map:transform src="dir2html.xsl" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+
+      <!-- =========================== Asciiart ================================= -->
+
+      <!-- expects format xxxyyyzzt.txt.png -->
+      <map:match pattern="*.jpg">
+        <map:generate type="asciiart-svg" src="data/{1}" />
+        <map:serialize type="svg2jpeg" />
+      </map:match>
+
+      <!-- expects format xxxyyyzzt.txt.png -->
+      <map:match pattern="*.png">
+        <map:generate type="asciiart-svg" src="data/{1}" />
+        <map:serialize type="svg2png" />
+      </map:match>
+
+      <map:match pattern="*.txt">
+        <map:read src="data/{1}.txt" mime-type="text/plain" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.asciiart.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-asciiart-sample" context-path="blockcontext:/cocoon-asciiart-sample/">
-            <servlet:connections>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.asciiart.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-asciiart-sample" context-path="blockcontext:/cocoon-asciiart-sample/">
+      <servlet:connections>
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -27,7 +27,7 @@
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="">
-        <map:redirect-to uri="login"/>
+        <map:redirect-to uri="login" />
       </map:match>
 
       <!-- ================= -->
@@ -36,14 +36,14 @@
       <map:match pattern="login">
         <!-- if we are already logged in, redirect to the protected document -->
         <map:act type="cauth-is-logged-in">
-          <map:parameter name="application" value="sample"/> 
+          <map:parameter name="application" value="sample" />
 
-          <map:redirect-to uri="protected"/>
-        </map:act> 
-        <map:generate src="docs/login.xml"/>
-        <map:transform src="stylesheets/simple-page2html.xsl"/>
-        <map:transform type="encodeURL"/>
-        <map:serialize/>
+          <map:redirect-to uri="protected" />
+        </map:act>
+        <map:generate src="docs/login.xml" />
+        <map:transform src="stylesheets/simple-page2html.xsl" />
+        <map:transform type="encodeURL" />
+        <map:serialize />
       </map:match>
 
       <!-- ========================================= -->
@@ -52,13 +52,13 @@
       <map:match pattern="do-login">
         <!-- try to login -->
         <map:act type="cauth-login">
-          <map:parameter name="application" value="sample"/>
-          <map:parameter name="name" value="{request-param:username}"/>
-          <map:parameter name="password" value="{request-param:password}"/>
-          <map:redirect-to uri="protected"/>
+          <map:parameter name="application" value="sample" />
+          <map:parameter name="name" value="{request-param:username}" />
+          <map:parameter name="password" value="{request-param:password}" />
+          <map:redirect-to uri="protected" />
         </map:act>
         <!-- something was wrong, try it again -->
-        <map:redirect-to uri="login"/>
+        <map:redirect-to uri="login" />
       </map:match>
 
       <!-- ================ -->
@@ -66,15 +66,15 @@
       <!-- ================ -->
       <map:match pattern="protected">
         <map:act type="cauth-is-logged-in">
-          <map:parameter name="application" value="sample"/> 
+          <map:parameter name="application" value="sample" />
 
-          <map:generate src="docs/protected.xml" type="jx"/>
-          <map:transform src="stylesheets/simple-page2html.xsl"/>
-          <map:transform type="encodeURL"/>
-          <map:serialize/>
+          <map:generate src="docs/protected.xml" type="jx" />
+          <map:transform src="stylesheets/simple-page2html.xsl" />
+          <map:transform type="encodeURL" />
+          <map:serialize />
         </map:act>
         <!-- something was wrong, redirect to login page -->
-        <map:redirect-to uri="login"/>
+        <map:redirect-to uri="login" />
       </map:match>
 
       <!-- ========================================= -->
@@ -82,10 +82,10 @@
       <!-- ========================================= -->
       <map:match pattern="do-logout">
         <map:act type="cauth-logout">
-          <map:parameter name="application" value="sample"/> 
+          <map:parameter name="application" value="sample" />
 
         </map:act>
-        <map:redirect-to uri="login"/>
+        <map:redirect-to uri="login" />
       </map:match>
     </map:pipeline>
 

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/cocoon-auth-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/cocoon-auth-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/cocoon-auth-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-sample/src/main/resources/META-INF/cocoon/spring/cocoon-auth-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.auth.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-auth-sample" context-path="blockcontext:/cocoon-auth-sample/" />
-    </bean>
+  <bean id="org.apache.cocoon.auth.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-auth-sample" context-path="blockcontext:/cocoon-auth-sample/" />
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,180 +24,180 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Flowscripts ================================= -->
-
-    <map:flow language="javascript" />
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="">
-                <map:generate src="welcome.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="sitemap.xmap">
-                <map:read src="sitemap.xmap" mime-type="text/xml" />
-            </map:match>
-        </map:pipeline>
-
-        <!-- Non flow part -->
-        <map:pipeline>
-
-            <!-- ================= -->
-            <!-- Simple login page -->
-            <!-- ================= -->
-            <map:match pattern="login">
-                <!-- if we are already logged in, redirect to the protected document -->
-                <map:act type="auth-loggedIn">
-                    <map:parameter name="handler" value="demohandler" />
-                    <map:redirect-to uri="protected" />
-                </map:act>
-                <map:generate src="docs/login.xml" />
-                <map:transform src="stylesheets/simple-page2html.xsl" />
-                <map:transform type="encodeURL" />
-                <map:serialize />
-            </map:match>
-
-            <!-- ========================================= -->
-            <!-- Form target which performs auth service   -->
-            <!-- ========================================= -->
-            <map:match pattern="do-login">
-                <!-- try to login -->
-                <map:act type="auth-login">
-                    <map:parameter name="handler" value="demohandler" />
-                    <map:parameter name="parameter_name" value="{request-param:username}" />
-                    <map:redirect-to uri="protected" />
-                </map:act>
-                <!-- something was wrong, try it again -->
-                <map:redirect-to uri="login" />
-            </map:match>
-
-            <!-- ================ -->
-            <!-- Protected area   -->
-            <!-- ================ -->
-            <map:match pattern="protected">
-                <map:act type="auth-protect">
-                    <map:parameter name="handler" value="demohandler" />
-
-                    <map:generate src="docs/protected.xml" />
-                    <map:transform type="session" />
-                    <map:transform src="stylesheets/simple-page2html.xsl" />
-                    <map:transform type="encodeURL" />
-                    <map:serialize />
-                </map:act>
-                <!-- something was wrong, redirect to login page -->
-                <map:redirect-to uri="login" />
-            </map:match>
-
-            <!-- ========================================= -->
-            <!-- Logout link which invalidates the session -->
-            <!-- ========================================= -->
-            <map:match pattern="do-logout">
-                <map:act type="auth-protect">
-                    <map:parameter name="handler" value="demohandler" />
-                    <map:act type="auth-logout" />
-                </map:act>
-                <map:redirect-to uri="login" />
-            </map:match>
-        </map:pipeline>
-
-        <!-- Flow part -->
-        <map:pipeline>
-            <!-- ================= -->
-            <!-- Simple login page -->
-            <!-- ================= -->
-            <map:match pattern="flow/login">
-                <map:call function="isLoggedIn">
-                    <map:parameter name="handler" value="flowdemohandler" />
-                    <map:parameter name="protected-redirect" value="protected" />
-                    <map:parameter name="failure-internal" value="flow/internal/login" />
-                </map:call>
-            </map:match>
-
-            <!-- ========================================= -->
-            <!-- Form target which performs auth service   -->
-            <!-- ========================================= -->
-            <map:match pattern="flow/do-login">
-                <!-- try to login -->
-                <map:call function="login">
-                    <map:parameter name="handler" value="flowdemohandler" />
-                    <map:parameter name="parameter_name" value="{request-param:username}" />
-                    <map:parameter name="protected-redirect" value="protected" />
-                    <map:parameter name="failure-redirect" value="login" />
-                </map:call>
-            </map:match>
-
-            <!-- ================ -->
-            <!-- Protected area   -->
-            <!-- ================ -->
-            <map:match pattern="flow/protected">
-                <map:call function="protect">
-                    <map:parameter name="handler" value="flowdemohandler" />
-                    <map:parameter name="protected-internal" value="flow/internal/protected" />
-                    <map:parameter name="failure-redirect" value="login" />
-                </map:call>
-            </map:match>
-
-            <!-- ========================================= -->
-            <!-- Logout link which invalidates the session -->
-            <!-- ========================================= -->
-            <map:match pattern="flow/do-logout">
-                <map:call function="logout">
-                    <map:parameter name="handler" value="flowdemohandler" />
-                    <map:parameter name="failure-redirect" value="login" />
-                </map:call>
-            </map:match>
-        </map:pipeline>
-
-        <map:pipeline internal-only="true">
-            <!-- This is the authentication resource -->
-            <map:match pattern="authenticate">
-                <map:generate src="docs/userlist.xml" />
-                <map:transform src="stylesheets/authenticate.xsl">
-                    <map:parameter name="use-request-parameters" value="true" />
-                </map:transform>
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="flow/internal/login">
-                <map:generate src="docs/login.xml" />
-                <map:transform src="stylesheets/simple-page2html.xsl" />
-                <map:transform type="encodeURL" />
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="flow/internal/protected">
-                <map:generate src="docs/protected.xml" />
-                <map:transform type="session" />
-                <map:transform src="stylesheets/simple-page2html.xsl" />
-                <map:transform type="encodeURL" />
-                <map:serialize />
-            </map:match>
-        </map:pipeline>
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Flowscripts ================================= -->
+
+  <map:flow language="javascript" />
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="">
+        <map:generate src="welcome.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="sitemap.xmap">
+        <map:read src="sitemap.xmap" mime-type="text/xml" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Non flow part -->
+    <map:pipeline>
+
+      <!-- ================= -->
+      <!-- Simple login page -->
+      <!-- ================= -->
+      <map:match pattern="login">
+        <!-- if we are already logged in, redirect to the protected document -->
+        <map:act type="auth-loggedIn">
+          <map:parameter name="handler" value="demohandler" />
+          <map:redirect-to uri="protected" />
+        </map:act>
+        <map:generate src="docs/login.xml" />
+        <map:transform src="stylesheets/simple-page2html.xsl" />
+        <map:transform type="encodeURL" />
+        <map:serialize />
+      </map:match>
+
+      <!-- ========================================= -->
+      <!-- Form target which performs auth service   -->
+      <!-- ========================================= -->
+      <map:match pattern="do-login">
+        <!-- try to login -->
+        <map:act type="auth-login">
+          <map:parameter name="handler" value="demohandler" />
+          <map:parameter name="parameter_name" value="{request-param:username}" />
+          <map:redirect-to uri="protected" />
+        </map:act>
+        <!-- something was wrong, try it again -->
+        <map:redirect-to uri="login" />
+      </map:match>
+
+      <!-- ================ -->
+      <!-- Protected area   -->
+      <!-- ================ -->
+      <map:match pattern="protected">
+        <map:act type="auth-protect">
+          <map:parameter name="handler" value="demohandler" />
+
+          <map:generate src="docs/protected.xml" />
+          <map:transform type="session" />
+          <map:transform src="stylesheets/simple-page2html.xsl" />
+          <map:transform type="encodeURL" />
+          <map:serialize />
+        </map:act>
+        <!-- something was wrong, redirect to login page -->
+        <map:redirect-to uri="login" />
+      </map:match>
+
+      <!-- ========================================= -->
+      <!-- Logout link which invalidates the session -->
+      <!-- ========================================= -->
+      <map:match pattern="do-logout">
+        <map:act type="auth-protect">
+          <map:parameter name="handler" value="demohandler" />
+          <map:act type="auth-logout" />
+        </map:act>
+        <map:redirect-to uri="login" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Flow part -->
+    <map:pipeline>
+      <!-- ================= -->
+      <!-- Simple login page -->
+      <!-- ================= -->
+      <map:match pattern="flow/login">
+        <map:call function="isLoggedIn">
+          <map:parameter name="handler" value="flowdemohandler" />
+          <map:parameter name="protected-redirect" value="protected" />
+          <map:parameter name="failure-internal" value="flow/internal/login" />
+        </map:call>
+      </map:match>
+
+      <!-- ========================================= -->
+      <!-- Form target which performs auth service   -->
+      <!-- ========================================= -->
+      <map:match pattern="flow/do-login">
+        <!-- try to login -->
+        <map:call function="login">
+          <map:parameter name="handler" value="flowdemohandler" />
+          <map:parameter name="parameter_name" value="{request-param:username}" />
+          <map:parameter name="protected-redirect" value="protected" />
+          <map:parameter name="failure-redirect" value="login" />
+        </map:call>
+      </map:match>
+
+      <!-- ================ -->
+      <!-- Protected area   -->
+      <!-- ================ -->
+      <map:match pattern="flow/protected">
+        <map:call function="protect">
+          <map:parameter name="handler" value="flowdemohandler" />
+          <map:parameter name="protected-internal" value="flow/internal/protected" />
+          <map:parameter name="failure-redirect" value="login" />
+        </map:call>
+      </map:match>
+
+      <!-- ========================================= -->
+      <!-- Logout link which invalidates the session -->
+      <!-- ========================================= -->
+      <map:match pattern="flow/do-logout">
+        <map:call function="logout">
+          <map:parameter name="handler" value="flowdemohandler" />
+          <map:parameter name="failure-redirect" value="login" />
+        </map:call>
+      </map:match>
+    </map:pipeline>
+
+    <map:pipeline internal-only="true">
+      <!-- This is the authentication resource -->
+      <map:match pattern="authenticate">
+        <map:generate src="docs/userlist.xml" />
+        <map:transform src="stylesheets/authenticate.xsl">
+          <map:parameter name="use-request-parameters" value="true" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="flow/internal/login">
+        <map:generate src="docs/login.xml" />
+        <map:transform src="stylesheets/simple-page2html.xsl" />
+        <map:transform type="encodeURL" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="flow/internal/protected">
+        <map:generate src="docs/protected.xml" />
+        <map:transform type="session" />
+        <map:transform src="stylesheets/simple-page2html.xsl" />
+        <map:transform type="encodeURL" />
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
 
-    </map:pipelines>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-authentication-fw-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.authentication_fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-authentication-fw-sample" context-path="blockcontext:/cocoon-authentication-fw-sample/">
-            <servlet:connections>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.authentication_fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-authentication-fw-sample" context-path="blockcontext:/cocoon-authentication-fw-sample/">
+      <servlet:connections>
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,53 +18,52 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Components ================================ -->
+  <!-- =========================== Components ================================ -->
 
-<map:components>
+  <map:components>
 
-  <map:readers default="resource">
+    <map:readers default="resource">
 
-    <!-- Defines a SOAP RPC reader that will serve SOAP requests via HTTP-POST. -->
-    <map:reader logger="sitemap.reader.soap-rpc" name="soap-rpc"
-                src="org.apache.cocoon.reading.AxisRPCReader">
-      <development-stage>false</development-stage>
-    </map:reader>
+      <!-- Defines a SOAP RPC reader that will serve SOAP requests via HTTP-POST. -->
+      <map:reader logger="sitemap.reader.soap-rpc" name="soap-rpc" src="org.apache.cocoon.reading.AxisRPCReader">
+        <development-stage>false</development-stage>
+      </map:reader>
 
-  </map:readers>
+    </map:readers>
 
-</map:components>
+  </map:components>
 
-<!-- =========================== Pipelines ================================= -->
+  <!-- =========================== Pipelines ================================= -->
 
-<map:pipelines>
-  
-  <!-- sub-sitemap soap example pipeline -->
-  <map:pipeline>
+  <map:pipelines>
 
-    <!-- Match SOAP RPC Router requests -->
-    <map:match pattern="rpcrouter">
-      <map:read type="soap-rpc" mime-type="text/xml"/>
-    </map:match>
+    <!-- sub-sitemap soap example pipeline -->
+    <map:pipeline>
 
-    <!-- Send all non qualified requests to the status page -->
-    <map:match pattern="">
-      <map:redirect-to uri="status.xsp"/>
-    </map:match>
+      <!-- Match SOAP RPC Router requests -->
+      <map:match pattern="rpcrouter">
+        <map:read type="soap-rpc" mime-type="text/xml" />
+      </map:match>
 
-    <map:match pattern="status.xsp">
-      <map:generate type="serverpages" src="status.xsp"/>
-      <map:transform src="status.xsl"/>
-      <map:serialize type="html"/>
-    </map:match>
+      <!-- Send all non qualified requests to the status page -->
+      <map:match pattern="">
+        <map:redirect-to uri="status.xsp" />
+      </map:match>
 
-    <!-- Match any other xsp pages we've put in the directory -->
-    <map:match pattern="*.xsp">
-      <map:generate type="serverpages" src="{1}.xsp"/>
-      <map:serialize type="xml"/>
-    </map:match>
+      <map:match pattern="status.xsp">
+        <map:generate type="serverpages" src="status.xsp" />
+        <map:transform src="status.xsl" />
+        <map:serialize type="html" />
+      </map:match>
 
-  </map:pipeline>
-</map:pipelines>
+      <!-- Match any other xsp pages we've put in the directory -->
+      <map:match pattern="*.xsp">
+        <map:generate type="serverpages" src="{1}.xsp" />
+        <map:serialize type="xml" />
+      </map:match>
+
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>
 

Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/META-INF/cocoon/spring/cocoon-axis-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/META-INF/cocoon/spring/cocoon-axis-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/META-INF/cocoon/spring/cocoon-axis-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/src/main/resources/META-INF/cocoon/spring/cocoon-axis-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.axis.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-axis-sample" context-path="blockcontext:/cocoon-axis-sample/" />
-    </bean>
+  <bean id="org.apache.cocoon.axis.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-axis-sample" context-path="blockcontext:/cocoon-axis-sample/" />
+  </bean>
 </beans>



Mime
View raw message