deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject [2/3] deltaspike git commit: DELTASPIKE-1227 MockServletContext should not get picked up for injection
Date Fri, 09 Dec 2016 09:32:22 GMT
DELTASPIKE-1227 MockServletContext should not get picked up for injection


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9e7f1102
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9e7f1102
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9e7f1102

Branch: refs/heads/master
Commit: 9e7f11028bb53fe9c3b88df183d17e11dd9c0db7
Parents: ff71547
Author: Mark Struberg <struberg@apache.org>
Authored: Fri Dec 9 10:09:30 2016 +0100
Committer: Mark Struberg <struberg@apache.org>
Committed: Fri Dec 9 10:09:30 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java | 2 ++
 .../java/org/apache/deltaspike/cdise/owb/MockServletContext.java   | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9e7f1102/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
index 33b276d..226ae1e 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
@@ -22,6 +22,7 @@ import java.util.Enumeration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.enterprise.inject.Typed;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionContext;
@@ -29,6 +30,7 @@ import javax.servlet.http.HttpSessionContext;
 /**
  * A simple mock HttpSession
  */
+@Typed // ignore this as CDI bean
 public class MockHttpSession implements HttpSession
 {
     private String sessionId;

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9e7f1102/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
index d661fe6..149fd20 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
@@ -26,6 +26,7 @@ import java.util.Hashtable;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import javax.enterprise.inject.Typed;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
@@ -36,6 +37,7 @@ import javax.servlet.ServletException;
  * Mock ServletContext needed to startup the container.
  *
  */
+@Typed // ignore this as CDI bean
 public class MockServletContext implements ServletContext
 {
     private static MockServletContext instance = new MockServletContext();


Mime
View raw message