incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
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 GMT
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 <code>PipelineImpl</code> 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 {
 



Mime
View raw message