svn commit: r1344620 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java
Author: lukaszlenart Date: Thu May 31 09:36:59 2012 New Revision: 1344620 URL: http://svn.apache.org/viewvc?rev=1344620&view=rev Log: WW-3173 adds missing closing tag Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java?rev=1344620&r1=1344619&r2=1344620&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java Thu May 31 09:36:59 2012 @@ -49,8 +49,7 @@ import javax.servlet.http.HttpServletRes * * * <@s.radio name="car" list={"ford": "Ford Motor Co", "toyota": "Toyota"} listKey="key" listValue="value" /> - * - * + * * */ @StrutsTag(name="radio", tldTagClass="org.apache.struts2.views.jsp.ui.RadioTag", description="Renders a radio button input field")
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache BookKeeper (https://cwiki.apache.org/confluence/display/BOOKKEEPER) Pages - Building documentation created by iv...@apache.org (06:05 AM) https://cwiki.apache.org/confluence/display/BOOKKEEPER/Building+documentation Apache CXF (https://cwiki.apache.org/confluence/display/CXF) Pages - DOSGi Presentations and Articles edited by sergey_beryozkin (10:16 AM) https://cwiki.apache.org/confluence/display/CXF/DOSGi+Presentations+and+Articles Apache Felix (https://cwiki.apache.org/confluence/display/FELIX) Pages - Apache Felix Application Demonstration edited by he...@ungoverned.org (02:33 PM) https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Application+Demonstration Apache Flume (https://cwiki.apache.org/confluence/display/FLUME) Pages - Getting Started edited by w...@cloudera.com (04:23 PM) https://cwiki.apache.org/confluence/display/FLUME/Getting+Started Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - PartitionedViews edited by cwsteinbach (10:32 PM) https://cwiki.apache.org/confluence/display/Hive/PartitionedViews DesignDocs edited by cwsteinbach (09:25 PM) https://cwiki.apache.org/confluence/display/Hive/DesignDocs HBaseIntegration edited by lars.francke (03:38 PM) https://cwiki.apache.org/confluence/display/Hive/HBaseIntegration LanguageManual UDF edited by lars.francke (03:06 PM) https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF AdminManual Configuration edited by lars.francke (02:46 PM) https://cwiki.apache.org/confluence/display/Hive/AdminManual+Configuration LanguageManual DML edited by lars.francke (01:58 PM) https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML LanguageManual DDL edited by lars.francke (01:14 PM) https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DDL Comments https://cwiki.apache.org/confluence/display/Hive/Links (5) https://cwiki.apache.org/confluence/display/Hive/Skewed+Join+Optimization (1) OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - Functional testing in the OFBiz - Implementation using pure Java WebDriver edited by luvinhthinh.m...@gmail.com (12:01 PM) https://cwiki.apache.org/confluence/display/OFBIZ/Functional+testing+in+the+OFBiz+-+Implementation+using+pure+Java+WebDriver Apache OFBiz User List edited by lvan...@hotmail.com (01:45 AM) https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List OFBiz Technical Documentation (https://cwiki.apache.org/confluence/display/OFBTECH) Pages - How to upgrade the embedded Tomcat edited by jacopoc (02:19 AM) https://cwiki.apache.org/confluence/display/OFBTECH/How+to+upgrade+the+embedded+Tomcat Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - AOO 3.4 Unofficial Developer Snapshots edited by oiseaumer (09:33 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4+Unofficial+Developer+Snapshots AOO 3.4.1 Feature Planning edited by jsc (12:06 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4.1+Feature+Planning Apache Sqoop (https://cwiki.apache.org/confluence/display/SQOOP) Pages - Meeting Minutes - May 30, 2012 created by k...@cloudera.com (06:29 PM) https://cwiki.apache.org/confluence/display/SQOOP/Meeting+Minutes+-+May+30%2C+2012 Apache VCL (https://cwiki.apache.org/confluence/display/VCL) Pages - VCL 2.3 edited by jfthomps (12:54 PM) https://cwiki.apache.org/confluence/display/VCL/VCL+2.3 2.3 VCL Release Procedures ToDo edited by jfthomps (12:07 PM) https://cwiki.apache.org/confluence/display/VCL/2.3+VCL+Release+Procedures+ToDo Graduation Board Resolution edited by arkurth (10:10 AM) https://cwiki.apache.org/confluence/display/VCL/Graduation+Board+Resolution Apache ZooKeeper (https://cwiki.apache.org/confluence/display/ZOOKEEPER) Pages - ZKClientBindings edited by a.zhurav...@gmail.com (05:34 PM) https://cwiki.apache.org/confluence/display/ZOOKEEPER/ZKClientBindings Change
svn commit: r1344990 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
Author: lukaszlenart Date: Fri Jun 1 05:42:55 2012 New Revision: 1344990 URL: http://svn.apache.org/viewvc?rev=1344990&view=rev Log: WW-3831 adds the same behaviour as in ServletUrlRenderer to render dynamic action in URL tag Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?rev=1344990&r1=1344989&r2=1344990&view=diff == --- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java (original) +++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Fri Jun 1 05:42:55 2012 @@ -94,17 +94,24 @@ public class PortletUrlRenderer implemen String namespace = urlComponent.determineNamespace(urlComponent.getNamespace(), urlComponent.getStack(), urlComponent.getHttpServletRequest()); urlComponent.setNamespace(namespace); if (onlyActionSpecified(urlComponent)) { - result = portletUrlHelper.buildUrl(urlComponent.getAction(), urlComponent.getNamespace(), urlComponent.getMethod(), - urlComponent.getParameters(), urlComponent.getPortletUrlType(), urlComponent.getPortletMode(), urlComponent.getWindowState()); + if (StringUtils.isNotEmpty(urlComponent.getAction())) { + String action = urlComponent.findString(urlComponent.getAction()); +result = portletUrlHelper.buildUrl(action, urlComponent.getNamespace(), urlComponent.getMethod(), +urlComponent.getParameters(), urlComponent.getPortletUrlType(), urlComponent.getPortletMode(), urlComponent.getWindowState()); + } + else { +result = portletUrlHelper.buildUrl(urlComponent.getAction(), urlComponent.getNamespace(), urlComponent.getMethod(), +urlComponent.getParameters(), urlComponent.getPortletUrlType(), urlComponent.getPortletMode(), urlComponent.getWindowState()); + } } else if (onlyValueSpecified(urlComponent)) { result = portletUrlHelper.buildResourceUrl(urlComponent.getValue(), urlComponent.getParameters()); } else { result = createDefaultUrl(urlComponent); } } -final String anchor = urlComponent.getAnchor(); -if (anchor != null && anchor.length() > 0) { -result += '#' + anchor; +String anchor = urlComponent.getAnchor(); +if (StringUtils.isNotEmpty(anchor)) { +result += '#' + urlComponent.findString(anchor); } String var = urlComponent.getVar();