[webbeans-commits] Webbeans SVN: r1471 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans and 2 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Feb 9 11:18:27 EST 2009


Author: pete.muir at jboss.org
Date: 2009-02-09 11:18:26 -0500 (Mon, 09 Feb 2009)
New Revision: 1471

Added:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java
Modified:
   ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
Log:
Fix failing test

Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java	2009-02-09 15:51:01 UTC (rev 1470)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -1,12 +1,14 @@
 package org.jboss.webbeans.tck;
 
 import java.lang.annotation.Annotation;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.manager.Manager;
 
 import org.jboss.jsr299.tck.spi.Managers;
 import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.WebBeans;
 
 public class ManagersImpl implements Managers
 {
@@ -23,7 +25,9 @@
 
    public List<Class<? extends Annotation>> getEnabledDeploymentTypes()
    {
-      return CurrentManager.rootManager().getEnabledDeploymentTypes();
+      List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>(CurrentManager.rootManager().getEnabledDeploymentTypes());
+      deploymentTypes.remove(WebBeans.class);
+      return deploymentTypes;
    }
    
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2009-02-09 15:51:01 UTC (rev 1470)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -173,6 +173,14 @@
          throw new DeploymentException("@Standard must be the lowest precedence deployment type");
       }
    }
+   
+   protected void addWebBeansDeploymentTypes()
+   {
+      if (!this.enabledDeploymentTypes.contains(WebBeans.class))
+      {
+         this.enabledDeploymentTypes.add(1, WebBeans.class);
+      }
+   }
 
    /**
     * Registers a bean with the manager
@@ -263,8 +271,9 @@
     */
    public void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes)
    {
-      this.enabledDeploymentTypes = enabledDeploymentTypes;
+      this.enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(enabledDeploymentTypes);
       checkEnabledDeploymentTypes();
+      addWebBeansDeploymentTypes();
    }
 
    /**

Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java	                        (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -0,0 +1,26 @@
+package org.jboss.webbeans;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+/**
+ * Deployment type for Web Beans beans
+ * 
+ * @author Pete Muir
+ *
+ */
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at Documented
+ at DeploymentType
+public @interface WebBeans
+{
+
+}


Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java	2009-02-09 15:51:01 UTC (rev 1470)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -22,6 +22,7 @@
 import javax.context.RequestScoped;
 import javax.inject.Initializer;
 
+import org.jboss.webbeans.WebBeans;
 import org.jboss.webbeans.conversation.bindings.ConversationInactivityTimeout;
 
 /**
@@ -32,6 +33,7 @@
  */
 @RequestScoped
 @Named("conversation")
+ at WebBeans
 public class ConversationImpl implements Conversation
 {
    // The conversation ID

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java	2009-02-09 15:51:01 UTC (rev 1470)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -24,6 +24,8 @@
 
 import javax.context.SessionScoped;
 
+import org.jboss.webbeans.WebBeans;
+
 /**
  * A ConversationTerminator implementation using Java SE scheduling
  *   
@@ -31,6 +33,7 @@
  * @see org.jboss.webbeans.conversation.ConversationTerminator
  */
 @SessionScoped
+ at WebBeans
 public class JavaSEConversationTerminator implements ConversationTerminator, Serializable
 {
    private ScheduledExecutorService terminator = Executors.newScheduledThreadPool(1);

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java	2009-02-09 15:51:01 UTC (rev 1470)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -21,6 +21,8 @@
 
 import javax.context.SessionScoped;
 
+import org.jboss.webbeans.WebBeans;
+
 /**
  * A ConversationIdGenerator implementation using running numerical values
  *  
@@ -28,6 +30,7 @@
  *
  */
 @SessionScoped
+ at WebBeans
 public class NumericConversationIdGenerator implements ConversationIdGenerator, Serializable
 {
    // The next conversation ID

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java	2009-02-09 15:51:01 UTC (rev 1470)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -26,6 +26,7 @@
 import javax.inject.Produces;
 import javax.servlet.http.HttpSession;
 
+import org.jboss.webbeans.WebBeans;
 import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
 import org.jboss.webbeans.context.ConversationContext;
 import org.jboss.webbeans.conversation.bindings.ConversationConcurrentAccessTimeout;
@@ -40,6 +41,7 @@
  * 
  */
 @SessionScoped
+ at WebBeans
 public class ServletConversationManager implements ConversationManager, Serializable
 {
    private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class);
@@ -78,6 +80,7 @@
    
    @Produces
    @ConversationInactivityTimeout
+   @WebBeans
    public long getConversationTimeoutInMilliseconds()
    {
       return 10 * 60 * 1000;
@@ -85,6 +88,7 @@
 
    @Produces
    @ConversationConcurrentAccessTimeout
+   @WebBeans
    public long getConversationConcurrentAccessTimeout()
    {
       return 1 * 1000;

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java	2009-02-09 15:51:01 UTC (rev 1470)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java	2009-02-09 16:18:26 UTC (rev 1471)
@@ -4,7 +4,10 @@
 import javax.inject.Produces;
 import javax.servlet.http.HttpSession;
 
+import org.jboss.webbeans.WebBeans;
+
 @RequestScoped
+ at WebBeans
 public class HttpSessionManager
 {
    private HttpSession session;
@@ -16,6 +19,7 @@
 
    @Produces
    @RequestScoped
+   @WebBeans
    HttpSession produceSession()
    {
       return session;




More information about the weld-commits mailing list