You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2016/12/09 09:32:21 UTC
[1/3] deltaspike git commit: upgrade to tomee-7.0.2
Repository: deltaspike
Updated Branches:
refs/heads/master a94386f01 -> 43bdf6ae5
upgrade to tomee-7.0.2
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/ff71547f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/ff71547f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/ff71547f
Branch: refs/heads/master
Commit: ff71547f1acc0ae97ed24d61dcd500288949379d
Parents: a94386f
Author: Mark Struberg <st...@apache.org>
Authored: Sun Nov 20 19:40:16 2016 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Fri Dec 2 19:22:48 2016 +0100
----------------------------------------------------------------------
deltaspike/parent/code/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ff71547f/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 179509c..b82426d 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -735,7 +735,7 @@
<id>tomee7-build-managed</id>
<properties>
- <tomee.version>7.0.0</tomee.version>
+ <tomee.version>7.0.2</tomee.version>
<cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
</properties>
[2/3] deltaspike git commit: DELTASPIKE-1227 MockServletContext
should not get picked up for injection
Posted by st...@apache.org.
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 <st...@apache.org>
Authored: Fri Dec 9 10:09:30 2016 +0100
Committer: Mark Struberg <st...@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();
[3/3] deltaspike git commit: DELTASPIKE-1227 also add Servlet-3.0
methods to mock
Posted by st...@apache.org.
DELTASPIKE-1227 also add Servlet-3.0 methods to mock
Helps if you have a module with both cdictrl tests + real tomcat integration tests
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/43bdf6ae
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/43bdf6ae
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/43bdf6ae
Branch: refs/heads/master
Commit: 43bdf6ae593aa568e9a40a66215bf0a70659946f
Parents: 9e7f110
Author: Mark Struberg <st...@apache.org>
Authored: Fri Dec 9 10:31:24 2016 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Fri Dec 9 10:31:24 2016 +0100
----------------------------------------------------------------------
deltaspike/cdictrl/impl-owb/pom.xml | 3 +-
.../cdise/owb/MockServletContext.java | 173 +++++++++++++++++++
2 files changed, 174 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/43bdf6ae/deltaspike/cdictrl/impl-owb/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-owb/pom.xml b/deltaspike/cdictrl/impl-owb/pom.xml
index 62eea0a..33d4711 100644
--- a/deltaspike/cdictrl/impl-owb/pom.xml
+++ b/deltaspike/cdictrl/impl-owb/pom.xml
@@ -58,8 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/43bdf6ae/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 149fd20..9c2d8da 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
@@ -22,16 +22,24 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
+import java.util.EventListener;
import java.util.Hashtable;
+import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import javax.enterprise.inject.Typed;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
/**
* Mock ServletContext needed to startup the container.
@@ -63,6 +71,9 @@ public class MockServletContext implements ServletContext
+
+
+
public Object getAttribute(String name)
{
return attributes.get(name);
@@ -188,4 +199,166 @@ public class MockServletContext implements ServletContext
{
attributes.put(name, object);
}
+
+ @Override
+ public boolean setInitParameter(String name, String value)
+ {
+ return false;
+ }
+
+ @Override
+ public ServletRegistration.Dynamic addServlet(String servletName, String className)
+ throws IllegalArgumentException, IllegalStateException
+ {
+ return null;
+ }
+
+ @Override
+ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet)
+ throws IllegalArgumentException, IllegalStateException
+ {
+ return null;
+ }
+
+ @Override
+ public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> clazz)
+ throws IllegalArgumentException, IllegalStateException
+ {
+ return null;
+ }
+
+ @Override
+ public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+ {
+ return null;
+ }
+
+ @Override
+ public ServletRegistration getServletRegistration(String servletName)
+ {
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends ServletRegistration> getServletRegistrations()
+ {
+ return null;
+ }
+
+ @Override
+ public FilterRegistration.Dynamic addFilter(String filterName, String className)
+ throws IllegalArgumentException, IllegalStateException
+ {
+ return null;
+ }
+
+ @Override
+ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
+ throws IllegalArgumentException, IllegalStateException
+ {
+ return null;
+ }
+
+ @Override
+ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass)
+ throws IllegalArgumentException, IllegalStateException
+ {
+ return null;
+ }
+
+ @Override
+ public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+ {
+ return null;
+ }
+
+ @Override
+ public FilterRegistration getFilterRegistration(String filterName)
+ {
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+ {
+ return null;
+ }
+
+ @Override
+ public void addListener(Class<? extends EventListener> listenerClass)
+ {
+
+ }
+
+ @Override
+ public void addListener(String className)
+ {
+
+ }
+
+ @Override
+ public <T extends EventListener> void addListener(T t)
+ {
+
+ }
+
+ @Override
+ public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+ {
+ return null;
+ }
+
+ @Override
+ public void declareRoles(String... roleNames)
+ {
+
+ }
+
+ @Override
+ public SessionCookieConfig getSessionCookieConfig()
+ {
+ return null;
+ }
+
+ @Override
+ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+ {
+
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+ {
+ return null;
+ }
+
+ @Override
+ public int getEffectiveMajorVersion() throws UnsupportedOperationException
+ {
+ return 0;
+ }
+
+ @Override
+ public int getEffectiveMinorVersion() throws UnsupportedOperationException
+ {
+ return 0;
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+ {
+ return null;
+ }
+
+ @Override
+ public ClassLoader getClassLoader()
+ {
+ return null;
+ }
+
+ @Override
+ public JspConfigDescriptor getJspConfigDescriptor()
+ {
+ return null;
+ }
}