svn commit: r442946 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/components/ main/resources/org/apache/struts2/ test/java/org/apache/struts2/config/

[hermanns]

Author: hermanns
Date: Wed Sep 13 04:35:29 2006
New Revision: 442946

URL: http://svn.apache.org/viewvc?view=rev&rev=442946
Log:
URL Tag includeParams default attribute value should be configurable
o backport from WW 2.2.4

Issue Number: WW-1442

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
    
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.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?view=diff&rev=442946&r1=442945&r2=442946
==============================================================================
--- 
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 
Wed Sep 13 04:35:29 2006
@@ -47,7 +47,10 @@
     /** The HTTPS port used by Struts URLs */
     public static final String STRUTS_URL_HTTPS_PORT = "struts.url.https.port";
 
-    /** The com.opensymphony.xwork.ObjectFactory implementation class */ 
+    /** The default includeParams method to generate Struts URLs */
+    public static final String STRUTS_URL_INCLUDEPARAMS = 
"struts.url.includeParams";
+
+    /** The com.opensymphony.xwork.ObjectFactory implementation class */
     public static final String STRUTS_OBJECTFACTORY = "struts.objectFactory";
     
     /** The com.opensymphony.xwork.util.ObjectTypeDeterminer implementation 
class */

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=442946&r1=442945&r2=442946
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java 
Wed Sep 13 04:35:29 2006
@@ -30,6 +30,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.StrutsException;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Settings;
 import org.apache.struts2.dispatcher.Dispatcher;
 import org.apache.struts2.portlet.context.PortletActionContext;
 import org.apache.struts2.portlet.util.PortletUrlHelper;
@@ -153,7 +155,10 @@
         // this at start so body params can override any of these they wish.
         try {
                // ww-1266
-            String includeParams = GET;
+            String includeParams =
+                    Settings.isSet(StrutsConstants.STRUTS_URL_INCLUDEPARAMS) ?
+                    
Settings.get(StrutsConstants.STRUTS_URL_INCLUDEPARAMS).toLowerCase() : GET;
+
 
             if (this.includeParams != null) {
                 includeParams = findString(this.includeParams);

Modified: 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?view=diff&rev=442946&r1=442945&r2=442946
==============================================================================
--- 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
 (original)
+++ 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
 Wed Sep 13 04:35:29 2006
@@ -122,6 +122,8 @@
 ### used to build URLs, such as the UrlTag
 struts.url.http.port = 80
 struts.url.https.port = 443
+### possible values are: none, get or all
+struts.url.includeParams = get
 
 ### Load custom default resource bundles
 # struts.custom.i18n.resources=testmessages,testmessages2

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java?view=diff&rev=442946&r1=442945&r2=442946
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
 Wed Sep 13 04:35:29 2006
@@ -33,6 +33,7 @@
 public class SettingsTest extends StrutsTestCase {
 
     public void testSettings() {
+        assertEquals("get", 
Settings.get(StrutsConstants.STRUTS_URL_INCLUDEPARAMS));
         assertEquals("12345", 
Settings.get(StrutsConstants.STRUTS_MULTIPART_MAXSIZE));
         assertEquals("\temp", 
Settings.get(StrutsConstants.STRUTS_MULTIPART_SAVEDIR));
 
@@ -44,7 +45,7 @@
         assertEquals("de", locale.getLanguage());
 
         int count = getKeyCount();
-        assertEquals(30, count);
+        assertEquals(31, count);
     }
 
     public void testDefaultResourceBundlesLoaded() {