Repository: struts Updated Branches: refs/heads/master 41c97636e -> 7605c1641
WW-4686 Renames packages in xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7605c164 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7605c164 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7605c164 Branch: refs/heads/master Commit: 7605c1641cc8e7eff1b53ad0c02437d3940cd84a Parents: 41c9763 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Sep 12 09:07:41 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Sep 12 09:07:41 2016 +0200 ---------------------------------------------------------------------- core/src/main/resources/struts-default.xml | 2 +- core/src/main/resources/xwork-default.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/7605c164/core/src/main/resources/struts-default.xml ---------------------------------------------------------------------- diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index e4090a5..4e5ae12 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -201,7 +201,7 @@ <interceptor name="execAndWait" class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/> <interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/> <interceptor name="fileUpload" class="org.apache.struts2.interceptor.FileUploadInterceptor"/> - <interceptor name="i18n" class="com.opensymphony.xwork2.interceptor.I18nInterceptor"/> + <interceptor name="i18n" class="org.apache.struts2.interceptor.I18nInterceptor"/> <interceptor name="logger" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/> <interceptor name="modelDriven" class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/> <interceptor name="scopedModelDriven" class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/> http://git-wip-us.apache.org/repos/asf/struts/blob/7605c164/core/src/main/resources/xwork-default.xml ---------------------------------------------------------------------- diff --git a/core/src/main/resources/xwork-default.xml b/core/src/main/resources/xwork-default.xml index dba9d68..d58b409 100644 --- a/core/src/main/resources/xwork-default.xml +++ b/core/src/main/resources/xwork-default.xml @@ -31,7 +31,7 @@ <interceptor name="conversionError" class="com.opensymphony.xwork2.interceptor.ConversionErrorInterceptor"/> <interceptor name="alias" class="com.opensymphony.xwork2.interceptor.AliasInterceptor"/> <interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/> - <interceptor name="i18n" class="com.opensymphony.xwork2.interceptor.I18nInterceptor"/> + <interceptor name="i18n" class="org.apache.struts2.interceptor.I18nInterceptor"/> <!-- END SNIPPET: xwork2-default-interceptors -->