Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@minotaur.apache.org Received: (qmail 1848 invoked from network); 9 Jun 2009 09:09:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Jun 2009 09:09:13 -0000 Received: (qmail 72508 invoked by uid 500); 9 Jun 2009 09:09:25 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 72459 invoked by uid 500); 9 Jun 2009 09:09:25 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 72450 invoked by uid 99); 9 Jun 2009 09:09:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2009 09:09:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2009 09:09:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1890D2388871; Tue, 9 Jun 2009 09:09:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r782924 - in /incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter: ProcessingContext.java impl/FactoryCache.java impl/PipelineImpl.java impl/ProcessorManagerImpl.java Date: Tue, 09 Jun 2009 09:08:58 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090609090900.1890D2388871@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue Jun 9 09:08:55 2009 New Revision: 782924 URL: http://svn.apache.org/viewvc?rev=782924&view=rev Log: Fix some bugs in the component handling. Modified: incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/ProcessingContext.java incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java Modified: incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/ProcessingContext.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/ProcessingContext.java?rev=782924&r1=782923&r2=782924&view=diff ============================================================================== --- incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/ProcessingContext.java (original) +++ incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/ProcessingContext.java Tue Jun 9 09:08:55 2009 @@ -28,8 +28,14 @@ */ public interface ProcessingContext { + /** + * The current request. + */ SlingHttpServletRequest getRequest(); + /** + * The current response. + */ SlingHttpServletResponse getResponse(); /** Modified: incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java?rev=782924&r1=782923&r2=782924&view=diff ============================================================================== --- incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java (original) +++ incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java Tue Jun 9 09:08:55 2009 @@ -276,7 +276,7 @@ } Object obj = super.addingService(reference); if ( obj == null && isGlobal ) { - obj = this.getService(reference); + obj = this.context.getService(reference); } return obj; } Modified: incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java?rev=782924&r1=782923&r2=782924&view=diff ============================================================================== --- incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java (original) +++ incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java Tue Jun 9 09:08:55 2009 @@ -33,8 +33,9 @@ import org.xml.sax.SAXException; /** - * Context for a pipeline invocation. - * This contexts keeps track of the used pipeline components for later disposal. + * The PipelineImpl is the heart of the pipeline + * processing. It uses the configured pipeline components, + * assembles a pipeline and runs the pipeline. */ public class PipelineImpl implements Processor { @@ -55,7 +56,7 @@ /** * Setup this pipeline. */ - public PipelineImpl(final FactoryCache factoryCache) { + public PipelineImpl(final FactoryCache factoryCache) { this.factoryCache = factoryCache; } Modified: incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java?rev=782924&r1=782923&r2=782924&view=diff ============================================================================== --- incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java (original) +++ incubator/sling/whiteboard/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java Tue Jun 9 09:08:55 2009 @@ -52,8 +52,8 @@ /** * This manager keeps track of configured processors. * - * @scrs.component metatype="no" - * @scrs.service interface="ProcessorManager" + * @scr.component metatype="no" abstract="true" + * @scr.service interface="ProcessorManager" */ public class ProcessorManagerImpl implements ProcessorManager {