Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 24352 invoked from network); 1 Feb 2008 00:36:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Feb 2008 00:36:20 -0000 Received: (qmail 84194 invoked by uid 500); 1 Feb 2008 00:36:11 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 84113 invoked by uid 500); 1 Feb 2008 00:36:11 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 84102 invoked by uid 99); 1 Feb 2008 00:36:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2008 16:36:11 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2008 00:35:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2CC621A9832; Thu, 31 Jan 2008 16:35:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Fri, 01 Feb 2008 00:35:48 -0000 To: cvs@cocoon.apache.org From: reinhard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080201003558.2CC621A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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. +--> - - - - - - @@ -105,16 +99,6 @@ - - - - - - - - - - @@ -123,8 +107,6 @@ | pipeline needs to be terminated by a serializer. +--> - - @@ -153,18 +135,11 @@ - - - org.apache.cocoon.SessionState - referer - - - - - - - - - @@ -258,17 +227,8 @@ | entirely and execution proceeds from the element right below the action. +--> - - - - - - - - - - + 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 @@ - + - + - + - + - + - + - + - + + model="non-thread-safe-pooled"/> - + @@ -127,11 +127,8 @@ - + - - @@ -163,10 +160,5 @@ - - - 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 @@ org.apache.cocoon.micro cocoon-micro-servlet-service-components + + javax.servlet + servlet-api + provided +