You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/04/26 18:29:43 UTC
[1/2] struts git commit: Drops static modifier
Repository: struts
Updated Branches:
refs/heads/master f06caf7ca -> bbd4a9e8c
Drops static modifier
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b46a6e79
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b46a6e79
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b46a6e79
Branch: refs/heads/master
Commit: b46a6e79560a973e8070477e3c1ef7b23806e360
Parents: f06caf7
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Apr 26 11:39:22 2017 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Apr 26 11:39:22 2017 +0200
----------------------------------------------------------------------
.../opensymphony/xwork2/util/DefaultLocalizedTextProvider.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b46a6e79/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java
index 61a8317..21f7477 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/DefaultLocalizedTextProvider.java
@@ -592,7 +592,7 @@ public class DefaultLocalizedTextProvider implements LocalizedTextProvider {
* @param result the result so far
* @return <tt>true</tt> if we could <b>not</b> find the text, <tt>false</tt> if the text was found (=success).
*/
- private static boolean unableToFindTextForKey(GetDefaultMessageReturnArg result) {
+ private boolean unableToFindTextForKey(GetDefaultMessageReturnArg result) {
if (result == null || result.message == null) {
return true;
}
@@ -887,7 +887,7 @@ public class DefaultLocalizedTextProvider implements LocalizedTextProvider {
}
- private static void clearTomcatCache() {
+ private void clearTomcatCache() {
ClassLoader loader = getCurrentThreadContextClassLoader();
// no need for compilation here.
Class cl = loader.getClass();
@@ -913,7 +913,7 @@ public class DefaultLocalizedTextProvider implements LocalizedTextProvider {
}
- private static void clearMap(Class cl, Object obj, String name)
+ private void clearMap(Class cl, Object obj, String name)
throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
Field field = cl.getDeclaredField(name);
[2/2] struts git commit: WW-4792 Marks XWork constants as deprecated
Posted by lu...@apache.org.
WW-4792 Marks XWork constants as deprecated
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bbd4a9e8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bbd4a9e8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bbd4a9e8
Branch: refs/heads/master
Commit: bbd4a9e8c567265c0eb376c0f8a3445f4d9a5fdf
Parents: b46a6e7
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Apr 26 20:29:33 2017 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Apr 26 20:29:33 2017 +0200
----------------------------------------------------------------------
.../com/opensymphony/xwork2/XWorkConstants.java | 23 +++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bbd4a9e8/core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index bc532d0..2499ab9 100644
--- a/core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -3,29 +3,46 @@ package com.opensymphony.xwork2;
/**
* Constants used across framework
*/
+@Deprecated
public final class XWorkConstants {
+ @Deprecated
public static final String COLLECTION_CONVERTER = "collectionConverter";
+ @Deprecated
public static final String DATE_CONVERTER = "dateConverter";
+ @Deprecated
public static final String NUMBER_CONVERTER = "numberConverter";
+ @Deprecated
public static final String STRING_CONVERTER = "stringConverter";
+ @Deprecated
public static final String ARRAY_CONVERTER = "arrayConverter";
+ @Deprecated
public static final String DEV_MODE = "devMode";
+ @Deprecated
public static final String LOG_MISSING_PROPERTIES = "logMissingProperties";
+ @Deprecated
public static final String ENABLE_OGNL_EXPRESSION_CACHE = "enableOGNLExpressionCache";
+ @Deprecated
public static final String ENABLE_OGNL_EVAL_EXPRESSION = "enableOGNLEvalExpression";
+ @Deprecated
public static final String RELOAD_XML_CONFIGURATION = "reloadXmlConfiguration";
+ @Deprecated
public static final String ALLOW_STATIC_METHOD_ACCESS = "allowStaticMethodAccess";
+ @Deprecated
public static final String XWORK_LOGGER_FACTORY = "xwork.loggerFactory";
-
+ @Deprecated
public static final String OGNL_EXCLUDED_CLASSES = "ognlExcludedClasses";
+ @Deprecated
public static final String OGNL_EXCLUDED_PACKAGE_NAME_PATTERNS = "ognlExcludedPackageNamePatterns";
+ @Deprecated
public static final String OGNL_EXCLUDED_PACKAGE_NAMES = "ognlExcludedPackageNames";
-
+ @Deprecated
public static final String ADDITIONAL_EXCLUDED_PATTERNS = "additionalExcludedPatterns";
+ @Deprecated
public static final String ADDITIONAL_ACCEPTED_PATTERNS = "additionalAcceptedPatterns";
-
+ @Deprecated
public static final String OVERRIDE_EXCLUDED_PATTERNS = "overrideExcludedPatterns";
+ @Deprecated
public static final String OVERRIDE_ACCEPTED_PATTERNS = "overrideAcceptedPatterns";
}