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;
* Creates actions, results, and interceptors
*
*
- * com.opensymphony.xwork2.factory.ResultBuilder
- * struts.objectFactory.resultBuilder
+ * com.opensymphony.xwork2.factory.ResultFactory
+ * struts.objectFactory.resultFactory
* singleton
- * Dedicated builder to create Results, you can implement/extend
existing one instead of defining new ObjectFactory
+ * Dedicated factory used to create Results, you can implement/extend
existing one instead of defining new ObjectFactory
*
*
* com.opensymphony.xwork2.ActionProxyFactory
@@ -332,7 +332,7 @@ public class BeanSelectionProvider imple
public void register(ContainerBuilder builder, LocatableProperties prop
