Commit Graph

41 Commits

Author SHA1 Message Date
Johannes Geppert eb564a25e1 Fix wrong closing HTML tags in javadoc comments 2015-07-16 22:02:21 +02:00
Lukasz Lenart fd0db86560 WW-4518 Moves the new filters to proper package 2015-06-23 17:36:32 +02:00
Johannes Geppert 5a835cf6ac Minor code improvements's in the cdi, convention, jasperreports, junit, rest and sitemesh plugin
- Use Java 7 features like diamond operator
- Improve some logging message and don't check LOG.isXxx if not necessary
- Fix some typos
- Use BooleanUtils.toBoolean(string) instead of "true".isEquals to be more robust
2015-06-16 20:37:20 +02:00
Johannes Geppert 95805e54f7 WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
- Use log4j2 Logger and LogManager instead of xwork implementation everywhere
2015-05-25 12:42:23 +02:00
Lukasz Lenart 29de8687dd WW-4419 Fixes NPE when performing async request 2014-12-23 21:49:21 +01:00
Lukasz Lenart 2b150d8775 Adds logging and proper header with licence 2014-12-23 21:48:43 +01:00
Lukasz Lenart 5f2898eadf Cleans up Maven generated website 2014-12-02 12:41:06 +01:00
zhouyanming 7bce8ef6a8 Defend for NPE when performing async request
when I combined spring async mvc with struts2 sitemesh plugin, It will throw NPE

java.lang.NullPointerException
	at org.apache.struts2.ServletActionContext.getRequest(ServletActionContext.java:112)
	at org.apache.struts2.sitemesh.StrutsSiteMeshFactory.isInsideActionTag(StrutsSiteMeshFactory.java:25)
	at org.apache.struts2.sitemesh.StrutsSiteMeshFactory.shouldParsePage(StrutsSiteMeshFactory.java:21)
	at com.opensymphony.sitemesh.compatability.PageParser2ContentProcessor.handles(PageParser2ContentProcessor.java:45)
	at com.opensymphony.sitemesh.webapp.ContentBufferingResponse$1.shouldParsePage(ContentBufferingResponse.java:29)
	at com.opensymphony.module.sitemesh.filter.PageResponseWrapper.setContentType(PageResponseWrapper.java:63)
	at com.opensymphony.sitemesh.webapp.ContentBufferingResponse$2.setContentType(ContentBufferingResponse.java:39)
	at com.opensymphony.module.sitemesh.filter.PageResponseWrapper.addHeader(PageResponseWrapper.java:135)
	at javax.servlet.http.HttpServletResponseWrapper.addHeader(HttpServletResponseWrapper.java:173)
	at org.springframework.http.server.ServletServerHttpResponse.writeHeaders(ServletServerHttpResponse.java:103)
	at org.springframework.http.server.ServletServerHttpResponse.getBody(ServletServerHttpResponse.java:83)
	at org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.writeInternal(AbstractJackson2HttpMessageConverter.java:217)
	at org.springframework.http.converter.AbstractHttpMessageConverter.write(AbstractHttpMessageConverter.java:208)
	at org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor.writeWithMessageConverters(AbstractMessageConverterMethodProcessor.java:161)
	at org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor.writeWithMessageConverters(AbstractMessageConverterMethodProcessor.java:101)
	at org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.handleReturnValue(RequestResponseBodyMethodProcessor.java:199)
	at org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite.handleReturnValue(HandlerMethodReturnValueHandlerComposite.java:71)
	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:128)
	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandleMethod(RequestMappingHandlerAdapter.java:781)
	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:721)
	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:83)
	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:943)
	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:877)
	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:966)
	at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:857)
	at javax.servlet.http.HttpServlet.service(HttpServlet.java:620)
	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:842)
	at javax.servlet.http.HttpServlet.service(HttpServlet.java:727)
	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:303)
	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208)
	at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:748)
	at org.apache.catalina.core.ApplicationDispatcher.doDispatch(ApplicationDispatcher.java:659)
	at org.apache.catalina.core.ApplicationDispatcher.dispatch(ApplicationDispatcher.java:625)
	at org.apache.catalina.core.AsyncContextImpl$1.run(AsyncContextImpl.java:239)
	at org.apache.catalina.core.AsyncContextImpl.doInternalDispatch(AsyncContextImpl.java:382)
	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:215)
	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:122)
	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:171)
	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:103)
	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:116)
	at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(CoyoteAdapter.java:299)
	at org.apache.coyote.http11.AbstractHttp11Processor.asyncDispatch(AbstractHttp11Processor.java:1652)
	at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:603)
	at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:314)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
	at java.lang.Thread.run(Thread.java:745)
2014-11-13 16:06:00 +08:00
Lukasz Lenart 4da2ec65c7 Updates classes to use the new version of Dispatcher's methods without ServletContext 2014-02-17 09:35:20 +01:00
Christian Grobmeier 5e3e793576 removed unused site folder and site.xml
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1521449 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 12:08:04 +00:00
Lukasz Lenart eb2a9eb8ff WW-3593 Adds missing html files
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1486344 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 16:37:42 +00:00
Lukasz Lenart 7caf810099 WW-4028 Extends ActionInvocation interface to support serialisation and deserialisation
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1483773 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 12:38:42 +00:00
Lukasz Lenart 6ec3d2a8b6 WW-3758 - upgrade commons-lang to version 3.1
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1292705 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 08:40:53 +00:00
Johannes Geppert 970251ff95 Update to current 2.3 DTD
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1221225 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 12:22:28 +00:00
Lukasz Lenart 38e068da57 Solves WW-3330 - <@s.action> broken in sitemesh freemarker decorator page
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1077833 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 06:51:59 +00:00
John Lindal 6d8c7bd11e WW-3548 update copyright to 2011
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1068561 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 20:35:46 +00:00
Lukasz Lenart f90d2ce991 Improved log message
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@931828 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 08:18:25 +00:00
Musachy Barroso 053dfd2b05 WW-3329 ${Parameters.xxx} in freemarker view is broken
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@899763 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 19:16:09 +00:00
Musachy Barroso 020ac20829 WW-3329 change params attribute to what it was before
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@836247 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 19:12:55 +00:00
Musachy Barroso 1e21c51890 remove duplicated file (thanks to windows)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@835433 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 16:32:24 +00:00
Wesley Wannemacher 04766584a5 WW-3291
- fixed compiler errors
- updated svn:ignore on a few dirs

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@835414 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 15:27:45 +00:00
Musachy Barroso 36b2ff880f WW-3291 Update sitemesh-plugin to use version 2.4.2 patch provided by Christian Wolfgang Stone
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@835251 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 06:11:13 +00:00
Musachy Barroso 7fd1ed3068 WW-3291 Update sitemesh-plugin to use version 2.4.2 patch provided by Christian Wolfgang Stone
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@835249 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 06:08:49 +00:00
Musachy Barroso c1b1b0326c WW-3291 Update sitemesh-plugin to use version 2.4.2 patch provided by Christian Wolfgang Stone
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@835248 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 06:06:40 +00:00
Antonio Petrelli 974e051bc5 WW-2147
Fixed license headers where needed.
Re-enabled RAT plugin and fixed its configuration.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@651946 13f79535-47bb-0310-9956-ffa450edef68
2008-04-27 13:41:38 +00:00
Antonio Petrelli f5a88391e1 WW-2437
Added Plexus and SiteMesh license and notice.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615331 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 20:30:09 +00:00
Donald J. Brown 7cd9c9165a Updating Struts to support the new immutable object scheme and the
new xwork capability to limit methods that are called.  Still more to do
here.

WW-2363 XW-595 XW-594


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@602665 13f79535-47bb-0310-9956-ffa450edef68
2007-12-09 12:11:25 +00:00
Antonio Petrelli 8dfaa6dd90 WW-2063
Fixed subversion properties.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@590812 13f79535-47bb-0310-9956-ffa450edef68
2007-10-31 20:32:54 +00:00
Donald J. Brown 2ea2d869cc Replacing all usages of commons logging with xwork logging. Yay for closing memory leaks.
WW-1413


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@582626 13f79535-47bb-0310-9956-ffa450edef68
2007-10-07 13:26:12 +00:00
Donald J. Brown cbdf6f296c Changes necessary for XWork 2.1:
* New EL abstraction to allow ONGL to be replaced
 * Got rid of static factories and state, in favor of dep injection
 * New plugin API points for the EL abstraction

XW-566 XW-461 XW-561


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@577728 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 12:51:41 +00:00
Antonio Petrelli cf351ce368 WW-2049
Added licenses to plugins code.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@560745 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 15:55:59 +00:00
Donald J. Brown 8622e46762 Adding notice and license files to all artifacts that will go into Maven
WW-1650


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@500893 13f79535-47bb-0310-9956-ffa450edef68
2007-01-28 21:36:41 +00:00
Donald J. Brown 6312b26c11 Moved continuations support into a new plugin
WW-1548 XW-453


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@486508 13f79535-47bb-0310-9956-ffa450edef68
2006-12-13 06:19:43 +00:00
Donald J. Brown de8c649f83 Moving sitemesh decorator over to sitemesh plugin, changing debug interceptor to only store stack in
session when first invoked, documentation updates to code behind plugin
WW-1546 WW-1483


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@483839 13f79535-47bb-0310-9956-ffa450edef68
2006-12-08 05:52:10 +00:00
Donald J. Brown 3395081c90 Changed manager dependencies to optional, will scream bloody murder when used by not set
WW-1506


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@475637 13f79535-47bb-0310-9956-ffa450edef68
2006-11-16 08:32:03 +00:00
Toby Jee 62ee994785 WW-1506
- Sitemesh plugin's struts-plugin.xml uses incorrect filter for both freemarker and velocity



git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@475283 13f79535-47bb-0310-9956-ffa450edef68
2006-11-15 16:05:10 +00:00
Donald J. Brown f92105e9b3 Fixing template manager injections to be static
WW-1498


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@475013 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 21:52:42 +00:00
Donald J. Brown 2db660a3bb Redesigning the Struts configuration to use the XWork DI container and its new configuration scheme.
The DI container will allow us better wire the framework together while allowing self-defining plugins
to extend/replace any component.  This change also gets rid of the need for struts.properties, allowing 
settings/constants to be defined in the XML.  In fact, even the XML isn't required when using the new 
zero configuration "actionPackages" filter init param.

These changes should be fully backwards compatible for most applications.

WW-1498 WW-1421 WW-1402


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@474191 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 08:30:40 +00:00
Ted Nathan Husted 1181c3d502 WW-1488 Update license headers for Struts 2 source.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@471756 13f79535-47bb-0310-9956-ffa450edef68
2006-11-06 15:01:43 +00:00
Toby Jee 8fa51a5cae WW-727
- added profiling to FreeMarkerPageFilter



git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@454721 13f79535-47bb-0310-9956-ffa450edef68
2006-10-10 12:33:25 +00:00
Donald J. Brown 93c092de04 Creating sitemesh plugin
WW-1457


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@450363 13f79535-47bb-0310-9956-ffa450edef68
2006-09-27 07:31:21 +00:00