[3/9] git commit: Uses new constructors of Prepare and Execution without ServletContext
Uses new constructors of Prepare and Execution without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ba0eda0c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ba0eda0c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ba0eda0c
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: ba0eda0c5469dabb4b48461a2a013397ee633302
Parents: 8746fd1
Author: Lukasz Lenart
Authored: Mon Feb 17 09:32:19 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:32:19 2014 +0100
--
.../apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java | 4 ++--
.../dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java | 4 ++--
.../apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java | 2 +-
.../apache/struts2/dispatcher/ng/listener/StrutsListener.java| 2 +-
.../org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
index bd522bb..7f8164f 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
@@ -57,8 +57,8 @@ public class StrutsExecuteFilter implements StrutsStatics,
Filter {
Dispatcher dispatcher = init.findDispatcherOnThread();
init.initStaticContentLoader(new FilterHostConfig(filterConfig),
dispatcher);
-prepare = new PrepareOperations(filterConfig.getServletContext(),
dispatcher);
-execute = new ExecuteOperations(filterConfig.getServletContext(),
dispatcher);
+prepare = new PrepareOperations(dispatcher);
+execute = new ExecuteOperations(dispatcher);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
index 1c3d3b4..970d8e7 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
@@ -57,8 +57,8 @@ public class StrutsPrepareAndExecuteFilter implements
StrutsStatics, Filter {
dispatcher = init.initDispatcher(config);
init.initStaticContentLoader(config, dispatcher);
-prepare = new PrepareOperations(filterConfig.getServletContext(),
dispatcher);
-execute = new ExecuteOperations(filterConfig.getServletContext(),
dispatcher);
+prepare = new PrepareOperations(dispatcher);
+execute = new ExecuteOperations(dispatcher);
this.excludedPatterns = init.buildExcludedPatternsList(dispatcher);
postInit(dispatcher, filterConfig);
http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
index ea0e510..27ce17e 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
@@ -55,7 +55,7 @@ public class StrutsPrepareFilter implements StrutsStatics,
Filter {
init.initLogging(config);
dispatcher = init.initDispatcher(config);
-prepare = new PrepareOperations(filterConfig.getServletContext(),
dispatcher);
+prepare = new PrepareOperations(dispatcher);
this.excludedPatterns = init.buildExcludedPatternsList(dispatcher);
postInit(dispatcher, filterConfig);
http://git-wip-us.apache.org/repos/asf/struts/blob/ba0eda0c/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java
--
diff --git
a/core/src/main/java/org/apache/strut
[2/9] git commit: Deprecates constructors based on ServletContext and introduces new one instead
Deprecates constructors based on ServletContext and introduces new one instead
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8746fd1f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8746fd1f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8746fd1f
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: 8746fd1f1cc2d4998663687115f5d04629f5786d
Parents: 01d401e
Author: Lukasz Lenart
Authored: Mon Feb 17 09:31:56 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:31:56 2014 +0100
--
.../apache/struts2/dispatcher/ng/ExecuteOperations.java | 10 +++---
.../apache/struts2/dispatcher/ng/PrepareOperations.java | 11 +++
2 files changed, 14 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/8746fd1f/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
b/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
index 7ca3d6a..0c94249 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
@@ -35,12 +35,16 @@ import java.io.IOException;
* Contains execution operations for filters
*/
public class ExecuteOperations {
-private ServletContext servletContext;
+
private Dispatcher dispatcher;
+@Deprecated
public ExecuteOperations(ServletContext servletContext, Dispatcher
dispatcher) {
this.dispatcher = dispatcher;
-this.servletContext = servletContext;
+}
+
+public ExecuteOperations(Dispatcher dispatcher) {
+this.dispatcher = dispatcher;
}
/**
@@ -74,6 +78,6 @@ public class ExecuteOperations {
* @throws ServletException
*/
public void executeAction(HttpServletRequest request, HttpServletResponse
response, ActionMapping mapping) throws ServletException {
-dispatcher.serviceAction(request, response, servletContext, mapping);
+dispatcher.serviceAction(request, response, mapping);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/8746fd1f/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
index a26a8b2..ccf21c7 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
@@ -47,15 +47,18 @@ public class PrepareOperations {
private static final Logger LOG =
LoggerFactory.getLogger(PrepareOperations.class);
-private ServletContext servletContext;
private Dispatcher dispatcher;
private static final String STRUTS_ACTION_MAPPING_KEY =
"struts.actionMapping";
public static final String CLEANUP_RECURSION_COUNTER =
"__cleanup_recursion_counter";
private Logger log = LoggerFactory.getLogger(PrepareOperations.class);
+@Deprecated
public PrepareOperations(ServletContext servletContext, Dispatcher
dispatcher) {
this.dispatcher = dispatcher;
-this.servletContext = servletContext;
+}
+
+public PrepareOperations(Dispatcher dispatcher) {
+this.dispatcher = dispatcher;
}
/**
@@ -75,7 +78,7 @@ public class PrepareOperations {
ctx = new ActionContext(new HashMap(oldContext.getContextMap()));
} else {
ValueStack stack =
dispatcher.getContainer().getInstance(ValueStackFactory.class).createValueStack();
-stack.getContext().putAll(dispatcher.createContextMap(request,
response, null, servletContext));
+stack.getContext().putAll(dispatcher.createContextMap(request,
response, null));
ctx = new ActionContext(stack.getContext());
}
request.setAttribute(CLEANUP_RECURSION_COUNTER, counter);
@@ -131,7 +134,7 @@ public class PrepareOperations {
try {
// Wrap request first, just in case it is multipart/form-data
// parameters might not be accessible through before encoding
(ww-1278)
-request = dispatcher.wrapRequest(request, servletContext);
+request = dispatcher.wrapRequest(request);
} catch (IOException e) {
throw new ServletException("Could not wrap servlet request with
MultipartRequestWrapper!", e);
}
[8/9] git commit: Updates tests to new version of methods without ServletContext
Updates tests to new version of methods without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9ff04d17
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9ff04d17
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9ff04d17
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: 9ff04d17a5edfeb9805d1485b29eda8d0dfa3ce8
Parents: ddd2719
Author: Lukasz Lenart
Authored: Mon Feb 17 09:34:47 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:34:47 2014 +0100
--
.../src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java | 2 +-
plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/9ff04d17/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
--
diff --git
a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
index 02fd69b..7bf18b7 100644
--- a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
+++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
@@ -137,7 +137,7 @@ public abstract class StrutsJUnit4TestCase extends
XWorkJUnit4TestCase {
ActionMapping mapping = getActionMapping(request);
assertNotNull(mapping);
-Dispatcher.getInstance().serviceAction(request, response,
servletContext, mapping);
+Dispatcher.getInstance().serviceAction(request, response, mapping);
if (response.getStatus() != HttpServletResponse.SC_OK)
throw new ServletException("Error code [" + response.getStatus() +
"], Error: ["
http://git-wip-us.apache.org/repos/asf/struts/blob/9ff04d17/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java
--
diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java
b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java
index 3a14545..de6f477 100644
--- a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java
+++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java
@@ -115,7 +115,7 @@ public abstract class StrutsTestCase extends XWorkTestCase {
ActionMapping mapping = getActionMapping(request);
assertNotNull(mapping);
-Dispatcher.getInstance().serviceAction(request, response,
servletContext, mapping);
+Dispatcher.getInstance().serviceAction(request, response, mapping);
if (response.getStatus() != HttpServletResponse.SC_OK) {
throw new ServletException("Error code [" + response.getStatus() +
"], Error: [" + response.getErrorMessage() + "]");
[7/9] git commit: Updates tests to new version of methods without ServletContext
Updates tests to new version of methods without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ddd27197
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ddd27197
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ddd27197
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: ddd27197f5155f6089e2d5e3b82363f44752c57d
Parents: d4ddd74
Author: Lukasz Lenart
Authored: Mon Feb 17 09:34:10 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:34:10 2014 +0100
--
.../org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ddd27197/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
--
diff --git
a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
index e20722f..a3bf453 100644
---
a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
+++
b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
@@ -119,8 +119,7 @@ public abstract class AbstractTagTest extends
StrutsTestCase {
session,
new ApplicationMap(pageContext.getServletContext()),
request,
-response,
-pageContext.getServletContext());
+response);
// let's not set the locale -- there is a test that checks if
Dispatcher actually picks this up...
// ... but generally we want to just use no locale (let it stay system
default)
extraContext.remove(ActionContext.LOCALE);
[9/9] git commit: Updates classes to use the new version of Dispatcher's methods without ServletContext
Updates classes to use the new version of Dispatcher's methods without
ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4da2ec65
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4da2ec65
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4da2ec65
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: 4da2ec65c706e1029b827f2ca36242e05d99fb63
Parents: 9ff04d1
Author: Lukasz Lenart
Authored: Mon Feb 17 09:35:20 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:35:20 2014 +0100
--
.../org/apache/struts2/validators/DWRValidator.java | 12 +++-
.../struts2/portlet/dispatcher/Jsr168Dispatcher.java| 7 ---
.../sitemesh/OldDecorator2NewStrutsDecorator.java | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4da2ec65/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
--
diff --git
a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
index 8c9a2eb..9d6f750 100644
--- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
+++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
@@ -32,22 +32,16 @@ import org.apache.struts2.dispatcher.ApplicationMap;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.RequestMap;
import org.apache.struts2.dispatcher.SessionMap;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
import uk.ltd.getahead.dwr.WebContextFactory;
import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionInvocation;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.ValidationAwareSupport;
-import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
@@ -69,8 +63,9 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
*
*/
public class DWRValidator {
+
private static final Logger LOG =
LoggerFactory.getLogger(DWRValidator.class);
-
+
public ValidationAwareSupport doPost(String namespace, String actionName,
Map params) throws Exception {
HttpServletRequest req =
WebContextFactory.get().getHttpServletRequest();
ServletContext servletContext =
WebContextFactory.get().getServletContext();
@@ -91,8 +86,7 @@ public class DWRValidator {
session,
application,
req,
-res,
-servletContext);
+res);
try {
ActionProxyFactory actionProxyFactory =
du.getContainer().getInstance(ActionProxyFactory.class);
http://git-wip-us.apache.org/repos/asf/struts/blob/4da2ec65/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
--
diff --git
a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
index 349d819..99da301 100644
---
a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
+++
b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
@@ -184,6 +184,7 @@ public class Jsr168Dispatcher extends GenericPortlet
implements StrutsStatics {
private Dispatcher dispatcherUtils;
private ActionMapper actionMapper;
private Container container;
+private ServletContext servletContext;
/**
* Initialize the portlet with the init parameters from
portlet.xml
@@ -201,7 +202,8 @@ public class Jsr168Dispatcher extends GenericPortlet
implements StrutsStatics {
params.put(name, value);
}
-dispatcherUtils = new Dispatcher(new
PortletServletContext(cfg.getPortletContext()), params);
+servletContext = new PortletServletContext(cfg.getPortletContext());
+dispatcherUtils = new Dispatcher(servletContext, params);
dispatcherUtils.init();
// For testability
@@ -428,11 +430,10 @@ public class Jsr168Dispatcher extends Gene
[4/9] git commit: Uses the new versions of methods without ServletContext
Uses the new versions of methods without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a2e97a9c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a2e97a9c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a2e97a9c
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: a2e97a9ca41aeb9b6c8be68744dccb0b8c67f81d
Parents: ba0eda0
Author: Lukasz Lenart
Authored: Mon Feb 17 09:32:42 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:32:42 2014 +0100
--
.../java/org/apache/struts2/dispatcher/FilterDispatcher.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/a2e97a9c/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
index 970311c..22fc051 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
@@ -361,7 +361,7 @@ public class FilterDispatcher implements StrutsStatics,
Filter {
try {
// Wrap request first, just in case it is multipart/form-data
// parameters might not be accessible through before encoding
(ww-1278)
-request = dispatcher.wrapRequest(request, getServletContext());
+request = dispatcher.wrapRequest(request);
} catch (IOException e) {
String message = "Could not wrap servlet request with
MultipartRequestWrapper!";
log.error(message, e);
@@ -431,7 +431,7 @@ public class FilterDispatcher implements StrutsStatics,
Filter {
return;
}
-dispatcher.serviceAction(request, response, servletContext,
mapping);
+dispatcher.serviceAction(request, response, mapping);
} finally {
dispatcher.cleanUpRequest(request);
[6/9] git commit: Updates tests to new version of methods without ServletContext
Updates tests to new version of methods without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d4ddd74e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d4ddd74e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d4ddd74e
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: d4ddd74ebed3a68fab70ddb9bb86ce5efa9ea65b
Parents: 4a4d041
Author: Lukasz Lenart
Authored: Mon Feb 17 09:34:03 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:34:03 2014 +0100
--
.../dispatcher/FilterDispatcherTest.java| 4 +-
.../apache/struts2/dispatcher/FilterTest.java | 4 +-
.../views/freemarker/FreeMarkerResultTest.java | 204 +--
.../freemarker/FreemarkerResultMockedTest.java | 262 +++
.../struts2/views/jsp/AbstractTagTest.java | 3 +-
.../apache/struts2/views/jsp/URLTagTest.java| 3 +-
6 files changed, 280 insertions(+), 200 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d4ddd74e/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
index 2c2d747..4449e40 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
@@ -122,7 +122,7 @@ public class FilterDispatcherTest extends
StrutsInternalTestCase {
return request;
}
-public void serviceAction(HttpServletRequest request,
HttpServletResponse response, ServletContext context, ActionMapping mapping)
throws ServletException {
+public void serviceAction(HttpServletRequest request,
HttpServletResponse response, ActionMapping mapping) throws ServletException {
serviceRequest = true;
}
@@ -152,7 +152,7 @@ public class FilterDispatcherTest extends
StrutsInternalTestCase {
return request;
}
-public void serviceAction(HttpServletRequest request,
HttpServletResponse response, ServletContext context, ActionMapping mapping)
throws ServletException {
+public void serviceAction(HttpServletRequest request,
HttpServletResponse response, ActionMapping mapping) throws ServletException {
serviceRequest = true;
// if we set the chracter encoding AFTER we do wrap request, we
will get
// a failing test
http://git-wip-us.apache.org/repos/asf/struts/blob/d4ddd74e/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
b/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
index 04b5c94..12f9a64 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
@@ -313,10 +313,10 @@ public class FilterTest extends StrutsInternalTestCase {
}
@Override
-public void serviceAction(HttpServletRequest request,
HttpServletResponse response, ServletContext context, ActionMapping mapping)
throws ServletException {
+public void serviceAction(HttpServletRequest request,
HttpServletResponse response, ActionMapping mapping) throws ServletException {
service = true;
}
-
+
@Override
public void cleanup() {
cleanUp = true;
http://git-wip-us.apache.org/repos/asf/struts/blob/d4ddd74e/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
index 62ab0ee..d721826 100644
---
a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
+++
b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
@@ -43,12 +43,14 @@ import javax.servlet.ServletContext;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.util.HashMap;
import static org.apache.struts2.views.jsp.AbstractUITagTest.normalize;
/**
* Test case for FreeMarkerResult.
- *
*/
public class FreeMarkerResultTest extends StrutsInternalTestCase {
@@ -62,54 +64,6 @@ public class FreeMarkerResultTest extends
StrutsInternal
[5/9] git commit: Uses the new versions of methods without ServletContext
Uses the new versions of methods without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4a4d0416
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4a4d0416
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4a4d0416
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: 4a4d04164a31dc5b905eca1f345c6d2a26472c30
Parents: a2e97a9
Author: Lukasz Lenart
Authored: Mon Feb 17 09:33:38 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:33:38 2014 +0100
--
.../struts2/components/ActionComponent.java | 41 +---
.../org/apache/struts2/views/jsp/TagUtils.java | 23 +--
2 files changed, 28 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4a4d0416/core/src/main/java/org/apache/struts2/components/ActionComponent.java
--
diff --git
a/core/src/main/java/org/apache/struts2/components/ActionComponent.java
b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
index 5eb7035..f184454 100644
--- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java
+++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
@@ -21,17 +21,15 @@
package org.apache.struts2.components;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsException;
import org.apache.struts2.StrutsStatics;
@@ -43,15 +41,14 @@ import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.jsp.TagUtils;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
*
@@ -188,7 +185,6 @@ public class ActionComponent extends ContextBean {
Map newParams = createParametersForContext();
ActionContext ctx = new ActionContext(stack.getContext());
-ServletContext servletContext = (ServletContext)
ctx.get(ServletActionContext.SERVLET_CONTEXT);
PageContext pageContext = (PageContext)
ctx.get(ServletActionContext.PAGE_CONTEXT);
Map session = ctx.getSession();
Map application = ctx.getApplication();
@@ -199,8 +195,7 @@ public class ActionComponent extends ContextBean {
session,
application,
req,
-res,
-servletContext);
+res);
ValueStack newStack = valueStackFactory.createValueStack(stack);
extraContext.put(ActionContext.VALUE_STACK, newStack);
http://git-wip-us.apache.org/repos/asf/struts/blob/4a4d0416/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
--
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
index a4a2848..ab7abea 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
@@ -21,12 +21,11 @@
package org.apache.struts2.views.jsp;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwo
[1/9] git commit: Removes duplicated ServletContext passed via parameters
Repository: struts
Updated Branches:
refs/heads/feature/WW-4292-dont-use-servletcontext [created] 4da2ec65c
Removes duplicated ServletContext passed via parameters
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/01d401ea
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/01d401ea
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/01d401ea
Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: 01d401ea1498671458ac59ef1e7f84961a5cdcc9
Parents: ad58c0e
Author: Lukasz Lenart
Authored: Mon Feb 17 09:29:40 2014 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 17 09:29:40 2014 +0100
--
.../apache/struts2/dispatcher/Dispatcher.java | 77
1 file changed, 61 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/01d401ea/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
--
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 032df36..863c94b 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -495,6 +495,16 @@ public class Dispatcher {
}
/**
+ * @deprecated use version without ServletContext param
+ */
+@Deprecated
+public void serviceAction(HttpServletRequest request, HttpServletResponse
response, ServletContext context,
+ ActionMapping mapping) throws ServletException {
+
+serviceAction(request, response, mapping);
+}
+
+/**
* Load Action class for mapping and invoke the appropriate Action method,
or go directly to the Result.
*
* This method first creates the action context from the given parameters,
@@ -509,12 +519,13 @@ public class Dispatcher {
* @param mapping the action mapping object
* @throws ServletException when an unknown error occurs (not a 404, but
typically something that
* would end up as a 5xx by the servlet container)
- * @param context Our ServletContext object
+ *
+ * @since 2.3.17
*/
-public void serviceAction(HttpServletRequest request, HttpServletResponse
response, ServletContext context,
- ActionMapping mapping) throws ServletException {
+public void serviceAction(HttpServletRequest request, HttpServletResponse
response, ActionMapping mapping)
+throws ServletException {
-Map extraContext = createContextMap(request, response,
mapping, context);
+Map extraContext = createContextMap(request, response,
mapping);
// If there was a previous value stack, then create a new copy and
pass it in to be used by the new Action
ValueStack stack = (ValueStack)
request.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY);
@@ -587,16 +598,27 @@ public class Dispatcher {
}
/**
+ * @deprecated use version without servletContext param
+ */
+@Deprecated
+public Map createContextMap(HttpServletRequest request,
HttpServletResponse response,
+ActionMapping mapping, ServletContext context) {
+
+return createContextMap(request, response, mapping);
+}
+
+/**
* Create a context map containing all the wrapped request objects
*
* @param request The servlet request
* @param response The servlet response
* @param mapping The action mapping
- * @param context The servlet context
* @return A map of context objects
+ *
+ * @since 2.3.17
*/
public Map createContextMap(HttpServletRequest request,
HttpServletResponse response,
-ActionMapping mapping, ServletContext context) {
+ActionMapping mapping) {
// request map wrapping the http request objects
Map requestMap = new RequestMap(request);
@@ -608,9 +630,9 @@ public class Dispatcher {
Map session = new SessionMap(request);
// application map wrapping the ServletContext
-Map application = new ApplicationMap(context);
+Map application = new ApplicationMap(servletContext);
-Map extraContext = createContextMap(requestMap, params,
session, application, request, response, context);
+Map extraContext = createContextMap(requestMap, params,
session, application, request, response);
if (mapping != null) {
extraContext.put(ServletActionContext.ACTION_MAPPING, mapping);
@@ -619,6 +641,21 @@ public class Dispatcher {
}
/**
+ * @deprecated use version without ServletContext param
+ */
+@Deprecated
+public Has
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Tapestry Pages Page: Page Navigation edited by Bob Harner [09:40 PM] (View Changes) Apache Struts 2 Documentation Pages Page: Dispatcher created by Lukasz Lenart [08:51 PM] Page: Core Developers Guide edited by Lukasz Lenart [08:41 PM] (View Changes) This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r1569205 - /struts/site/branches/jekyll-powered/build_cms.sh
Author: lukaszlenart Date: Tue Feb 18 06:01:08 2014 New Revision: 1569205 URL: http://svn.apache.org/r1569205 Log: Uses Jekyll instead Maven to generate site Modified: struts/site/branches/jekyll-powered/build_cms.sh Modified: struts/site/branches/jekyll-powered/build_cms.sh URL: http://svn.apache.org/viewvc/struts/site/branches/jekyll-powered/build_cms.sh?rev=1569205&r1=1569204&r2=1569205&view=diff == --- struts/site/branches/jekyll-powered/build_cms.sh (original) +++ struts/site/branches/jekyll-powered/build_cms.sh Tue Feb 18 06:01:08 2014 @@ -1,3 +1,3 @@ #!/bin/sh -mvn clean site +jekyll build
svn commit: r898357 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Tue Feb 18 06:01:13 2014 New Revision: 898357 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Feb 18 06:01:13 2014 @@ -1 +1 @@ -1566423 +1569205
svn commit: r1569208 - in /struts/site/trunk: ./ _config.yml build_cms.sh content/ pom.xml source/ source/announce-2008.html
Author: lukaszlenart Date: Tue Feb 18 06:13:35 2014 New Revision: 1569208 URL: http://svn.apache.org/r1569208 Log: Merge all from jekyll-powered at 1569207 (reintegration) Added: struts/site/trunk/_config.yml - copied unchanged from r1569207, struts/site/branches/jekyll-powered/_config.yml struts/site/trunk/content/ - copied from r1569207, struts/site/branches/jekyll-powered/content/ struts/site/trunk/source/ - copied from r1569207, struts/site/branches/jekyll-powered/source/ Removed: struts/site/trunk/pom.xml Modified: struts/site/trunk/ (props changed) struts/site/trunk/build_cms.sh struts/site/trunk/source/announce-2008.html (props changed) Propchange: struts/site/trunk/ -- --- svn:ignore (original) +++ svn:ignore Tue Feb 18 06:13:35 2014 @@ -1 +1,2 @@ struts-site.iml +.idea Propchange: struts/site/trunk/ -- Merged /struts/site/branches/jekyll-powered:r1565944-1569207 Modified: struts/site/trunk/build_cms.sh URL: http://svn.apache.org/viewvc/struts/site/trunk/build_cms.sh?rev=1569208&r1=1569207&r2=1569208&view=diff == --- struts/site/trunk/build_cms.sh (original) +++ struts/site/trunk/build_cms.sh Tue Feb 18 06:13:35 2014 @@ -1,3 +1,3 @@ #!/bin/sh -mvn clean site +jekyll build Propchange: struts/site/trunk/source/announce-2008.html -- Merged /struts/site/branches/jekyll-powered/source/announce-2008.html:r1566350-1569207
buildbot failure in ASF Buildbot on struts-site-staging
The Buildbot has detected a new failure on builder struts-site-staging while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/struts-site-staging/builds/184 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: scheduler Build Source Stamp: [branch struts/site] 1569208 Blamelist: lukaszlenart BUILD FAILED: failed compile sincerely, -The Buildbot
svn commit: r1569211 - /struts/site/branches/jekyll-powered/
Author: lukaszlenart Date: Tue Feb 18 06:26:02 2014 New Revision: 1569211 URL: http://svn.apache.org/r1569211 Log: Branch integrated into trunk Removed: struts/site/branches/jekyll-powered/
buildbot success in ASF Buildbot on struts-site-staging
The Buildbot has detected a restored build on builder struts-site-staging while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/struts-site-staging/builds/185 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: scheduler Build Source Stamp: [branch struts/site] 1569211 Blamelist: lukaszlenart Build succeeded! sincerely, -The Buildbot
svn commit: r898361 - /websites/staging/struts/trunk/content/
Author: buildbot Date: Tue Feb 18 06:26:17 2014 New Revision: 898361 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Feb 18 06:26:17 2014 @@ -1 +1 @@ -1569205 +1569211
