Repository: struts-examples Updated Branches: refs/heads/master 8a9466c90 -> e726ed76f
Defines custom stack to be used across app Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/e726ed76 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/e726ed76 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/e726ed76 Branch: refs/heads/master Commit: e726ed76f39981880ea3599cc7b07aa13cd9ba90 Parents: 8a9466c Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Sun Mar 6 10:41:22 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Sun Mar 6 10:41:22 2016 +0100 ---------------------------------------------------------------------- message-store/src/main/resources/example.xml | 8 +++----- message-store/src/main/resources/struts.xml | 9 +++++++++ message-store/src/main/webapp/WEB-INF/web.xml | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/e726ed76/message-store/src/main/resources/example.xml ---------------------------------------------------------------------- diff --git a/message-store/src/main/resources/example.xml b/message-store/src/main/resources/example.xml index dd68bec..78dfd5e 100644 --- a/message-store/src/main/resources/example.xml +++ b/message-store/src/main/resources/example.xml @@ -7,13 +7,12 @@ - of how to break up the configuration file into multiple files. --> <struts> - <package name="example" namespace="/example" extends="struts-default"> + <package name="example" namespace="/example" extends="default"> <default-action-ref name="HelloWorld" /> <action name="HelloWorld1" class="org.apache.struts.example.HelloWorld1"> - <interceptor-ref name="createSession"/> - <interceptor-ref name="basicStack"/> + <interceptor-ref name="default"/> <interceptor-ref name="store"> <param name="operationMode">AUTOMATIC</param> </interceptor-ref> @@ -23,8 +22,7 @@ </action> <action name="HelloWorld2" class="org.apache.struts.example.HelloWorld2"> - <interceptor-ref name="createSession"/> - <interceptor-ref name="basicStack"/> + <interceptor-ref name="default"/> <interceptor-ref name="store"> <param name="operationMode">AUTOMATIC</param> </interceptor-ref> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/e726ed76/message-store/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/message-store/src/main/resources/struts.xml b/message-store/src/main/resources/struts.xml index bd842e9..1640bd3 100644 --- a/message-store/src/main/resources/struts.xml +++ b/message-store/src/main/resources/struts.xml @@ -10,6 +10,15 @@ <package name="default" namespace="/" extends="struts-default"> + <interceptors> + <interceptor-stack name="default"> + <interceptor-ref name="createSession"/> + <interceptor-ref name="basicStack"/> + </interceptor-stack> + </interceptors> + + <default-interceptor-ref name="default"/> + <default-action-ref name="index"/> <action name="index"> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/e726ed76/message-store/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/message-store/src/main/webapp/WEB-INF/web.xml b/message-store/src/main/webapp/WEB-INF/web.xml index 8858656..d6897e8 100644 --- a/message-store/src/main/webapp/WEB-INF/web.xml +++ b/message-store/src/main/webapp/WEB-INF/web.xml @@ -8,7 +8,7 @@ <filter> <filter-name>struts2</filter-name> <filter-class> - org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter </filter-class> </filter>
