WW-2524: Tag r632761 as Struts 2.0.11.1

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

apps/blank/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>

apps/mailreader/pom.xml

@@ -4,7 +4,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.0.11.2</version>
+      <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>

apps/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -109,7 +109,6 @@
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
-                <version>0.3.1</version>
                 <configuration>
                     <container>
                         <containerId>tomcat5x</containerId>
@@ -167,4 +166,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

apps/portlet/pom.xml

@@ -4,7 +4,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.0.11.2</version>
+      <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>

apps/showcase/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>

assembly/pom.xml

@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
 
     <scm>
@@ -103,7 +103,7 @@
                                     <groupId>com.opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
                                     <classifier>javadoc</classifier>
-                                    <version>2.0.5</version>
+                                    <version>2.0.4</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>

backport/translate.bat

@@ -1,2 +1,2 @@
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/struts2-core-2.0.11.2.jar -destjar struts2-core-j4-2.0.11.2.jar
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/xwork-2.0.5.jar -destjar xwork-j4-2.0.5.jar 
+java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/struts2-core-2.0.11.1.jar -destjar struts2-core-j4-2.0.11.1.jar
+java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/xwork-2.0.4.jar -destjar xwork-j4-2.0.4.jar 

backport/translate.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/struts2-core-2.0.11.2.jar -destjar struts2-core-j4-2.0.11.2.jar
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/xwork-2.0.5.jar -destjar xwork-j4-2.0.5.jar 
+java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/struts2-core-2.0.11.1.jar -destjar struts2-core-j4-2.0.11.1.jar
+java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/xwork-2.0.4.jar -destjar xwork-j4-2.0.4.jar 

core/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
@@ -56,7 +56,7 @@
                                 <artifactItem>
                                     <groupId>com.opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
-                                    <version>2.0.5</version>
+                                    <version>2.0.4</version>
                                     <classifier>sources</classifier>
                                 </artifactItem>
                             </artifactItems>
@@ -294,7 +294,7 @@
         <dependency>
             <groupId>com.opensymphony</groupId>
             <artifactId>xwork</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.4</version>
         </dependency>
 
         <dependency>

core/src/main/java/org/apache/struts2/components/DateTimePicker.java

@@ -21,9 +21,7 @@
 package org.apache.struts2.components;
 
 import java.text.ParseException;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
@@ -131,10 +129,8 @@ import com.opensymphony.xwork2.util.ValueStack;
 public class DateTimePicker extends UIBean {
 
     final public static String TEMPLATE = "datetimepicker";
-//  Backported changes from s2 trunk (r657936)
-//    final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-	final private static String RFC3339_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
-    final private static String RFC3339_PATTERN = "{0,date," + RFC3339_FORMAT + "}";
+    final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat(
+    "yyyy-MM-dd'T'HH:mm:ss");
     final protected static Log LOG = LogFactory.getLog(DateTimePicker.class);
     
     protected String iconPath;
@@ -298,14 +294,12 @@ public class DateTimePicker extends UIBean {
             return null;
 
         if(obj instanceof Date) {
-            return MessageFormat.format(RFC3339_PATTERN, (Date) obj);
-        } else if(obj instanceof Calendar) {
-            return MessageFormat.format(RFC3339_PATTERN, ((Calendar) obj).getTime());
+            return RFC3339_FORMAT.format((Date) obj);
         } else {
             // try to parse a date
             String dateStr = obj.toString();
             if(dateStr.equalsIgnoreCase("today"))
-                return MessageFormat.format(RFC3339_PATTERN, new Date());
+                return RFC3339_FORMAT.format(new Date());
 
             try {
                 Date date = null;
@@ -313,7 +307,7 @@ public class DateTimePicker extends UIBean {
                     SimpleDateFormat format = new SimpleDateFormat(
                             (String) getParameters().get("displayFormat"));
                     date = format.parse(dateStr);
-                    return MessageFormat.format(RFC3339_PATTERN, date);
+                    return RFC3339_FORMAT.format(date);
                 } else {
                     // last resource to assume already in correct/default format
                     return dateStr;

core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java

@@ -22,6 +22,7 @@ package org.apache.struts2.views.xslt;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Writer;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -314,6 +315,8 @@ public class XSLTResult implements Result {
         try {
             HttpServletResponse response = ServletActionContext.getResponse();
 
+            Writer writer = response.getWriter();
+
             // Create a transformer for the stylesheet.
             Templates templates = null;
             Transformer transformer;
@@ -351,11 +354,13 @@ public class XSLTResult implements Result {
             LOG.debug("xmlSource = " + xmlSource);
             transformer.transform(xmlSource, new StreamResult(out));
 
-            out.flush(); // ...and flush...
+            out.close(); // ...and flush...
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Time:" + (System.currentTimeMillis() - startTime) + "ms");
             }
+
+            writer.flush();
         } catch (Exception e) {
             LOG.error("Unable to render XSLT Template, '" + location + "'", e);
             throw e;

core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js

@@ -140,8 +140,6 @@ dojo.widget.defineWidget(
        if(this.executeScripts) {
          //update targets content
          var parsed = this.parse(data);
-         this.setContent(parsed.text);
-           
          //eval scripts
          if(parsed.scripts && parsed.scripts.length > 0) {
            var scripts = "";
@@ -150,6 +148,7 @@ dojo.widget.defineWidget(
            }
            (new Function('_container_', scripts+'; return this;'))(this);
          }
+         this.setContent(parsed.text);
        }
        else {
          this.setContent(data);

core/src/main/resources/template/simple/checkboxlist.ftl

@@ -30,7 +30,7 @@
             <#assign itemKey = stack.findValue('top')/>
         </#if>
         <#if parameters.listValue?exists>
-            <#assign itemValue = stack.findString(parameters.listValue)?default("")/>
+            <#assign itemValue = stack.findString(parameters.listValue)/>
         <#else>
             <#assign itemValue = stack.findString('top')/>
         </#if>

core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java

@@ -140,8 +140,7 @@ public class CheckboxListTest extends AbstractUITagTest {
         testAction.setFoo("hello");
         testAction.setList(new String[][]{
                 {"hello", "world"},
-                {"foo", "bar"},
-                {"baz", null}
+                {"foo", "bar"}
         });
 
         CheckboxListTag tag = new CheckboxListTag();

core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt

@@ -5,7 +5,5 @@
 <label for="foo-1" class="checkboxLabel">world</label>
 <input type="checkbox" name="foo" value="foo" id="foo-2" title="mytitle" onchange="alert('foo');"/>
 <label for="foo-2" class="checkboxLabel">bar</label>
-<input type="checkbox" name="foo" value="baz" id="foo-3" title="mytitle" onchange="alert('foo');"/>
-<label for="foo-3" class="checkboxLabel"></label>
     </td>
 </tr>

plugins/codebehind/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-codebehind-plugin</artifactId>

plugins/config-browser/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-config-browser-plugin</artifactId>

plugins/jasperreports/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jasperreports-plugin</artifactId>

plugins/jfreechart/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
    </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jfreechart-plugin</artifactId>

plugins/jsf/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jsf-plugin</artifactId>

plugins/pell-multipart/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-pell-multipart-plugin</artifactId>

plugins/plexus/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-plexus-plugin</artifactId>

plugins/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-plugins</artifactId>

plugins/sitegraph/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-sitegraph-plugin</artifactId>

plugins/sitemesh/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-sitemesh-plugin</artifactId>

plugins/spring/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-spring-plugin</artifactId>

plugins/struts1/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-struts1-plugin</artifactId>

plugins/tiles/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.11.2</version>
+        <version>2.0.11.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-tiles-plugin</artifactId>

pom.xml

@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-parent</artifactId>
-    <version>2.0.11.2</version>
+    <version>2.0.11.1</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/struts2</url>

src/site/xdoc/index.xml

@@ -32,17 +32,17 @@
         </div>
         <div>
         <table><tr><td>
-        <a href="http://struts.apache.org/download.cgi#struts20112">
+        <a href="http://struts.apache.org/download.cgi#struts20111">
           <div style="background:url(images/download.gif) no-repeat scroll 0%; width:200px; min-height:80px; float:left;position:relative;margin:5px">
             <span style="top:15px;position:absolute;color:white;padding-left:10px">
-              <small>version 2.0.11.2</small>
+              <small>version 2.0.11.1</small>
               <br />
               <span style="font-weight: bold; font-size:140%">Download Now</span>
             </span>
           </div>
         </a>
         </td><td>
-        <a href="http://struts.apache.org/2.0.11.2/docs/home.html" style="margin:10px">
+        <a href="http://struts.apache.org/2.x/docs/home.html" style="margin:10px">
           <div style="background:url(images/help.gif) no-repeat scroll 0%; width:200px; min-height:80px; float:left;position:relative;margin:5px">
             <span style="top:15px;position:absolute;color:white;padding-left:10px">
               <span style="font-weight: bold; font-size:140%">Get Started</span>