Author: lukaszlenart
Date: Fri Jul 26 09:16:06 2013
New Revision: 1507232
URL: http://svn.apache.org/r1507232
Log:
WW-4144 Renames ResultBuilder to ResultFactory to keep convention
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
- copied, changed from r1506959,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultBuilder.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultFactory.java
- copied, changed from r1506959,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultBuilder.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java
- copied, changed from r1506959,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultBuilderTest.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java
- copied, changed from r1506959,
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultBuilder.java
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultBuilder.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultBuilder.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultBuilderTest.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultBuilder.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/core/src/test/resources/struts-object-factory-result-builder.xml
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=1507232&r1=1507231&r2=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
Fri Jul 26 09:16:06 2013
@@ -64,7 +64,7 @@ public final class StrutsConstants {
/** The com.opensymphony.xwork2.ObjectFactory implementation class */
public static final String STRUTS_OBJECTFACTORY = "struts.objectFactory";
- public static final String STRUTS_OBJECTFACTORY_RESULTBUILDER =
"struts.objectFactory.resultBuilder";
+ public static final String STRUTS_OBJECTFACTORY_RESULTFACTORY =
"struts.objectFactory.resultFactory";
/** The com.opensymphony.xwork2.util.FileManager implementation class */
public static final String STRUTS_FILE_MANAGER_FACTORY =
"struts.fileManagerFactory";
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=1507232&r1=1507231&r2=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Fri Jul 26 09:16:06 2013
@@ -61,7 +61,7 @@ import org.apache.struts2.components.Url
import org.apache.struts2.dispatcher.StaticContentLoader;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
-import com.opensymphony.xwork2.factory.ResultBuilder;
+import com.opensymphony.xwork2.factory.ResultFactory;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.util.UrlHelper;
import org.apache.struts2.views.velocity.VelocityManager;
@@ -93,10 +93,10 @@ import java.util.StringTokenizer;
* <td>Creates actions, results, and interceptors</td>
* </tr>
* <tr>
- * <td>com.opensymphony.xwork2.factory.ResultBuilder</td>
- * <td>struts.objectFactory.resultBuilder</td>
+ * <td>com.opensymphony.xwork2.factory.ResultFactory</td>
+ * <td>struts.objectFactory.resultFactory</td>
* <td>singleton</td>
- * <td>Dedicated builder to create Results, you can implement/extend
existing one instead of defining new ObjectFactory</td>
+ * <td>Dedicated factory used to create Results, you can implement/extend
existing one instead of defining new ObjectFactory</td>
* </tr>
* <tr>
* <td>com.opensymphony.xwork2.ActionProxyFactory</td>
@@ -332,7 +332,7 @@ public class BeanSelectionProvider imple
public void register(ContainerBuilder builder, LocatableProperties props) {
alias(ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY,
builder, props);
- alias(ResultBuilder.class,
StrutsConstants.STRUTS_OBJECTFACTORY_RESULTBUILDER, builder, props);
+ alias(ResultFactory.class,
StrutsConstants.STRUTS_OBJECTFACTORY_RESULTFACTORY, builder, props);
alias(FileManagerFactory.class,
StrutsConstants.STRUTS_FILE_MANAGER_FACTORY, builder, props, Scope.SINGLETON);
Copied:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
(from r1506959,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultBuilder.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java?p2=struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultBuilder.java&r1=1506959&r2=1507232&rev=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultBuilder.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
Fri Jul 26 09:16:06 2013
@@ -3,7 +3,7 @@ package org.apache.struts2.factory;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.factory.ResultBuilder;
+import com.opensymphony.xwork2.factory.ResultFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.reflection.ReflectionException;
import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler;
@@ -15,7 +15,7 @@ import java.util.Map;
/**
* Default implementation which uses {@link
com.opensymphony.xwork2.result.ParamNameAwareResult} to accept or throwaway
parameters
*/
-public class StrutsResultBuilder implements ResultBuilder {
+public class StrutsResultFactory implements ResultFactory {
protected ObjectFactory objectFactory;
protected ReflectionProvider reflectionProvider;
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=1507232&r1=1507231&r2=1507232&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Fri Jul 26
09:16:06 2013
@@ -28,8 +28,8 @@
<struts>
<bean class="com.opensymphony.xwork2.ObjectFactory" name="xwork" />
<bean type="com.opensymphony.xwork2.ObjectFactory" name="struts"
class="org.apache.struts2.impl.StrutsObjectFactory" />
- <bean type="com.opensymphony.xwork2.factory.ResultBuilder" name="xwork"
class="org.apache.struts2.factory.StrutsResultBuilder" />
- <bean type="com.opensymphony.xwork2.factory.ResultBuilder" name="struts"
class="org.apache.struts2.factory.StrutsResultBuilder" />
+ <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="xwork"
class="org.apache.struts2.factory.StrutsResultFactory" />
+ <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts"
class="org.apache.struts2.factory.StrutsResultFactory" />
<bean type="com.opensymphony.xwork2.FileManager"
class="com.opensymphony.xwork2.util.fs.DefaultFileManager" name="system"
scope="singleton"/>
Copied:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultFactory.java
(from r1506959,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultBuilder.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultFactory.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultFactory.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultBuilder.java&r1=1506959&r2=1507232&rev=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultBuilder.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/MyResultFactory.java
Fri Jul 26 09:16:06 2013
@@ -1,4 +1,4 @@
package org.apache.struts2.factory;
-public class MyResultBuilder extends StrutsResultBuilder {
+public class MyResultFactory extends StrutsResultFactory {
}
Copied:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java
(from r1506959,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultBuilderTest.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultBuilderTest.java&r1=1506959&r2=1507232&rev=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultBuilderTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java
Fri Jul 26 09:16:06 2013
@@ -3,19 +3,19 @@ package org.apache.struts2.factory;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.factory.ResultBuilder;
+import com.opensymphony.xwork2.factory.ResultFactory;
import org.apache.struts2.StrutsTestCase;
import com.opensymphony.xwork2.result.ParamNameAwareResult;
import java.util.HashMap;
import java.util.Map;
-public class StrutsResultBuilderTest extends StrutsTestCase {
+public class StrutsResultFactoryTest extends StrutsTestCase {
public void testAcceptParams() throws Exception {
// given
initDispatcherWithConfigs("struts-default.xml");
- StrutsResultBuilder builder = (StrutsResultBuilder)
container.getInstance(ResultBuilder.class);
+ StrutsResultFactory builder = (StrutsResultFactory)
container.getInstance(ResultFactory.class);
Map<String, String> params = new HashMap<String, String>();
params.put("accept", "ok");
@@ -36,10 +36,10 @@ public class StrutsResultBuilderTest ext
initDispatcherWithConfigs("struts-default.xml,struts-object-factory-result-builder.xml");
// when
- ResultBuilder actual = container.getInstance(ResultBuilder.class);
+ ResultFactory actual = container.getInstance(ResultFactory.class);
// then
- assertTrue(actual instanceof MyResultBuilder);
+ assertTrue(actual instanceof MyResultFactory);
}
public static class MyResult implements Result, ParamNameAwareResult {
Modified:
struts/struts2/trunk/core/src/test/resources/struts-object-factory-result-builder.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/struts-object-factory-result-builder.xml?rev=1507232&r1=1507231&r2=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/struts-object-factory-result-builder.xml
(original)
+++
struts/struts2/trunk/core/src/test/resources/struts-object-factory-result-builder.xml
Fri Jul 26 09:16:06 2013
@@ -26,9 +26,9 @@
<struts>
- <bean type="com.opensymphony.xwork2.factory.ResultBuilder"
- name="myResultBuilder"
class="org.apache.struts2.factory.MyResultBuilder" />
+ <bean type="com.opensymphony.xwork2.factory.ResultFactory"
+ name="myResultFactory"
class="org.apache.struts2.factory.MyResultFactory" />
- <constant name="struts.objectFactory.resultBuilder"
value="myResultBuilder" />
+ <constant name="struts.objectFactory.resultFactory"
value="myResultFactory" />
</struts>
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java?rev=1507232&r1=1507231&r2=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
Fri Jul 26 09:16:06 2013
@@ -20,7 +20,7 @@ import com.opensymphony.xwork2.config.en
import com.opensymphony.xwork2.config.entities.InterceptorConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.conversion.TypeConverter;
-import com.opensymphony.xwork2.factory.ResultBuilder;
+import com.opensymphony.xwork2.factory.ResultFactory;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.Interceptor;
@@ -54,7 +54,7 @@ public class ObjectFactory implements Se
private Container container;
protected ReflectionProvider reflectionProvider;
- private ResultBuilder resultBuilder;
+ private ResultFactory resultFactory;
@Inject(value="objectFactory.classloader", required=false)
public void setClassLoader(ClassLoader cl) {
@@ -79,8 +79,8 @@ public class ObjectFactory implements Se
}
@Inject(required = false)
- public void setResultBuilder(ResultBuilder resultBuilder) {
- this.resultBuilder = resultBuilder;
+ public void setResultFactory(ResultFactory resultFactory) {
+ this.resultFactory = resultFactory;
}
/**
@@ -229,8 +229,8 @@ public class ObjectFactory implements Se
* @param extraContext a Map of extra context which uses the same keys as
the {@link com.opensymphony.xwork2.ActionContext}
*/
public Result buildResult(ResultConfig resultConfig, Map<String, Object>
extraContext) throws Exception {
- if (resultBuilder != null) {
- return resultBuilder.buildResult(resultConfig, extraContext);
+ if (resultFactory != null) {
+ return resultFactory.buildResult(resultConfig, extraContext);
}
String resultClassName = resultConfig.getClassName();
Result result = null;
Copied:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java
(from r1506959,
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultBuilder.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java?p2=struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java&p1=struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultBuilder.java&r1=1506959&r2=1507232&rev=1507232&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultBuilder.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java
Fri Jul 26 09:16:06 2013
@@ -8,7 +8,7 @@ import java.util.Map;
/**
* Used by {@link com.opensymphony.xwork2.ObjectFactory} to build {@link
com.opensymphony.xwork2.Result}
*/
-public interface ResultBuilder {
+public interface ResultFactory {
Result buildResult(ResultConfig resultConfig, Map<String, Object>
extraContext) throws Exception;
