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

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Wed Feb 11 06:41:05 EST 2009


Author: nickarls
Date: 2009-02-11 06:41:05 -0500 (Wed, 11 Feb 2009)
New Revision: 1482

Added:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBean.java
Removed:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java
Modified:
   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
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java
Log:
minor stuff

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-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -176,9 +176,9 @@
    
    protected void addWebBeansDeploymentTypes()
    {
-      if (!this.enabledDeploymentTypes.contains(WebBeans.class))
+      if (!this.enabledDeploymentTypes.contains(WebBean.class))
       {
-         this.enabledDeploymentTypes.add(1, WebBeans.class);
+         this.enabledDeploymentTypes.add(1, WebBean.class);
       }
    }
 

Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBean.java (from rev 1477, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBean.java	                        (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBean.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -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 WebBean
+{
+
+}


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

Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java	2009-02-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/WebBeans.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -1,26 +0,0 @@
-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
-{
-
-}

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-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -22,7 +22,7 @@
 import javax.context.RequestScoped;
 import javax.inject.Initializer;
 
-import org.jboss.webbeans.WebBeans;
+import org.jboss.webbeans.WebBean;
 import org.jboss.webbeans.conversation.bindings.ConversationInactivityTimeout;
 
 /**
@@ -33,7 +33,7 @@
  */
 @RequestScoped
 @Named("conversation")
- at WebBeans
+ at WebBean
 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-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -24,7 +24,7 @@
 
 import javax.context.SessionScoped;
 
-import org.jboss.webbeans.WebBeans;
+import org.jboss.webbeans.WebBean;
 
 /**
  * A ConversationTerminator implementation using Java SE scheduling
@@ -33,7 +33,7 @@
  * @see org.jboss.webbeans.conversation.ConversationTerminator
  */
 @SessionScoped
- at WebBeans
+ at WebBean
 public class JavaSEConversationTerminator implements ConversationTerminator, Serializable
 {
    private ScheduledExecutorService executor = 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-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -21,7 +21,7 @@
 
 import javax.context.SessionScoped;
 
-import org.jboss.webbeans.WebBeans;
+import org.jboss.webbeans.WebBean;
 
 /**
  * A ConversationIdGenerator implementation using running numerical values
@@ -30,7 +30,7 @@
  *
  */
 @SessionScoped
- at WebBeans
+ at WebBean
 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-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -26,7 +26,7 @@
 import javax.inject.Produces;
 import javax.servlet.http.HttpSession;
 
-import org.jboss.webbeans.WebBeans;
+import org.jboss.webbeans.WebBean;
 import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
 import org.jboss.webbeans.context.ConversationContext;
 import org.jboss.webbeans.conversation.bindings.ConversationConcurrentAccessTimeout;
@@ -41,7 +41,7 @@
  * 
  */
 @SessionScoped
- at WebBeans
+ at WebBean
 public class ServletConversationManager implements ConversationManager, Serializable
 {
    private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class);
@@ -83,7 +83,7 @@
    
    @Produces
    @ConversationInactivityTimeout
-   @WebBeans
+   @WebBean
    public long getConversationTimeoutInMilliseconds()
    {
       return CONVERSATION_TIMEOUT_IN_MS;
@@ -91,7 +91,7 @@
 
    @Produces
    @ConversationConcurrentAccessTimeout
-   @WebBeans
+   @WebBean
    public long getConversationConcurrentAccessTimeout()
    {
       return CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS;

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-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -4,10 +4,10 @@
 import javax.inject.Produces;
 import javax.servlet.http.HttpSession;
 
-import org.jboss.webbeans.WebBeans;
+import org.jboss.webbeans.WebBean;
 
 @RequestScoped
- at WebBeans
+ at WebBean
 public class HttpSessionManager
 {
    private HttpSession session;
@@ -19,7 +19,7 @@
 
    @Produces
    @RequestScoped
-   @WebBeans
+   @WebBean
    HttpSession produceSession()
    {
       return session;

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java	2009-02-11 10:44:19 UTC (rev 1481)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java	2009-02-11 11:41:05 UTC (rev 1482)
@@ -35,12 +35,45 @@
  * Filter for handling conversation propagation over redirects
  * 
  * @author Nicklas Karlsson
- *
+ * 
  */
 // TODO: Quick and dirty, not for actual usage yet ;-)
 public class WebBeansServletFilter implements Filter
 {
 
+   private class RedirectUrl
+   {
+      private String URL;
+      private FacesContext context;
+
+      public RedirectUrl(String URL)
+      {
+         this.URL = URL;
+         context = FacesContext.getCurrentInstance();
+      }
+
+      public RedirectUrl appendCid(String cid)
+      {
+         return new RedirectUrl(URL + (URL.indexOf("?") > 0 ? "&" : "?") + "cid=" + cid);
+      }
+
+      public RedirectUrl getRedirectView()
+      {
+         String requestPath = context.getExternalContext().getRequestContextPath();
+         return new RedirectUrl(URL.substring(URL.indexOf(requestPath) + requestPath.length()));         
+      }
+
+      public RedirectUrl getActionUrl()
+      {
+         return new RedirectUrl(context.getApplication().getViewHandler().getActionURL(context, URL));
+      }
+
+      public String encode()
+      {
+         return context.getExternalContext().encodeActionURL(URL);
+      }
+   }
+
    public void destroy()
    {
    }
@@ -55,17 +88,14 @@
       return new HttpServletResponseWrapper(response)
       {
          @Override
-         public void sendRedirect(String location) throws IOException
+         public void sendRedirect(String path) throws IOException
          {
-            FacesContext context = FacesContext.getCurrentInstance();
             Conversation conversation = CurrentManager.rootManager().getInstanceByType(Conversation.class);
             if (conversation.isLongRunning())
             {
-               location = context.getApplication().getViewHandler().getActionURL(context, location);
-               String appendedConversation = "?cid=" + conversation.getId();
-               location = context.getExternalContext().encodeActionURL(location + appendedConversation);
+               path = new RedirectUrl(path).getRedirectView().getActionUrl().appendCid(conversation.getId()).encode();
             }
-            super.sendRedirect(location);
+            super.sendRedirect(path);
          }
       };
    }




More information about the weld-commits mailing list