svn commit: r938378 - in /felix/trunk: scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java

[cziegeler]

Author: cziegeler
Date: Tue Apr 27 09:40:24 2010
New Revision: 938378

URL: http://svn.apache.org/viewvc?rev=938378&view=rev
Log:
FELIX-2305 : Servlets should not be immediate

Modified:
    
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
    
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java

Modified: 
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java?rev=938378&r1=938377&r2=938378&view=diff
==============================================================================
--- 
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
 (original)
+++ 
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
 Tue Apr 27 09:40:24 2010
@@ -30,7 +30,7 @@ import java.lang.annotation.*;
 public @interface SlingServlet {
 
     /**
-     * Whether to generate a default SCR component tag with "immediate=true". 
If
+     * Whether to generate a default SCR component tag. If
      * set to false, a {...@link org.apache.felix.scr.annotations.Component}
      * annotation can be added manually with defined whatever configuration
      * needed.

Modified: 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java?rev=938378&r1=938377&r2=938378&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
 (original)
+++ 
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
 Tue Apr 27 09:40:24 2010
@@ -32,9 +32,6 @@ import com.thoughtworks.qdox.model.Annot
  */
 public class SlingServletComponentTag extends AbstractTag {
 
-    private static final Map<String, String> IMMEDIATE_MAP =
-            Collections.singletonMap(Constants.COMPONENT_IMMEDIATE, 
String.valueOf(true));
-
     /**
      * @param desc Description
      */
@@ -49,7 +46,7 @@ public class SlingServletComponentTag ex
 
     @Override
     public Map<String, String> createNamedParameterMap() {
-        return IMMEDIATE_MAP;
+        return Collections.emptyMap();
     }
 
 }