Includes test update; changing struts.properties requires non-intuitive test change :/

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@722328 13f79535-47bb-0310-9956-ffa450edef68

core/src/main/resources/org/apache/struts2/default.properties

@@ -24,7 +24,7 @@
 ###(can be overridden by a struts.properties file in the root of the classpath)
 ###
 
-### Specifies the Configuration used to configure Struts 
+### Specifies the Configuration used to configure Struts
 ### one could extend org.apache.struts2.config.Configuration
 ### to build one's customize way of getting the configurations parameters into Struts
 # struts.configuration=org.apache.struts2.config.DefaultConfiguration
@@ -35,7 +35,7 @@ struts.i18n.encoding=UTF-8
 
 ### if specified, the default object factory can be overridden here
 ### Note: short-hand notation is supported in some cases, such as "spring"
-###       Alternatively, you can provide a com.opensymphony.xwork2.ObjectFactory subclass name here  
+###       Alternatively, you can provide a com.opensymphony.xwork2.ObjectFactory subclass name here
 # struts.objectFactory = spring
 
 ### specifies the autoWiring logic when using the SpringObjectFactory.
@@ -83,13 +83,13 @@ struts.multipart.maxSize=2097152
 struts.action.extension=action,,
 
 ### Used by FilterDispatcher
-### If true then Struts serves static content from inside its jar. 
+### If true then Struts serves static content from inside its jar.
 ### If false then the static content must be available at <context_path>/struts
 struts.serve.static=true
 
 ### Used by FilterDispatcher
 ### This is good for development where one wants changes to the static content be
-### fetch on each request. 
+### fetch on each request.
 ### NOTE: This will only have effect if struts.serve.static=true
 ### If true -> Struts will write out header for static contents such that they will
 ###             be cached by web browsers (using Date, Cache-Content, Pragma, Expires)
@@ -101,8 +101,8 @@ struts.serve.static.browserCache=true
 
 ### Set this to false if you wish to disable implicit dynamic method invocation
 ### via the URL request. This includes URLs like foo!bar.action, as well as params
-### like method:bar (but not action:foo). 
-### An alternative to implicit dynamic method invocation is to use wildcard 
+### like method:bar (but not action:foo).
+### An alternative to implicit dynamic method invocation is to use wildcard
 ### mappings, such as <action name="*/*" method="{2}" class="actions.{1}">
 struts.enable.DynamicMethodInvocation = true
 
@@ -110,8 +110,8 @@ struts.enable.DynamicMethodInvocation = true
 ### Actions names cannot have slashes, and will be accessible via any directory
 ### prefix.  This is the traditional behavior expected of WebWork applications.
 ### Setting to true is useful when you want to use wildcards and store values
-### in the URL, to be extracted by wildcard patterns, such as 
-### <action name="*/*" method="{2}" class="actions.{1}"> to match "/foo/edit" or 
+### in the URL, to be extracted by wildcard patterns, such as
+### <action name="*/*" method="{2}" class="actions.{1}"> to match "/foo/edit" or
 ### "/foo/save".
 struts.enable.SlashesInActionNames = false
 
@@ -159,7 +159,7 @@ struts.velocity.toolboxlocation=
 struts.url.http.port = 80
 struts.url.https.port = 443
 ### possible values are: none, get or all
-struts.url.includeParams = get
+struts.url.includeParams = none
 
 ### Load custom default resource bundles
 # struts.custom.i18n.resources=testmessages,testmessages2

core/src/test/java/org/apache/struts2/config/SettingsTest.java

@@ -45,7 +45,7 @@ public class SettingsTest extends StrutsTestCase {
         assertEquals("othertestvalue", Settings.get("othertestkey"));
 
         int count = getKeyCount();
-        assertEquals(11, count);
+        assertEquals(12, count);
     }
 
     public void testDefaultResourceBundlesLoaded() {

core/src/test/resources/struts.properties

@@ -18,6 +18,12 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+
+# NOTE: Changing the number of properties in this file requires
+# a modification to /org/apache/struts2/config/SettingsTest to
+# update the number of expected properties... which is different
+# than the number of properties in this file.
+
 struts.i18n.encoding=ISO-8859-1
 struts.locale=de_DE
 struts.multipart.saveDir=\temp
@@ -36,3 +42,6 @@ struts.custom.i18n.resources=testmessages,testmessages2
 
 ### XSLT Cache
 struts.xslt.nocache = true
+
+### URL tag includeParams default
+struts.url.includeParams=get