svn commit: r1433853 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
Author: lukaszlenart Date: Wed Jan 16 08:34:41 2013 New Revision: 1433853 URL: http://svn.apache.org/viewvc?rev=1433853&view=rev Log: Adds better logging message to indicate where is the problem, which result type is missing DEFAULT_PARAM field Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java?rev=1433853&r1=1433852&r2=1433853&view=diff == --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java Wed Jan 16 08:34:41 2013 @@ -570,7 +570,7 @@ public class XmlConfigurationProvider im } catch (Throwable t) { if (LOG.isDebugEnabled()) { -LOG.debug("The result type doesn't have a default param defined", t); +LOG.debug("The result type #0 doesn't have a default param [DEFAULT_PARAM] defined", t, className); } } ResultTypeConfig.Builder resultType = new ResultTypeConfig.Builder(name, className).defaultResultParam(paramName)
svn commit: r1433854 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Author: lukaszlenart Date: Wed Jan 16 08:36:59 2013 New Revision: 1433854 URL: http://svn.apache.org/viewvc?rev=1433854&view=rev Log: Solves problem with missing action name when mapping returned with empty action name Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=1433854&r1=1433853&r2=1433854&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java Wed Jan 16 08:36:59 2013 @@ -27,6 +27,7 @@ import com.opensymphony.xwork2.config.Co import com.opensymphony.xwork2.config.entities.PackageConfig; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; +import org.apache.commons.lang3.StringUtils; import org.apache.struts2.RequestUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; @@ -37,7 +38,6 @@ import javax.servlet.http.HttpServletReq import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -315,7 +315,8 @@ public class DefaultActionMapper impleme handleSpecialParameters(request, mapping); -if (mapping.getName() == null) { +// if Action name is empty it can be a request to static resource, return null to handle that case +if (StringUtils.isEmpty(mapping.getName())) { return null; } @@ -353,9 +354,8 @@ public class DefaultActionMapper impleme // handle special parameter prefixes. Set uniqueParameters = new HashSet(); Map parameterMap = request.getParameterMap(); -for (Iterator iterator = parameterMap.keySet().iterator(); iterator -.hasNext();) { -String key = (String) iterator.next(); +for (Object o : parameterMap.keySet()) { +String key = (String) o; // Strip off the image button location info, if found if (key.endsWith(".x") || key.endsWith(".y")) { @@ -364,8 +364,7 @@ public class DefaultActionMapper impleme // Ensure a parameter doesn't get processed twice if (!uniqueParameters.contains(key)) { -ParameterAction parameterAction = (ParameterAction) prefixTrie -.get(key); +ParameterAction parameterAction = (ParameterAction) prefixTrie.get(key); if (parameterAction != null) { parameterAction.execute(key, mapping); uniqueParameters.add(key); @@ -486,7 +485,7 @@ public class DefaultActionMapper impleme if (extensions == null) { return null; } else { -return (String) extensions.get(0); +return extensions.get(0); } }
svn commit: r1433889 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Author: lukaszlenart Date: Wed Jan 16 10:39:01 2013 New Revision: 1433889 URL: http://svn.apache.org/viewvc?rev=1433889&view=rev Log: Solves problem with missing action name when mapping returned with empty action name Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java?rev=1433889&r1=1433888&r2=1433889&view=diff == --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java Wed Jan 16 10:39:01 2013 @@ -40,6 +40,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Collections; import java.util.HashMap; /** @@ -92,8 +93,9 @@ public class FilterDispatcherTest extend return _dispatcher; } }; -filter.setActionMapper(new InnerActionMapper()); filter.init(filterConfig); +// set ActionMapper after init() as all dependencies will be injected in init() +filter.setActionMapper(new InnerActionMapper()); _dispatcher.setDefaultEncoding("UTF-16_DUMMY"); filter.doFilter(req, res, chain); @@ -157,7 +159,7 @@ public class FilterDispatcherTest extend public static class InnerActionMapper implements ActionMapper { public ActionMapping getMapping(HttpServletRequest request, ConfigurationManager config) { -return new ActionMapping(); +return new ActionMapping("action", "/", null, Collections.emptyMap()); } public ActionMapping getMappingFromActionName(String actionName) {
svn commit: r1434060 - /struts/site/trunk/pom.xml
Author: joes Date: Wed Jan 16 17:33:22 2013 New Revision: 1434060 URL: http://svn.apache.org/viewvc?rev=1434060&view=rev Log: whitespace to trigger site build Modified: struts/site/trunk/pom.xml Modified: struts/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/site/trunk/pom.xml?rev=1434060&r1=1434059&r2=1434060&view=diff == --- struts/site/trunk/pom.xml (original) +++ struts/site/trunk/pom.xml Wed Jan 16 17:33:22 2013 @@ -1,4 +1,5 @@ + + http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
svn commit: r846891 - in /websites/staging/struts/trunk/content: ./ css/ images/ images/logos/
Author: buildbot Date: Wed Jan 16 17:34:47 2013 New Revision: 846891 Log: Staging update by buildbot for struts Added: websites/staging/struts/trunk/content/ (with props) websites/staging/struts/trunk/content/css/ websites/staging/struts/trunk/content/css/maven-base.css websites/staging/struts/trunk/content/css/maven-theme.css websites/staging/struts/trunk/content/css/print.css websites/staging/struts/trunk/content/css/site.css websites/staging/struts/trunk/content/extpaths.txt websites/staging/struts/trunk/content/images/ websites/staging/struts/trunk/content/images/collapsed.gif (with props) websites/staging/struts/trunk/content/images/expanded.gif (with props) websites/staging/struts/trunk/content/images/external.png (with props) websites/staging/struts/trunk/content/images/icon_error_sml.gif (with props) websites/staging/struts/trunk/content/images/icon_info_sml.gif (with props) websites/staging/struts/trunk/content/images/icon_success_sml.gif (with props) websites/staging/struts/trunk/content/images/icon_warning_sml.gif (with props) websites/staging/struts/trunk/content/images/logos/ websites/staging/struts/trunk/content/images/logos/build-by-maven-black.png (with props) websites/staging/struts/trunk/content/images/logos/build-by-maven-white.png (with props) websites/staging/struts/trunk/content/images/logos/maven-feather.png (with props) websites/staging/struts/trunk/content/images/newwindow.png (with props) Propchange: websites/staging/struts/trunk/content/ -- cms:source-revision = 1434060 Added: websites/staging/struts/trunk/content/css/maven-base.css == --- websites/staging/struts/trunk/content/css/maven-base.css (added) +++ websites/staging/struts/trunk/content/css/maven-base.css Wed Jan 16 17:34:47 2013 @@ -0,0 +1,151 @@ +body { + margin: 0px; + padding: 0px; +} +img { + border:none; +} +table { + padding:0px; + width: 100%; + margin-left: -2px; + margin-right: -2px; +} +acronym { + cursor: help; + border-bottom: 1px dotted #feb; +} +table.bodyTable th, table.bodyTable td { + padding: 2px 4px 2px 4px; + vertical-align: top; +} +div.clear{ + clear:both; + visibility: hidden; +} +div.clear hr{ + display: none; +} +#bannerLeft, #bannerRight { + font-size: xx-large; + font-weight: bold; +} +#bannerLeft img, #bannerRight img { + margin: 0px; +} +.xleft, #bannerLeft img { + float:left; +} +.xright, #bannerRight { + float:right; +} +#banner { + padding: 0px; +} +#banner img { + border: none; +} +#breadcrumbs { + padding: 3px 10px 3px 10px; +} +#leftColumn { + width: 170px; + float:left; + overflow: auto; +} +#bodyColumn { + margin-right: 1.5em; + margin-left: 197px; +} +#legend { + padding: 8px 0 8px 0; +} +#navcolumn { + padding: 8px 4px 0 8px; +} +#navcolumn h5 { + margin: 0; + padding: 0; + font-size: small; +} +#navcolumn ul { + margin: 0; + padding: 0; + font-size: small; +} +#navcolumn li { + list-style-type: none; + background-image: none; + background-repeat: no-repeat; + background-position: 0 0.4em; + padding-left: 16px; + list-style-position: outside; + line-height: 1.2em; + font-size: smaller; +} +#navcolumn li.expanded { + background-image: url(../images/expanded.gif); +} +#navcolumn li.collapsed { + background-image: url(../images/collapsed.gif); +} +#poweredBy { + text-align: center; +} +#navcolumn img { + margin-top: 10px; + margin-bottom: 3px; +} +#poweredBy img { + display:block; + margin: 20px 0 20px 17px; +} +#search img { +margin: 0px; +display: block; +} +#search #q, #search #btnG { +border: 1px solid #999; +margin-bottom:10px; +} +#search form { +margin: 0px; +} +#lastPublished { + font-size: x-small; +} +.navSection { + margin-bottom: 2px; + padding: 8px; +} +.navSectionHead { + font-weight: bold; + font-size: x-small; +} +.section { + padding: 4px; +} +#footer { + padding: 3px 10px 3px 10px; + font-size: x-small; +} +#breadcrumbs { + font-size: x-small; + margin: 0pt; +} +.source { + padding: 12px; + margin: 1em 7px 1em 7px; +} +.source pre { + margin: 0px; + padding: 0px; +} +#navcolumn img.imageLink, .imageLink { + padding-left: 0px; + padding-bottom: 0px; + padding-top: 0px; + padding-right: 2px; + border: 0px; + margin: 0px; +} Added: websites/staging/struts/trunk/content/css/maven-theme.css == --- websites/staging/struts/trunk/content/css/maven-theme.css (added) +++ websites/staging/struts/trunk/content/css/maven-theme.css Wed Jan 16 17:34:47 2013 @@ -0,0 +1,141 @@ +body { + padding: 0px 0px 10px 0px; +} +body, td, select, input, li{ + font-family: Verdana, Helvetica, Arial, sans-serif; + font-size: 13px; +} +code{ + font-family: Courier, m
svn commit: r1434130 - /struts/site/trunk/content/site/xdoc/download.xml
Author: lukaszlenart Date: Wed Jan 16 19:42:56 2013 New Revision: 1434130 URL: http://svn.apache.org/viewvc?rev=1434130&view=rev Log: WW-3966 solves problem with unnecessary dots Modified: struts/site/trunk/content/site/xdoc/download.xml Modified: struts/site/trunk/content/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/struts/site/trunk/content/site/xdoc/download.xml?rev=1434130&r1=1434129&r2=1434130&view=diff == --- struts/site/trunk/content/site/xdoc/download.xml (original) +++ struts/site/trunk/content/site/xdoc/download.xml Wed Jan 16 19:42:56 2013 @@ -113,9 +113,9 @@ limitations under the License. Full Distribution: -struts-2.3.8.-all.zip (76mb) -[http://www.apache.org/dist/struts/binaries/struts-2.3.8.-all.zip.asc";>PGP] -[http://www.apache.org/dist/struts/binaries/struts-2.3.8.-all.zip.md5";>MD5] +struts-2.3.8-all.zip (76mb) +[http://www.apache.org/dist/struts/binaries/struts-2.3.8-all.zip.asc";>PGP] +[http://www.apache.org/dist/struts/binaries/struts-2.3.8-all.zip.md5";>MD5] @@ -123,18 +123,18 @@ limitations under the License. Example Applications: -struts-2.3.8.-apps.zip (29mb) -[http://www.apache.org/dist/struts/examples/struts-2.3.8.-apps.zip.asc";>PGP] -[http://www.apache.org/dist/struts/examples/struts-2.3.8.-apps.zip.md5";>MD5] +struts-2.3.8-apps.zip (29mb) +[http://www.apache.org/dist/struts/examples/struts-2.3.8-apps.zip.asc";>PGP] +[http://www.apache.org/dist/struts/examples/struts-2.3.8-apps.zip.md5";>MD5] Essential Dependencies Only: -struts-2.3.8.-lib.zip (15mb) -[http://www.apache.org/dist/struts/library/struts-2.3.8.-lib.zip.asc";>PGP] -[http://www.apache.org/dist/struts/library/struts-2.3.8.-lib.zip.md5";>MD5] +struts-2.3.8-lib.zip (15mb) +[http://www.apache.org/dist/struts/library/struts-2.3.8-lib.zip.asc";>PGP] +[http://www.apache.org/dist/struts/library/struts-2.3.8-lib.zip.md5";>MD5] @@ -142,18 +142,18 @@ limitations under the License. Documentation: -struts-2.3.8.-docs.zip (33mb) -[http://www.apache.org/dist/struts/documentation/struts-2.3.8.-docs.zip.asc";>PGP] -[http://www.apache.org/dist/struts/documentation/struts-2.3.8.-docs.zip.md5";>MD5] +struts-2.3.8-docs.zip (33mb) +[http://www.apache.org/dist/struts/documentation/struts-2.3.8-docs.zip.asc";>PGP] +[http://www.apache.org/dist/struts/documentation/struts-2.3.8-docs.zip.md5";>MD5] Source: -struts-2.3.8.-src.zip (6mb) -[http://www.apache.org/dist/struts/source/struts-2.3.8.-src.zip.asc";>PGP] -[http://www.apache.org/dist/struts/source/struts-2.3.8.-src.zip.md5";>MD5] +struts-2.3.8-src.zip (6mb) +[http://www.apache.org/dist/struts/source/struts-2.3.8-src.zip.asc";>PGP] +[http://www.apache.org/dist/struts/source/struts-2.3.8-src.zip.md5";>MD5]
buildbot failure in ASF Buildbot on struts-site-staging
The Buildbot has detected a new failure on builder struts-site-staging while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/struts-site-staging/builds/1 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: scheduler Build Source Stamp: [branch struts/site] 1434130 Blamelist: lukaszlenart BUILD FAILED: failed shell sincerely, -The Buildbot
svn commit: r1434351 - /struts/site/trunk/content/resources/extpaths.txt
Author: lukaszlenart Date: Wed Jan 16 19:48:12 2013 New Revision: 1434351 URL: http://svn.apache.org/viewvc?rev=1434351&view=rev Log: INFRA-5659 removes folder which are generated with Maven Modified: struts/site/trunk/content/resources/extpaths.txt Modified: struts/site/trunk/content/resources/extpaths.txt URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/extpaths.txt?rev=1434351&r1=1434350&r2=1434351&view=diff == --- struts/site/trunk/content/resources/extpaths.txt (original) +++ struts/site/trunk/content/resources/extpaths.txt Wed Jan 16 19:48:12 2013 @@ -39,10 +39,8 @@ 2.3.8 2.x api -css dev dtds -images img js legacy
svn commit: r846910 - in /websites/staging/struts/trunk/content: ./ extpaths.txt
Author: buildbot Date: Wed Jan 16 19:48:15 2013 New Revision: 846910 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) websites/staging/struts/trunk/content/extpaths.txt Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Jan 16 19:48:15 2013 @@ -1 +1 @@ -1434060 +1434351 Modified: websites/staging/struts/trunk/content/extpaths.txt == --- websites/staging/struts/trunk/content/extpaths.txt (original) +++ websites/staging/struts/trunk/content/extpaths.txt Wed Jan 16 19:48:15 2013 @@ -39,10 +39,8 @@ 2.3.8 2.x api -css dev dtds -images img js legacy
buildbot success in ASF Buildbot on struts-site-staging
The Buildbot has detected a restored build on builder struts-site-staging while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/struts-site-staging/builds/2 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: scheduler Build Source Stamp: [branch struts/site] 1434351 Blamelist: lukaszlenart Build succeeded! sincerely, -The Buildbot
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Ambari (Incubating) (https://cwiki.apache.org/confluence/display/AMBARI) Pages - Ambari Design created by yusaku (10:08 PM) https://cwiki.apache.org/confluence/display/AMBARI/Ambari+Design How to Commit created by mahadev (01:22 AM) https://cwiki.apache.org/confluence/display/AMBARI/How+to+Commit Ambari edited by mahadev (01:21 AM) https://cwiki.apache.org/confluence/display/AMBARI/Ambari How to Commit. created by mahadev (01:20 AM) https://cwiki.apache.org/confluence/display/AMBARI/How+to+Commit. Apache Bigtop (https://cwiki.apache.org/confluence/display/BIGTOP) Pages - How to install Hadoop distribution from Bigtop 0.5.0 edited by myers (09:37 PM) https://cwiki.apache.org/confluence/display/BIGTOP/How+to+install+Hadoop+distribution+from+Bigtop+0.5.0 Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Discussion Forums edited by bvahdat (02:24 PM) https://cwiki.apache.org/confluence/display/CAMEL/Discussion+Forums Camel 2.11.0 Release edited by davsclaus (05:56 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.11.0+Release SQL edited by davsclaus (04:21 AM) https://cwiki.apache.org/confluence/display/CAMEL/SQL JPA edited by davsclaus (02:05 AM) https://cwiki.apache.org/confluence/display/CAMEL/JPA Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - AWS Style Health Checks edited by rajesh.batt...@citrix.com (11:45 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/AWS+Style+Health+Checks IPv6 support created by yasker (10:03 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/IPv6+support Provide full clone support for guest VMs on VMWare deployments in Cloudstack created by vijayendra.bhamidip...@citrix.com (08:11 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Provide+full+clone+support+for+guest+VMs+on+VMWare+deployments+in+Cloudstack FS for 3 foreign language keyboard support edited by fangw (07:56 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+for+3+foreign+language+keyboard+support Zone-wide primary storage target edited by edison (06:24 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Zone-wide+primary+storage+target Storage subsystem 2.0 edited by edison (05:09 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Storage+subsystem+2.0 Community edited by jzb (04:32 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Community CloudStack Meeting 16 January 2013 Minutes created by jzb (04:19 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Meeting+16+January+2013+Minutes CloudStack Meeting 16 January 2013 Log created by jzb (04:04 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Meeting+16+January+2013+Log DevCloud edited by mlsorensen (03:19 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/DevCloud Collaborating on Github edited by chris.x.se...@sungard.com (02:53 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Collaborating+on+Github devcloud-kvm edited by mlsorensen (02:48 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/devcloud-kvm Apache CloudStack Weekly News - 21 January 2013 edited by sudhap (01:24 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+Weekly+News+-+21+January+2013 Devcloud Continuous Tests edited by tsp (09:45 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Devcloud+Continuous+Tests Multiple Ip ranges. created by bharat.kumar (05:30 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+Ip+ranges. FS - IP Range Reservation within a Network edited by saksham (06:59 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+IP+Range+Reservation+within+a+Network Non contiguous vlan ranges. created by bharat.kumar (04:47 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Non+contiguous+vlan+ranges. Non contiguous vlan range. created by bharat.kumar (04:45 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Non+contiguous+vlan+range. Draft - CloudStack Community Events Plan edited by sebgoa (04:03 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Draft+-+CloudStack+Community+Events+Plan FS - Persistent Networks edited by likitha.she...@citrix.com (01:35 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+Persistent+Networks Dedicated Resources - Private pod, cluster, host Functional Spec edited by deeptidohare (01:24 AM) http
svn commit: r1434580 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ site/resources/tags/ site/resources/tags/ajax/ test/java/o
Author: lukaszlenart Date: Thu Jan 17 07:41:45 2013 New Revision: 1434580 URL: http://svn.apache.org/viewvc?rev=1434580&view=rev Log: WW-3908 renames required attribute into requiredLabel to allow support of Html5 required attribute Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java struts/struts2/trunk/core/src/site/resources/tags/a.html struts/struts2/trunk/core/src/site/resources/tags/actionerror.html struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html struts/struts2/trunk/core/src/site/resources/tags/ajax/textarea.html struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html struts/struts2/trunk/core/src/site/resources/tags/ajax/treenode.html struts/struts2/trunk/core/src/site/resources/tags/checkbox.html struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html struts/struts2/trunk/core/src/site/resources/tags/combobox.html struts/struts2/trunk/core/src/site/resources/tags/component.html struts/struts2/trunk/core/src/site/resources/tags/debug.html struts/struts2/trunk/core/src/site/resources/tags/div.html struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html struts/struts2/trunk/core/src/site/resources/tags/fielderror.html struts/struts2/trunk/core/src/site/resources/tags/file.html struts/struts2/trunk/core/src/site/resources/tags/form.html struts/struts2/trunk/core/src/site/resources/tags/head.html struts/struts2/trunk/core/src/site/resources/tags/hidden.html struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html struts/struts2/trunk/core/src/site/resources/tags/label.html struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html struts/struts2/trunk/core/src/site/resources/tags/password.html struts/struts2/trunk/core/src/site/resources/tags/radio.html struts/struts2/trunk/core/src/site/resources/tags/reset.html struts/struts2/trunk/core/src/site/resources/tags/select.html struts/struts2/trunk/core/src/site/resources/tags/submit.html struts/struts2/trunk/core/src/site/resources/tags/textarea.html struts/struts2/trunk/core/src/site/resources/tags/textfield.html struts/struts2/trunk/core/src/site/resources/tags/token.html struts/struts2/trunk/core/src/site/resources/tags/updownselect.html struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/freemarker/dynaAttributes.ftl Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=1434580&r1=1434579&r2=1434580&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Thu Jan 17 07:41:45 2013 @@ -459,10 +459,10 @@ public abstract class UIBean extends Com protected String label; protected String labelPosition; protected String labelSeparator; -protected String requiredposition; +protected String requiredPosition; protected String errorPosition; protected String name; -protected String required; +protected String requiredLabel; protected String tabindex; protected String value; protected String title; @@ -669,16 +669,16 @@ public abstract class UIBean extends Com addParameter("labelposition", findString(labelPosition)); } -if (requiredposition != null) { -addParameter("requiredposition", findString(requiredposition)); +if (requiredPosition != null) { +addParameter("requiredposition", findString(requiredPosition)); } if (errorPosition != null) { addParameter("errorposition", findString(errorPosition)); } -if (required != null) { -addParameter("required", findValue(required, Boolean.class)); +if (requiredLabel != null) { +addParameter("required", findValue(requiredLabel, Boolean.class)); } if (disabled != null) { @@ -1077,8 +1077,8 @@ public abstract class UIBean e