Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5188 Replaces since 2.6 with 6.0

Browse Source
This commit is contained in:
Lukasz Lenart
2022-06-14 13:27:46 +02:00
parent ba041e1ee6
commit b6b74a46ea
43 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/admin/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-osgi-admin-bundle</artifactId>
<packaging>bundle</packaging>
<name>DEPRECATED: Struts 2 OSGi Admin Bundle - since 2.6</name>
<name>DEPRECATED: Struts 2 OSGi Admin Bundle - since 6.0.0</name>
<dependencies>
<dependency>
bundles/demo/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-osgi-demo-bundle</artifactId>
<packaging>bundle</packaging>
<name>DEPRECATED: Struts 2 OSGi Demo Bundle - since 2.6</name>
<name>DEPRECATED: Struts 2 OSGi Demo Bundle - since 6.0.0</name>
<dependencies>
bundles/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-osgi-bundles</artifactId>
<packaging>pom</packaging>
<name>DEPRECATED: Struts 2 OSGi Bundles - since 2.6</name>
<name>DEPRECATED: Struts 2 OSGi Bundles - since 6.0.0</name>
<modules>
<module>admin</module>
core/pom.xml
+1 -1
View File
@@ -31,7 +31,7 @@
<name>Struts 2 Core</name>
<properties>
<tlib.version>2.6</tlib.version>
<tlib.version>6.0</tlib.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
+1 -1
View File
@@ -24,7 +24,7 @@ import java.util.concurrent.Callable;
* Adds support for invoke async actions. This allows us to support action methods that return {@link Callable}
* as well as invoking them in separate not-container thread then executing the result in another container thread.
*
* @since 2.6
* @since 6.0.0
*/
public interface AsyncManager {
boolean hasAsyncActionResult();
core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java
+1 -1
View File
@@ -21,7 +21,7 @@ package com.opensymphony.xwork2.security;
/**
* Used across different places to check if given string is not excluded and is accepted
* @see <a href="https://securitylab.github.com/research/apache-struts-double-evaluation/">here</a>
* @since 2.6
* @since 6.0.0
*/
public interface NotExcludedAcceptedPatternsChecker extends ExcludedPatternsChecker, AcceptedPatternsChecker {
core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java
+5 -5
View File
@@ -235,7 +235,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider {
*
* @param bundleName The bundle to remove from the bundle map
*
* @deprecated A "no-op" since 2.6. Use {@link #clearBundle(java.lang.String, java.util.Locale)} instead.
* @deprecated A "no-op" since 6.0.0. Use {@link #clearBundle(java.lang.String, java.util.Locale)} instead.
*/
public void clearBundle(final String bundleName) {
LOG.debug("No-op. Did NOT clear resource bundle [{}], result: false.", bundleName);
@@ -248,7 +248,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider {
* @param bundleName The bundle (combined with locale) to remove from the bundle map
* @param locale Provides the locale to combine with the bundle to get the key
*
* @since 2.6
* @since 6.0.0
*/
protected void clearBundle(final String bundleName, Locale locale) {
final String key = createMissesKey(String.valueOf(getCurrentThreadContextClassLoader().hashCode()), bundleName, locale);
@@ -266,7 +266,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider {
* {@link AbstractLocalizedTextProvider} has already been used for failed bundle
* lookups of a given key, or some transitory state made a bundle lookup fail.
*
* @since 2.6
* @since 6.0.0
*/
protected void clearMissingBundlesCache() {
missingBundles.clear();
@@ -313,7 +313,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider {
* The <code>clearCache()</code> methods have been available since Java 1.6, so
* it is anticipated the logic will work on any subsequent JVM versions.
*
* @since 2.6
* @since 6.0.0
*/
private void clearResourceBundleClassloaderCaches() {
final ClassLoader ccl = getCurrentThreadContextClassLoader();
@@ -436,7 +436,7 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider {
*
* @param searchDefaultBundlesFirst provide {@link String} "true" or "false" to set the flag state accordingly.
*
* @since 2.6
* @since 6.0.0
*/
@Inject(value = StrutsConstants.STRUTS_I18N_SEARCH_DEFAULTBUNDLES_FIRST, required = false)
public void setSearchDefaultBundlesFirst(String searchDefaultBundlesFirst) {
core/src/main/java/org/apache/struts2/StrutsConstants.java
+13 -13
View File
@@ -43,7 +43,7 @@ public final class StrutsConstants {
* Note: This control flag may not be meaningful to all provider implementations, and should be false by default.
* </p>
*
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_I18N_SEARCH_DEFAULTBUNDLES_FIRST = "struts.i18n.search.defaultbundles.first";
@@ -254,7 +254,7 @@ public final class StrutsConstants {
* Specifies an OGNL expression cache factory implementation. A default implementation is provided, but
* could be replaced by a custom one if desired.
*
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_EXPRESSION_CACHE_FACTORY = "struts.ognl.expressionCacheFactory";
@@ -262,7 +262,7 @@ public final class StrutsConstants {
* Specifies an OGNL BeanInfo cache factory implementation. A default implementation is provided, but
* could be replaced by a custom one if desired.
*
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_BEANINFO_CACHE_FACTORY = "struts.ognl.beanInfoCacheFactory";
@@ -275,7 +275,7 @@ public final class StrutsConstants {
* For the optional LRU cache, once the maximum is reached, the least-recently-used (LRU) entry will be
* removed when a new entry needs to be added (cache is fully-utilized).
*
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_BEANINFO_CACHE_MAXSIZE = "struts.ognl.beanInfoCacheMaxSize";
@@ -287,32 +287,32 @@ public final class StrutsConstants {
* Note: When enabling LRU cache mode you must also set a maximum size (via {@link #STRUTS_OGNL_BEANINFO_CACHE_MAXSIZE})
* for it to be effective. Otherwise, there is no condition to evict a LRU entry (cache has no limit).
*
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_BEANINFO_CACHE_LRU_MODE = "struts.ognl.beanInfoCacheLRUMode";
/**
* Logs properties that are not found (very verbose)
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_LOG_MISSING_PROPERTIES = "struts.ognl.logMissingProperties";
/**
* Logs properties that are not found (very verbose)
* @deprecated as of 2.6. Use {@link #STRUTS_OGNL_LOG_MISSING_PROPERTIES} instead.
* @deprecated as of 6.0.0. Use {@link #STRUTS_OGNL_LOG_MISSING_PROPERTIES} instead.
*/
@Deprecated
public static final String STRUTS_LOG_MISSING_PROPERTIES = STRUTS_OGNL_LOG_MISSING_PROPERTIES;
/**
* Enables caching of parsed OGNL expressions
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_ENABLE_EXPRESSION_CACHE = "struts.ognl.enableExpressionCache";
/**
* Enables caching of parsed OGNL expressions
* @deprecated as of 2.6. Use {@link #STRUTS_OGNL_ENABLE_EXPRESSION_CACHE} instead.
* @deprecated as of 6.0.0. Use {@link #STRUTS_OGNL_ENABLE_EXPRESSION_CACHE} instead.
*/
public static final String STRUTS_ENABLE_OGNL_EXPRESSION_CACHE = STRUTS_OGNL_ENABLE_EXPRESSION_CACHE;
@@ -325,7 +325,7 @@ public final class StrutsConstants {
* For the optional LRU cache, once the maximum is reached, the least-recently-used (LRU) entry will be
* removed when a new entry needs to be added (cache is fully-utilized).
*
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_EXPRESSION_CACHE_MAXSIZE = "struts.ognl.expressionCacheMaxSize";
@@ -337,19 +337,19 @@ public final class StrutsConstants {
* Note: When enabling LRU cache mode you must also set a maximum size (via {@link #STRUTS_OGNL_EXPRESSION_CACHE_MAXSIZE})
* for it to be effective. Otherwise, there is no condition to evict a LRU entry (cache has no limit).
*
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_EXPRESSION_CACHE_LRU_MODE = "struts.ognl.expressionCacheLRUMode";
/**
* Enables evaluation of OGNL expressions
* @since 2.6
* @since 6.0.0
*/
public static final String STRUTS_OGNL_ENABLE_EVAL_EXPRESSION = "struts.ognl.enableEvalExpression";
/**
* Enables evaluation of OGNL expressions
* @deprecated as of 2.6. Use {@link #STRUTS_OGNL_ENABLE_EVAL_EXPRESSION} instead.
* @deprecated as of 6.0.0. Use {@link #STRUTS_OGNL_ENABLE_EVAL_EXPRESSION} instead.
*/
public static final String STRUTS_ENABLE_OGNL_EVAL_EXPRESSION = STRUTS_OGNL_ENABLE_EVAL_EXPRESSION;
core/src/main/java/org/apache/struts2/action/CookiesAware.java
+2 -2
View File
@@ -29,7 +29,7 @@ import java.util.Map;
* Please note that the {@link CookieInterceptor} needs to be
* activated to receive a cookies map.
*
* @since 2.6
* @since 6.0.0
*/
public interface CookiesAware {
/**
@@ -37,4 +37,4 @@ public interface CookiesAware {
* @param cookies the cookies
*/
void withCookies(Map<String, String> cookies);
}
}
core/src/main/java/org/apache/struts2/action/ParametersAware.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.apache.struts2.dispatcher.HttpParameters;
* One common use for this is to have the action propagate parameters to internally instantiated data
* objects.
*
* @since 2.6
* @since 6.0.0
*/
public interface ParametersAware {
core/src/main/java/org/apache/struts2/action/ServletContextAware.java
+1 -1
View File
@@ -23,7 +23,7 @@ import javax.servlet.ServletContext;
/**
* For components that have a dependence on the Servlet context.
*
* @since 2.6
* @since 6.0.0
*/
public interface ServletContextAware {
core/src/main/java/org/apache/struts2/components/Component.java
+2 -2
View File
@@ -538,7 +538,7 @@ public class Component {
* Override to set if body content should be HTML-escaped.
*
* @return always true (default) for this component.
* @since 2.6
* @since 6.0.0
*/
public boolean escapeHtmlBody() {
return escapeHtmlBody;
@@ -600,7 +600,7 @@ public class Component {
*
* @param expression of the component
* @return true|false
* @since 2.6
* @since 6.0.0
*/
protected boolean isAcceptableExpression(String expression) {
NotExcludedAcceptedPatternsChecker.IsAllowed isAllowed = notExcludedAcceptedPatterns.isAllowed(expression);
core/src/main/java/org/apache/struts2/components/Date.java
+1 -1
View File
@@ -59,7 +59,7 @@ import java.util.List;
* </p>
*
* <p>
* <b>Note</b>: Since Struts 2.6 a new Java 8 API has been used to format the Date, it's based on
* <b>Note</b>: Since Struts 6.0.0 a new Java 8 API has been used to format the Date, it's based on
* <a href="https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</a>
* which uses a bit different patterns.
* </p>
core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
+3 -3
View File
@@ -83,14 +83,14 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider {
dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN", "struts-2.1.7.dtd");
dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.3//EN", "struts-2.3.dtd");
dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.5//EN", "struts-2.5.dtd");
dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.6//EN", "struts-2.6.dtd");
dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 6.0//EN", "struts-6.0.dtd");
setDtdMappings(dtdMappings);
File file = new File(filename);
if (file.getParent() != null) {
this.baseDir = file.getParentFile();
}
}
/* (non-Javadoc)
* @see com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#register(com.opensymphony.xwork2.inject.ContainerBuilder, java.util.Properties)
*/
@@ -175,7 +175,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider {
}
}
public String toString() {
return ("Struts XML configuration provider ("+filename+")");
}
core/src/main/java/org/apache/struts2/result/StreamResult.java
+1 -1
View File
@@ -295,7 +295,7 @@ public class StreamResult extends StrutsResultSupport {
*
* @param expression of result
* @return true|false
* @since 2.6
* @since 6.0.0
*/
protected boolean isAcceptableExpression(String expression) {
NotExcludedAcceptedPatternsChecker.IsAllowed isAllowed = notExcludedAcceptedPatterns.isAllowed(expression);
core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
+1 -1
View File
@@ -154,7 +154,7 @@ public class AnchorTag extends AbstractClosingTag {
*
* @param escapeHtmlBody
*
* @since 2.6
* @since 6.0.0
*/
public void setEscapeHtmlBody(String escapeHtmlBody) {
this.escapeHtmlBody = escapeHtmlBody;
core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class SubmitTag extends AbstractClosingTag {
*
* @param escapeHtmlBody
*
* @since 2.6
* @since 6.0.0
*/
public void setEscapeHtmlBody(boolean escapeHtmlBody) {
this.escapeHtmlBody = escapeHtmlBody;
core/src/main/resources/struts-2.6.dtd → core/src/main/resources/struts-6.0.dtd
+2 -2
View File
@@ -26,8 +26,8 @@
Use the following DOCTYPE
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"http://struts.apache.org/dtds/struts-6.0.dtd">
-->
<!ELEMENT struts ((package|include|bean|constant)*,bean-selection?, unknown-handler-stack?)>
core/src/main/resources/struts-default.xml
+2 -2
View File
@@ -31,8 +31,8 @@
and {@link com.opensymphony.xwork2.inject.Inject}
-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"struts-6.0.dtd">
<struts>
core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java
+3 -3
View File
@@ -264,7 +264,7 @@ public class StrutsLocalizedTextProviderTest extends XWorkTestCase {
* Unit test to confirm expected behaviour of "clearing methods" provided to
* StrutsLocalizedTextProvider (from AbstractLocalizedTextProvider).
*
* @since 2.6
* @since 6.0.0
*/
public void testLocalizedTextProviderClearingMethods() {
TestStrutsLocalizedTextProvider testStrutsLocalizedTextProvider = new TestStrutsLocalizedTextProvider();
@@ -331,7 +331,7 @@ public class StrutsLocalizedTextProviderTest extends XWorkTestCase {
* Unit test to confirm the basic behaviour of bundle reload methods provided to
* StrutsLocalizedTextProvider (from AbstractLocalizedTextProvider).
*
* @since 2.6
* @since 6.0.0
*/
public void testLocalizedTextProviderReloadMethods() {
TestStrutsLocalizedTextProvider testStrutsLocalizedTextProvider = new TestStrutsLocalizedTextProvider();
@@ -582,7 +582,7 @@ public class StrutsLocalizedTextProviderTest extends XWorkTestCase {
/**
* Basic test class to allow specific testing of StrutsLocalizedTextProvider.
*
* @since 2.6
* @since 6.0.0
*/
class TestStrutsLocalizedTextProvider extends StrutsLocalizedTextProvider {
core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml
+3 -3
View File
@@ -20,6 +20,6 @@
*/
-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
<struts />
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"struts-6.0.dtd">
<struts/>
core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml
+6 -6
View File
@@ -21,14 +21,14 @@
-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"struts-6.0.dtd">
<struts>
<!-- CUSTOM ACTION MAPPER -->
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="WW3090" class="org.apache.struts2.views.jsp.URLTagTest$RedBlueActionMapper" />
<constant name="struts.mapper.class" value="WW3090" />
<!-- CUSTOM ACTION MAPPER -->
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="WW3090" class="org.apache.struts2.views.jsp.URLTagTest$RedBlueActionMapper"/>
<constant name="struts.mapper.class" value="WW3090"/>
</struts>
core/src/test/resources/struts-escape-body.xml
+2 -2
View File
@@ -20,8 +20,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"struts-6.0.dtd">
<struts>
<constant name="struts.ui.escapeHtmlBody" value="true"/>
core/src/test/resources/struts.xml
+6 -6
View File
@@ -20,8 +20,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"struts-6.0.dtd">
<struts>
<package name="default" extends="struts-default">
<action name="hello" class="com.opensymphony.xwork2.ActionSupport">
@@ -56,25 +56,25 @@
</result>
</action>
<action name="test5" class="com.opensymphony.xwork2.ActionSupport">
<action name="test5" class="com.opensymphony.xwork2.ActionSupport">
<result type="freemarker">
<param name="location">org/apache/struts2/views/freemarker/callActionFreeMarker2.ftl</param>
</result>
</action>
<action name="test6" class="com.opensymphony.xwork2.ActionSupport">
<action name="test6" class="com.opensymphony.xwork2.ActionSupport">
<result type="freemarker">
<param name="location">org/apache/struts2/views/freemarker/dynaAttributes.ftl</param>
</result>
</action>
<action name="test7" class="com.opensymphony.xwork2.ActionSupport">
<action name="test7" class="com.opensymphony.xwork2.ActionSupport">
<result type="freemarker">
<param name="location">org/apache/struts2/views/freemarker/manual-list.ftl</param>
</result>
</action>
<action name="test8" class="com.opensymphony.xwork2.ActionSupport">
<action name="test8" class="com.opensymphony.xwork2.ActionSupport">
<result type="freemarker">
<param name="location">org/apache/struts2/views/freemarker/customTextField.ftl</param>
</result>
plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java
+1 -1
View File
@@ -24,7 +24,7 @@ import java.util.concurrent.Executor;
/**
* A {@link Callable} with a timeout value and an {@link Executor}.
*
* @since 2.6
* @since 6.0.0
*/
public class AsyncAction implements Callable {
plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java
+1 -1
View File
@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Implements {@link AsyncManager} to add support for invoke async actions via Servlet 3's API.
*
* @since 2.6
* @since 6.0.0
*/
public class DefaultAsyncManager implements AsyncManager, AsyncListener {
private static final Logger LOG = LogManager.getLogger(DefaultAsyncManager.class);
plugins/embeddedjsp/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-embeddedjsp-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Embedded JSP Plugin (since 2.6)</name>
<name>DEPRECATED: Struts 2 Embedded JSP Plugin, since 6.0.0</name>
<dependencies>
<dependency>
plugins/gxp/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-gxp-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 GXP Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 GXP Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+1 -1
View File
@@ -512,7 +512,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
*
* @param expression of result
* @return true|false
* @since 2.6
* @since 6.0.0
*/
protected boolean isAcceptableExpression(String expression) {
NotExcludedAcceptedPatternsChecker.IsAllowed isAllowed = notExcludedAcceptedPatterns.isAllowed(expression);
plugins/osgi/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-osgi-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 OSGi Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 OSGi Plugin - since 6.0.0</name>
<dependencies>
<!-- Define OSGi Core and Compendium dependencies directly here for the plugin.
plugins/osgi/src/main/java/org/apache/struts2/osgi/action/ServiceAware.java
+1 -1
View File
@@ -25,7 +25,7 @@ import java.util.List;
* registered with the type of the parameterized type
*
* @param <T> The type of the service
* @since 2.6
* @since 6.0.0
*/
public interface ServiceAware<T> {
plugins/oval/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-oval-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 OVal Plugin (since 2.6)</name>
<name>DEPRECATED: Struts 2 OVal Plugin, since 6.0.0</name>
<dependencies>
<!-- OVal -->
plugins/plexus/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-plexus-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Plexus Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Plexus Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/portlet-mocks/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-portlet-mocks-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Portlet Mocks Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Portlet Mocks Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/portlet-tiles/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-portlet-tiles-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Portlet Tiles Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Portlet Tiles Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/portlet/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-portlet-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Portlet Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Portlet Plugin - since 6.0.0</name>
<dependencies>
<!-- junit and related JARs are needed for 'compile'! -->
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java
+1 -1
View File
@@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action;
import javax.portlet.PortletContext;
/**
* @since 2.6
* @since 6.0.0
*/
public interface PortletContextAware {
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletPreferencesAware.java
+1 -1
View File
@@ -26,7 +26,7 @@ import javax.portlet.PortletPreferences;
* implement this interface. If running in a servlet environment, an
* appropriate testing implementation will be provided.
*
* @since 2.6
* @since 6.0.0
*/
public interface PortletPreferencesAware {
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletRequestAware.java
+1 -1
View File
@@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action;
import javax.portlet.PortletRequest;
/**
* @since 2.6
* @since 6.0.0
*/
public interface PortletRequestAware {
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletResponseAware.java
+1 -1
View File
@@ -21,7 +21,7 @@ package org.apache.struts2.portlet.action;
import javax.portlet.PortletResponse;
/**
* @since 2.6
* @since 6.0.0
*/
public interface PortletResponseAware {
plugins/sitemesh/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<artifactId>struts2-sitemesh-plugin</artifactId>
<packaging>jar</packaging>
<name>DEPRECATED: Struts 2 Sitemesh Plugin - since 2.6</name>
<name>DEPRECATED: Struts 2 Sitemesh Plugin - since 6.0.0</name>
<dependencies>
<dependency>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class StrutsVelocityContext extends VelocityContext {
*
* @param chainedContexts Existing Velocity contexts to chain to
* @param stack Struts ValueStack
* @since 2.6
* @since 6.0.0
*/
public StrutsVelocityContext(List<VelocityContext> chainedContexts, ValueStack stack) {
this.chainedContexts = chainedContexts;
plugins/velocity/src/main/resources/struts-plugin.xml
+6 -6
View File
@@ -20,18 +20,18 @@
*/
-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
"http://struts.apache.org/dtds/struts-2.6.dtd">
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
"struts-6.0.dtd">
<struts>
<bean name="struts" class="org.apache.struts2.views.velocity.VelocityManager" />
<bean name="struts" class="org.apache.struts2.views.velocity.VelocityManager"/>
<bean type="org.apache.struts2.components.template.TemplateEngine" name="vm"
class="org.apache.struts2.views.velocity.template.VelocityTemplateEngine" />
class="org.apache.struts2.views.velocity.template.VelocityTemplateEngine"/>
<bean type="org.apache.struts2.views.TagLibraryDirectiveProvider" name="s"
class="org.apache.struts2.views.velocity.VelocityTagLibrary" />
class="org.apache.struts2.views.velocity.VelocityTagLibrary"/>
<package name="velocity-default" extends="struts-default">
<result-types>