svn commit: r1468832 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Author: mcucchiara Date: Wed Apr 17 11:00:27 2013 New Revision: 1468832 URL: http://svn.apache.org/r1468832 Log: Corrected typo Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?rev=1468832&r1=1468831&r2=1468832&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Wed Apr 17 11:00:27 2013 @@ -21,19 +21,17 @@ package org.apache.struts2.components; -import java.io.Writer; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts2.StrutsConstants; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; - import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.Writer; /** * @@ -64,7 +62,7 @@ import com.opensymphony.xwork2.util.logg * * * - * action (String) - (value or action choose either one, if both exist value takes precedence) action's name (alias) + * action (String) - (value or action choose either one, if both exist value takes precedence) action's name (alias) * value (String) - (value or action choose either one, if both exist value takes precedence) the url itself * scheme (String) - http scheme (http, https) defaults to the scheme this request is in * namespace - action's namespace
svn commit: r1468833 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Author: mcucchiara Date: Wed Apr 17 11:02:18 2013 New Revision: 1468833 URL: http://svn.apache.org/r1468833 Log: Default value is 'none' Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?rev=1468833&r1=1468832&r2=1468833&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Wed Apr 17 11:02:18 2013 @@ -68,9 +68,9 @@ import java.io.Writer; * namespace - action's namespace * method (String) - action's method name, defaults to 'execute' * encode (Boolean) - url encode the generated url. Defaults to 'true'. - * includeParams (String) - The includeParams attribute may have the value 'none', 'get' or 'all'. Defaults to 'get'. - * none - include no parameters in the URL - * get - include only GET parameters in the URL (default) + * includeParams (String) - The includeParams attribute may have the value 'none', 'get' or 'all'. Defaults to 'none'. + * none - include no parameters in the URL (default) + * get - include only GET parameters in the URL * all - include both GET and POST parameters in the URL * * includeContext (Boolean) - Specifies whether to include the web app context path. Defaults to 'true'.
[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 - Coding Guidelines for Ambari edited by sandeepbaldawa (12:03 AM) https://cwiki.apache.org/confluence/display/AMBARI/Coding+Guidelines+for+Ambari Apache Avro (https://cwiki.apache.org/confluence/display/AVRO) Pages - FAQ edited by gabriel.r...@gmail.com (07:35 AM) https://cwiki.apache.org/confluence/display/AVRO/FAQ Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Bindy edited by ceposta (12:46 PM) https://cwiki.apache.org/confluence/display/CAMEL/Bindy HawtDB edited by davsclaus (02:37 AM) https://cwiki.apache.org/confluence/display/CAMEL/HawtDB Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - Mapping model for CloudStack zone and Vmware datacenter edited by sateeshc (09:21 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Mapping+model+for+CloudStack+zone+and+Vmware+datacenter Strengthen console URL token generation created by kelveny (08:14 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Strengthen+console+URL+token+generation Security Improvement to console access created by kelveny (07:38 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Security+Improvement+to+console+access Graphics and Resources edited by karenv (07:19 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Graphics+and+Resources FS - Affinity-Anti-affinity groups edited by prachidamle (06:30 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+Affinity-Anti-affinity+groups Draft - CloudStack Community Events Plan edited by karenv (04:43 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Draft+-+CloudStack+Community+Events+Plan Branch Merge Expectations edited by bfederle (03:17 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Branch+Merge+Expectations Mixed Zone Management edited by bfederle (03:15 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Mixed+Zone+Management LB using External Provider for Shared Networks edited by sadhu (12:52 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/LB+using+External+Provider+for+Shared+Networks Scaling-up CPU and RAM for running VMs edited by prashantkm (08:18 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Scaling-up+CPU+and+RAM+for+running+VMs Dedicated Resources - Private pod, cluster, host Functional Spec edited by deeptidohare (05:12 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Dedicated+Resources+-+Private+pod%2C+cluster%2C+host+Functional+Spec Add Remove Networks to VMs (Enhanced) edited by saksham (04:22 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Add+Remove+Networks+to+VMs+%28Enhanced%29 Storage_Backup_ObjectStore_Plugin_TestPlan edited by sanjeevn (03:07 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Storage_Backup_ObjectStore_Plugin_TestPlan Add Remove networks to VM Test cases edited by shweta.agar...@citrix.com (02:31 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Add+Remove+networks+to+VM+Test+cases nTier Apps 2.0 Functional Spec edited by rajesh.batt...@citrix.com (01:58 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/nTier+Apps+2.0+Functional+Spec PVLAN for isolation within a VLAN edited by vijayendra.bhamidip...@citrix.com (01:27 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/PVLAN+for+isolation+within+a+VLAN Apache Flume (https://cwiki.apache.org/confluence/display/FLUME) Pages - How to Release edited by mpercy (09:41 PM) https://cwiki.apache.org/confluence/display/FLUME/How+to+Release Archived - How to Release edited by mpercy (09:29 PM) https://cwiki.apache.org/confluence/display/FLUME/Archived+-+How+to+Release Flume 0.9 Developer FAQ edited by mpercy (09:25 PM) https://cwiki.apache.org/confluence/display/FLUME/Flume+0.9+Developer+FAQ Developer Section edited by mpercy (09:25 PM) https://cwiki.apache.org/confluence/display/FLUME/Developer+Section How to Contribute edited by mpercy (07:57 PM) https://cwiki.apache.org/confluence/display/FLUME/How+to+Contribute Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA) Comments https://cwiki.apache.org/confluence/display/KAFKA/Restful+API+Proposal (1) https://cwiki.apache.org/confluence/display/KAFKA/0.8.0+Producer+Example (1) KNOX (https://cwiki.apache.org/confluence/display
svn commit: r1469181 - in /struts/struts2/trunk: plugins/convention/src/test/java/org/apache/struts2/convention/ xwork-core/src/main/java/com/opensymphony/xwork2/ xwork-core/src/main/java/com/opensymp
Author: lukaszlenart
Date: Thu Apr 18 06:19:52 2013
New Revision: 1469181
URL: http://svn.apache.org/r1469181
Log:
WW-4046 Solves failing test and uses ActionContext to create validators
Modified:
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
Modified:
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java?rev=1469181&r1=1469180&r2=1469181&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
Thu Apr 18 06:19:52 2013
@@ -760,9 +760,9 @@ public class PackageBasedActionConfigBui
public void setProperties(Map properties,
Object o) {
}
-public void setProperties(Map
properties, Object o, Map context, boolean
throwPropertyExceptions) throws ReflectionException {
+public void setProperties(Map properties,
Object o, Map context, boolean throwPropertyExceptions) throws
ReflectionException {
if (o instanceof ActionChainResult) {
-
((ActionChainResult)o).setActionName(properties.get("actionName"));
+
((ActionChainResult)o).setActionName(String.valueOf(properties.get("actionName")));
}
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java?rev=1469181&r1=1469180&r2=1469181&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
Thu Apr 18 06:19:52 2013
@@ -251,8 +251,8 @@ public class ObjectFactory implements Se
* @param extraContext a Map of extra context which uses the same keys as
the {@link com.opensymphony.xwork2.ActionContext}
*/
public Validator buildValidator(String className, Map
params, Map extraContext) throws Exception {
-Validator validator = (Validator) buildBean(className, null);
-reflectionProvider.setProperties(params, validator);
+Validator validator = (Validator) buildBean(className, extraContext);
+reflectionProvider.setProperties(params, validator, extraContext);
return validator;
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java?rev=1469181&r1=1469180&r2=1469181&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
Thu Apr 18 06:19:52 2013
@@ -45,12 +45,11 @@ public class OgnlReflectionProvider impl
}
}
-public void setProperties(Map props, Object o, Map context) {
+public void setProperties(Map props, Object o, Map context) {
ognlUtil.setProperties(props, o, context);
}
-public void setProperties(Map props, Object o, Map context,
-boolean throwPropertyExceptions) throws ReflectionException{
+public void setProperties(Map props, Object o, Map context, boolean throwPropert
svn commit: r1469182 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Author: lukaszlenart
Date: Thu Apr 18 06:20:37 2013
New Revision: 1469182
URL: http://svn.apache.org/r1469182
Log:
WW-4038 Solves a bug with struts.convention.action.includeJars
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=1469182&r1=1469181&r2=1469182&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Thu Apr 18 06:20:37 2013
@@ -413,7 +413,7 @@ public class PackageBasedActionConfigBui
private UrlSet buildUrlSet(List resourceUrls) throws IOException {
ClassLoaderInterface classLoaderInterface = getClassLoaderInterface();
UrlSet urlSet = new UrlSet(resourceUrls);
-urlSet.include(new UrlSet(classLoaderInterface, this.fileProtocols));
+urlSet = urlSet.include(new UrlSet(classLoaderInterface,
this.fileProtocols));
//excluding the urls found by the parent class loader is desired, but
fails in JBoss (all urls are removed)
if (excludeParentClassLoader) {
