[struts] 01/01: Merge pull request #252 from lukaszlenart/with-no-setters
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
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(-)
[struts] branch master updated (b7cc4b8 -> 6f56e14)
This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from b7cc4b8 Merge pull request #255 from
JCgH4164838Gh792C124B5/localS2Branch
add d38efae WW-4963 Implements new SessionAware interface that uses
withSession instead of setSession
add 3820eae WW-4963 Implements new ServletRequestAware interface that
uses withRequest instead of setRequest
add e0fb803 WW-4963 Implements new ServletResponseAware interface that
uses withResponseServlet instead of setResponseServlet
add dc7138e WW-4963 Implements new ApplicationAware interface that uses
withApplication instead of setApplication
add 384d418 WW-4963 Implements new PrincipalAware interface that uses
withPrincipalProxy instead of setPrincipalProxy
add 01016b4 WW-4963 Implements new BundleContextAware interface that uses
withBundleContext instead of setBundleContext
add 23e9c88 WW-4963 Implements new CookiesAware interface that uses
withCookies instead of setCookiesMap
add 42245be WW-4963 Implements new PortletContextAware interface that
uses withPortletContext instead of setPortletContext
add f598600 WW-4963 Implements new PortletPreferencesAware interface that
uses withPortletPreferences instead of setPortletPreferences
add ec4a445 WW-4963 Implements new PortletRequestAware interface that
uses withPortletRequest instead of setPortletRequest
add 5428252 WW-4963 Implements new PortletResponseAware interface with a
test that uses withPortletResponse instead of setPortletReponse
add 56fc731 WW-4963 Implements new ParametersAware interface that uses
withParameters instead of setHttpParameters and cleans up logic a bit
add 8cf787b WW-4963 Implements new ServiceAware interface that uses
withServices instead of setServices
add b608549 WW-4963 Implements new ServletContextAware interface and
fixes actions that uses withServletContext instead of setServletContext
new 6f56e14 Merge pull request #252 from lukaszlenart/with-no-setters
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 +
.../SomeAction.java => action/ServiceAction.java} | 68
.../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/PortletAwareIntercepto
[struts-site] branch master updated: Cleans up file and adds a note about using ## in versioning
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new 68fa63e Cleans up file and adds a note about using ## in versioning
68fa63e is described below
commit 68fa63ea0bac257a40072cf4954405b39611e1bf
Author: Lukasz Lenart
AuthorDate: Mon Oct 22 20:51:53 2018 +0200
Cleans up file and adds a note about using ## in versioning
---
source/plugins/tiles/index.md | 48 ---
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/source/plugins/tiles/index.md b/source/plugins/tiles/index.md
index b4200d1..2e40402 100644
--- a/source/plugins/tiles/index.md
+++ b/source/plugins/tiles/index.md
@@ -4,23 +4,27 @@ title: Tiles Plugin
---
# Tiles Plugin
+{:.no_toc}
-Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent look and feel. It can be used for both page
decorating and componentization.
+* Will be replaced with the ToC, excluding a header
+{:toc}
-The Tiles plugin allows actions to return Tiles pages.
+Tiles is a templating framework designed to easily allow the creation of web
application pages with a consistent look and feel. It can
+be used for both page decorating and componentization.
+The Tiles plugin allows actions to return Tiles pages.
## Features
-+ Supports Tiles in Freemarker, JSP, and Velocity
-
-+ Provides annotations to keep tiles.xml short and put definitons into actions
+- Supports Tiles in Freemarker, JSP, and Velocity
+- Provides annotations to keep tiles.xml short and put definitons into actions
## Usage
The following steps must be taken in order to enable tiles support within your
Struts2 application:
-1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency configuration will be similar to:
+1. Include the struts-tiles-plugin as a dependency in your web application. If
you are using maven2, the dependency configuration will
+ be similar to:
```xml
@@ -32,8 +36,9 @@ The following steps must be taken in order to enable tiles
support within your S
```
-{:start="2"}
-2. Register the tiles listener. This listener will typically either be the
standard tiles listener (org.apache.tiles.listener.TilesListener) or the
Struts2 replacement (org.apache.struts2.tiles.TilesListener). The latter
provides tighter integration with Struts features such as freemarker
integration.
+2. Register the tiles listener. This listener will typically either be the
standard tiles listener `org.apache.tiles.listener.TilesListener`
+ or the Struts2 replacement `org.apache.struts2.tiles.TilesListener`. The
latter provides tighter integration with Struts features such
+ as freemarker integration.
```xml
@@ -43,8 +48,8 @@ The following steps must be taken in order to enable tiles
support within your S
```
-{:start="3"}
-3. All package definitions which require tiles support must either extend the
tiles-default package or must register the [Tiles
Result](https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=Tiles+Result&linkCreation=true&fromPageId=27401)
type definition.
+3. All package definitions which require tiles support must either extend the
`tiles-default` package or must register
+ the [Tiles Result] type definition.
```xml
@@ -54,7 +59,6 @@ The following steps must be taken in order to enable tiles
support within your S
```
-{:start="4"}
4. Configure your actions to utilize a tiles definition:
@@ -65,7 +69,6 @@ The following steps must be taken in order to enable tiles
support within your S
```
-{:start="5"}
5. Instead of xml configuration you can use annotations
@@ -78,8 +81,7 @@ The following steps must be taken in order to enable tiles
support within your S
public class FooAction extends ActionSupport {
```
-{:start="6"}
-6. You have to define Tiles Definitons in a tiles.xml file. That can be placed
in `resources` or in `WEB-INF`.
+6. You have to define Tiles Definitons in a `tiles.xml` file. That can be
placed in `resources` or in `WEB-INF`.
```xml
@@ -103,11 +105,18 @@ public class FooAction extends ActionSupport {
```
-As from Struts 2.3.28, the plugin automatically loads all Tiles definitions
matching the following pattern tiles*.xml - you don't have to specify them via
org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG in web.xml,
but you can use this option if your application is going to work in restricted
servlet environment e.g. Google AppEngine. In such case, definitions will be
read from provided init-param.
+As from Struts 2.3.28, the plugin automatically loads all Tiles definitions
matching the following pattern `tiles*.xml` - you don't have
+to specify them via
`org.apach
[struts-site] branch asf-site updated: Updates production by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 689ec48 Updates production by Jenkins 689ec48 is described below commit 689ec4875d873385893cae746f71dad02a8fe410 Author: jenkins AuthorDate: Mon Oct 22 19:00:52 2018 + Updates production by Jenkins --- content/plugins/tiles/index.html | 63 +++- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/content/plugins/tiles/index.html b/content/plugins/tiles/index.html index bd78365..6b13bd4 100644 --- a/content/plugins/tiles/index.html +++ b/content/plugins/tiles/index.html @@ -127,21 +127,30 @@ << back to Plugins https://github.com/apache/struts-site/edit/master/source/plugins/tiles/index.md"; title="Edit this page on GitHub">Edit on GitHub -Tiles Plugin +Tiles Plugin + + + Features + Usage + Accessing Struts attributes + I18N + + + Example + Settings + Installation + -Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent look and feel. It can be used for both page decorating and componentization. +Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent look and feel. It can +be used for both page decorating and componentization. The Tiles plugin allows actions to return Tiles pages. Features - -Supports Tiles in Freemarker, JSP, and Velocity - - -Provides annotations to keep tiles.xml short and put definitons into actions - + Supports Tiles in Freemarker, JSP, and Velocity + Provides annotations to keep tiles.xml short and put definitons into actions Usage @@ -149,7 +158,8 @@ The following steps must be taken in order to enable tiles support within your Struts2 application: - Include the struts-tiles-plugin as a dependency in your web application. If you are using maven2, the dependency configuration will be similar to: + Include the struts-tiles-plugin as a dependency in your web application. If you are using maven2, the dependency configuration will + be similar to:@@ -161,8 +171,10 @@ - - Register the tiles listener. This listener will typically either be the standard tiles listener (org.apache.tiles.listener.TilesListener) or the Struts2 replacement (org.apache.struts2.tiles.TilesListener). The latter provides tighter integration with Struts features such as freemarker integration. + + Register the tiles listener. This listener will typically either be the standard tiles listener org.apache.tiles.listener.TilesListener + or the Struts2 replacement org.apache.struts2.tiles.TilesListener. The latter provides tighter integration with Struts features such + as freemarker integration. @@ -172,8 +184,9 @@ - - All package definitions which require tiles support must either extend the tiles-default package or must register the https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=Tiles+Result&linkCreation=true&fromPageId=27401";>Tiles Result type definition. + + All package definitions which require tiles support must either extend the tiles-default package or must register + the [Tiles Result] type definition. @@ -183,7 +196,7 @@ - + Configure your actions to utilize a tiles definition: @@ -194,7 +207,7 @@ - + Instead of xml configuration you can use annotations @@ -207,8 +220,8 @@ - - You have to define Tiles Definitons in a tiles.xml file. That can be placed in resources or in WEB-INF. + + You have to define Tiles Definitons in a tiles.xml file. That can be placed in resources or in WEB-INF.
