This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/struts-2-5-x by this push:
new a15c12a add properties support to XWorkTestCase.loadButAdd
a15c12a is described below
commit a15c12a05109da5ad48efb77921f4178ceab16fa
Author: Yasser Zamani <[email protected]>
AuthorDate: Sun Feb 24 17:53:45 2019 +0330
add properties support to XWorkTestCase.loadButAdd
also includes cleanups for PRs #292 and #320
---
.../com/opensymphony/xwork2/XWorkTestCase.java | 23 +++---
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 53 +++++--------
.../xwork2/ognl/OgnlValueStackTest.java | 33 --------
.../xwork-test-allowstatic-devmode-false.xml | 89 ----------------------
.../xwork-test-allowstatic-devmode-true.xml | 89 ----------------------
.../providers/xwork-test-allowstatic-true.xml | 89 ----------------------
.../config/providers/xwork-test-devmode-true.xml | 89 ----------------------
7 files changed, 31 insertions(+), 434 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
b/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
index 21442da..bc6b0a8 100644
--- a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
+++ b/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
@@ -27,6 +27,7 @@ import com.opensymphony.xwork2.test.StubConfigurationProvider;
import com.opensymphony.xwork2.util.XWorkTestCaseHelper;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import junit.framework.TestCase;
+import org.apache.commons.lang3.ClassUtils;
/**
* Base JUnit TestCase to extend for XWork specific JUnit tests. Uses
@@ -78,16 +79,20 @@ public abstract class XWorkTestCase extends TestCase {
@Override
public void register(ContainerBuilder builder,
LocatableProperties props) throws ConfigurationException {
- builder.factory(type, name, new Factory() {
- public Object create(Context context) throws Exception {
- return impl;
- }
+ if (impl instanceof String ||
ClassUtils.isPrimitiveOrWrapper(impl.getClass())) {
+ props.setProperty(name, "" + impl);
+ } else {
+ builder.factory(type, name, new Factory() {
+ public Object create(Context context) throws Exception
{
+ return impl;
+ }
- @Override
- public Class type() {
- return impl.getClass();
- }
- }, Scope.SINGLETON);
+ @Override
+ public Class type() {
+ return impl.getClass();
+ }
+ }, Scope.SINGLETON);
+ }
}
});
}
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index f8669ba..9c5e59b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -19,19 +19,20 @@
package com.opensymphony.xwork2.ognl;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.XWorkException;
import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
import com.opensymphony.xwork2.interceptor.ChainingInterceptor;
+import com.opensymphony.xwork2.test.StubConfigurationProvider;
import com.opensymphony.xwork2.test.User;
import com.opensymphony.xwork2.util.*;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
import ognl.*;
+import org.apache.struts2.StrutsConstants;
import java.lang.reflect.Method;
import java.text.DateFormat;
@@ -1232,37 +1233,17 @@ public class OgnlUtilTest extends XWorkTestCase {
}
}
- private void reloadTestContainerConfiguration(boolean devMode, boolean
allowStatic) throws Exception {
- super.tearDown();
-
- ConfigurationProvider configurationProvider;
- if (devMode == true && allowStatic == true) {
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml",
true);
- }
- else if (devMode == true && allowStatic == false) {
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml",
true);
- }
- else if (devMode == false && allowStatic == true) {
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml",
true);
- }
- else { // devMode, allowStatic both false
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml",
true);
- }
-
- configurationManager = new
ConfigurationManager(Container.DEFAULT_NAME);
- configurationManager.addContainerProvider(configurationProvider);
- configuration = configurationManager.getConfiguration();
- container = configuration.getContainer();
- container.inject(configurationProvider);
- configurationProvider.init(configuration);
- actionProxyFactory = container.getInstance(ActionProxyFactory.class);
-
- // Reset the value stack
- ValueStack stack =
container.getInstance(ValueStackFactory.class).createValueStack();
- stack.getContext().put(ActionContext.CONTAINER, container);
- ActionContext.setContext(new ActionContext(stack.getContext()));
-
- ognlUtil = container.getInstance(OgnlUtil.class);
+ private void reloadTestContainerConfiguration(final boolean devMode, final
boolean allowStatic) throws Exception {
+ loadConfigurationProviders(new StubConfigurationProvider() {
+ @Override
+ public void register(ContainerBuilder builder,
+ LocatableProperties props) throws
ConfigurationException {
+ props.setProperty(StrutsConstants.STRUTS_DEVMODE, "" +
devMode);
+ props.setProperty(XWorkConstants.DEV_MODE, "" + devMode);
+
props.setProperty(StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS, "" +
allowStatic);
+ props.setProperty(XWorkConstants.ALLOW_STATIC_METHOD_ACCESS,
"" + allowStatic);
+ }
+ });
}
public static class Email {
diff --git
a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
index e66fc24..c4e31f6 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
@@ -972,39 +972,6 @@ public class OgnlValueStackTest extends XWorkTestCase {
assertEquals(null, stack.findValue("address.country.name",
String.class));
}
- private void reloadTestContainerConfiguration(boolean devMode, boolean
allowStatic) throws Exception {
- super.tearDown();
-
- ConfigurationProvider configurationProvider;
- if (devMode == true && allowStatic == true) {
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml",
true);
- }
- else if (devMode == true && allowStatic == false) {
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml",
true);
- }
- else if (devMode == false && allowStatic == true) {
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml",
true);
- }
- else { // devMode, allowStatic both false
- configurationProvider = new
XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml",
true);
- }
-
- configurationManager = new
ConfigurationManager(Container.DEFAULT_NAME);
- configurationManager.addContainerProvider(configurationProvider);
- configuration = configurationManager.getConfiguration();
- container = configuration.getContainer();
- container.inject(configurationProvider);
- configurationProvider.init(configuration);
- actionProxyFactory = container.getInstance(ActionProxyFactory.class);
-
- // Reset the value stack
- ValueStack stack =
container.getInstance(ValueStackFactory.class).createValueStack();
- stack.getContext().put(ActionContext.CONTAINER, container);
- ActionContext.setContext(new ActionContext(stack.getContext()));
-
- ognlUtil = container.getInstance(OgnlUtil.class);
- }
-
class BadJavaBean {
private int count;
private int count2;
diff --git
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml
deleted file mode 100644
index 1f0c0ee..0000000
---
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.5//EN"
- "http://struts.apache.org/dtds/xwork-2.5.dtd";
- >
-
-<xwork>
-
- <constant name="struts.devMode" value="false" />
- <constant name="devMode" value="false" />
- <constant name="struts.i18n.reload" value="false" />
- <constant name="logMissingProperties" value="false" />
- <constant name="enableOGNLExpressionCache" value="true" />
- <constant name="enableOGNLEvalExpression" value="false" />
- <constant name="reloadXmlConfiguration" value="false" />
- <constant name="allowStaticMethodAccess" value="false" />
- <constant name="struts.ognl.allowStaticMethodAccess" value="false" />
- <constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <constant name="struts.dispatcher.errorHandler" value="struts" />
-
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
- <bean
class="org.apache.struts2.views.freemarker.FreemarkerThemeTemplateLoader" />
- <bean class="org.apache.struts2.views.freemarker.FreemarkerManager"
name="default" />
- <bean class="org.apache.struts2.views.velocity.VelocityManager"
name="default" optional="true" />
- <bean class="org.apache.struts2.components.template.TemplateEngineManager"
/>
- <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter"
/>
- <bean class="com.opensymphony.xwork2.ognl.OgnlUtil" />
- <bean class="org.apache.struts2.views.jsp.ui.OgnlTool" />
-
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default"
class="org.apache.struts2.factory.StrutsActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.FileManager" name="system"
class="com.opensymphony.xwork2.util.fs.DefaultFileManager" scope="singleton"/>
- <bean type="com.opensymphony.xwork2.FileManagerFactory" name="default"
class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory"
scope="singleton"/>
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider"
name="global-only"
class="com.opensymphony.xwork2.util.GlobalLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="default"
class="com.opensymphony.xwork2.util.StrutsLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="system"
class="com.opensymphony.xwork2.DefaultTextProvider" scope="singleton" />
- <bean
type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterCreator"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterCreator" />
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder" />
- <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter"
name="default" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
-
- <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="default"
class="com.opensymphony.xwork2.factory.DefaultActionFactory" />
- <bean type="com.opensymphony.xwork2.factory.ConverterFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultConverterFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="default"
class="org.apache.struts2.factory.StrutsResultFactory" />
- <bean type="com.opensymphony.xwork2.factory.UnknownHandlerFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory" />
- <bean type="com.opensymphony.xwork2.factory.ValidatorFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultValidatorFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.InterceptorFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory" />
- <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="default"
class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
name="default" class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
-
- <bean type="ognl.MethodAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor" />
- <bean type="ognl.MethodAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.HttpParameters"
class="com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.ognl.ObjectProxy"
class="com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.Parameter"
class="com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.ArrayList"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Collection"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Enumeration"
class="com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashMap"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashSet"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Iterator"
class="com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.List"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Map"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.ObjectAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Set"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
-
-</xwork>
\ No newline at end of file
diff --git
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml
deleted file mode 100644
index 7551cb1..0000000
---
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.5//EN"
- "http://struts.apache.org/dtds/xwork-2.5.dtd";
- >
-
-<xwork>
-
- <constant name="struts.devMode" value="true" />
- <constant name="devMode" value="true" />
- <constant name="struts.i18n.reload" value="false" />
- <constant name="logMissingProperties" value="false" />
- <constant name="enableOGNLExpressionCache" value="true" />
- <constant name="enableOGNLEvalExpression" value="false" />
- <constant name="reloadXmlConfiguration" value="false" />
- <constant name="allowStaticMethodAccess" value="true" />
- <constant name="struts.ognl.allowStaticMethodAccess" value="true" />
- <constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <constant name="struts.dispatcher.errorHandler" value="struts" />
-
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
- <bean
class="org.apache.struts2.views.freemarker.FreemarkerThemeTemplateLoader" />
- <bean class="org.apache.struts2.views.freemarker.FreemarkerManager"
name="default" />
- <bean class="org.apache.struts2.views.velocity.VelocityManager"
name="default" optional="true" />
- <bean class="org.apache.struts2.components.template.TemplateEngineManager"
/>
- <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter"
/>
- <bean class="com.opensymphony.xwork2.ognl.OgnlUtil" />
- <bean class="org.apache.struts2.views.jsp.ui.OgnlTool" />
-
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default"
class="org.apache.struts2.factory.StrutsActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.FileManager" name="system"
class="com.opensymphony.xwork2.util.fs.DefaultFileManager" scope="singleton"/>
- <bean type="com.opensymphony.xwork2.FileManagerFactory" name="default"
class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory"
scope="singleton"/>
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider"
name="global-only"
class="com.opensymphony.xwork2.util.GlobalLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="default"
class="com.opensymphony.xwork2.util.StrutsLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="system"
class="com.opensymphony.xwork2.DefaultTextProvider" scope="singleton" />
- <bean
type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterCreator"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterCreator" />
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder" />
- <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter"
name="default" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
-
- <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="default"
class="com.opensymphony.xwork2.factory.DefaultActionFactory" />
- <bean type="com.opensymphony.xwork2.factory.ConverterFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultConverterFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="default"
class="org.apache.struts2.factory.StrutsResultFactory" />
- <bean type="com.opensymphony.xwork2.factory.UnknownHandlerFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory" />
- <bean type="com.opensymphony.xwork2.factory.ValidatorFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultValidatorFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.InterceptorFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory" />
- <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="default"
class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
name="default" class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
-
- <bean type="ognl.MethodAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor" />
- <bean type="ognl.MethodAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.HttpParameters"
class="com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.ognl.ObjectProxy"
class="com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.Parameter"
class="com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.ArrayList"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Collection"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Enumeration"
class="com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashMap"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashSet"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Iterator"
class="com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.List"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Map"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.ObjectAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Set"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
-
-</xwork>
\ No newline at end of file
diff --git
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml
deleted file mode 100644
index 220432c..0000000
---
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.5//EN"
- "http://struts.apache.org/dtds/xwork-2.5.dtd";
- >
-
-<xwork>
-
- <constant name="struts.devMode" value="false" />
- <constant name="devMode" value="false" />
- <constant name="struts.i18n.reload" value="false" />
- <constant name="logMissingProperties" value="false" />
- <constant name="enableOGNLExpressionCache" value="true" />
- <constant name="enableOGNLEvalExpression" value="false" />
- <constant name="reloadXmlConfiguration" value="false" />
- <constant name="allowStaticMethodAccess" value="true" />
- <constant name="struts.ognl.allowStaticMethodAccess" value="true" />
- <constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <constant name="struts.dispatcher.errorHandler" value="struts" />
-
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
- <bean
class="org.apache.struts2.views.freemarker.FreemarkerThemeTemplateLoader" />
- <bean class="org.apache.struts2.views.freemarker.FreemarkerManager"
name="default" />
- <bean class="org.apache.struts2.views.velocity.VelocityManager"
name="default" optional="true" />
- <bean class="org.apache.struts2.components.template.TemplateEngineManager"
/>
- <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter"
/>
- <bean class="com.opensymphony.xwork2.ognl.OgnlUtil" />
- <bean class="org.apache.struts2.views.jsp.ui.OgnlTool" />
-
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default"
class="org.apache.struts2.factory.StrutsActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.FileManager" name="system"
class="com.opensymphony.xwork2.util.fs.DefaultFileManager" scope="singleton"/>
- <bean type="com.opensymphony.xwork2.FileManagerFactory" name="default"
class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory"
scope="singleton"/>
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider"
name="global-only"
class="com.opensymphony.xwork2.util.GlobalLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="default"
class="com.opensymphony.xwork2.util.StrutsLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="system"
class="com.opensymphony.xwork2.DefaultTextProvider" scope="singleton" />
- <bean
type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterCreator"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterCreator" />
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder" />
- <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter"
name="default" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
-
- <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="default"
class="com.opensymphony.xwork2.factory.DefaultActionFactory" />
- <bean type="com.opensymphony.xwork2.factory.ConverterFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultConverterFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="default"
class="org.apache.struts2.factory.StrutsResultFactory" />
- <bean type="com.opensymphony.xwork2.factory.UnknownHandlerFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory" />
- <bean type="com.opensymphony.xwork2.factory.ValidatorFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultValidatorFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.InterceptorFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory" />
- <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="default"
class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
name="default" class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
-
- <bean type="ognl.MethodAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor" />
- <bean type="ognl.MethodAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.HttpParameters"
class="com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.ognl.ObjectProxy"
class="com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.Parameter"
class="com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.ArrayList"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Collection"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Enumeration"
class="com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashMap"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashSet"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Iterator"
class="com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.List"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Map"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.ObjectAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Set"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
-
-</xwork>
\ No newline at end of file
diff --git
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml
deleted file mode 100644
index 59914b6..0000000
---
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.5//EN"
- "http://struts.apache.org/dtds/xwork-2.5.dtd";
- >
-
-<xwork>
-
- <constant name="struts.devMode" value="true" />
- <constant name="devMode" value="true" />
- <constant name="struts.i18n.reload" value="false" />
- <constant name="logMissingProperties" value="false" />
- <constant name="enableOGNLExpressionCache" value="true" />
- <constant name="enableOGNLEvalExpression" value="false" />
- <constant name="reloadXmlConfiguration" value="false" />
- <constant name="allowStaticMethodAccess" value="false" />
- <constant name="struts.ognl.allowStaticMethodAccess" value="false" />
- <constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <constant name="struts.dispatcher.errorHandler" value="struts" />
-
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
- <bean
class="org.apache.struts2.views.freemarker.FreemarkerThemeTemplateLoader" />
- <bean class="org.apache.struts2.views.freemarker.FreemarkerManager"
name="default" />
- <bean class="org.apache.struts2.views.velocity.VelocityManager"
name="default" optional="true" />
- <bean class="org.apache.struts2.components.template.TemplateEngineManager"
/>
- <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter"
/>
- <bean class="com.opensymphony.xwork2.ognl.OgnlUtil" />
- <bean class="org.apache.struts2.views.jsp.ui.OgnlTool" />
-
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default"
class="org.apache.struts2.factory.StrutsActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.FileManager" name="system"
class="com.opensymphony.xwork2.util.fs.DefaultFileManager" scope="singleton"/>
- <bean type="com.opensymphony.xwork2.FileManagerFactory" name="default"
class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory"
scope="singleton"/>
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider"
name="global-only"
class="com.opensymphony.xwork2.util.GlobalLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="default"
class="com.opensymphony.xwork2.util.StrutsLocalizedTextProvider"
scope="singleton" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="system"
class="com.opensymphony.xwork2.DefaultTextProvider" scope="singleton" />
- <bean
type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor"
/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterCreator"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterCreator" />
- <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder"
name="default"
class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder" />
- <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter"
name="default" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
-
- <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="default"
class="com.opensymphony.xwork2.factory.DefaultActionFactory" />
- <bean type="com.opensymphony.xwork2.factory.ConverterFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultConverterFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="default"
class="org.apache.struts2.factory.StrutsResultFactory" />
- <bean type="com.opensymphony.xwork2.factory.UnknownHandlerFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory" />
- <bean type="com.opensymphony.xwork2.factory.ValidatorFactory"
name="default" class="com.opensymphony.xwork2.factory.DefaultValidatorFactory"
/>
- <bean type="com.opensymphony.xwork2.factory.InterceptorFactory"
name="default"
class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory" />
- <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="default"
class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
name="default" class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
-
- <bean type="ognl.MethodAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor" />
- <bean type="ognl.MethodAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.util.CompoundRoot"
class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.HttpParameters"
class="com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="com.opensymphony.xwork2.ognl.ObjectProxy"
class="com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor" />
- <bean type="ognl.PropertyAccessor"
name="org.apache.struts2.dispatcher.Parameter"
class="com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.ArrayList"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Collection"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Enumeration"
class="com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashMap"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashSet"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Iterator"
class="com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.List"
class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Map"
class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.lang.Object"
class="com.opensymphony.xwork2.ognl.accessor.ObjectAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Set"
class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
-
-</xwork>
\ No newline at end of file
