Fixes reference to the new filters and update plugins' layout
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
deleted file mode 100644
index b7ecc64..0000000
--- a/source/_layouts/plugin.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <meta name="Date-Revision-yyyymmdd" content="20140918"/>
- <meta http-equiv="Content-Language" content="en"/>
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-
- <title>{{ page.title }}</title>
-
- <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
- <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
- <link href="/css/main.css" rel="stylesheet">
- <link href="/css/custom.css" rel="stylesheet">
- <link href="/highlighter/github-theme.css" rel="stylesheet">
-
- <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
- <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
- <script type="text/javascript" src="/js/community.js"></script>
-
- <!-- Matomo -->
- <script>
- var _paq = window._paq = window._paq || [];
- /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
- /* We explicitly disable cookie tracking to avoid privacy issues */
- _paq.push(['disableCookies']);
- _paq.push(['trackPageView']);
- _paq.push(['enableLinkTracking']);
- (function() {
- var u="//analytics.apache.org/";
- _paq.push(['setTrackerUrl', u+'matomo.php']);
- _paq.push(['setSiteId', '41']);
- var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
- })();
- </script>
- <!-- End Matomo Code -->
-</head>
-<body>
-
-{% include header.html %}
-
-<article class="container">
- <section class="col-md-12">
- <a class="edit-on-gh" href="{{ site.repository_url }}/edit/master/source/{{ page.path }}" title="Edit this page on GitHub">Edit on GitHub</a>
- {% if page.parent %}
- <a href="{{ page.parent.url }}" title="back to {{ page.parent.title }}"><< back to {{ page.parent.title }}</a>
- {% else %}
- <a href="../" title="back to Plugins"><< back to Plugins</a>
- {% endif %}
- {{ content }}
- </section>
-</article>
-
-{% include footer.html %}
-
-</body>
-</html>
diff --git a/source/core-developers/web-xml.md b/source/core-developers/web-xml.md
index 5e947b6..38dd4e6 100644
--- a/source/core-developers/web-xml.md
+++ b/source/core-developers/web-xml.md
@@ -10,10 +10,11 @@
{:toc}
The `web.xml` web application descriptor file represents the core of the Java web application, so it is appropriate
-that it is also part of the core of the Struts framework. In the `web.xml` file, Struts defines its FilterDispatcher,
-the Servlet Filter class that initializes the Struts framework and handles all requests. This filter can contain
-initialization parameters that affect what, if any, additional configuration files are loaded and how the framework
-should behave.
+that it is also part of the core of the Struts framework. In the `web.xml` file you can use one of the two options:
+1. Configure `org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter` which acts as a central
+ point of initializing the Struts framework and handles all requests.
+2. Use combination of `org.apache.struts2.dispatcher.filter.StrutsPrepareFilter` and `org.apache.struts2.dispatcher.filter.StrutsExecuteFilter`
+ to support custom integration with other frameworks like Sitemesh.
## Simple Example
@@ -43,7 +44,7 @@
</web-app>
```
-See [SiteMesh Plugin](../plugins/sitemesh-plugin) for an example on when to use separate Filters for prepare and execution phase.
+See [SiteMesh Plugin](../plugins/sitemesh/) for an example on when to use separate Filters for prepare and execution phase.
## Custom mapping
diff --git a/source/plugins/async/index.md b/source/plugins/async/index.md
index 7c19b29..f5eee28 100644
--- a/source/plugins/async/index.md
+++ b/source/plugins/async/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Async Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/bean-validation/index.md b/source/plugins/bean-validation/index.md
index 51a6064..fe41e68 100644
--- a/source/plugins/bean-validation/index.md
+++ b/source/plugins/bean-validation/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Bean Validation Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/cdi/index.md b/source/plugins/cdi/index.md
index e26cd3b..bdcab63 100644
--- a/source/plugins/cdi/index.md
+++ b/source/plugins/cdi/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: CDI Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/codebehind/index.md b/source/plugins/codebehind/index.md
index b4a785a..52e76e5 100644
--- a/source/plugins/codebehind/index.md
+++ b/source/plugins/codebehind/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Codebehind Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/config-browser/index.md b/source/plugins/config-browser/index.md
index 6e13b79..f05497d 100644
--- a/source/plugins/config-browser/index.md
+++ b/source/plugins/config-browser/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Config Browser Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/convention/converting.md b/source/plugins/convention/converting.md
index 1f45d2b..011b015 100644
--- a/source/plugins/convention/converting.md
+++ b/source/plugins/convention/converting.md
@@ -1,10 +1,11 @@
---
layout: default
title: Converting application from Codebehind to Convention Plugin (WIP)
+parent:
+ url: index
+ title: Convention plugin
---
-[<< back to Convention Plugin](./)
-
# Converting application from Codebehind to Convention Plugin
## Changes required
diff --git a/source/plugins/convention/index.md b/source/plugins/convention/index.md
index c022b7d..a91df8f 100644
--- a/source/plugins/convention/index.md
+++ b/source/plugins/convention/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Convention plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/dwr/index.md b/source/plugins/dwr/index.md
index 5750205..800efb4 100644
--- a/source/plugins/dwr/index.md
+++ b/source/plugins/dwr/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: DWR Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/embedded-jsp/index.md b/source/plugins/embedded-jsp/index.md
index 8fa8cc7..a4ce7ba 100644
--- a/source/plugins/embedded-jsp/index.md
+++ b/source/plugins/embedded-jsp/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Embedded JSP Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/index.md b/source/plugins/index.md
index 6e948e5..95138bf 100644
--- a/source/plugins/index.md
+++ b/source/plugins/index.md
@@ -14,37 +14,37 @@
## Bundled Plugins
-| Name | Versions | Note |
-|-------------------------------------------|------------------------|-----------------------------------------------------------------------|
-| [Async Plugin](async) | 6.0.0+ |
-| [Bean Validation Plugin](bean-validation) | 2.5+ |
-| [CDI (JSR 299) Plugin](cdi) | 2.3.1+ |
-| [Codebehind Plugin](codebehind) | < 2.5 | removed since 2.5, use [Convention Plugin](convention) |
-| [Config Browser Plugin](config-browser) |||
-| [Convention Plugin](convention) | 2.1.3+ ||
-| [DWR Plugin](dwr) |||
-| [Embedded JSP Plugin](embedded-jsp) | 2.1.7+ | deprecated since 6.0.0 |
-| [JasperReports Plugin](jasperreports) |||
-| [Java 8 Support Plugin](java-8-support) | 2.3.21 - 2.5.2 ||
-| [Javatemplates Plugin](javatemplates) | 2.1.3+ ||
-| [JFreeChart Plugin](jfreechart) |||
-| [JSF Plugin](jsf) | < 2.5 | removed since 2.5 |
-| [JSON Plugin](json) | 2.1.7+ ||
-| [JUnit Plugin](junit) |||
-| [OVal Plugin](oval) | 2.1.7+ | deprecated since 6.0.0, use [Bean Validation Plugin](bean-validation) |
-| [OSGi Plugin](osgi) | 2.1.7+ | deprecated since 6.0.0 |
-| [Plexus Plugin](plexus) || deprecated since 6.0.0 |
-| [Portlet Plugin](portlet) || deprecated since 6.0.0 |
-| [Portlet Tiles Plugin](portlet-tiles) | 2.3.5+ | deprecated since 6.0.0 |
-| [REST Plugin](rest) | 2.1.1+ ||
-| [SiteGraph Plugin](sitegraph) | < 2.5 | removed since 2.5 |
-| [SiteMesh Plugin](sitemesh) || deprecated since 6.0.0 |
-| [Spring Plugin](spring) |||
-| [Struts 1 Plugin](struts-1) | < 2.5 | removed since 2.5 |
-| [TestNG Plugin](testng) |||
-| [Tiles Plugin](tiles) |||
-| [Tiles 3 Plugin](tiles-3) | < 2.5 | removed since 2.5 |
-| [Velocity Plugin](velocity) | | |
+| Name | Versions | Note |
+|-------------------------------------------|----------------|-----------------------------------------------------------------------|
+| [Async Plugin](async) | 6.0.0+ |
+| [Bean Validation Plugin](bean-validation) | 2.5+ |
+| [CDI (JSR 299) Plugin](cdi) | 2.3.1+ |
+| [Codebehind Plugin](codebehind) | < 2.5 | removed since 2.5, use [Convention Plugin](convention) |
+| [Config Browser Plugin](config-browser) | | |
+| [Convention Plugin](convention) | 2.1.3+ | |
+| [DWR Plugin](dwr) | | |
+| [Embedded JSP Plugin](embedded-jsp) | 2.1.7+ | deprecated since 6.0.0 |
+| [JasperReports Plugin](jasperreports) | | |
+| [Java 8 Support Plugin](java-8-support) | 2.3.21 - 2.5.2 | |
+| [Javatemplates Plugin](javatemplates) | 2.1.3+ | |
+| [JFreeChart Plugin](jfreechart) | | |
+| [JSF Plugin](jsf) | < 2.5 | removed since 2.5 |
+| [JSON Plugin](json) | 2.1.7+ | |
+| [JUnit Plugin](junit) | | |
+| [OVal Plugin](oval) | 2.1.7+ | deprecated since 6.0.0, use [Bean Validation Plugin](bean-validation) |
+| [OSGi Plugin](osgi) | 2.1.7+ | deprecated since 6.0.0 |
+| [Plexus Plugin](plexus) | | deprecated since 6.0.0 |
+| [Portlet Plugin](portlet) | | deprecated since 6.0.0 |
+| [Portlet Tiles Plugin](portlet-tiles) | 2.3.5+ | deprecated since 6.0.0 |
+| [REST Plugin](rest) | 2.1.1+ | |
+| [SiteGraph Plugin](sitegraph) | < 2.5 | removed since 2.5 |
+| [SiteMesh Plugin](sitemesh) | | |
+| [Spring Plugin](spring) | | |
+| [Struts 1 Plugin](struts-1) | < 2.5 | removed since 2.5 |
+| [TestNG Plugin](testng) | | |
+| [Tiles Plugin](tiles) | | |
+| [Tiles 3 Plugin](tiles-3) | < 2.5 | removed since 2.5 |
+| [Velocity Plugin](velocity) | | |
> For a complete list of bundled and third-party plugins, visit
> the [Plugin Registry](http://cwiki.apache.org/S2PLUGINS/Home).
diff --git a/source/plugins/jasperreports/index.md b/source/plugins/jasperreports/index.md
index 3408608..cf50775 100644
--- a/source/plugins/jasperreports/index.md
+++ b/source/plugins/jasperreports/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: JasperReports Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/java-8-support/index.md b/source/plugins/java-8-support/index.md
index 30b36c1..2a15102 100644
--- a/source/plugins/java-8-support/index.md
+++ b/source/plugins/java-8-support/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Java 8 Support Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/javatemplates/index.md b/source/plugins/javatemplates/index.md
index 664fe74..630698e 100644
--- a/source/plugins/javatemplates/index.md
+++ b/source/plugins/javatemplates/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Javatemplates Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/jfreechart/index.md b/source/plugins/jfreechart/index.md
index 12be296..85cd67a 100644
--- a/source/plugins/jfreechart/index.md
+++ b/source/plugins/jfreechart/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: JFreeChart Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/jsf/index.md b/source/plugins/jsf/index.md
index 0daa9f0..0b9433d 100644
--- a/source/plugins/jsf/index.md
+++ b/source/plugins/jsf/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: JSF Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/json/index.md b/source/plugins/json/index.md
index 728664f..58b266c 100644
--- a/source/plugins/json/index.md
+++ b/source/plugins/json/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: JSON plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/json/json-ajax-validation.md b/source/plugins/json/json-ajax-validation.md
index 80e6218..b771c4c 100644
--- a/source/plugins/json/json-ajax-validation.md
+++ b/source/plugins/json/json-ajax-validation.md
@@ -1,9 +1,9 @@
---
-layout: plugin
+layout: default
title: JSON Ajax validation
parent:
title: JSON plugin
- url: index.html
+ url: index
---
# JSON Ajax Validation
diff --git a/source/plugins/junit/index.md b/source/plugins/junit/index.md
index 225905e..56e7a01 100644
--- a/source/plugins/junit/index.md
+++ b/source/plugins/junit/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: JUnit plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/osgi/index.md b/source/plugins/osgi/index.md
index 08b4574..85c1428 100644
--- a/source/plugins/osgi/index.md
+++ b/source/plugins/osgi/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: OSGi Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/oval/index.md b/source/plugins/oval/index.md
index 43dddf7..51c46d2 100644
--- a/source/plugins/oval/index.md
+++ b/source/plugins/oval/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: OVal Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/plexus/index.md b/source/plugins/plexus/index.md
index 384d905..2acad12 100644
--- a/source/plugins/plexus/index.md
+++ b/source/plugins/plexus/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Plexus Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/portlet-tiles/index.md b/source/plugins/portlet-tiles/index.md
index e385550..ce36027 100644
--- a/source/plugins/portlet-tiles/index.md
+++ b/source/plugins/portlet-tiles/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Portlet Tiles Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/portlet/index.md b/source/plugins/portlet/index.md
index 711a83b..e773556 100644
--- a/source/plugins/portlet/index.md
+++ b/source/plugins/portlet/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Portlet Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/portlet/struts-2-portlet-tutorial.md b/source/plugins/portlet/struts-2-portlet-tutorial.md
index 2dd99a3..481ded3 100644
--- a/source/plugins/portlet/struts-2-portlet-tutorial.md
+++ b/source/plugins/portlet/struts-2-portlet-tutorial.md
@@ -1,6 +1,9 @@
---
-layout: plugin
+layout: default
title: Struts 2 Portlet Tutorial
+parent:
+ url: index
+ title: Portlet Plugin
---
# Struts 2 Portlet Tutorial
diff --git a/source/plugins/rest/index.md b/source/plugins/rest/index.md
index 5c903ff..9528404 100644
--- a/source/plugins/rest/index.md
+++ b/source/plugins/rest/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: REST Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/sitegraph/index.md b/source/plugins/sitegraph/index.md
index 4dcfc20..4473d0c 100644
--- a/source/plugins/sitegraph/index.md
+++ b/source/plugins/sitegraph/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: SiteGraph Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/sitemesh/index.md b/source/plugins/sitemesh/index.md
index 5a32f52..75a59b8 100644
--- a/source/plugins/sitemesh/index.md
+++ b/source/plugins/sitemesh/index.md
@@ -1,9 +1,9 @@
---
-layout: plugin
+layout: default
title: SiteMesh Plugin
parent:
- url: /plugins
title: Plugins
+ url: ../
---
# SiteMesh Plugin
@@ -12,12 +12,11 @@
* Will be replaced with the ToC, excluding a header
{:toc}
-> This plugin got marked as deprecated since Struts 2.6!
-
## About SiteMesh
> [SiteMesh](http://www.sitemesh.org/) is a web-page layout and decoration framework and web application integration
-> framework to aid in creating large sites consisting of many pages for which a consistent look/feel, navigation and layout scheme is required.
+> framework to aid in creating large sites consisting of many pages for which a consistent look/feel, navigation
+> and layout scheme is required.
The Sitemesh plugin allows Sitemesh templates to access framework resources.
@@ -33,7 +32,7 @@
## Usage
From 2.2+ the new `com.opensymphony.sitemesh.webapp.SiteMeshFilter` filter
-and Struts `org.apache.struts2.dispatcher.ng.listener.StrutsListener` context listener must be added to `web.xml`, like:
+and Struts `org.apache.struts2.dispatcher.listener.StrutsListener` context listener must be added to `web.xml`, like:
```xml
<filter>
@@ -42,15 +41,15 @@
</filter>
...
<listener>
- <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class>
+ <listener-class>org.apache.struts2.dispatcher.listener.StrutsListener</listener-class>
</listener>
```
-## FreeMarker and Velocity Decorators
+## FreeMarker and Velocity Decorators
-The plugin provides an extension of the SiteMesh _Velocity_ and _FreeMarker_ servlets. These servlets provide
-the standard variables and _Struts Tags_ that you used to create views in your favourite template language.
+The plugin provides an extension of the SiteMesh _Velocity_ and _FreeMarker_ servlets. These servlets provide
+the standard variables and _Struts Tags_ that you used to create views in your favourite template language.
### FreeMarker
@@ -84,13 +83,12 @@
servlet, which can be configured like this in `web.xml`:
```xml
-
<servlet>
<servlet-name>sitemesh-freemarker</servlet-name>
<servlet-class>org.apache.struts2.sitemesh.VelocityDecoratorServlet</servlet-class>
<init-param>
- <param-name>default_encoding</param-name>
- <param-value>UTF-8</param-value>
+ <param-name>default_encoding</param-name>
+ <param-value>UTF-8</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -98,8 +96,7 @@
<servlet-mapping>
<servlet-name>sitemesh-freemarker</servlet-name>
<url-pattern>*.ftl</url-pattern>
-</servlet-mapping>
-
+</servlet-mapping>
```
### Full integration with SiteMesh 2 + Freemarker 2.4.2 + Velocity 1.3 , including Struts 2 Tags, ValueStack, and FreemarkerManager statics.
@@ -107,10 +104,9 @@
Such configuration is available as from Struts 2.2.0, please refer to [WW-3296](https://issues.apache.org/jira/browse/WW-3296) for me details.
```xml
-
<filter>
<filter-name>struts-prepare</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
</filter>
<filter>
@@ -120,7 +116,7 @@
<filter>
<filter-name>struts-execute</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
</filter>
<filter-mapping>
@@ -175,12 +171,12 @@
```xml
<filter>
<filter-name>struts-prepare</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
</filter>
<filter>
<filter-name>struts-execute</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
</filter>
@@ -205,7 +201,7 @@
</filter-mapping>
<listener>
- <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class>
+ <listener-class>org.apache.struts2.dispatcher.listener.StrutsListener</listener-class>
</listener>
<servlet>
@@ -245,12 +241,12 @@
```xml
<filter>
<filter-name>struts-prepare</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
</filter>
<filter>
<filter-name>struts-execute</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
</filter>
<filter>
@@ -272,16 +268,15 @@
<filter-name>struts-execute</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
```
-You do not need the struts2-sitmesh-plugin if you are using JSP for your decorators.
+You do not need the Struts2 Sitmesh plugin if you are using JSP for your decorators.
Here are the only changes needed to web.xml
```xml
<filter>
<filter-name>struts2-prepare</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
</filter>
<filter>
@@ -291,7 +286,7 @@
<filter>
<filter-name>struts2-execute</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
</filter>
<filter-mapping>
@@ -320,4 +315,5 @@
## Installation
-This plugin can be installed by copying the plugin jar into your application's `/WEB-INF/lib` directory. No other files need to be copied or created.
+This plugin can be installed by copying the plugin jar into your application's `/WEB-INF/lib` directory.
+No other files need to be copied or created.
diff --git a/source/plugins/spring/index.md b/source/plugins/spring/index.md
index 51d956e..3203a68 100644
--- a/source/plugins/spring/index.md
+++ b/source/plugins/spring/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Spring Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
@@ -187,8 +187,6 @@
</beans>
```
-To use session-scoped components with Spring and Struts, see the [Spring Session Components Workarounds](spring-session-components-workarounds) analysis.
-
## Class Reloading
The Spring plugin can be configured to automatically reload classes that change in the file system. This feature will
diff --git a/source/plugins/spring/spring-session-components-workarounds.md b/source/plugins/spring/spring-session-components-workarounds.md
deleted file mode 100644
index ba48d41..0000000
--- a/source/plugins/spring/spring-session-components-workarounds.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: plugin
-title: Spring Session Components Workarounds
----
-
-# Spring Session Components Workarounds
diff --git a/source/plugins/struts-1/index.md b/source/plugins/struts-1/index.md
index bb8f8a7..ae1c14a 100644
--- a/source/plugins/struts-1/index.md
+++ b/source/plugins/struts-1/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Struts 1 Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/testng/index.md b/source/plugins/testng/index.md
index efc0410..1633ec9 100644
--- a/source/plugins/testng/index.md
+++ b/source/plugins/testng/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: TestNG Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/tiles-3/index.md b/source/plugins/tiles-3/index.md
index 725d3c1..e6a3e95 100644
--- a/source/plugins/tiles-3/index.md
+++ b/source/plugins/tiles-3/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Tiles 3 Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/tiles/index.md b/source/plugins/tiles/index.md
index cf911ca..f8da2ac 100644
--- a/source/plugins/tiles/index.md
+++ b/source/plugins/tiles/index.md
@@ -1,8 +1,8 @@
---
-layout: plugin
+layout: default
title: Tiles Plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
diff --git a/source/plugins/velocity/index.md b/source/plugins/velocity/index.md
index fd67911..7e5e441 100644
--- a/source/plugins/velocity/index.md
+++ b/source/plugins/velocity/index.md
@@ -2,7 +2,7 @@
layout: default
title: Velocity plugin
parent:
- url: /plugins
+ url: ../
title: Plugins
---
