minor stuff

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1482 1c488680-804c-0410-94cd-c6b725194a0e
weld · Feb 11, 2009 · 0fd96c7 · 0fd96c7
1 parent 1c04cd9
commit 0fd96c7
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 23 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -176,9 +176,9 @@ protected void checkEnabledDeploymentTypes()
 
    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);
       }
    }
 

diff --git a/...ain/java/org/jboss/webbeans/WebBeans.java → ...main/java/org/jboss/webbeans/WebBean.java b/...ain/java/org/jboss/webbeans/WebBeans.java → ...main/java/org/jboss/webbeans/WebBean.java
@@ -20,7 +20,7 @@
 @Retention(RUNTIME)
 @Documented
 @DeploymentType
-public @interface WebBeans
+public @interface WebBean
 {
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
@@ -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")
-@WebBeans
+@WebBean
 public class ConversationImpl implements Conversation
 {
    // The conversation ID

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java b/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
@@ -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
-@WebBeans
+@WebBean
 public class JavaSEConversationTerminator implements ConversationTerminator, Serializable
 {
    private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);

diff --git a/...eans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java b/...eans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java
@@ -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
-@WebBeans
+@WebBean
 public class NumericConversationIdGenerator implements ConversationIdGenerator, Serializable
 {
    // The next conversation ID

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java b/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
@@ -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
-@WebBeans
+@WebBean
 public class ServletConversationManager implements ConversationManager, Serializable
 {
    private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class);
@@ -83,15 +83,15 @@ public ServletConversationManager()
 
    @Produces
    @ConversationInactivityTimeout
-   @WebBeans
+   @WebBean
    public long getConversationTimeoutInMilliseconds()
    {
       return CONVERSATION_TIMEOUT_IN_MS;
    }
 
    @Produces
    @ConversationConcurrentAccessTimeout
-   @WebBeans
+   @WebBean
    public long getConversationConcurrentAccessTimeout()
    {
       return CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
@@ -4,10 +4,10 @@
 import javax.inject.Produces;
 import javax.servlet.http.HttpSession;
 
-import org.jboss.webbeans.WebBeans;
+import org.jboss.webbeans.WebBean;
 
 @RequestScoped
-@WebBeans
+@WebBean
 public class HttpSessionManager
 {
    private HttpSession session;
@@ -19,7 +19,7 @@ public void setSession(HttpSession session)
 
    @Produces
    @RequestScoped
-   @WebBeans
+   @WebBean
    HttpSession produceSession()
    {
       return session;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java
@@ -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 @@ private ServletResponse wrapResponse(HttpServletResponse response)
       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);
          }
       };
    }