svn commit: r1180998 - /struts/struts2/trunk/pom.xml
Author: lukaszlenart
Date: Mon Oct 10 14:37:28 2011
New Revision: 1180998
URL: http://svn.apache.org/viewvc?rev=1180998&view=rev
Log:
WW-3580 - upgrades OGNL to version 3.0.3 to improve performance
Modified:
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1180998&r1=1180997&r2=1180998&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Mon Oct 10 14:37:28 2011
@@ -86,7 +86,7 @@
${project.version}
3.0.5.RELEASE
-3.0.2
+3.0.3
3.3
2.0.6
svn commit: r1181085 - /struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Author: lukaszlenart
Date: Mon Oct 10 17:31:07 2011
New Revision: 1181085
URL: http://svn.apache.org/viewvc?rev=1181085&view=rev
Log:
WW-3047 - adds js_script to escape the option label and value
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl?rev=1181085&r1=1181084&r2=1181085&view=diff
==
---
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Mon Oct 10 17:31:07 2011
@@ -101,7 +101,7 @@
<#else>
<#assign doubleItemValue = stack.findString('top')/>
-${parameters.id}Group[${itemCount}][${doubleItemCount}] = new
Option("${doubleItemValue}", "${doubleItemKeyStr}");
+${parameters.id}Group[${itemCount}][${doubleItemCount}] = new
Option("${doubleItemValue?js_string}", "${doubleItemKeyStr?js_string}");
<#assign doubleItemCount = doubleItemCount + 1/>
@@ -134,13 +134,13 @@
<#if parameters.doubleNameValue?exists>
<#if parameters.doubleMultiple?exists>
for (j = 0; j < ${parameters.doubleNameValue}.length;
j++) {
- if (${parameters.id}Temp.options[i].value ==
${parameters.doubleNameValue}[j]) {
+ if (${parameters.id}Temp.options[i].value ==
${parameters.doubleNameValue?js_string}[j]) {
${parameters.id}Temp.options[i].selected = true;
selected = true;
}
}
<#else>
-if (${parameters.id}Temp.options[i].value ==
'${parameters.doubleNameValue}') {
+if (${parameters.id}Temp.options[i].value ==
'${parameters.doubleNameValue?js_string}') {
${parameters.id}Temp.options[i].selected = true;
selected = true;
}
@@ -152,4 +152,4 @@
${parameters.id}Temp.options[0].selected = true;
}
}
-
\ No newline at end of file
+
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ACE (https://cwiki.apache.org/confluence/display/ACE) Pages - Board Report (2011-10) created by marrs (02:15 PM) https://cwiki.apache.org/confluence/display/ACE/Board+Report+%282011-10%29 Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Networks of Brokers edited by gtully (03:20 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Networks+of+Brokers TCP Transport Reference edited by tabish121 (01:43 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/TCP+Transport+Reference Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Camel 2.9.0 Release edited by muellerc (05:46 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.9.0+Release Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - PluginDeveloperKit edited by jvs (09:08 PM) https://cwiki.apache.org/confluence/display/Hive/PluginDeveloperKit Apache MyFaces (https://cwiki.apache.org/confluence/display/MYFACES) Pages - MyFaces Commons Components created by lu4242 (07:14 PM) https://cwiki.apache.org/confluence/display/MYFACES/MyFaces+Commons+Components MyFaces Commons Converters created by lu4242 (06:58 PM) https://cwiki.apache.org/confluence/display/MYFACES/MyFaces+Commons+Converters MyFaces Commons Utils created by lu4242 (06:32 PM) https://cwiki.apache.org/confluence/display/MYFACES/MyFaces+Commons+Utils MyFaces Commons User Guide edited by lu4242 (06:19 PM) https://cwiki.apache.org/confluence/display/MYFACES/MyFaces+Commons+User+Guide OODT (https://cwiki.apache.org/confluence/display/OODT) Pages - How to Publish the OODT Web Site edited by good...@oodt.apache.org (04:37 PM) https://cwiki.apache.org/confluence/display/OODT/How+to+Publish+the+OODT+Web+Site RADiX Powered By OODT edited by pramirez (10:28 AM) https://cwiki.apache.org/confluence/display/OODT/RADiX+Powered+By+OODT Apache OpenNLP (https://cwiki.apache.org/confluence/display/OPENNLP) Pages - TestPlan1.5.2 edited by jkosin (07:43 PM) https://cwiki.apache.org/confluence/display/OPENNLP/TestPlan1.5.2 Apache Struts 2 Plugin Registry (https://cwiki.apache.org/confluence/display/S2PLUGINS) Pages - Home edited by xsureal (10:35 PM) https://cwiki.apache.org/confluence/display/S2PLUGINS/Home Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY) Pages - JavaScript edited by bobharner (05:37 PM) https://cwiki.apache.org/confluence/display/TAPESTRY/JavaScript CSS edited by bobharner (05:11 PM) https://cwiki.apache.org/confluence/display/TAPESTRY/CSS Ajax and Zones edited by bobharner (10:09 AM) https://cwiki.apache.org/confluence/display/TAPESTRY/Ajax+and+Zones Apache VCL (https://cwiki.apache.org/confluence/display/VCL) Pages - Index edited by xsureal (10:31 PM) https://cwiki.apache.org/confluence/display/VCL/Index Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET) Pages - Open Flash Chart and Wicket edited by bzfnaz (11:01 PM) https://cwiki.apache.org/confluence/display/WICKET/Open+Flash+Chart+and+Wicket Community meetups edited by xsureal (09:32 PM) https://cwiki.apache.org/confluence/display/WICKET/Community+meetups Generic Busy Indicator (for both Ajax and non-Ajax submits) edited by lepirlouit (04:58 AM) https://cwiki.apache.org/confluence/display/WICKET/Generic+Busy+Indicator+%28for+both+Ajax+and+non-Ajax+submits%29 Apache Zookeeper (https://cwiki.apache.org/confluence/display/ZOOKEEPER) Pages - ZKClientBindings edited by randgalt (08:00 PM) https://cwiki.apache.org/confluence/display/ZOOKEEPER/ZKClientBindings Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
svn commit: r1181629 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
Author: lukaszlenart
Date: Tue Oct 11 06:00:56 2011
New Revision: 1181629
URL: http://svn.apache.org/viewvc?rev=1181629&view=rev
Log:
WW-3692 - uses containsBean() method instead of containsBeanDefinition() to
resolve aliases of a bean to find
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java?rev=1181629&r1=1181628&r2=1181629&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
Tue Oct 11 06:00:56 2011
@@ -145,9 +145,9 @@ public class SpringObjectFactory extends
*/
@Override
public Object buildBean(String beanName, Map extraContext,
boolean injectInternal) throws Exception {
-Object o = null;
+Object o;
-if (appContext.containsBeanDefinition(beanName)) {
+if (appContext.containsBean(beanName)) {
o = appContext.getBean(beanName);
} else {
Class beanClazz = getClassInstance(beanName);
