You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/02/01 01:35:48 UTC
svn commit: r617318 - in /cocoon/whiteboard/micro:
core/cocoon-core/src/main/java/org/apache/cocoon/acting/
core/cocoon-core/src/main/java/org/apache/cocoon/components/crawler/
core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/
core/cocoo...
Author: reinhard
Date: Thu Jan 31 16:35:14 2008
New Revision: 617318
URL: http://svn.apache.org/viewvc?rev=617318&view=rev
Log:
first round on removing stuff (for now) in order to make refactoring simpler. since they are still available in trunk, it should be fairly easy to put them back
Removed:
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/acting/CopySourceAction.java
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/components/crawler/
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/components/persistence/
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/SitemapServlet.java
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/JPathTransformer.java
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
cocoon/whiteboard/micro/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java
cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-fam.xconf
cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/org/apache/cocoon/components/
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/acting/RequestParamActionTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/matching/CookieMatcherTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/selection/CookieSelectorTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/transformation/FilterTransformerTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/environment/commandline/
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/environment/mock/
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/matching/CookieMatcherTestCase.xtest
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/selection/CookieSelectorTestCase.xtest
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/augment-input-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/augment-result-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/cinclude-incl.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/cinclude-input-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/cinclude-input-2.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/cinclude-input-3.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/cinclude-result-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/cinclude-result-2.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/cinclude-result-3.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/encodeurl-input-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/encodeurl-input-2.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/encodeurl-result-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/encodeurl-result-2.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/filter-input.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/filter-result-1-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/filter-result-1-3.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/filter-result-3-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-incl.txt
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-incl.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-input-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-input-2.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-input-fallbackTest.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-input-multipleNestedFallbackTest.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-input-nestedXincludeFallbackTest.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-input-simpleFallbackForTextParseTest.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-result-1.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-result-2.xml
cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/xinclude-result-fallbackTest.xml
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGeneratorBean.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CalendarGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/RequestGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/RequestParseException.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/LinkSerializer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/AugmentTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/FilterTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/LogTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/pagination/
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ClearCacheAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/FormValidatorAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/HelloAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/InputModuleAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/PropagatorAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/RequestParamAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionIsValidAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionPropagatorAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionStateAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SessionValidatorAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/acting/SetterAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/output/
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/CookieMatcher.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/MountTableMatcher.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/RequestAttributeMatcher.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/SessionAttributeMatcher.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/matching/modular/
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/selection/SessionAttributeSelector.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-components/src/main/resources/META-INF/cocoon/avalon/
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractMultiAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ConfigurableServiceableAction.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ConfigurationHelper.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ValidatorActionHelper.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/acting/ValidatorActionResult.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/classloader/reloading/
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/AbstractInputModule.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleAttributeException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleDestructionException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleInitializationException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/InputModuleNotFoundException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelper.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/JXPathHelperConfiguration.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/input/ModuleHolder.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/modules/output/AbstractOutputModule.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/CoreException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/CoreFatalException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/CoreInitializationException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/CoreResourceNotFoundException.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/WiringNotFoundException.java
Modified:
cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles
cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
Modified: cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf?rev=617318&r1=617317&r2=617318&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf (original)
+++ cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf Thu Jan 31 16:35:14 2008
@@ -53,17 +53,11 @@
| All components follow this scheme.
+-->
<map:generators default="file">
- <map:generator label="content" logger="sitemap.generator.imagedirectory" name="imagedirectory" src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
- <map:generator label="content" logger="sitemap.generator.request" name="request" pool-max="16" src="org.apache.cocoon.generation.RequestGenerator"/>
<map:generator label="content" logger="sitemap.generator.stream" name="stream" pool-max="16" src="org.apache.cocoon.generation.StreamGenerator"/>
<map:generator label="content" logger="sitemap.generator.status" name="status" pool-max="16" src="org.apache.cocoon.generation.StatusGenerator"/>
- <!-- The notifying generator can only be used in a <handle-errors> section -->
- <map:generator name="notifying" src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
<!-- The exception generator can only be used in a <handle-errors> section : it produces an XML
representation of the exception that caused the error handler to be executed -->
<map:generator name="exception" src="org.apache.cocoon.generation.ExceptionGenerator"/>
- <map:generator label="content" logger="sitemap.generator.mp3directory" name="mp3directory" src="org.apache.cocoon.generation.MP3DirectoryGenerator"/>
-
</map:generators>
@@ -105,16 +99,6 @@
</map:transformer>
<map:transformer logger="sitemap.transformer.include" name="include" pool-max="16" src="org.apache.cocoon.transformation.IncludeTransformer"/>
- <map:transformer logger="sitemap.transformer.xinclude" name="xinclude" pool-max="16" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
- <map:transformer logger="sitemap.transformer.cinclude" name="cinclude" pool-max="16" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
- <map:transformer logger="sitemap.transformer.encodeURL" name="encodeURL" src="org.apache.cocoon.transformation.EncodeURLTransformer"/>
- <map:transformer logger="sitemap.transformer.write-source" name="write-source" src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
- <map:transformer logger="sitemap.transformer.writeDOMsession" name="writeDOMsession" src="org.apache.cocoon.transformation.WriteDOMSessionTransformer"/>
- <map:transformer logger="sitemap.transformer.readDOMsession" name="readDOMsession" src="org.apache.cocoon.transformation.ReadDOMSessionTransformer"/>
- <map:transformer logger="sitemap.transformer.log" name="log" pool-max="16" src="org.apache.cocoon.transformation.LogTransformer"/>
- <map:transformer logger="sitemap.transformer.paginate" name="paginate" src="org.apache.cocoon.transformation.pagination.Paginator"/>
- <map:transformer logger="sitemap.transformer.jpath" name="jpath" src="org.apache.cocoon.transformation.JPathTransformer"/>
- <map:transformer logger="sitemap.transformer.filter" name="filter" src="org.apache.cocoon.transformation.FilterTransformer"/>
</map:transformers>
@@ -123,8 +107,6 @@
| pipeline needs to be terminated by a serializer.
+-->
<map:serializers default="html">
- <map:serializer logger="sitemap.serializer.links" name="links" src="org.apache.cocoon.serialization.LinkSerializer"/>
-
<map:serializer logger="sitemap.serializer.zip" mime-type="application/zip" name="zip" src="org.apache.cocoon.serialization.ZipArchiveSerializer"/>
<map:serializer logger="sitemap.serializer.sxw" mime-type="application/vnd.sun.xml.writer" name="sxw" src="org.apache.cocoon.serialization.ZipArchiveSerializer"/>
<map:serializer logger="sitemap.serializer.sxc" mime-type="application/vnd.sun.xml.calc" name="sxc" src="org.apache.cocoon.serialization.ZipArchiveSerializer"/>
@@ -153,18 +135,11 @@
<map:matcher logger="sitemap.matcher.wildcard" name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
<map:matcher logger="sitemap.matcher.regexp" name="regexp" src="org.apache.cocoon.matching.RegexpURIMatcher"/>
<map:matcher logger="sitemap.matcher.request-parameter" name="request-parameter" src="org.apache.cocoon.matching.RequestParameterMatcher"/>
- <map:matcher logger="sitemap.matcher.cookie" name="cookie" src="org.apache.cocoon.matching.CookieMatcher"/>
<map:matcher logger="sitemap.matcher.header" name="header" src="org.apache.cocoon.matching.HeaderMatcher"/>
<map:matcher logger="sitemap.matcher.parameter" name="parameter" src="org.apache.cocoon.matching.ParameterMatcher"/>
- <map:matcher logger="sitemap.matcher.sessionstate" name="sessionstate" src="org.apache.cocoon.matching.WildcardSessionAttributeMatcher">
- <attribute-name>org.apache.cocoon.SessionState</attribute-name>
- </map:matcher>
<map:matcher logger="sitemap.matcher.referer-match" name="referer-match" src="org.apache.cocoon.matching.WildcardHeaderMatcher">
<header-name>referer</header-name>
</map:matcher>
- <map:matcher name="mount-table" src="org.apache.cocoon.matching.MountTableMatcher">
- <map:parameter name="ignore-missing-tables" value="true"/>
- </map:matcher>
<map:matcher logger="sitemap.matcher.locale" name="locale" src="org.apache.cocoon.matching.LocaleMatcher">
<!--+
| Default configuration:
@@ -233,12 +208,6 @@
<parameter-name>myparam</parameter-name>
+-->
</map:selector>
- <map:selector logger="sitemap.selector.request-attribute" name="request-attribute" src="org.apache.cocoon.selection.RequestAttributeSelector">
- <!-- <attribute-name>myparam</attribute-name> -->
- </map:selector>
- <map:selector logger="sitemap.selector.session-attribute" name="session-attribute" src="org.apache.cocoon.selection.SessionAttributeSelector">
- <!-- <attribute-name>myparam</attribute-name> -->
- </map:selector>
<map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector"/>
<map:selector logger="sitemap.selector.header" name="header" src="org.apache.cocoon.selection.HeaderSelector">
<!-- <header-name>myparam</header-name> -->
@@ -258,17 +227,8 @@
| entirely and execution proceeds from the element right below the action.
+-->
<map:actions>
- <map:action logger="sitemap.action.request" name="request" src="org.apache.cocoon.acting.RequestParamAction"/>
- <map:action logger="sitemap.action.requestParamExists" name="req-params" src="org.apache.cocoon.acting.RequestParameterExistsAction"/>
- <map:action logger="sitemap.action.form-validator" name="form-validator" src="org.apache.cocoon.acting.FormValidatorAction"/>
- <map:action logger="sitemap.action.session-state" name="session-state" src="org.apache.cocoon.acting.SessionStateAction"/>
- <map:action logger="sitemap.action.session-isvalid" name="session-isvalid" src="org.apache.cocoon.acting.SessionIsValidAction"/>
- <map:action logger="sitemap.action.session-validator" name="session-validator" src="org.apache.cocoon.acting.SessionValidatorAction"/>
- <map:action logger="sitemap.action.session-invalidator" name="session-invalidator" src="org.apache.cocoon.acting.SessionInvalidatorAction"/>
<map:action logger="sitemap.action.resource-exists" name="resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
<map:action logger="sitemap.action.set-header" name="set-header" src="org.apache.cocoon.acting.HttpHeaderAction"/>
- <map:action logger="sitemap.action.clear-cache" name="clear-cache" src="org.apache.cocoon.acting.ClearCacheAction"/>
- <map:action logger="sitemap.action.clear-persistent-store" name="clear-persistent-store" src="org.apache.cocoon.acting.ClearPersistentStoreAction"/>
<map:action logger="sitemap.action.locale" name="locale" src="org.apache.cocoon.acting.LocaleAction">
<!--+
| Default configuration:
@@ -354,5 +314,5 @@
<parameter name="cache-expires" value="180"/> <!-- Expires in secondes -->
</map:pipe>
</map:pipes>
-
+
</map:components>
Modified: cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles?rev=617318&r1=617317&r2=617318&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles (original)
+++ cocoon/whiteboard/micro/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles Thu Jan 31 16:35:14 2008
@@ -67,7 +67,7 @@
<role name="org.apache.cocoon.Processor"
shorthand="sitemap"
default-class="org.apache.cocoon.components.treeprocessor.TreeProcessor"/>
-
+
<!-- the tree builder for the sitemap language (additional implementations can be added here
or in cocoon.xconf for other implementations) -->
<role name="org.apache.cocoon.components.treeprocessor.TreeBuilder/sitemap-1.0"
@@ -81,41 +81,41 @@
<role name="org.apache.cocoon.acting.ActionSelector"
shorthand="actions"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
-
+
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
-
+
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
-
+
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generators"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
-
+
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
-
+
<role name="org.apache.cocoon.serialization.SerializerSelector"
shorthand="serializers"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
-
+
<role name="org.apache.cocoon.reading.ReaderSelector"
shorthand="readers"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
-
+
<role name="org.apache.cocoon.components.notification.NotifyingBuilder"
shorthand="notifying-builder"
default-class="org.apache.cocoon.components.notification.DefaultNotifyingBuilder"
- model="non-thread-safe-pooled"/>
+ model="non-thread-safe-pooled"/>
<!-- system-defined sitemap components -->
<role name="org.apache.cocoon.generation.Generator/<notifier>"
default-class="org.apache.cocoon.sitemap.NotifyingGenerator"
model="non-thread-safe-pooled"/>
-
+
<role name="org.apache.cocoon.generation.Generator/<aggregator>"
default-class="org.apache.cocoon.sitemap.DefaultContentAggregator"
model="non-thread-safe-pooled"/>
@@ -127,11 +127,8 @@
<role name="org.apache.cocoon.transformation.Transformer/<gatherer>"
default-class="org.apache.cocoon.sitemap.LinkGatherer"
model="non-thread-safe-pooled"/>
-
+
<!--=========================================================================-->
- <role name="org.apache.cocoon.classloader.reloading.Monitor"
- shorthand="fam"
- default-class="org.apache.cocoon.components.fam.MonitorImpl"/>
<role name="org.apache.excalibur.xmlizer.XMLizer"
shorthand="xmlizer"
@@ -147,7 +144,7 @@
default-class="org.apache.cocoon.i18n.XMLResourceBundleFactory"/>
<!-- Control flow layer: the interpreters selector and continuations manager -->
- <role name="org.apache.cocoon.components.flow.InterpreterSelector"
+ <role name="org.apache.cocoon.components.flow.InterpreterSelector"
shorthand="flow-interpreters"
default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
@@ -163,10 +160,5 @@
<role name="org.apache.cocoon.components.modules.output.OutputModuleSelector"
shorthand="output-modules"
default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
- <!-- Storing data in the current request -->
- <role name="org.apache.cocoon.components.persistence.RequestDataStore"
- shorthand="request-data-store"
- default-class="org.apache.cocoon.components.persistence.RequestDataStoreImpl"/>
</role-list>
Modified: cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java?rev=617318&r1=617317&r2=617318&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java (original)
+++ cocoon/whiteboard/micro/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java Thu Jan 31 16:35:14 2008
@@ -658,7 +658,7 @@
} catch (Exception e) {
handleException(e);
}
-
+
return true;
}
@@ -708,7 +708,7 @@
this.newManager.release(this.serializer);
this.serializerParam = null;
}
-
+
// Release source resolver
if (this.sourceResolver != null) {
this.newManager.release(this.sourceResolver);
@@ -723,7 +723,7 @@
// Release error pipeline
// This is not done by using release in the creating container as release
- // is a noop for the Avalon life style in the Spring container
+ // is a noop for the Avalon life style in the Spring container
this.errorPipeline = null;
}
@@ -887,7 +887,7 @@
* Handles exception which can happen during pipeline processing.
* If this not a connection reset, then all locations for pipeline components are
* added to the exception.
- *
+ *
* @throws ConnectionResetException if connection reset detected
* @throws ProcessingException in all other cases
*/
@@ -910,7 +910,7 @@
throw (ConnectionResetException)e;
}
- // Not a connection reset: add all location information
+ // Not a connection reset: add all location information
if (this.reader == null) {
// Add all locations in reverse order
ArrayList locations = new ArrayList(this.transformers.size() + 2);
@@ -919,7 +919,7 @@
locations.add(getLocation((Parameters)this.transformerParams.get(i)));
}
locations.add(getLocation(this.generatorParam));
-
+
throw ProcessingException.throwLocated("Failed to process pipeline", e, locations);
} else {
Modified: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml?rev=617318&r1=617317&r2=617318&view=diff
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml (original)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml Thu Jan 31 16:35:14 2008
@@ -45,6 +45,11 @@
<groupId>org.apache.cocoon.micro</groupId>
<artifactId>cocoon-micro-servlet-service-components</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>