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 2020/05/01 05:10:39 UTC
[struts] branch master updated: rename springconstants to have a
uniform naming pattern
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.git
The following commit(s) were added to refs/heads/master by this push:
new f851497 rename springconstants to have a uniform naming pattern
new 158b1d4 Merge pull request #229 from sdutry/WW-4796
f851497 is described below
commit f85149791d2bff9953e91051b74f8f69ff450fae
Author: Stefaan Dutry <st...@gmail.com>
AuthorDate: Mon May 28 13:15:09 2018 +0200
rename springconstants to have a uniform naming pattern
Also removed constant from cdi-plugin config, as it is suspected to not be used.
issue:
- WW-4796
---
plugins/cdi/src/main/resources/struts-plugin.xml | 2 --
.../struts2/spring/ClassReloadingXMLWebApplicationContext.java | 2 +-
.../src/main/java/org/apache/struts2/spring/SpringConstants.java | 6 +++---
.../java/org/apache/struts2/spring/StrutsSpringObjectFactory.java | 6 +++---
.../apache/struts2/spring/config/entities/SpringConstantConfig.java | 6 +++---
plugins/spring/src/main/resources/struts-plugin.xml | 6 +++---
6 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/plugins/cdi/src/main/resources/struts-plugin.xml b/plugins/cdi/src/main/resources/struts-plugin.xml
index bbbd5a9..9c79a33 100644
--- a/plugins/cdi/src/main/resources/struts-plugin.xml
+++ b/plugins/cdi/src/main/resources/struts-plugin.xml
@@ -30,6 +30,4 @@
<!-- Make the CDI object factory the automatic default -->
<constant name="struts.objectFactory" value="cdi" />
- <constant name="struts.class.reloading.reloadConfig" value="false" />
-
</struts>
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java
index 03fe9de..4235a67 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java
@@ -52,7 +52,7 @@ import java.util.regex.Pattern;
* </p>
* <ul>
* <li>Set "struts.devMode" to "true" </li>
- * <li>Set "struts.class.reloading.watchList" to a comma separated list of directories, or jar files (absolute paths)</li>
+ * <li>Set "struts.objectFactory.spring.class.reloading.watchList" to a comma separated list of directories, or jar files (absolute paths)</li>
* <li>Add this to web.xml:
* <pre>
* <context-param>
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java b/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java
index f174e2f..d577577 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java
@@ -19,7 +19,7 @@
package org.apache.struts2.spring;
public class SpringConstants {
- public static final String SPRING_CLASS_RELOADING_WATCH_LIST = "struts.class.reloading.watchList";
- public static final String SPRING_CLASS_RELOADING_ACCEPT_CLASSES = "struts.class.reloading.acceptClasses";
- public static final String SPRING_CLASS_RELOADING_RELOAD_CONFIG = "struts.class.reloading.reloadConfig";
+ public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST = "struts.objectFactory.spring.class.reloading.watchList";
+ public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES = "struts.objectFactory.spring.class.reloading.acceptClasses";
+ public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG = "struts.objectFactory.spring.class.reloading.reloadConfig";
}
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
index 157518c..f11ea6a 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
@@ -94,9 +94,9 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory {
return;
}
- String watchList = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_WATCH_LIST);
- String acceptClasses = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_ACCEPT_CLASSES);
- String reloadConfig = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_RELOAD_CONFIG);
+ String watchList = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST);
+ String acceptClasses = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES);
+ String reloadConfig = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG);
if ("true".equals(devMode)
&& StringUtils.isNotBlank(watchList)
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java b/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
index d948490..b9abca1 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
@@ -37,9 +37,9 @@ public class SpringConstantConfig extends ConstantConfig {
public Map<String, String> getAllAsStringsMap() {
Map<String, String> map = super.getAllAsStringsMap();
- map.put(SpringConstants.SPRING_CLASS_RELOADING_WATCH_LIST, StringUtils.join(classReloadingWatchList, ','));
- map.put(SpringConstants.SPRING_CLASS_RELOADING_ACCEPT_CLASSES, StringUtils.join(classReloadingAcceptClasses, ','));
- map.put(SpringConstants.SPRING_CLASS_RELOADING_RELOAD_CONFIG, Objects.toString(classReloadingReloadConfig, null));
+ map.put(SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST, StringUtils.join(classReloadingWatchList, ','));
+ map.put(SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES, StringUtils.join(classReloadingAcceptClasses, ','));
+ map.put(SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG, Objects.toString(classReloadingReloadConfig, null));
return map;
}
diff --git a/plugins/spring/src/main/resources/struts-plugin.xml b/plugins/spring/src/main/resources/struts-plugin.xml
index 9ded322..51fb37c 100644
--- a/plugins/spring/src/main/resources/struts-plugin.xml
+++ b/plugins/spring/src/main/resources/struts-plugin.xml
@@ -29,9 +29,9 @@
<!-- Make the Spring object factory the automatic default -->
<constant name="struts.objectFactory" value="spring" />
- <constant name="struts.class.reloading.watchList" value="" />
- <constant name="struts.class.reloading.acceptClasses" value="" />
- <constant name="struts.class.reloading.reloadConfig" value="false" />
+ <constant name="struts.objectFactory.spring.class.reloading.watchList" value="" />
+ <constant name="struts.objectFactory.spring.class.reloading.acceptClasses" value="" />
+ <constant name="struts.objectFactory.spring.class.reloading.reloadConfig" value="false" />
<constant name="struts.disallowProxyMemberAccess" value="true" />
<constant name="struts.json.result.excludeProxyProperties" value="true" />