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

rename springconstants to have a uniform naming pattern

Browse Source 
Also removed constant from cdi-plugin config, as it is suspected to not be used.

issue:
- WW-4796
This commit is contained in:
Stefaan Dutry
2018-05-28 13:15:09 +02:00
parent 6357867082
commit f85149791d
6 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cdi/src/main/resources/struts-plugin.xml
-2
View File
@@ -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>
plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java
+1 -1
View File
@@ -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>
* &lt;context-param&gt;
plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java
+3 -3
View File
@@ -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";
}
plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+3 -3
View File
@@ -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)
plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
+3 -3
View File
@@ -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;
}
plugins/spring/src/main/resources/struts-plugin.xml
+3 -3
View File
@@ -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" />