You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/06/10 10:18:31 UTC
tomee git commit: TOMEE-1839 upgrading arquillian and fixing
integration
Repository: tomee
Updated Branches:
refs/heads/master 0d3a8277c -> 5dc764ba1
TOMEE-1839 upgrading arquillian and fixing integration
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5dc764ba
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5dc764ba
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5dc764ba
Branch: refs/heads/master
Commit: 5dc764ba1ebc3462cda21347fb40cee90be91c80
Parents: 0d3a827
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Jun 10 12:18:07 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Jun 10 12:18:07 2016 +0200
----------------------------------------------------------------------
.../common/ArquillianFilterRunner.java | 27 +++++++++++++++++++-
pom.xml | 2 +-
2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5dc764ba/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java
index cbf363a..c9c942f 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java
@@ -19,11 +19,16 @@ package org.apache.openejb.arquillian.common;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
import java.io.IOException;
+import java.util.Enumeration;
+
+import static java.util.Collections.emptyEnumeration;
// this filter simply allows us to invoke arquillian servlet directly
// instead of needing to pass through the servlet filters
@@ -44,7 +49,27 @@ public class ArquillianFilterRunner implements Filter {
public void init(final FilterConfig filterConfig) throws ServletException {
try {
delegate = HttpServlet.class.cast(Thread.currentThread().getContextClassLoader().loadClass(ARQUILLIAN_SERVLET_RUNNER).newInstance());
- delegate.init();
+ delegate.init(new ServletConfig() {
+ @Override
+ public String getServletName() {
+ return ArquillianFilterRunner.class.getName();
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return filterConfig.getServletContext();
+ }
+
+ @Override
+ public String getInitParameter(final String name) {
+ return null;
+ }
+
+ @Override
+ public Enumeration<String> getInitParameterNames() {
+ return emptyEnumeration();
+ }
+ });
} catch (final Exception e) {
// no-op: can happen if the servlet is not present, that's a normal case
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5dc764ba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 462cfeb..3b7583e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<batchee.version>0.2-incubating</batchee.version>
- <version.arquillian>1.1.10.Final</version.arquillian>
+ <version.arquillian>1.1.11.Final</version.arquillian>
<version.shrinkwrap.descriptor>2.0.0-alpha-7</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.2</version.shrinkwrap.shrinkwrap>