struts git commit: WW-4644 - Drops xwork-core from bom

2016-06-11 Thread amashchenko
Repository: struts
Updated Branches:
  refs/heads/master 095960b56 -> 39cc611d7


WW-4644 - Drops xwork-core from bom


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/39cc611d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/39cc611d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/39cc611d

Branch: refs/heads/master
Commit: 39cc611d7205a6fb44fb18ccf36502bcab5bca23
Parents: 095960b
Author: Aleksandr Mashchenko 
Authored: Sat Jun 11 20:30:05 2016 +0300
Committer: Aleksandr Mashchenko 
Committed: Sat Jun 11 20:30:05 2016 +0300

--
 bom/pom.xml | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/39cc611d/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 13098b3..6e3ccab 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -44,11 +44,6 @@
 
 
 
-org.apache.struts.xwork
-xwork-core
-${struts-version.version}
-
-
 org.apache.struts
 struts2-core
 ${struts-version.version}



struts git commit: Fixes WW-4529 and few other typos

2016-06-11 Thread amashchenko
Repository: struts
Updated Branches:
  refs/heads/master 39cc611d7 -> e28e5f03a


Fixes WW-4529 and few other typos


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e28e5f03
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e28e5f03
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e28e5f03

Branch: refs/heads/master
Commit: e28e5f03a6fd56797fb69d9d2422a39c176a6317
Parents: 39cc611
Author: Aleksandr Mashchenko 
Authored: Sat Jun 11 21:17:01 2016 +0300
Committer: Aleksandr Mashchenko 
Committed: Sat Jun 11 21:17:01 2016 +0300

--
 .../xwork2/interceptor/StaticParametersInterceptor.java| 2 +-
 .../opensymphony/xwork2/validator/DelegatingValidatorContext.java  | 2 +-
 .../main/java/org/apache/struts2/components/DoubleListUIBean.java  | 2 +-
 core/src/main/java/org/apache/struts2/components/ListUIBean.java   | 2 +-
 core/src/main/java/org/apache/struts2/components/Set.java  | 2 +-
 .../main/java/org/apache/struts2/factory/StrutsResultFactory.java  | 2 +-
 .../java/org/apache/struts2/views/freemarker/tags/TagModel.java| 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
index 914a2a1..d3e2df2 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
@@ -205,7 +205,7 @@ public class StaticParametersInterceptor extends 
AbstractInterceptor {
 
 /**
  * Adds the parameters into context's ParameterMap.
- * As default, static parameters will not overwrite existing paramaters 
from other sources.
+ * As default, static parameters will not overwrite existing parameters 
from other sources.
  * If you want the static parameters as successor over already existing 
parameters, set overwrite to true.
  *
  * @param acThe action context

http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 0f56055..cf6de26 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -184,7 +184,7 @@ public class DelegatingValidatorContext implements 
ValidatorContext {
 }
 
 public static TextProvider makeTextProvider(Object object, LocaleProvider 
localeProvider) {
-// the object argument passed through here will most probably be an 
ActionSupport decendant which does
+// the object argument passed through here will most probably be an 
ActionSupport descendant which does
 // implements TextProvider.
 if (object != null && object instanceof DelegatingValidatorContext) {
 return ((DelegatingValidatorContext) object).getTextProvider();

http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java 
b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
index 22e53fa..5383a53 100644
--- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * 
  * 
  * Note that the doublelistkey and doublelistvalue attribute will default to 
"key" and "value"
- * respectively only when the doublelist attribute is evaluated to a Map or 
its decendant.
+ * respectively only when the doublelist attribute is evaluated to a Map or 
its descendant.
  * Other thing else, will result in doublelistkey and doublelistvalue to be 
null and not used.
  * 
  *

http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/org/apache/struts2/components/ListUIBean.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java 
b/core/