This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 6f56e14de93e35b76bcac96207934d3663b4ca57 Merge: b7cc4b8 b608549 Author: Yasser Zamani <yasser.zam...@live.com> AuthorDate: Mon Oct 22 12:42:48 2018 +0330 Merge pull request #252 from lukaszlenart/with-no-setters WW-4963 Implement new Aware interfaces .../struts2/showcase/source/ViewSourceAction.java | 4 +- .../struts2/osgi/admin/actions/BundlesAction.java | 4 +- .../src/main/java/actions/osgi/BundlesAction.java | 4 +- .../{interceptor => action}/ApplicationAware.java | 11 +- .../{interceptor => action}/CookiesAware.java | 8 +- .../ParametersAware.java} | 12 +- .../{interceptor => action}/PrincipalAware.java | 13 +- .../{util => action}/ServletContextAware.java | 6 +- .../ServletRequestAware.java | 12 +- .../ServletResponseAware.java | 14 +- .../{interceptor => action}/SessionAware.java | 15 +- .../struts2/interceptor/ApplicationAware.java | 4 + .../struts2/interceptor/CookieInterceptor.java | 8 +- .../apache/struts2/interceptor/CookiesAware.java | 4 + .../struts2/interceptor/HttpParametersAware.java | 6 + .../apache/struts2/interceptor/ParameterAware.java | 2 +- .../apache/struts2/interceptor/PrincipalAware.java | 7 + .../apache/struts2/interceptor/RequestAware.java | 6 + .../interceptor/ServletConfigInterceptor.java | 40 ++++- .../struts2/interceptor/ServletRequestAware.java | 4 + .../struts2/interceptor/ServletResponseAware.java | 4 + .../apache/struts2/interceptor/SessionAware.java | 4 + .../apache/struts2/util/ServletContextAware.java | 7 + .../struts2/interceptor/CookieInterceptorTest.java | 68 ++++++++ .../interceptor/ServletConfigInterceptorTest.java | 191 +++++++++++++++++++-- .../BundleContextAware.java | 62 +++---- .../osgi/{interceptor => action}/ServiceAware.java | 66 +++---- .../osgi/interceptor/BundleContextAware.java | 7 + .../struts2/osgi/interceptor/OsgiInterceptor.java | 107 ++++++++---- .../struts2/osgi/interceptor/ServiceAware.java | 6 + .../apache/struts2/osgi/action/ServiceAction.java} | 66 +++---- .../osgi/interceptor/OsgiInterceptorTest.java | 71 ++++++++ .../PortletContextAware.java | 57 +++--- .../PortletPreferencesAware.java | 76 ++++---- .../PortletRequestAware.java | 57 +++--- .../PortletResponseAware.java | 57 +++--- .../interceptor/PortletAwareInterceptor.java | 54 +++++- .../portlet/interceptor/PortletContextAware.java | 9 +- .../interceptor/PortletPreferencesAware.java | 7 +- .../portlet/interceptor/PortletRequestAware.java | 10 +- .../portlet/interceptor/PortletResponseAware.java | 8 + .../interceptor/PortletAwareInterceptorTest.java | 97 +++++++---- 42 files changed, 914 insertions(+), 361 deletions(-)